Make glade update the MainWindow.ui file

1 files changed, 134 insertions, 85 deletions

diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui
index 0d77264..f971d47 100644
--- a/portato/gui/templates/MainWindow.ui
+++ b/portato/gui/templates/MainWindow.ui
@@ -1,16 +1,19 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Fri Dec  5 12:57:49 2008 -->
 <interface>
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="MainWindow">
     <property name="border_width">2</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
-    <signal handler="cb_destroy" name="destroy"/>
-    <signal handler="cb_delete" name="delete_event"/>
-    <signal handler="cb_minimized" name="window_state_event"/>
+    <property name="window_position">center</property>
+    <signal name="destroy" handler="cb_destroy"/>
+    <signal name="delete_event" handler="cb_delete"/>
+    <signal name="window_state_event" handler="cb_minimized"/>
     <child>
       <object class="GtkVBox" id="mainVB">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
+          <placeholder/>
         </child>
         <child>
           <object class="GtkHBox" id="searchHB">
@@ -19,23 +22,24 @@
             <child>
               <object class="GtkEntry" id="searchEntry">
                 <property name="visible">True</property>
-                <signal handler="cb_search_changed" name="changed"/>
-                <signal handler="cb_search_changed" name="delete_text"/>
-                <signal handler="cb_search_clicked" name="activate" object="searchEntry"/>
+                <signal name="changed" handler="cb_search_changed"/>
+                <signal name="delete_text" handler="cb_search_changed"/>
+                <signal name="activate" handler="cb_search_clicked" object="searchEntry"/>
               </object>
               <packing>
                 <property name="padding">5</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="deleteSearchButton">
+                <property name="label">gtk-delete</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">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="label">gtk-delete</property>
                 <property name="use_stock">True</property>
-                <signal handler="cb_delete_search_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_delete_search_clicked"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -45,10 +49,12 @@
             </child>
             <child>
               <object class="GtkButton" id="searchButton">
-                <property name="visible">True</property>
                 <property name="label">gtk-find</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="receives_default">False</property>
                 <property name="use_stock">True</property>
-                <signal handler="cb_search_clicked" name="clicked" object="searchEntry"/>
+                <signal name="clicked" handler="cb_search_clicked" object="searchEntry"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -66,13 +72,14 @@
         <child>
           <object class="GtkVPaned" id="vpaned">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
             <property name="position">300</property>
             <child>
               <object class="GtkFrame" id="listFrame">
                 <property name="visible">True</property>
                 <property name="label_xalign">0</property>
                 <property name="label_yalign">0</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
+                <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkHBox" id="listHB">
                     <property name="visible">True</property>
@@ -83,8 +90,8 @@
                       <object class="GtkScrolledWindow" id="catScroll">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
                         <child>
                           <object class="GtkTreeView" id="catList">
                             <property name="visible">True</property>
@@ -92,13 +99,16 @@
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkScrolledWindow" id="pkgScroll">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
                         <child>
                           <object class="GtkTreeView" id="pkgList">
                             <property name="visible">True</property>
@@ -114,8 +124,8 @@
                       <object class="GtkScrolledWindow" id="versionScroll">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
                         <child>
                           <object class="GtkTreeView" id="versionList">
                             <property name="visible">True</property>
@@ -129,7 +139,7 @@
                     </child>
                   </object>
                 </child>
-                <child type="label">
+                <child type="label_item">
                   <placeholder/>
                 </child>
               </object>
@@ -147,6 +157,7 @@
                   <object class="GtkVBox" id="packageVB">
                     <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="orientation">vertical</property>
                     <child>
                       <object class="GtkHBox" id="packageHeaderHB">
                         <property name="visible">True</property>
@@ -157,9 +168,12 @@
                             <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="label" translatable="yes">label</property>
-                            <property name="ellipsize">PANGO_ELLIPSIZE_START</property>
+                            <property name="ellipsize">start</property>
                             <property name="single_line_mode">True</property>
                           </object>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="pkgEmergeBtn">
@@ -167,9 +181,9 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">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-text" translatable="yes">Install onto system</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <signal handler="cb_package_emerge_clicked" name="clicked"/>
+                            <property name="tooltip_text" translatable="yes">Install onto system</property>
+                            <property name="relief">none</property>
+                            <signal name="clicked" handler="cb_package_emerge_clicked"/>
                             <child>
                               <object class="GtkImage" id="image1">
                                 <property name="visible">True</property>
