Updated .ui files, so they work with the most up2date glade. Therefore moved action and menu declarations into an extra file and added some white magic to the UIBuilder class.

1 files changed, 139 insertions, 290 deletions

diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui
index e84bfd5..8e8c3b4 100644
--- a/portato/gui/templates/MainWindow.ui
+++ b/portato/gui/templates/MainWindow.ui
@@ -1,225 +1,28 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Fri Dec  5 12:57:49 2008 -->
 <interface>
-  <object class="GtkUIManager" id="uimanager">
-    <child>
-      <object class="GtkActionGroup" id="pluginActionGroup">
-        <child>
-          <object class="GtkAction" id="pluginMenuAction">
-            <property name="name">pluginMenuAction</property>
-            <property name="label" translatable="yes">Plu_gins</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkActionGroup" id="generalActionGroup">
-        <child>
-          <object class="GtkAction" id="fileMenuAction">
-            <property name="name">fileMenuAction</property>
-            <property name="label" translatable="yes">_File</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="prefAction">
-            <property name="stock_id">gtk-preferences</property>
-            <property name="name">prefAction</property>
-            <property name="label" translatable="yes">_Preferences</property>
-            <signal handler="cb_preferences_clicked" name="activate"/>
-          </object>
-          <accelerator key="P" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="reloadAction">
-            <property name="stock_id">gtk-refresh</property>
-            <property name="name">reloadAction</property>
-            <property name="label" translatable="yes">Re_load Portage</property>
-            <signal handler="cb_reload_clicked" name="activate"/>
-          </object>
-          <accelerator key="F5" modifiers=""/>
-          <accelerator key="R" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="closeAction">
-            <property name="stock_id">gtk-quit</property>
-            <property name="name">closeAction</property>
-            <signal handler="cb_close" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="emergeMenuAction">
-            <property name="name">emergeMenuAction</property>
-            <property name="label" translatable="yes">_Emerge</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="emergeAction">
-            <property name="stock_id">gtk-add</property>
-            <property name="name">emergeAction</property>
-            <property name="label" translatable="yes">_Install</property>
-            <signal handler="cb_package_emerge_clicked" name="activate"/>
-          </object>
-          <accelerator key="plus" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="unmergeAction">
-            <property name="stock_id">gtk-remove</property>
-            <property name="name">unmergeAction</property>
-            <property name="label" translatable="yes">_Uninstall</property>
-            <signal handler="cb_package_unmerge_clicked" name="activate"/>
-          </object>
-          <accelerator key="minus" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="updateAction">
-            <property name="name">updateAction</property>
-            <property name="label" translatable="yes">Update _World</property>
-            <signal handler="cb_update_clicked" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="showUpdatesAction">
-            <property name="name">showUpdatesAction</property>
-            <property name="label" translatable="yes">Show Updatable P_ackages</property>
-            <signal handler="cb_show_updates_clicked" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="showInstalledAction">
-            <property name="name">showInstalledAction</property>
-            <property name="label" translatable="yes">Show _Only Installed Packages</property>
-            <signal handler="cb_show_installed_toggled" name="toggled"/>
-          </object>
-          <accelerator key="i" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="syncAction">
-            <property name="stock_id">gtk-refresh</property>
-            <property name="name">syncAction</property>
-            <property name="label" translatable="yes">_Sync</property>
-            <signal handler="cb_sync_clicked" name="activate"/>
-          </object>
-          <accelerator key="Y" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="saveFlagsAction">
-            <property name="stock_id">gtk-save</property>
-            <property name="name">saveFlagsAction</property>
-            <property name="label" translatable="yes">Save _Flags</property>
-            <signal handler="cb_save_flags_clicked" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkToggleAction" id="pauseAction">
-            <property name="name">pauseActionMenu</property>
-            <property name="label" translatable="yes">Emerge _Paused</property>
-            <signal handler="cb_pause_emerge" name="activate"/>
-          </object>
-          <accelerator key="Z" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="killAction">
-            <property name="stock_id">gtk-stop</property>
-            <property name="name">killAction</property>
-            <property name="label" translatable="yes">_Kill Emerge</property>
-            <signal handler="cb_kill_clicked" name="activate"/>
-          </object>
-          <accelerator key="K" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="copyAction">
-            <property name="stock_id">gtk-copy</property>
-            <property name="name">copyAction</property>
-            <property name="label" translatable="yes">_Copy</property>
-            <signal handler="cb_copy_clicked" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="helpMenuAction">
-            <property name="name">helpMenuAction</property>
-            <property name="label" translatable="yes">_?</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="aboutAction">
-            <property name="stock_id">gtk-about</property>
-            <property name="name">aboutAction</property>
-            <property name="label" translatable="yes">_About</property>
-            <signal handler="cb_about_clicked" name="activate"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkAction" id="pluginsAction">
-            <property name="stock_id">gtk-connect</property>
-            <property name="name">pluginsAction</property>
-            <property name="label" translatable="yes">_Plugins</property>
-            <signal handler="cb_plugins_clicked" name="activate"/>
-          </object>
-        </child>
-      </object>
-    </child>
-    <ui>
-      <menubar name="menubar">
-        <menu name="fileMenu" action="fileMenuAction">
-          <menuitem name="prefMenuItem" action="prefAction"/>
-          <menuitem name="reloadMenuItem" action="reloadAction"/>
-          <separator/>
-          <menuitem name="closeMenuItem" action="closeAction"/>
-        </menu>
-        <menu name="emergeMenu" action="emergeMenuAction">
-          <menuitem name="emergeMenuItem" action="emergeAction"/>
-          <menuitem name="unmergeMenuItem" action="unmergeAction"/>
-          <menuitem name="updateMenuItem" action="updateAction"/>
-          <menuitem name="showUpdatesMenuItem" action="showUpdatesAction"/>
-          <menuitem name="showInstalledMenuItem" action="showInstalledAction"/>
-          <separator/>
-          <menuitem name="syncMenuItem" action="syncAction"/>
-          <menuitem name="saveFlagsMenuItem" action="saveFlagsAction"/>
-          <separator/>
-          <menuitem name="pauseMenuItem" action="pauseAction"/>
-          <menuitem name="killMenuItem" action="killAction"/>
-        </menu>
-        <menu name="pluginMenu" action="pluginMenuAction"/>
-        <menu name="helpMenu" action="helpMenuAction">
-          <menuitem name="aboutMenuItem" action="aboutAction"/>
-          <menuitem name="pluginsMenuItem" action="pluginsAction"/>
-        </menu>
-      </menubar>
-      <popup name="systrayPopup">
-        <menuitem action="pauseAction"/>
-        <menuitem action="killAction"/>
-        <menuitem action="closeAction"/>
-      </popup>
-      <popup name="consolePopup">
-        <menuitem name="copyMenuItem" action="copyAction"/>
-        <menuitem name="killMenuItem" action="killAction"/>
-        <menuitem name="pauseMenuItem" action="pauseAction"/>
-      </popup>
-    </ui>
-  </object>
-  <object class="GtkMenu" constructor="uimanager" id="systrayPopup">
-    <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>
-  </object>
-  <object class="GtkMenu" constructor="uimanager" id="consolePopup">
-    <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>
-  </object>
+  <requires lib="gtk+" version="2.14"/>
+  <!-- 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>
-          <object class="GtkMenuBar" constructor="uimanager" id="menubar">
+          <object class="GtkVBox" id="menubar_box">
             <property name="visible">True</property>
