From 81f99ae86baf3b8578979b4149dbeee6ea97c48b Mon Sep 17 00:00:00 2001
From: Valeriy Kamyshniy <vkamyshniy@wavesglobal.com>
Date: Tue, 27 May 2014 03:43:58 -0500
Subject: [PATCH] [Summary] making the report area of top bar fixed size.
 Adding waveform zoom button Icons

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 463714]
---
 gtk2_ardour/icons/tool_waveform_zoom.png      | Bin 0 -> 637 bytes
 .../icons/tool_waveform_zoom_active.png       | Bin 0 -> 710 bytes
 .../icons/tool_waveform_zoom_prelight.png     | Bin 0 -> 666 bytes
 gtk2_ardour/ui/editor_window.xml              |  23 ++++++++++++------
 4 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 gtk2_ardour/icons/tool_waveform_zoom.png
 create mode 100644 gtk2_ardour/icons/tool_waveform_zoom_active.png
 create mode 100644 gtk2_ardour/icons/tool_waveform_zoom_prelight.png

diff --git a/gtk2_ardour/icons/tool_waveform_zoom.png b/gtk2_ardour/icons/tool_waveform_zoom.png
new file mode 100644
index 0000000000000000000000000000000000000000..464a765d46040285b2877f2cbcd0625e72b251c3
GIT binary patch
literal 637
zcmV-@0)qXCP)<h;3K|Lk000e1NJLTq001HY000^Y1^@s6(r%6d00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGmbN~PnbOGLGA9w%&00v@9M??Vs0RI60
zpuMM)00007bV*G`2iXb^6&5m`C=D3^00HeuL_t(YOYN0iO9DX@hF?=r{8-cwL>G#>
zE%3s^pswoH{*eEwenXL&8U=afMM|QGg6OK5AI&+<(zXPvX4J(#H#2jbne(2HSsmGI
zc8-4l3+Z;da`|^`$nnpyg_yC0n6VV%a5&@)aJ$`dCJt__HwMewHX{)polYlIRpogo
z6oL{A@|<wFT=06m@OV7ZvOJbTlF1}|J|E`uIn+dgoo#Pzv5kmEqc}>Zadvu&ljCEA
zg~(N~6haR7_x7MD3jBcpJB`QV@cI2L;_%=A;c%EsMSD}J6n1xZmM)#;m-Rf8;c+^h
za(Q$nlL_~a(Pl)`G(0>$g6`J)j7sVf`(NsHUK?3h$SMqnLrg>fEJKJ1h%6EpmzO*m
zS#Rr`7>!2I`hCt0jpMgB%w{wB>sJ=a2p#T=i-O{%=xL_Q>2F()(g->1wA*+pm-(Cy
z^$?Y^*Xv2kCktidxmv|dE{E}WjJl{VMOvv;kQ27SU?6vW(CKt=Un=1?pZ_9)puOLT
zAS{Kn#l>Y28Hu3G6^cdFYBh{rUpXsR*Vm{Dq2!>|YT>R>K%?1|rx(YvG=7nKa!AiH
z7K?F4D8;lkNBk2kGeRN=>XSyJ!E;KnZeJHmy&7Z3)0cLg{Oa>v23v?3TZox|A_RB`
XxK`J2v<}4O00000NkvXXu0mjf_vaV&

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/tool_waveform_zoom_active.png b/gtk2_ardour/icons/tool_waveform_zoom_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..7fa207886e2c12fb1d06cdd0e4cb7f76a4b02b32
GIT binary patch
literal 710
zcmV;%0y+JOP)<h;3K|Lk000e1NJLTq001HY000^Y1^@s6(r%6d00004XF*Lt006O%
z3;baP00009a7bBm000tn000tn0p4aGcmMzZ2XskIMF-vm69^bGDswoW00072Nkl<Z
zNK5UOOK1~87{~wnZqv|hOlqsPsWzg9777(l9+Y0{Nhl(S-b4@HTJS1(@F?n058^@e
zqGEkfiy$I`7p1-qR#Nnk^sz~k&7+T`N!FR^MAEgeiKeuN{FdeWW_Nb>zu#jSq4&x)
z3tIptWHy!N!_7nFcGIZ~u~Qdf$5DtN2&<Nyjhe=MiX=(gs|}7q0v)@URTLSAdV<XN
zx3^)Z&&Pa<rYO+eZn#}8ex-UGg`7S%2(PZAP_)n=Jb>n=CLHeT!#2H{-QVBUg$pN7
z;L`cC7&&ta{vGWsdetIr9~iux$>#X*Z-xer!q=k1h{ti{U_W~I2GC8SG!vVLDl0fQ
zbestlMG>xs1_bx)rujs~h@x05@>QI1{IlM;IKpghWd$lpL5VCG3*=Bq%GM)hnt1T)
zH6l@ijOa|DlcZErRZM)JWOK@?SjfL%rqjsgh+q;STJx<Q54%2m^*XcVY-szMnGB3X
z0#SCFSX^F4zEI$I*HTeL3MALGM%uhyh`gQY!hrSXE6brToC-(q{Ovo;k>^U#TB6-I
zOX|x`MG<-b`73Tde2m4VB}`2IKx$zDZ$5m)tw*DXCsTaZDnBFBxHmSA+oMm{h@i|T
zlk1A0ICjlGzaRHsj<eznbavp*lV_|ujCcaSrf2Xa6hfn_L6#+iNvGU>F^2FQEzs(4
zOiin&g{47}W%LBP@rgu)hFB(lR{IzK500scv04D~`8>XbrkGDdOpCCVI0`B4BdIN~
sc+0Bo4s%1>w;Jj~?9_$W*&;%K-%TCe4V%U!IsgCw07*qoM6N<$g0CP&N&o-=

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/tool_waveform_zoom_prelight.png b/gtk2_ardour/icons/tool_waveform_zoom_prelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e1b5d83a2e1219ba04853aaee6a084e899cb4b8
GIT binary patch
literal 666
zcmV;L0%iS)P)<h;3K|Lk000e1NJLTq001HY000^Y1^@s6(r%6d00004XF*Lt006O%
z3;baP00009a7bBm000tn000tn0p4aGcmMzZ2XskIMF-vm6%-yIzsKvD0006hNkl<Z
zNK5UMT~8B16o%jJmQ5SFB8Bo%BB&%7FG-LKLIOd(QSV6f&Rc(lk>A3d{sR-0C?aT5
z5}R-VA*EVqkQTT5(J!pK&K#$vEKPQc5V+{GyO}d*cXr-6bIwT5p1*K#2_PYwZiw#1
z5fJT#(-z{UEyRtd5J{4R1t>~~u-L%B*{;F!Z~d`eYUQAen<LlB?ukax-PJ`lCm0MO
z91bHC3JFi^cnX=CoJ6Fv6OQfR#>g;Dc58H$e4N37e%zm(!Th6#cyRA7dYQ=6AWzK9
zE>x;j(LKqX@o}h;2z1lL?XfWo55>_Ji$ODV76}=1)6*o1Z=s?nhz|}h8#pXza2)@K
zw&%(E^vPptYqc6}L7iW$FR_b@X@+T8SW6`EQ!D(-vz}--I@mwb-!s&2#J7;sP%M>b
z0bDS@uc#{d7hk@jwvlr!-%_~@gKeo{v4^$Qqa)b1E#4l-S48+=-7s*KRZ2a~rfI=p
zSACU@@CgrcIV6%v7=|glpj_hBr#G3;S46f_DZKfxj4Dg&bS8r`Tj|E;Cf+iiRV<3H
z{&JAdW99P~EPY%#CW6DiZ6<=_Dda~kkM*xf5^<<$SYBPj_D&k*N`(^g^}8i(r*=@#
zb!7MV@&3~)cC%SA+CQFKqpA_whJYNvwfGRev54>x^S*n<|AS{lxCoB@+eT(@k8B>|
zy8o<bscITCzLmqu59eCGt<V<YrY*$HB@qJr0n0$;v5QV8UjP6A07*qoM6N<$f^ao1
AIRF3v

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 4501cfdc6a..a24db0b5f7 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -14,7 +14,7 @@
                         prelighticon="tracks_prelight"/>
             <icon source="display_clock_mockup.png" tooltip="--------------------&#xA;This is a mockup&#xA;--------------------" />
             <icon source="display_metrics_mockup.png" tooltip="--------------------&#xA;This is a mockup&#xA;--------------------" box.pack="end"/>
-            <EventBox bgnormal="#383838" box.expand="true" box.fill="true" box.padding="4">
+            <EventBox bgnormal="#383838" box.expand="false" box.fill="false" width="420" box.padding="4">
               <EventBox bgnormal="#151515" borderwidth="1"/>
             </EventBox>
             <VBox spacing ="1" box.pack="end">
@@ -122,13 +122,20 @@
                         normalicon="tool_zoom"
                         activeicon="tool_zoom_active"
                         prelighticon="tool_zoom_prelight"/>
-            <iconbutton id="media_button"
-                        tooltip="Media Button"
-                        width="48" height="26"
-                        normalicon="media_button"
-                        activeicon="media_button_active"
-                        prelighticon="media_button_prelight"
-                        box.pack="end"/>
+            <HBox box.pack="end" spacing ="1">
+              <iconbutton id="tool_waveform_zoom_button"
+                          tooltip="Waveform Zoom"
+                          width="34" height="26"
+                          normalicon="tool_waveform_zoom"
+                          activeicon="tool_waveform_zoom_active"
+                          prelighticon="tool_waveform_zoom_prelight"/>
+              <iconbutton id="media_button"
+                          tooltip="Media Button"
+                          width="48" height="26"
+                          normalicon="media_button"
+                          activeicon="media_button_active"
+                          prelighticon="media_button_prelight"/>
+            </HBox>
           </HBox>
         </EventBox>
       </VBox>