@@ -189,9 +203,9 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">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-text" translatable="yes">Uninstall from system</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <signal handler="cb_package_unmerge_clicked" name="clicked"/>
+                            <property name="tooltip_text" translatable="yes">Uninstall from system</property>
+                            <property name="relief">none</property>
+                            <signal name="clicked" handler="cb_package_unmerge_clicked"/>
                             <child>
                               <object class="GtkImage" id="image4">
                                 <property name="visible">True</property>
@@ -211,9 +225,9 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">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-text" translatable="yes">Revert changes</property>
-                            <property name="relief">GTK_RELIEF_NONE</property>
-                            <signal handler="cb_package_revert_clicked" name="clicked"/>
+                            <property name="tooltip_text" translatable="yes">Revert changes</property>
+                            <property name="relief">none</property>
+                            <signal name="clicked" handler="cb_package_revert_clicked"/>
                             <child>
                               <object class="GtkImage" id="image5">
                                 <property name="visible">True</property>
@@ -231,26 +245,27 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="padding">4</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkNotebook" id="packageNotebook">
                         <property name="visible">True</property>
-                        <property name="tab_pos">GTK_POS_BOTTOM</property>
+                        <property name="tab_pos">bottom</property>
                         <property name="scrollable">True</property>
                         <child>
                           <object class="GtkScrolledWindow" id="generalScroll">
                             <property name="visible">True</property>
                             <property name="can_focus">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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <object class="GtkViewport" id="generalVB">
                                 <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="resize_mode">GTK_RESIZE_QUEUE</property>
-                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <property name="resize_mode">queue</property>
+                                <property name="shadow_type">none</property>
                                 <child>
                                   <object class="GtkTable" id="generalTable">
                                     <property name="visible">True</property>
@@ -261,12 +276,6 @@
                                     <property name="column_spacing">5</property>
                                     <property name="row_spacing">5</property>
                                     <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
                                       <object class="GtkLabel" id="licenseLabel">
                                         <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>
@@ -280,7 +289,7 @@
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -296,7 +305,7 @@
                                         <property name="top_attach">3</property>
                                         <property name="bottom_attach">4</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                         <property name="y_padding">5</property>
                                       </packing>
                                     </child>
@@ -312,7 +321,7 @@
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">5</property>
                                         <property name="bottom_attach">6</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -327,7 +336,7 @@
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">5</property>
                                         <property name="bottom_attach">6</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -344,7 +353,7 @@
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -358,7 +367,7 @@
                                       </object>
                                       <packing>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                         <property name="y_padding">5</property>
                                       </packing>
                                     </child>
@@ -376,7 +385,7 @@
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                         <property name="y_padding">5</property>
                                       </packing>
                                     </child>
@@ -391,7 +400,7 @@
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -408,7 +417,7 @@
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">1</property>
                                         <property name="bottom_attach">2</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -424,44 +433,46 @@
                                         <property name="top_attach">2</property>
                                         <property name="bottom_attach">3</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                         <property name="y_padding">5</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="installedCheck">
+                                        <property name="label" translatable="yes">Installed</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">Installed</property>
                                         <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="cb_button_pressed" name="button_press_event"/>
+                                        <signal name="button_press_event" handler="cb_button_pressed"/>
                                       </object>
                                       <packing>
                                         <property name="top_attach">6</property>
                                         <property name="bottom_attach">7</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="maskedCheck">
+                                        <property name="label" translatable="yes">Masked</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">Masked</property>
                                         <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="cb_masked_toggled" name="toggled"/>
+                                        <signal name="toggled" handler="cb_masked_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="top_attach">8</property>
                                         <property name="bottom_attach">9</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -475,25 +486,26 @@
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">8</property>
                                         <property name="bottom_attach">9</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" id="testingCheck">
+                                        <property name="label" translatable="yes">Testing</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="no_show_all">True</property>
-                                        <property name="label" translatable="yes">Testing</property>
                                         <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <signal handler="cb_testing_toggled" name="toggled"/>
+                                        <signal name="toggled" handler="cb_testing_toggled"/>
                                       </object>
                                       <packing>
                                         <property name="top_attach">7</property>
                                         <property name="bottom_attach">8</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -510,7 +522,7 @@
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
                                         <property name="x_options">GTK_FILL</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                         <property name="y_padding">5</property>
                                       </packing>
                                     </child>
