From 92d9267183b2785d65445bf86caecf9d175ab6cd Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Tue, 8 Jul 2014 15:43:00 +0300
Subject: [PATCH] [Summary] Implementing TRACK Header UI

---
 gtk2_ardour/icons/time_axis_mute_implicit.png | Bin 1148 -> 266 bytes
 gtk2_ardour/icons/time_axis_solo_safe.png     | Bin 402 -> 343 bytes
 gtk2_ardour/ui/audio_time_axis.xml            |  45 +++++++++---------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/gtk2_ardour/icons/time_axis_mute_implicit.png b/gtk2_ardour/icons/time_axis_mute_implicit.png
index 88ab3c2f4590219d4b7f91382fae90403f53cb9c..8554f06554b3bf0343a706838c552c33e7bc75d5 100644
GIT binary patch
delta 249
zcmeyv(Zw`DvYw5BfuShC><o}%FY)wsWxvPH!6VC&ebdehD8yOd5n0T@Aa@9a8S^fb
z+5rVw(j9#r85lP9bN@+X1@dQlx;TbZ+)6f?Yx3Qmc`L(Kp2^v>zs&E<TF2BRm?Xii
z*Lh&B_2q^s3Igln-oLBk*9zlX)cD755)X4zK#@XOqf`W=3CEFl4W|-KdnTCQcjirP
zkoq%kl0h`@5if^uNoU?z-_FDZ8?3m$&Jz-Nzwn5`jMp&>OkD4^NFH-I5vtH&Y}R=3
ueb<rHBL~%Prn)o(t+ZfrV3juIVP=@%s~Xy{@eCi(l?<M)elF{r5}E)Bh*!k`

literal 1148
zcmbVMU1-!u9FMIWq6k8J2ll07DtF+y$s|oSo6yznZg$({Zr8G1u=J&-$+R2VWMVRP
z(^@<|?%?`xD3v0f+=DO2;eo<^f%stU9re755584=_KS*N2wEsOX?Lqa@xeec|C#yy
z{@?#h^%T3dZ*AGiFwFLRw_c)aQ}k|Wpx+ho{5iVpB-uXFi-$<n@DY=;@E`(t#~4N>
zWLV>eZ=eo_X{^}gKGIkCS~Ic384-pH9gngZrelBT8RiHgU=R)4Zjya+<thtoE6E;|
z3$Wm2P{r<^@KNtXv20F^n5xC@-v>HEjVf>uF+k{yx`7rZ*;Tz7m7`;x1*;G;l4RGM
z>MQhs4E7O_IT$lxTmW&26C|ig>Rup10rG;#LnS6aO;$80fZD@SYrZw4mGoTA7TqP;
z3L&1x^VMpVtG094ALa#BRe31#q8OuySTODqBaFF0TU~>W0@JrWVq+IX8jV3bMv^S`
zbS(tOD-_lhyFo2cG-Z5fc)Y+t-f^P1R?z_|p|@^qhz`o*9^y+Vz+=8i>oL?;C)3=0
z*iZzd-e?DWn-;|w)v-C|AeZFzBuj5N%eJ&!R>=v1B0)uj@q{2GV4_`*$J0<u%aST5
z>N+;!rn3|;q!T$QPNi&nN=jw28A;Ifcve;t={h&>2E=epRJUtWyEU%zL9UkZkwLIu
z#(1>e0X-E=a8SV>$n?sb01Ad_yU|HhptX2)<l9G(mGiL!Rx_;G8+edQy&t(MreQ{r
zRWTtaGD^G1*0|QkWR0iJ@KJlb(=PQR+Jlj}-u!g4K0e5$Gvm|Yn4Rlvp@VfHucyl4
zok8hm>CB0}vkm{=To^ii;qlpl=BCEWhbj-PYt74_UwVFW=EoO{ZTIlN@w@z<{?6(9
zx8ynP>Q^^bnrB{JpP#QjZaDQUzrg%fT)K#sSGN7y`XBRX^Y8hmUtIsA>zm8rv29y6
zy=+|E{lI#?{Qb*+t{nL3lg^c;O9Q7q`+IgrgZ63n^u7KciePFXy<~hjIobN%uD|S^
nE#`w?_Wgf52G32OZvwMSZb!%PpC^ybMgN0*wy0lBANuwU2fcnA

diff --git a/gtk2_ardour/icons/time_axis_solo_safe.png b/gtk2_ardour/icons/time_axis_solo_safe.png
index 2013a063d31b57244c04ef2a1d050d57625df22d..248d5c1c7bf3e7c831bf924068f833d6ca4900dd 100644
GIT binary patch
delta 246
zcmV<S015w+1J?qOEe8xK5ww_PeUUUL0s!WbT^)a1bFSnuxP1K2x|^5vHv<zT4uToP
z&-mLF#3$P@WP@}jG3+7RFl+{qWf(4lK!Ak^&7nX_35eeV@oJD5HiHNn1~jM~NTmVs
zEGQicG{hB`dP3fG0phbz!@_`g4?e|&44VZt@Es7Z0^)m=7zPR_WgvEix^NZH>&E07
z26A3aIW(|m5m1Xg0zlCZWrAEZ6UhG$b!7$6;Il*<hL(;%8chhf2&*^oB}kGCqtqa{
wVbm}PVi>SsqlQ5szz8a7e}8&Li5YMJ0N&JYt2yWr0000007*qoM6N<$g2E|ang9R*

delta 306
zcmV-20nPr`0+IueEe8uK9g|FK5Ro(|0s$eBT^)ZCvySGn{^w==&A>#dqksk-w4VGM
z>=+hG3_1dI5zHVEAlqe!a@hXcAQ?oqVO!I=|JzOZg%QpKy_xN;`d^geC&RZtEDT*6
z?|}{Qp7|APgyD5rL$KWcAo)jNwypR}hLy?uc#{!cmuU)oWO($IhoNEZBchTHUYCW>
z{m6f)$^VhzQW3-d&1u{O6F0#Ku$c6RQLm4I@!?l)u%Y2Dy8p>C>_i^R|E_RIcFS4%
zilA5Vh8f6Jo6|o22e}9on|ghJfCgU1tpQs`2c;uIu0RJM3o%><%xl-JCx0a?<D(dc
zp4UhP@Cd+`*GM-ESg_&BYovP<SVGEje+3!`Af<)@0IQ^HT~wyDI{*Lx07*qoM6N<$
Ef|o*&i2wiq

diff --git a/gtk2_ardour/ui/audio_time_axis.xml b/gtk2_ardour/ui/audio_time_axis.xml
index bbd83bbc45..46cfbb7261 100644
--- a/gtk2_ardour/ui/audio_time_axis.xml
+++ b/gtk2_ardour/ui/audio_time_axis.xml
@@ -9,7 +9,7 @@
           <HBox>
             <HBox width="12"/>
             <VBox>
-              <Label id="number_label" text="32" fgnormal="#ffffff" fgactive="#ffffff" font ="Calibri 12"/>
+              <Label id="number_label" text="32" fgnormal="#ffffff" fgactive="#ffffff" font ="Helvetica 10"/>
             </VBox>
           </HBox>
         </EventBox>
@@ -24,13 +24,13 @@
             id="name_label_home">
         <HBox width="5"/>
         <Label id="name_label"
-               font ="Calibri 12"
+               font ="Helvetica 10"
                fgnormal="#ffffff"
                fgactive="#ffffff"/>
         <FocusEntry id="name_entry"
                     width="100"
                     height="20"
-                    font ="Calibri 12"
+                    font ="Helvetica 10"
                     noshowall="true"
                     visible="false"/>
       </HBox>
@@ -62,24 +62,26 @@
           <VBox>
             <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
             <iconbutton id="solo_button"
-                      width="19"
-                      height="19"
-                      normalicon="time_axis_solo"
-                      activeicon="time_axis_solo_active"
-                      implicitactiveicon="time_axis_solo_safe"
-                      prelighticon="time_axis_solo_prelight"/>
+                        width="19"
+                        height="19"
+                        normalicon="time_axis_solo"
+                        activeicon="time_axis_solo_active"
+                        implicitactiveicon="time_axis_solo_safe"
+                        prelighticon="time_axis_solo_prelight"
+                        tooltip="Solo"/>
             <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
           </VBox>
           <EventBox width="1" bgnormal="#000000" bgactive="#000000"/>
           <VBox>
             <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
             <iconbutton id="mute_button"
-                      width="19"
-                      height="19"
-                      normalicon="time_axis_mute"
-                      activeicon="time_axis_mute_active"
-                      implicitactiveicon="time_axis_mute_implicit"
-                      prelighticon="time_axis_mute_prelight"/>
+                        width="19"
+                        height="19"
+                        normalicon="time_axis_mute"
+                        activeicon="time_axis_mute_active"
+                        implicitactiveicon="time_axis_mute_implicit"
+                        prelighticon="time_axis_mute_prelight"
+                        tooltip="Mute"/>
             <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
           </VBox>
           <EventBox width="1" bgnormal="#000000" bgactive="#000000"/>
@@ -90,13 +92,12 @@
         <EventBox width="1" bgnormal="#000000" bgactive="#000000"/>
         <VBox>
           <iconbutton id="monitor_input_button"
-                  x="1"
-                  y="0"
-                  width="19"
-                  height="19"
-                  normalicon="time_axis_monitor_input"
-                  activeicon="time_axis_monitor_input_active"
-                  prelighticon="time_axis_monitor_input_prelight"/>
+                      width="19"
+                      height="19"
+                      normalicon="time_axis_monitor_input"
+                      activeicon="time_axis_monitor_input_active"
+                      prelighticon="time_axis_monitor_input_prelight"
+                      tooltip="Input Monitoring"/>
           <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
         </VBox>
         <EventBox width="1" bgnormal="#000000" bgactive="#000000"/>