From bf938eb1d6bc233b9e9986f885292328aed8fcd6 Mon Sep 17 00:00:00 2001
From: YPozdnyakov <YPozdnyakov@wavesglobal.com>
Date: Wed, 10 Dec 2014 17:36:31 +0200
Subject: [PATCH] [Summary]: Add track_context_menu icons according to Igor
 request

---
 gtk2_ardour/editor.cc                  |  18 +++++++-----------
 gtk2_ardour/icons/tool_arrow_idle.png  | Bin 0 -> 1141 bytes
 gtk2_ardour/icons/tool_cut_idle.png    | Bin 0 -> 1199 bytes
 gtk2_ardour/icons/tool_marker_idle.png | Bin 0 -> 1089 bytes
 gtk2_ardour/icons/tool_zoom_idle.png   | Bin 0 -> 1254 bytes
 5 files changed, 7 insertions(+), 11 deletions(-)
 create mode 100644 gtk2_ardour/icons/tool_arrow_idle.png
 create mode 100644 gtk2_ardour/icons/tool_cut_idle.png
 create mode 100644 gtk2_ardour/icons/tool_marker_idle.png
 create mode 100644 gtk2_ardour/icons/tool_zoom_idle.png

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ed61d2b49d..fa6df9cff1 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -1990,28 +1990,24 @@ Editor::add_track_context_items (Menu_Helpers::MenuList& edit_items)
     // Tools menu
     Glib::RefPtr<Gtk::Action> act = ActionManager::get_action_from_name ("set-mouse-mode-range");
     assert (act);
-    Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
     Image* icon;
-    icon = manage (new Gtk::Image (tact->get_active() ? get_icon_path (X_ ("tool_marker_active")) : get_icon_path (X_ ("tool_marker"))));
+    icon = manage (new Gtk::Image (get_icon_path (X_ ("tool_marker_idle"))));
     edit_items.push_back (ImageMenuElem ( ("Range Select Tool \t 1"), *icon, sigc::bind (sigc::mem_fun (*this, &Editor::activate_track_context_menu_action), act)));
     
     act = ActionManager::get_action_from_name ("set-mouse-mode-object");
     assert (act);
-    tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-    icon = manage (new Gtk::Image (tact->get_active () ? get_icon_path (X_ ("tool_arrow_active")) : get_icon_path (X_ ("tool_arrow"))));
-    edit_items.push_back (ImageMenuElem ( ("Pointer Tool \t\t 2"), *icon, sigc::bind (sigc::mem_fun (*this, &Editor::activate_track_context_menu_action), act)));
+    icon = manage (new Gtk::Image (get_icon_path (X_ ("tool_arrow_idle"))));
+    edit_items.push_back (ImageMenuElem ( ("Pointer Tool      \t 2"), *icon, sigc::bind (sigc::mem_fun (*this, &Editor::activate_track_context_menu_action), act)));
     
     act = ActionManager::get_action_from_name ("set-mouse-mode-cut");
     assert (act);
-    tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-    icon = manage (new Gtk::Image (tact->get_active () ? get_icon_path (X_ ("tool_cut_active")) : get_icon_path (X_ ("tool_cut"))));
-    edit_items.push_back (ImageMenuElem ( ("Split Tool \t\t 3"), *icon, sigc::bind (sigc::mem_fun (*this, &Editor::activate_track_context_menu_action), act)));
+    icon = manage (new Gtk::Image (get_icon_path (X_ ("tool_cut_idle"))));
+    edit_items.push_back (ImageMenuElem ( ("Split Tool        \t 3"), *icon, sigc::bind (sigc::mem_fun (*this, &Editor::activate_track_context_menu_action), act)));
     
     act = ActionManager::get_action_from_name ("set-mouse-mode-zoom");
     assert (act);
-    tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-    icon = manage (new Gtk::Image (tact->get_active () ? get_icon_path (X_ ("tool_zoom_active")) : get_icon_path (X_ ("tool_zoom"))));
-    edit_items.push_back (ImageMenuElem ( ("Zoom Tool \t\t 4"), *icon, sigc::bind (sigc::mem_fun (*this, &Editor::activate_track_context_menu_action), act)));
+    icon = manage (new Gtk::Image (get_icon_path (X_ ("tool_zoom_idle"))));
+    edit_items.push_back (ImageMenuElem ( ("Zoom Tool         \t 4"), *icon, sigc::bind (sigc::mem_fun (*this, &Editor::activate_track_context_menu_action), act)));
 }
 
 void
