From 302e2e7fab05bd92791ba9fb427266f9a308db00 Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Wed, 22 Oct 2014 13:10:51 +0300
Subject: [PATCH] [Summary] Change request from Igor

---
 gtk2_ardour/icons/transport_bar_bg.png     | Bin 0 -> 421 bytes
 gtk2_ardour/icons/transport_bar_border.png | Bin 0 -> 485 bytes
 gtk2_ardour/ui/editor_window.xml           | 258 ++++++++++++---------
 3 files changed, 154 insertions(+), 104 deletions(-)
 create mode 100644 gtk2_ardour/icons/transport_bar_bg.png
 create mode 100644 gtk2_ardour/icons/transport_bar_border.png

diff --git a/gtk2_ardour/icons/transport_bar_bg.png b/gtk2_ardour/icons/transport_bar_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..238864249d99fdf176f7545e2f1110a5b58ece1e
GIT binary patch
literal 421
zcmeAS@N?(olHy`uVBq!ia0y~yU~d4jr8t;?<jq;vtbi1IiKnkC`#mmEVKMc*)Y3Gd
z5NCl$WHAGS+#wKV%)3x(2NYyUcl32+VA$Bt{U?!?fq~J))5S5Q;?~<cw|NgM2(TPb
z2-NyJogwo;r^rcZxp^xS>T?eNDp|Vq8_2462FGT|GBSt-RlnbC4CFH~6fAgkUkA+M
zEG+}lJJLdc3d_=2*};N>VFh4XU||Crh@s%b$P1z!T9~9jbOQ&g35aG8<jMfkN+K5+
z82&$g@pW?0sW%)9HdFk~4#Z}?uPp;=-|^rRKLf+=)ti}Xp6p|+N!NMD5cd_RtH4b7
z!hv-q(?JGwZ)S!YtaIcu2T<sM=b8r~DF%f@ELbc9O5Bd#{BkQypD@q?K;WXWfDuG@
m1UN8*Xs{0|tk|7^<~-q**^;i1_UqI%kc_9RpUXO@geCyN{cHsQ

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/icons/transport_bar_border.png b/gtk2_ardour/icons/transport_bar_border.png
new file mode 100644
index 0000000000000000000000000000000000000000..f46ca1a9fc57fca18b0d35cfd223f816e7197b11
GIT binary patch
literal 485
zcmeAS@N?(olHy`uVBq!ia0y~yU~d4jWjNS?WW&Nm1we`=-O<;Pfnj4m_n$;oAfL0q
zBeIx*LGBO;Gv-|=wF3&Wmw5WRvftwp6&6#^OD#=fU|=lqba4!+h<khYWNC|ofQzHo
zvkk^?9_)|3<m%_Muftn<;`{LHzxVCu1?mQY`1SLi8!|9MI4nPY)-ytwKZ;84Z)cK#
za1<KgESK2pOBq1U1Oko)a8}^+O05Q{R;DY3GHeN86$}jwehyH>TUONG7d-$GW?&S7
zu@tjzo3R=|gdG~9u3u%~fp7#4aArVQ4FX?(*1$C|W<`oI!!$6cFM!(Wbj9X8R{~T6
zgQ@RiMwsIrdLL)N9r}PDrbfV&ry1@ohp)By2sJDw5OW+lUhVQ@gt=$It!<|8kSbu3
ef~Zk&y8MSRZL-WB_1U`rKti6belF{r5}E+^x@4LF

literal 0
HcmV?d00001

diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index 783dcabb98..42df0040f3 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -227,127 +227,177 @@
             </VBox>
           </HBox>
         </EventBox>
-        <EventBox bgnormal="#3E3E3E">
-          <HBox borderwidth="1"
-                spacing="1">
-            <iconbutton id="inspector_on_button"
-                        tooltip="Show/Hide Inspector"
-                        width="48" height="26"
-                        normalicon="inspector_on"
-                        activeicon="inspector_on_active"/>
-            <iconbutton id="mixer_on_button"
-                        tooltip="Show/Hide Mixer"
-                        width="48" height="26"
-                        normalicon="mixer_on"
-                        activeicon="mixer_on_active"/>
-            <iconbutton id="meter_bridge_on_button"
-                        tooltip="Show/Hide Meter Bridge"
-                        width="48" height="26"
-                        normalicon="meter_bridge_on"
-                        activeicon="meter_bridge_on_active"/>
-            <Layout width="54"
-                    height="26"
-                    bgnormal="#3E3E3E"/>
-            <iconbutton id="transport_start_button"
-                        tooltip="Rewind"
-                        width="34" height="26"
-                        normalicon="transport_start"
-                        activeicon="transport_start_active"/>
-            <iconbutton id="transport_end_button"
-                        tooltip="Forward"
-                        width="34" height="26"
-                        normalicon="transport_end"
-                        activeicon="transport_end_active"/>
-            <iconbutton id="transport_play_button"
-                        tooltip="Play"
-                        width="34" height="26"
-                        normalicon="transport_play"
-                        activeicon="transport_play_active"/>
-            <iconbutton id="transport_record_button"
-                        tooltip="Record"
-                        width="34" height="26"
-                        normalicon="transport_record"
-                        activeicon="transport_record_active"/>
-            <iconbutton id="transport_stop_button"
-                        tooltip="Stop"
-                        width="34" height="26"
-                        normalicon="transport_stop"
-                        activeicon="transport_stop_active"/>
-            <iconbutton id="transport_loop_button"
-                        tooltip="Loop"
-                        width="34" height="26"
-                        normalicon="transport_loop"
-                        activeicon="transport_loop_active"/>
-            <iconbutton id="lock_session_button"
-                        tooltip="Lock"
-                        width="34" height="26"
-                        normalicon="lock_session"
-                        activeicon="lock_session_active"/>
-            <Layout width="60"
-                    height="26"
-                    bgnormal="#3E3E3E"/>
-            <iconbutton id="tool_marker_button"
-                        tooltip="Range Select Tool"
-                        width="34" height="26"
-                        normalicon="tool_marker"
-                        activeicon="tool_marker_active"/>
-            <iconbutton id="tool_arrow_button"
-                        tooltip="Pointer Tool"
-                        width="34" height="26"
-                        normalicon="tool_arrow"
-                        activeicon="tool_arrow_active"/>
-            <iconbutton id="tool_cut_button"
-                        tooltip="Split Tool"
-                        width="34" height="26"
-                        normalicon="tool_cut"
-                        activeicon="tool_cut_active"/>
-            <iconbutton id="tool_zoom_button"
-                        tooltip="Zoom Tool"
-                        width="34" height="26"
-                        normalicon="tool_zoom"
-                        activeicon="tool_zoom_active"/>
-            <HBox box.pack="end" spacing ="1">
-              <Adjustment id="temporal_zoom_adjustment"
-                          minvalue="0"
-                          maxvalue="25"
-                          initialvalue="4"
-                          step="1"
-                          pageincrement="1"/>
-              <Adjustment id="vertical_zoom_adjustment"
-                          minvalue="1"
-                          maxvalue="40"
-                          initialvalue="2"
-                          step="1"
-                          pageincrement="1"/>
+        <HBox>
+          <Layout bgnormal="#FF0000"
+                  width="649"
+                  height="28">
+            <icon source="transport_bar_border.png"/>
+            <HBox borderwidth="1"
+                  spacing="1">
+              <iconbutton id="inspector_on_button"
+                          tooltip="Show/Hide Inspector"
+                          width="48"
+                          height="26"
+                          normalicon="inspector_on"
+                          activeicon="inspector_on_active"/>
+              <iconbutton id="mixer_on_button"
+                          tooltip="Show/Hide Mixer"
+                          width="48"
+                          height="26"
+                          normalicon="mixer_on"
+                          activeicon="mixer_on_active"/>
+              <iconbutton id="meter_bridge_on_button"
+                          tooltip="Show/Hide Meter Bridge"
+                          width="48"
+                          height="26"
+                          normalicon="meter_bridge_on"
+                          activeicon="meter_bridge_on_active"/>
+              <EventBox x="148"
+                        y="1"
+                        width="54"
+                        height="26">
+                <!-- Some may ask why it's enveloped in the EventBox? The answer would be: GTK alighns the horizontal size of ICON -->
+                <Icon source="transport_bar_bg.png"/>
+              </EventBox>
+              <iconbutton id="transport_start_button"
+                          tooltip="Rewind"
+                          width="34"
+                          height="26"
+                          normalicon="transport_start"
+                          activeicon="transport_start_active"/>
+              <iconbutton id="transport_end_button"
+                          tooltip="Forward"
+                          width="34"
+                          height="26"
+                          normalicon="transport_end"
+                          activeicon="transport_end_active"/>
+              <iconbutton id="transport_play_button"
+                          tooltip="Play"
+                          width="34"
+                          height="26"
+                          normalicon="transport_play"
+                          activeicon="transport_play_active"/>
+              <iconbutton id="transport_record_button"
+                          tooltip="Record"
+                          width="34"
+                          height="26"
+                          normalicon="transport_record"
+                          activeicon="transport_record_active"/>
+              <iconbutton id="transport_stop_button"
+                          tooltip="Stop"
+                          width="34"
+                          height="26"
+                          normalicon="transport_stop"
+                          activeicon="transport_stop_active"/>
+              <iconbutton id="transport_loop_button"
+                          tooltip="Loop"
+                          width="34"
+                          height="26"
+                          normalicon="transport_loop"
+                          activeicon="transport_loop_active"/>
+              <iconbutton id="lock_session_button"
+                          tooltip="Lock"
+                          width="34"
+                          height="26"
+                          normalicon="lock_session"
+                          activeicon="lock_session_active"/>
+              <EventBox width="60"
+                        height="26">
+                <!-- Some may ask why it's enveloped in the EventBox? The answer would be: GTK alighns the horizontal size of ICON -->
+                <Icon source="transport_bar_bg.png"/>
+              </EventBox>
+              <iconbutton id="tool_marker_button"
+                          tooltip="Range Select Tool"
+                          width="34"
+                          height="26"
+                          normalicon="tool_marker"
+                          activeicon="tool_marker_active"/>
+              <iconbutton id="tool_arrow_button"
+                          tooltip="Pointer Tool"
+                          width="34"
+                          height="26"
+                          normalicon="tool_arrow"
+                          activeicon="tool_arrow_active"/>
+              <iconbutton id="tool_cut_button"
+                          tooltip="Split Tool"
+                          width="34"
+                          height="26"
+                          normalicon="tool_cut"
+                          activeicon="tool_cut_active"/>
+              <iconbutton id="tool_zoom_button"
+                          tooltip="Zoom Tool"
+                          width="34"
+                          height="26"
+                          normalicon="tool_zoom"
+                          activeicon="tool_zoom_active"/>
+            </HBox>
+          </Layout>
+          <Layout bgnormal="#FF0000"
+                  height="28"
+                  box.fill="true"
+                  box.expand="true">
+            <icon source="transport_bar_border.png"/>
+            <icon source="transport_bar_bg.png"
+                  y="1"/>
+          </Layout>
+          <Layout bgnormal="#FF0000"
+                  width="249"
+                  height="28"
+                  box.pack="end">
+            <icon source="transport_bar_border.png"/>
+            <Adjustment id="temporal_zoom_adjustment"
+                        minvalue="0"
+                        maxvalue="25"
+                        initialvalue="4"
+                        step="1"
+                        pageincrement="1"/>
+            <Adjustment id="vertical_zoom_adjustment"
+                        minvalue="1"
+                        maxvalue="40"
+                        initialvalue="2"
+                        step="1"
+                        pageincrement="1"/>
+            <HBox borderwidth="1"
+                  spacing="1">
               <Fader id="vertical_zoom_fader"
-                     adjustment="vertical_zoom_adjustment"
-                     facesource="vertical_zoom_fader_face.png"
-                     handlesource="zoom_fader_handle.png"
-                     activehandlesource="zoom_fader_handle_active.png"
-                     minposx="20"
-                     minposy="13"
-                     maxposx="66"
-                     maxposy="13"/>
+                   adjustment="vertical_zoom_adjustment"
+                   facesource="vertical_zoom_fader_face.png"
+                   handlesource="zoom_fader_handle.png"
+                   activehandlesource="zoom_fader_handle_active.png"
+                   x="1"
+                   y="1"
+                   minposx="20"
+                   minposy="13"
+                   maxposx="66"
+                   maxposy="13"/>
               <Fader adjustment="temporal_zoom_adjustment"
                      facesource="horizontal_zoom_fader_face.png"
                      handlesource="zoom_fader_handle.png"
                      activehandlesource="zoom_fader_handle_active.png"
+                     x="76"
+                     y="1"
                      minposx="66"
                      minposy="13"
                      maxposx="20"
                      maxposy="13"/>
               <EventBox id="waves_zoom_control_home"
                         tooltip="Waveform Zoom"
-                        width="48" height="26"
+                        x="151"
+                        y="1"
+                        width="48"
+                        height="26"
                         bgnormal="#ffff00"/>
               <iconbutton id="media_button"
                           tooltip="Media Button"
-                          width="48" height="26"
+                          x="200"
+                          y="1"
+                          width="48"
+                          height="26"
                           normalicon="media_button"
                           activeicon="media_button_active"/>
             </HBox>
-          </HBox>
-        </EventBox>
+          </Layout>
+        </HBox>
       </VBox>
     </EventBox>
     <EventBox bgnormal="#000000" height="1"/>