Trim some unnecessary widgets.

git-svn-id: http://svn.drobilla.net/lad/patchage@1160 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 79 insertions, 225 deletions

diff --git a/src/patchage.glade b/src/patchage.glade
index f76892a..9872708 100644
--- a/src/patchage.glade
+++ b/src/patchage.glade
@@ -352,42 +352,39 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkHBox" id="toolbars_box">
+          <widget class="GtkToolbar" id="toolbar">
             <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+            <property name="show_arrow">False</property>
+            <property name="icon_size">GTK_ICON_SIZE_SMALL_TOOLBAR</property>
+            <property name="icon_size_set">True</property>
             <child>
-              <widget class="GtkToolbar" id="toolbar">
+              <widget class="GtkToolItem" id="toolitem28">
                 <property name="visible">True</property>
-                <property name="show_arrow">False</property>
-                <property name="icon_size">GTK_ICON_SIZE_SMALL_TOOLBAR</property>
-                <property name="icon_size_set">True</property>
+                <property name="visible_vertical">False</property>
                 <child>
-                  <widget class="GtkToolItem" id="toolitem28">
+                  <widget class="GtkAlignment" id="alignment2">
                     <property name="visible">True</property>
-                    <property name="visible_vertical">False</property>
+                    <property name="yscale">0</property>
                     <child>
-                      <widget class="GtkAlignment" id="alignment2">
+                      <widget class="GtkHBox" id="hbox4">
                         <property name="visible">True</property>
-                        <property name="yscale">0</property>
                         <child>
-                          <widget class="GtkHBox" id="hbox4">
+                          <widget class="GtkLabel" id="label10">
                             <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkLabel" id="label10">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">  Latency: </property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkComboBoxEntry" id="buffer_size_combo">
-                                <property name="visible">True</property>
-                                <property name="tooltip" translatable="yes">Jack latency</property>
-                                <property name="border_width">1</property>
-                                <property name="items" translatable="yes">32 frames
+                            <property name="label" translatable="yes">  Latency: </property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkComboBoxEntry" id="buffer_size_combo">
+                            <property name="visible">True</property>
+                            <property name="tooltip" translatable="yes">Jack latency</property>
+                            <property name="border_width">1</property>
+                            <property name="items" translatable="yes">32 frames
 64 frames
 128 frames
 256 frames
@@ -395,185 +392,83 @@
 1024 frames
 2048 frames
 4096 frames</property>
-                                <child internal-child="entry">
-                                  <widget class="GtkEntry" id="comboboxentry-entry1">
-                                  </widget>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="padding">1</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="sample_rate_label">
-                                <property name="label" translatable="yes">48</property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="padding">1</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="label9">
-                                <property name="xpad">1</property>
-                                <property name="label" translatable="yes">kHz</property>
+                            <child internal-child="entry">
+                              <widget class="GtkEntry" id="comboboxentry-entry1">
                               </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">3</property>
-                              </packing>
                             </child>
                           </widget>
+                          <packing>
+                            <property name="padding">1</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="separatortoolitem3">
-                    <property name="visible">True</property>
-                    <property name="border_width">8</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="clear_load_but">
-                    <property name="visible">True</property>
-                    <property name="tooltip" translatable="yes">Clear the dropout indicator</property>
-                    <property name="stock_id">gtk-clear</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolItem" id="toolitem30">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment3">
-                        <property name="visible">True</property>
-                        <property name="yscale">0</property>
                         <child>
-                          <widget class="GtkProgressBar" id="main_xrun_progress">
-                            <property name="visible">True</property>
-                            <property name="tooltip" translatable="yes">Drouput (XRun) Indicator
-
-The bar represents the percentage of available time used for audio processing (i.e. the DSP load).  If the bar reaches 100%, a dropout will occur.</property>
-                            <property name="pulse_step">0.10000000149</property>
-                            <property name="text" translatable="yes">0 Dropouts</property>
+                          <widget class="GtkLabel" id="sample_rate_label">
+                            <property name="label" translatable="yes">48</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="padding">1</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label9">
+                            <property name="xpad">1</property>
+                            <property name="label" translatable="yes">kHz</property>
                           </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
                         </child>
                       </widget>
                     </child>
                   </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="toolbutton1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">False</property>
-                  </packing>
                 </child>
               </widget>
               <packing>
                 <property name="expand">False</property>
+                <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolbar" id="toolbar3">
+              <widget class="GtkSeparatorToolItem" id="separatortoolitem3">
                 <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-                <property name="show_arrow">False</property>