diff --git a/gtk2_ardour/icons/tool_arrow_idle.png b/gtk2_ardour/icons/tool_arrow_idle.png
new file mode 100644
index 0000000000000000000000000000000000000000..a413ba90f84f0c8157310f80cee394e6b26c902b
GIT binary patch
literal 1141
zcmbVM+iMh87@u|PEoRAs){uq5Frh`LJ9EzL&hE~THQBkDm2M211sBocWacD0Z06FL
zlkOy78(Wb`DM$*X55)`iq4*#{6cHmv@kP-Gq0rI?DfAC01%0w$&m_CihmZ#cX3ja^
z`F_9eKIg~B4ySt3JrqTyDx+$RtRIp$y=w>gHp=}9Sq8Ayz!TmSZW{rj%9b~Y=!#=Z
zqZ%@-xi220A&N>i?Ro<@s-H=w=debs!$yuz&=fT^9QlUXLYSUJ)3#e;{<(Xfp>3<g
z922Ub>MN*ekIn~ZVt%Y{&bLg_VulaVLy<%X9E1%za%S96ib~8HuSE8-m}BTQ72GN@
z>rOSQ<Fw)hh!$9oF+m>E`5X&#K+K5;X&ykpL7oGJ3<Q!;kN~7R4@0a4)|6CJ^^Pra
zDltureTn1R?Ka!avR*LFK~WSrz;isGAsU%*&c#NQal^qbgNi~kuzhTME*&!(lin;Y
zF~rmL5FEc+-5_?uPNGQ4xXAE1$O6uB;<(ndLtH~|-Plw+tk3y~tD(@F4NOvxslhIo
z<Zf$2u_EzCIvUudD8`KHnX?XZaYZdL<c76uOM=-l$mfbmPUb<r2w|}Rbw%WJWlh#a
zC<|SV&9H*5E7`2btNAj7P$NvbEUJ(Pa$eVTz<03~H^hc(qOM(=*zI89mRLy%kb%9R
z?s+ra4j6BG*bAGUPb(7w3+bw1+HNd~3$z}uiURvfWa)wD&}$i%>`gq-w4AIJ1qJ5T
zBNurYlw|-4ya<X)A<uNM*860QBhGMfd%V*wT@mTQc)QX3<ghV5$R#rqkm0y>B>kEU
z*42tyu19}P{`cn1aPn4SZ!)#|>y@kLY6HuEE&Xw?_4`-!tHfg8wto}H3b*$>N<Ufr
z^l&0|y6=|{E}R|Ne`4V{pJ+bb8LWIwecyLuHL>{j^MivgUXS;0zkL48iN<I}{b-f>
zk?P%_yphtr`)T)RdHK?X2WOXlOEjN;yYlnm)bh4F=RSGZn@q1z&rT(le%N>MWozN%
k=s*_V92pQW)w_Kcpst-1KCk&N7UCa4MH^GE%cs8iAGs1~e*gdg

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/tool_cut_idle.png b/gtk2_ardour/icons/tool_cut_idle.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0ee2bbbbf67091d506853d79faf321221078eea
GIT binary patch
literal 1199
zcmbVMO>Em#9Cwy=t*TXYbf{}N%<_bUfY|T3juV?EjX&22(nV>c<uWwKer>$gAG6)X
zEthR*unJ8o2ToiV6et{k1Bj0a!Pe6zP1;0Hh)6IvOk5_o0vgY4QaDsQV99>({onuh
z`+s}2I&*wzaD0#;h@tYdTEpuT_#GcOfWHlCRKd$wq&1>hZ!T&Z0U{*JYa+7j81txx
z3~Tx9O*Bam>6Tq@M2*UeqUkxbk?7E|<6|^IOisnVVJ@JEY@&JFEl>}xeM^zHRiI90
zE1=>lsAW&D1ZZ|;rf#k*n1V%370Jn1!~_nC3^H~W-B64R)Hbh(_lcOH$ZeHqp+N08
z)u>cS#S0Lbr9s97JS2IJh8z$$;W?585HOHsKrRD;n9Yd*lHG^G)&grztf_j}7CsfI
zRuuUn!?fFNx;;UA!8`*6L0|yOuxtivWWr@PGUALI9_ulvC^Q4xk8IB+6Go%yEky+i
zd%6>X<5w!X#BSJ46iyiv8$JVRz&K74*S2;T)zH6g?5Q2rmwm+4Q0OfMCa%Zau^t%b
z?$L%4MeL1uBCv5$j78NmmmK6qWwk)z8``oh5l%>e=kf|Cvw+V-n9o675m-*rWL<!A
zw#Ts-HV<;Ts&hG&mmq{1X3}Lrg)ESHUDE;E!<OAJGF%h&?Aq9F7t22qD=GmpA}^?W
z-eRu<sx2?_!j|Wg%50W~WW_LTH<2U-+KE?1fqf2Hdf++ac7{cJ4-YhrleK(Sf!t2y
z0xJVa1|Y`@Ag|<js*AP$Pu3Xh43o6Sf7+!d!abO5cbgv{cE<;~cxD1T9L0B@8pVUv
zDXUUF{-OET!-rGp&r>7mq3<@XZeG9Bxpr>s&W-o}F1<4HG=I2tnHW&M8o3Y`*FGtI
z_=0rc$NurH$JQC*_w?HJ^&__~XWo*(IXH1YwMA(sb6@mZPYz}qsWYFZ>-W>c3~}#D
z6~4T7sr35etNh_i-}#F&@msSI=k}c~4v+2|dZ|<s`_6nxTmfqrUaf8xOQ)VGmG8Ya
z_7m~hdTRQ4dGqT-oj29xqvQMkyh`__l((g$8*fymN^oFn_Spxc@~Mx`|JuBD@Y4Gy
oj&J<DYJKqi-9MuJM+S#a6P^Cb?OzVP+ev;QWo<_NSU!F6AGI2Ong9R*

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/tool_marker_idle.png b/gtk2_ardour/icons/tool_marker_idle.png
new file mode 100644
index 0000000000000000000000000000000000000000..93cfbac96d34d5cb786103d6b54c07c1c4c626ff
GIT binary patch
literal 1089
zcmbVL&rj1(950yxLxLeON+c4Ra&_%{Wxv`macx&v!eERg?%;v0eXs`FSK9|G!~^OD
z4jlahNF?DR@!~}f5=9ad&uWNXOgtLm(L}}9v7raT!6xnd(a-1e{k>6|9P8=s?`9aL
zr!cOS>3W5}{TDmwx0>ry>2i(at7Hbxk%r+TCTHOqVhfHjkIKlfR_?w<BMcL(+m$M*
z7AIsAJG>EL_|Wkvn_)&qL(ec55MgU*-gdLx(TkTHYg<|FcCrYHo{H-B_^OX)Rwpaw
z>Vhd*+~`eqB$TOugNVU~&Y~O0VU}y^%5)!H3mn^okcBLF;#9R*VpZ%THpzpy2~v<v
zC3u(sQbM}HiU0xuiULT-A&`@489=u6aMYS_&B<j=Z`q=!ELSJQlLevCXz-0;9{ckG
zlq5+2q9BTKiiig*E-}Km8w|A-G!&S=?GYQhY@}$^@Dj;#)YFp?9IseB6?TJGqG-y5
z(C`Gv1Ho~kxSHsIl+j-|&O`^56%Pqz6yPP_r1h8^YLjX1&NmbRsW<YJZ_}a}iyAhU
z9OROMmgVRl-m)zj4(C8Bkx>(h2vQjcGij)+l9<Tl6<vZ#vaN9zH>vCD@UWEAQaK1=
zo+{~zq(KoVDLt<PvCS>G0Wn+?we8x}Zi_3O%av6h83g+kj2GJ-P^x2sgF5zDbtcI}
zwrH5P8{I?&I*C_9zP*er-Nz2w%&=^q;Xyv1Q1Y3i3KJ)hOQHgD3IJ(Q0vR=(;#yqm
zf3hY}XN0Id{%M!?745-jd)oZ;a5_H7r8DEx;SeXE4A8;C1ua(z4{JY<k4IzAIxfe0
z_I9?^{nAyXd->?_5%c)MS{Unn__6EG=TDbPueZP7x;MD~ZDab~_{5j4=kGhlzjf8d
zl-=u_zoyl$SEbp0hbjMfI>CIMd9&SjKhwKDSdNcv9{k?f+K;U<F=lUS;6vxZ(0nx1
Mh5V$ptIR(51LT}nAOHXW

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/tool_zoom_idle.png b/gtk2_ardour/icons/tool_zoom_idle.png
new file mode 100644
index 0000000000000000000000000000000000000000..23373b708137af13018418b6a6e37fc4aea19f7d
GIT binary patch
literal 1254
zcmbVMTWs4@7(Q9HQk9h!R$9>wWE=!cBJr{7Tx>N<VmqOkNQu&*MO;Lj<fJjJ?O?l0
zTEvuWfC^$Lo5lk#Xq~uJeb@sMnh@nC#sd#X1qE%|(=-N}5TYs+t&E{^+$M#GY7bbl
z&pH43zwf{M)#T`--CcuS0D$iJh?K(X-S{2s?7-hlWI)8rJytYhjp;?JA{z)q3VIF^
zaaA5iDI^!BpZ^*S1K=zv>5P?0JjUmB)g#+Fo~l~LXaI&o)v}zQKo*fh<BAp}mp}fD
zB$PssJmgKlL|H^7Wn{)cV>6@a{LDn2E0CcB#Bi0z1S+y*qN+}6CSMJb8@xQ;+hU3&
zHdL&MAi3#OCXpmW-9Uub1KoM(qX{4Dp;^eW+#>`7X-Lrw1^sRs@?Jj=X`=Oz*qTu&
z@+m3SvV~7UvSe9ho}wz1il;K<(T#D6<~WXm48<^Rtl>7NHA}9#HPh8*kdT=-l(MDh
z8eucaIep3slGxMD5Y%!au|=$ztwiCJQB}E2(H=;tsvXycwrQo%ziw=+ZKkKoh)N+-
zpEB~e9z|ChjB|HuL$)IJhJV~pa8cw*NzYHINVDQnki<8hf>Pk=p$PP`0g)9L=nK$v
zz)#0Sj$tEFA;!^yx6QE~*6)WAFEb=bK2D_RC}xTYoJ2EF@WrAr$h5I>&9r1KkJ@$>
zY`29KZ;9na1Id<dq;-9=-2usxZs}%8FB9UJ*FzHtIj?B8#4gZgyb>~$!>AB5bd}i1
zFt2RmK{Uz=(STQ^+0Do~Mt~6kLO;X7fav#;Eo|ZcWR1ekP<DI#r(N12+=KRZtNHO^
zYkZJ~XU4$8;cI@{1i;Z3mm=xvrQFT+^^o&J#~x?*=ks&o`DDM)b$I#Go8X<*`b99?
zvtz|^$bZhcwhFHtd_Vl<&RX-xynHR|Sh_43i#<cVR~N#BZ)dI%>8S-AB_$MpMfhYA
z{ITF_p8hMm=$xIZuQ_`M!1wzbcfAL{+EX8VqSo<j?YGd;HDdYL?w1!{2tW7Bv8Pw}
zC3c@*9~nJ)1HAit{p`)x9=yJH_J?nqcmDWd<ND9_0J!!{!$06yd5HMQd8IgiF4Dn+
zm0hWmryT6A&g_XJwZ2~o@!tA@8{wto{1?RWKbKBrfj8@7-@5;)&JP~w?Vo%7YX5i1
z+b_7#9gVrY4>NuHFMM;`NB5O3?>Ms<dh+cz1`qO}6N2hX#lJ7^Q;yqzo_KUrIxA$4
F{sTWDpUD6K

literal 0
HcmV?d00001