+            <property name="orientation">vertical</property>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -229,23 +32,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>
@@ -255,10 +59,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>
@@ -276,13 +82,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>
@@ -293,8 +100,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>
@@ -302,13 +109,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>
@@ -324,8 +134,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>
@@ -339,7 +149,7 @@
                     </child>
                   </object>
                 </child>
-                <child type="label">
+                <child type="label_item">
                   <placeholder/>
                 </child>
               </object>
@@ -357,6 +167,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>
@@ -367,9 +178,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">
@@ -377,9 +191,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>
@@ -399,9 +213,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>
@@ -421,9 +235,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>
@@ -441,26 +255,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>
@@ -471,12 +286,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>
@@ -490,7 +299,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>
@@ -506,7 +315,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>
@@ -522,7 +331,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>
@@ -537,7 +346,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>
@@ -554,7 +363,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>
@@ -568,7 +377,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>
@@ -586,7 +395,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>
@@ -601,7 +410,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>
@@ -618,7 +427,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>
@@ -634,44 +443,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>
@@ -685,25 +496,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>
@@ -720,7 +532,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>
@@ -731,7 +543,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>
@@ -739,9 +551,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>
@@ -762,12 +580,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">
@@ -796,22 +617,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>
@@ -822,6 +646,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">
@@ -839,28 +666,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>
@@ -868,6 +708,7 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -876,14 +717,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>
@@ -902,17 +745,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>
@@ -942,6 +785,9 @@
                           <placeholder/>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                     <child type="tab">
                       <object class="GtkLabel" id="label18">
@@ -960,19 +806,22 @@
                         <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="GtkTextView" id="logView">
                             <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="editable">False</property>
-                            <property name="wrap_mode">GTK_WRAP_WORD</property>
+                            <property name="wrap_mode">word</property>
                             <property name="cursor_visible">False</property>
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
                     </child>
                     <child type="tab">
                       <object class="GtkLabel" id="label19">