+                <property name="border_width">8</property>
               </widget>
               <packing>
-                <property name="position">1</property>
+                <property name="expand">False</property>
+                <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolbar" id="toolbar2">
+              <widget class="GtkToolButton" id="clear_load_but">
                 <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="show_arrow">False</property>
-                <property name="icon_size">GTK_ICON_SIZE_SMALL_TOOLBAR</property>
-                <property name="icon_size_set">True</property>
-                <child>
-                  <widget class="GtkSeparatorToolItem" id="toolbutton2">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="homogeneous">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="zoom_normal_but">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="tooltip" translatable="yes">Zoom to normal size</property>
-                    <property name="stock_id">gtk-zoom-100</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolButton" id="zoom_full_but">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="tooltip" translatable="yes">Zoom to fit all modules</property>
-                    <property name="stock_id">gtk-zoom-fit</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
+                <property name="tooltip" translatable="yes">Clear the dropout indicator</property>
+                <property name="stock_id">gtk-clear</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="position">2</property>
               </packing>
             </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolbar" id="toolbar1">
             <child>
-              <widget class="GtkToolItem" id="toolitem11">
+              <widget class="GtkToolItem" id="toolitem30">
                 <property name="visible">True</property>
                 <child>
-                  <widget class="GtkButton" id="rewind_but">
+                  <widget class="GtkAlignment" id="alignment3">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="tooltip" translatable="yes">Rewind Jack transport</property>
-                    <property name="response_id">0</property>
+                    <property name="yscale">0</property>
                     <child>
-                      <widget class="GtkImage" id="image577">
+                      <widget class="GtkProgressBar" id="main_xrun_progress">
                         <property name="visible">True</property>
-                        <property name="stock">gtk-media-previous</property>
+                        <property name="tooltip" translatable="yes">Drouput (XRun) Indicator
+
+The bar represents the percentage of available time used for audio processing (i.e. the DSP load).  If the bar reaches 100%, a dropout will occur.</property>
+                        <property name="pulse_step">0.10000000149</property>
+                        <property name="text" translatable="yes">0 Dropouts</property>
                       </widget>
                     </child>
                   </widget>
@@ -585,89 +480,48 @@ The bar represents the percentage of available time used for audio processing (i
               </packing>
             </child>
             <child>
-              <widget class="GtkToolItem" id="toolitem12">
+              <widget class="GtkSeparatorToolItem" id="toolbutton1">
                 <property name="visible">True</property>
-                <child>
-                  <widget class="GtkButton" id="play_but">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="tooltip" translatable="yes">Start Jack transport</property>
-                    <property name="border_width">1</property>
-                    <property name="response_id">0</property>
-                    <child>
-                      <widget class="GtkImage" id="image579">
-                        <property name="visible">True</property>
-                        <property name="stock">gtk-media-play</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="draw">False</property>
               </widget>
               <packing>
-                <property name="expand">False</property>
                 <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolItem" id="toolitem13">
+              <widget class="GtkSeparatorToolItem" id="toolbutton2">
                 <property name="visible">True</property>
-                <child>
-                  <widget class="GtkButton" id="stop_but">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="border_width">1</property>
-                    <property name="response_id">0</property>
-                    <child>
-                      <widget class="GtkImage" id="image580">
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Pause Jack transport</property>
-                        <property name="stock">gtk-media-pause</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkToolItem" id="toolitem14">
+              <widget class="GtkToolButton" id="zoom_normal_but">
                 <property name="visible">True</property>
-                <property name="border_width">1</property>
-                <child>
-                  <widget class="GtkEntry" id="entry1">
-                    <property name="visible">True</property>
-                    <property name="sensitive">False</property>
-                    <property name="can_focus">True</property>
-                    <property name="tooltip" translatable="yes">Jack transport time</property>
-                    <property name="editable">False</property>
-                    <property name="invisible_char">*</property>
-                    <property name="width_chars">11</property>
-                    <property name="text" translatable="yes">00:00:00.000</property>
-                  </widget>
-                </child>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="stock_id">gtk-zoom-100</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="homogeneous">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
+              <widget class="GtkToolButton" id="zoom_full_but">
                 <property name="visible">True</property>
-                <property name="border_width">4</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="stock_id">gtk-zoom-fit</property>
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="homogeneous">False</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
         <child>
@@ -685,7 +539,7 @@ The bar represents the percentage of available time used for audio processing (i
             </child>
           </widget>
           <packing>
-            <property name="position">3</property>
+            <property name="position">2</property>
           </packing>
         </child>
       </widget>