@@ -521,7 +533,7 @@
                                         <property name="no_show_all">True</property>
                                         <property name="xalign">0</property>
                                         <property name="label">use flags</property>
-                                        <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                                        <property name="ellipsize">end</property>
                                         <property name="single_line_mode">True</property>
                                       </object>
                                       <packing>
@@ -529,9 +541,15 @@
                                         <property name="right_attach">2</property>
                                         <property name="top_attach">4</property>
                                         <property name="bottom_attach">5</property>
-                                        <property name="y_options"/>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
+                                    <child>
+                                      <placeholder/>
+                                    </child>
                                   </object>
                                 </child>
                               </object>
@@ -552,12 +570,15 @@
                             <property name="visible">True</property>
                             <property name="can_focus">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="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <placeholder/>
                             </child>
                           </object>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
                         <child type="tab">
                           <object class="GtkLabel" id="label20">
@@ -586,22 +607,25 @@
                     <property name="visible">True</property>
                     <property name="can_focus">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="tab_pos">GTK_POS_BOTTOM</property>
+                    <property name="tab_pos">bottom</property>
                     <property name="scrollable">True</property>
                     <child>
                       <object class="GtkVBox" id="queueVB">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkHButtonBox" id="queueBB">
                             <property name="visible">True</property>
                             <property name="border_width">5</property>
                             <property name="homogeneous">True</property>
-                            <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+                            <property name="layout_style">spread</property>
                             <child>
                               <object class="GtkButton" id="executeBtn">
                                 <property name="visible">True</property>
-                                <property name="tooltip-text" translatable="yes">Execute the current selected queue</property>
-                                <signal handler="cb_execute_clicked" name="clicked"/>
+                                <property name="can_focus">False</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">Execute the current selected queue</property>
+                                <signal name="clicked" handler="cb_execute_clicked"/>
                                 <child>
                                   <object class="GtkHBox" id="hbox7">
                                     <property name="visible">True</property>
@@ -612,6 +636,9 @@
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="stock">gtk-execute</property>
                                       </object>
+                                      <packing>
+                                        <property name="position">0</property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label12">
@@ -629,28 +656,41 @@
                                   </object>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="updateBtn">
-                                <property name="visible">True</property>
-                                <property name="tooltip-text" translatable="yes">Calculate the packages which will be installed during an "update world"</property>
                                 <property name="label" translatable="yes">Update _World</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">Calculate the packages which will be installed during an "update world"</property>
                                 <property name="use_underline">True</property>
-                                <signal handler="cb_update_clicked" name="clicked"/>
+                                <signal name="clicked" handler="cb_update_clicked"/>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="removeBtn">
-                                <property name="visible">True</property>
-                                <property name="tooltip-text" translatable="yes">Remove the selected package from the queue</property>
                                 <property name="label" translatable="yes">_Remove</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">Remove the selected package from the queue</property>
                                 <property name="use_underline">True</property>
-                                <signal handler="cb_remove_clicked" name="clicked"/>
+                                <signal name="clicked" handler="cb_remove_clicked"/>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -658,6 +698,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -666,14 +707,16 @@
                             <property name="homogeneous">True</property>
                             <child>
                               <object class="GtkCheckButton" id="oneshotCB">
+                                <property name="label">--oneshot</property>
                                 <property name="visible">True</property>
                                 <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
-                                <property name="label">--oneshot</property>
+                                <property name="receives_default">False</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="padding">5</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
@@ -692,17 +735,17 @@
                           <object class="GtkScrolledWindow" id="queueScroll">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
                             <child>
                               <object class="GtkTreeView" id="queueList">
                                 <property name="visible">True</property>
                                 <property name="has_tooltip">True</property>
                                 <property name="headers_visible">False</property>
                                 <property name="enable_search">False</property>
-                                <signal handler="cb_right_click" name="button_press_event"/>
-                                <signal handler="cb_queue_tooltip_queried" name="query_tooltip"/>
-                                <signal handler="cb_queue_row_activated" name="row_activated"/>
+                                <signal name="button_press_event" handler="cb_right_click"/>
+                                <signal name="query_tooltip" handler="cb_queue_tooltip_queried"/>
+                                <signal name="row_activated" handler="cb_queue_row_activated"/>
                               </object>
                             </child>
                           </object>
@@ -732,6 +775,9 @@
                           <placeholder/>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">1</property>