From 2a0a5631169610be9a6179042cac5b9e801bf66c Mon Sep 17 00:00:00 2001
From: VKamyshniy <VKamyshniy@wavesglobal.com>
Date: Wed, 13 Aug 2014 12:40:28 +0300
Subject: [PATCH] [Summary] Progressing MASTER BUS panel per change request
 from Igor.

---
 gtk2_ardour/ui/master_ui.xml | 130 ++++++++++++++++-------------------
 1 file changed, 60 insertions(+), 70 deletions(-)

diff --git a/gtk2_ardour/ui/master_ui.xml b/gtk2_ardour/ui/master_ui.xml
index 7943b3863c..3e1293afc9 100644
--- a/gtk2_ardour/ui/master_ui.xml
+++ b/gtk2_ardour/ui/master_ui.xml
@@ -1,81 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<RouteUI width="97"
-         height="60"
+<RouteUI width="233"
+         height="66"
          bgnormal="#383838"
          bgactive="#6A6A6A"
          peaktreshold="-144.4">
-  <VBox  id="peak_display_button_home" borderwidth="1" spacing="1">
-    <EventBox id="no_peak_display_box"
-              width="95"
-              height="13"
-              bgnormal="#B1B1B1"
-              ui.orphan="true"/>
-    <Button id="peak_display_button"
-            text="- inf"
+  <HBox>
+    <VBox width="35"/>
+    <EventBox width="1"
+              bgnormal="#000000"
+              bgactive="#000000"/>
+    <VBox width="103">
+      <HBox height="3"/>
+      <HBox>
+      <VBox width="6"/>
+      <Label text="MASTER"
+             font="Helvetica 10"
+             fgnormal="#ffffff"
+             fgactive="#ffffff"
+             justify="left"/>
+      </HBox>
+    </VBox>
+    <VBox>
+      <EventBox bgnormal="#000000"
+              bgactive="#000000">
+        <EventBox bgnormal="#383838"
+                  bgactive="#6A6A6A"
+                  borderwidth="1">
+          <iconbutton id="master_mute_button"
+                width="41"
+                height="20"
+                normalicon="master_mute"
+                activeicon="master_mute_active"
+                prelighticon="master_mute_prelight"/>
+        </EventBox>
+      </EventBox>
+    </VBox>
+    <VBox id="level_meter_home"
+          box.pack="end"/>
+  </HBox>
+  <EventBox id="no_peak_display_box"
             width="95"
             height="13"
             bgnormal="#B1B1B1"
-            bgactive="#D83838"
-            fgnormal="#000000"
-            fgactive="#000000"
-            bghover="#C47474"
             ui.orphan="true"/>
-    <HBox box.pack="end"
-          spacing="1">
-      <VBox spacing="1">
-          <VBox>
-              <EventBox height="5" bgnormal="#383838" bgactive="#383838"/>
-              <HBox>
-                  <icon id="master_bus_master_label"
-                        source="master_bus_master_label.png"
-                        x="1"
-                        y="1"/>
-              </HBox>
-              <EventBox height="5" bgnormal="#383838" bgactive="#383838" box.pack="end"/>
-          </VBox>
-          <HBox>
-              <EventBox width="1" bgnormal="#000000" bgactive="#000000"/>
-              <VBox>
-                  <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
-                  <iconbutton id="master_mute_button"
-                            width="41"
-                            height="20"
-                            normalicon="master_mute"
-                            activeicon="master_mute_active"
-                            prelighticon="master_mute_prelight"/>
-                  <EventBox height="1" bgnormal="#000000" bgactive="#000000"/>
-              </VBox>
-              <EventBox width="1" bgnormal="#000000" bgactive="#000000"/>
-          </HBox>
-        <iconbutton id="clear_solo_button"
-                    width="47"
-                    height="27"
-                    normalicon="master_clear_solo"
-                    activeicon="master_clear_solo_active"
-                    prelighticon="master_clear_solo_prelight"
-                    ui.orphan="true"/>
-        <iconbutton id="global_rec_button"
-                    width="47"
-                    height="27"
-                    normalicon="master_global_rec"
-                    activeicon="master_global_rec_active"
-                    prelighticon="master_global_rec_prelight"
-                    ui.orphan="true"/>
-      </VBox>
-      <Layout bgnormal="#383838"
+  <Button id="peak_display_button"
+          text="- inf"
+          width="95"
+          height="13"
+          bgnormal="#B1B1B1"
+          bgactive="#D83838"
+          fgnormal="#000000"
+          fgactive="#000000"
+          bghover="#C47474"
+          ui.orphan="true"/>
+  <iconbutton id="clear_solo_button"
               width="47"
-              height="60">
-        <VBox id="the_icon_home">
-          <icon id="master_bus_multi_out_mode_icon"
-                source="master_bus_multi_out_mode.png"
-                ui.orphan="true"/>
-        </VBox>
-        <VBox id="level_meter_home"
-              height="60"
-              width = "7"
-              x="18"/>
-      </Layout>
-    </HBox>
-  </VBox>
+              height="27"
+              normalicon="master_clear_solo"
+              activeicon="master_clear_solo_active"
+              prelighticon="master_clear_solo_prelight"
+              ui.orphan="true"/>
+  <iconbutton id="global_rec_button"
+              width="47"
+              height="27"
+              normalicon="master_global_rec"
+              activeicon="master_global_rec_active"
+              prelighticon="master_global_rec_prelight"
+              ui.orphan="true"/>
 </RouteUI>