From 4dab63411cd109e3d8216aecd85cfd6789cf77d3 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Mon, 18 Aug 2014 15:07:46 +0300
Subject: [PATCH] [Summary] Implementing change requests from Igor.

---
 gtk2_ardour/icons/time_axis_monitor_input.png | Bin 1056 -> 185 bytes
 gtk2_ardour/icons/time_axis_mute.png          | Bin 1123 -> 262 bytes
 gtk2_ardour/icons/time_axis_record.png        | Bin 1105 -> 243 bytes
 gtk2_ardour/icons/time_axis_solo.png          | Bin 308 -> 270 bytes
 gtk2_ardour/ui/audio_time_axis.xml            |  11 ++++++++---
 5 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gtk2_ardour/icons/time_axis_monitor_input.png b/gtk2_ardour/icons/time_axis_monitor_input.png
index 7bc9c7c7d8dbd98263a2cb88b49e786aefe67afd..47fae900ad64e40c31645ae25760470aaff62ea0 100644
GIT binary patch
delta 157
zcmZ3$v6FFvN<Djtr>`sfJq{rrCh7Sn0~Ht;7&r?&B8wRq<PL!_W8Q^QJD?y-x}&cn
z1H;CC?mvmFK)#2ki(^Q|t>i!d|L<2hoWSmUaH0?M+lD~*KC4OB`qr#oUCfZw==jz{
z;RgQ^w&uGNL)aJh$&@}xV0Jz<aWQXCpgW(L!7Gm}F-8U-XWp3?7IFRt8p`15>gTe~
HDWM4f_VYIa

literal 1056
zcmbVLO=#0l9FLm}nGQYdu#E{JI|(*<uT9z{uFf=Rw}P#uE7)Vx<aG^e^0MUBW;===
zb}0xudYcD95O!1#dfY(p;z{%-9=ymv5D$Vc{g?`42Ls9b$nW?2fA3bxt25IJ(+tDR
z6xWO@U9Zu1_QDkXUU@M4kS_BiUnlFhMS5m{7|q5_#1>t1167e}Z*Lu;Wrmq-JGDBg
zmu{;Tc6l?#@R93NHp48hM80WlBEmM&hT~<qZ?9f+tYc@nyHW|1d>yr&wVeR1@04rS
z&Zec<+{#UMIZ~;Bi-^faZpRDND9a6WRl1L_1&$p+$Yz!sI#n-KSRDt5m3WY_KpL`X
zk%uBsMCCf01P}-?DS%7@0#(YW0J5Wpqt*hurB;o?$QC_ixi%rbDhRz^kME^;9Bc?s
zQ4|3rg=8{85s7fyBW9HF!lki-fkG>AeBxk_jTOx%?vgA=JspPN`lZr|uosRJMN=k3
zrY}Gq2(BB)H9&`?ivGB9Dmtuf`$(vw5O)KM)}ysFCez%VZ72p(Z`3=1LyKZ|3~Y5>
z<dLG0<>(*Yc5D?$GJr56f=m*mWe61r6g`#7q_mV=potx8oXXY2f|1XQP|6q(=Ea<p
zGYmbiD?m%?N?sXri(W`f&q8CnPHcC`O`XYA^#GX!2Q`d4;|{2_F~MOQ`>eh$@sKT<
zmgB`Yae;>M8Ypn?A-fP@mmOqSbx!j@{5Nu0*3(K_(j-~ViJ~TQBd+~FSre!;LfjsI
zwafU5_F%j{X?}V*86V`)nF;7{xG$dlpo3K|8d@#-(ENUU{PP_+Ja=)gwfMGgH|HiA
z?;q{=pPZkYpI4ZJH;v0jzixHF!l(WIV)ygYrCr>p%sjr)>u-rKSFb8x4>g9FxWw%4
VO?|0O9(;^vwwNy)&vT9YzXAE4Nmc*=

diff --git a/gtk2_ardour/icons/time_axis_mute.png b/gtk2_ardour/icons/time_axis_mute.png
index 16bd09a37b2283200183706ee10c2162dec78b94..e53aa0c1d4dbd5a4880a7add2ea3c47b70c4290c 100644
GIT binary patch
delta 234
zcmV<G02Tk^2!;ZXB!35VNliru-Ut#4GdFGnEc5^X010qNS#tmY9>M?s9>M``&~-il
z000DMK}|sb0I`n?{9y$E005OqL_t(|+GG6x|Gy-|U<X6NkxT>afKf+|I&vsFl7$+E
zOrJhI4M+(B@#@UX%zIF=au5yVcMb|i0zoJcyFeXU0dydU-D3fjqu7zujPCbP$1*@2
z{GM6{Q`3>FfmjI`ipEgKt{#kz1f|8Z43KD60^&V`(UBkk3OyGnJt(6a=135rS}20S
kXai%^k%J73I+9ud0O|E3<9pKiod5s;07*qoM6N<$g57smH2?qr

literal 1123
zcmbVLO-K|`93LwzwZemtg~Bi%Drjfk+nw3n8QgT8S#6^+TNe@|aCYYD4muyrJl#>~
zP!@fmAVfh?WOe9}T|+!bmnaBA=oC>M>Jmu^MR@Ct?plF#Xkg}j%<uR6e_!e8?%Gwm
zua=^yUD+c_j;sgC+pwdWeCsbXTqMh0oaw{8&LA#n9-`8QQ$Tdq(uPnDX~y`Om#CGZ
zwieBNAMR6+NxEaPT8Lo-%Oz}zYHbT#O&>;>E}$XPPBGsW78%+!Qp`y~1*$8fqIqP(
zL%kE-d3|D77Y(NEFx?tRM8HB=qXTQi_N5@jtm#T*A6|0|y#~R<DQ4ZNKDCFI9S_k0
z3nDs*Lpsj0kOv|!9-^ZF0uDwwkcdDa2?+^6y8JN2nr943Ii<5~i=0wS5o1^4xKgRa
zmSU{q4RKHuMGi!{Xf#3)5r5pqS`e}QmWqOceBCo$Y&td_DryC16sH*C>3Rs3tEwBq
zwqH&ZNf{StE(ck_SymX=8rsJ>^xKV1(SCm1MO+T~&Zwu8dJMKy$Rv0FHWUJhH_~y>
zBt_9i6h|Mmkd3oSiXnek!!#ryBmsm89wee5o`g_@K$K&#L@XUkc9O(aG&bYL5@|l8
z#6>716bLhXhtQ!Yaz++GIx349vBJ&TKGtj<RqUF?Zke0>Cs&d^q+!R)JI+X@1A2-M
zcKo8_(sHlBLR!^y(++RK0<FiZAkQ2_MyKak^jd}`a}y5$|99lcq#PIHLRv^BJ9s|L
zGi9#vKUw35GhEmnf3!>Giu7Q(-DrMt*ccyVlbP|zaLm`O+GMb1vPwE1ye)iRSy_Dz
zUR2dxA8dLxZ4?@}47{0nFx~Wc{x<V*dHGKD!)@mRq5i{U?aj%{bElq;?XK<Gl0Hzs
z(B9l%g-Y$8rR}|V@sf0->dT9tlTbZ>zrW`4)a>->RAY0^(Q8AqOFO-<cc0x_I4M7v
z_%SeLS3f-PURLG3vvc>Bs-Hh<>1r0=HPzG)Q2S5p`80PmayA_MY^Gaz(lK!U7w@8G
A=Kufz

diff --git a/gtk2_ardour/icons/time_axis_record.png b/gtk2_ardour/icons/time_axis_record.png
index 2d9b23da641d72ca0f974c0a4554010c9c313e99..f33df063bf9fd9148d08a5e053f9fae57d76b82e 100644
GIT binary patch
delta 215
zcmcb}@tJXgN<Djtr>`sfJq{smORh659r+9l44efXk;M!Qa)&^eG4DdD9Z--Z-O<;P
zfnj4m_n$;oAiv4e#WAGfR`Q?!|M#mLPGEOFIMIjsZ9|}YpH-2D)uh%aHsASnw!9vk
zN}O|9AKA{FIa6e|@7W1FtyVm3)(sJzQf$GxDhm?=_=T!XuT1>THe31h!Yv9{8s}ay
zm~yMnru&J9c$TEs=@)IOOTJH$@;a@=F-2^p@T|qWJ%R3gMh34uvKSebZ<oB*uJuA4
P=o|)5S3j3^P6<r_U>{CU

literal 1105
zcmbVLO=#0l9FJ3m&P{e0;$%X|=0UW{du`G-admV_yA|x5UBRlCrpenHwtSep*>)FY
zZUa$<gWW_?^q}I@n>Y{NL_rk6(-0B#A~<E@K@Wm2T{{(~2Ls9b$nW?2f1e#3=xb@(
z*+fxPOR8VVkaZ7v+cr0nZ|hXsG+EklB8P|UVO&yOM8$QxfasK|j-U)u^~#B-sGFiT
z7L9BU=h6oy%{E!p$FOD7A#953?kPK}Hi|G^KqH0~V?IB8#L$KwV~z-EkalELH2No8
zG&C`g)h0$YQD=G%(A{N;2$%?~blDuUJgFRGs=5-{`_~*pS0Q*b#;iJ(OAper?IK!W
zK|ljxNQZeA@<8OpeRL2&z`-B~A^`{_AtC`t*B*vgbM;{<qa<s#$SKAYF?J-5E0s!Y
zDa6|D2nR(`<Uo)M1_J~U@G2Ho%K^*ltSczU(_F*BhHcTlqFS)Waf~6Ju7+Sb>GYbg
z<<$~JQpS~4hl4EOOw*66iuP~@{c>Ynw3n?oh|3_)9(OfTkKxWbndI)@hI}CLMmppg
zq$ui`Vr%0jvT#a?G2{=c8@dF9D1b1+gGdmBqY#P^h;k?t3B^OvBuQ*tV_j~XPb!H7
zfI>upFv0f<y^10yWD&%JvX~I-+?3^E)zVPiu0iY)WF#pApDX{BE6FZWvF&DUd#v68
zgGC$LUeR`Fc}QR(omMr&@^AbCt;VY$*Eosvq-&dWHN%pzjt7AMGxBIu4vS$SE<~ff
zJRj$o8dv|HtZ~E{&To(3+NFL)deGmlH9tA5jSsTO%(!GYaOK@iGFYclN<3R$Dtuj8
z`Thbt*|2qfxZ~NZUf9u)e>Hb)w&V7Li-ot#%a<CjZ<?EW-mr3c;rRV+w=OhKOU*O;
zPv?xm>8`eq@xt91>C2nEr;GF3r=)uxn0bG+t8cM+@%)+Hi)#CaA9;52)8V~*`_+Xj
kFB>1<=<M4izV6u4ny0=UYg3ozopb(>rxF9oo!<Q9PcUv`*8l(j

diff --git a/gtk2_ardour/icons/time_axis_solo.png b/gtk2_ardour/icons/time_axis_solo.png
index 332a4717f2d87e6131ef1a611d8df125351fffea..90f9d2f59c56c6db9d1673cdb40819f3f7956184 100644
GIT binary patch
delta 234
zcmdnO)W<YIr(TGM(J(*$v?&7v180FpWHAGS+(8g#Je(O43>0KZcl32+VA$Bt{U?zX
z$e-)!;uunKEBVj=|NB)AC$Kvooan>+wjt2H&#FknYEo+yo9}!(S(jF(jY0zZ*&kh1
zurfBDoV0nR<fNw#cNkNbGk(;{lJxO)-^K7TQehrz@{vS`J?REkMPgSLzL!u~SdnjF
zB{YR^YU7Qmj6#bP+NJo-+?!-ry{0e7nCI$RymI<(Nd-j<;g0{t4o+K}fJ&w`Ut~MB
iLYZAsqEuxo1A}_HqOhj%ix8ko89ZJ6T-G@yGywq0<WX|~

delta 273
zcmV+s0q*{e0<;2<EPo3R00QR2JuUzM010qNS#tmY9>M?s9>M``&~-il000DMK}|sb
z0I`n?{9y$E006^DL_t(|+GF(b@%hg%$N>wKW*lgT-~&tp?SNt9NES*Bkd%}pN&WNZ
z&q=mpNQC5&a3sai4Fg6-Mj$E_h?Ri&JrJ)3(dW*cqu6X}hJR!^5O+Y?X+XS+S_V_o
zkuE@d7Kmp7aTpNq8H|pc1$F2<21qF08;p(wr9)*Pc4dHsD9EA4gUyj3M}g8MD4J(c
z(Ol}~ZU#sQ&IDpmg9Q|-6%3FN9XyT%7BwITnNZQwa4;ka^HE2RC`VG9amZ<UkqQ7d
X&m!R-LrJ;-015yANkvXXu0mjf<}PQ!

diff --git a/gtk2_ardour/ui/audio_time_axis.xml b/gtk2_ardour/ui/audio_time_axis.xml
index c9b3e5fdbc..297254db45 100644
--- a/gtk2_ardour/ui/audio_time_axis.xml
+++ b/gtk2_ardour/ui/audio_time_axis.xml
@@ -7,9 +7,12 @@
       <HBox box.expand="true" box.fill="true">
         <EventBox id="selected_track_color_box" width="29" bgactive="#5BA55C">
           <HBox>
-            <HBox width="12"/>
-            <VBox>
-              <Label id="number_label" text="32" fgnormal="#ffffff" fgactive="#ffffff" font ="Helvetica 10"/>
+            <!--<Igor! width="2" below is the shift from RIGHT side of the space>-->
+            <VBox width="2" box.pack="end"/>
+            <VBox box.pack="end">
+              <!--<Igor! height="4" below is the shift from TOP side of the space>-->
+              <HBox height="4"/>
+              <Label id="number_label" text="32" fgnormal="#ffffff" fgactive="#ffffff" font ="Helvetica Bold 13"/>
             </VBox>
           </HBox>
         </EventBox>
@@ -20,6 +23,8 @@
     </VBox>
     <VBox>
       <EventBox height="1" bgnormal="#494949" bgactive="#494949"/>
+      <!--<Igor! About the track name: height="5" below is the shift from TOP side of the space>-->
+      <HBox height="5"/>
       <HBox width="80"
             id="name_label_home">
         <HBox width="5"/>