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.

author: René 'Necoro' Neumann <necoro@necoro.net> 2009-09-06 01:46:45 +0200
committer: René 'Necoro' Neumann <necoro@necoro.net> 2009-09-06 01:46:45 +0200
commit: aeffd6bb3e77545ac6de777c4b0c9f3024ae654f (patch)
tree: 2ab74d4b3b47fd35ec3a3b3f2f115a7430f9f006 /portato/gui/templates
parent: bf86fab5906e1466984d072cc9a0309b38b55a43 (diff)
parent: 30b9a89aaf90e5ea0edeadee6d6f1a9f05c40703 (diff)
download: portato-aeffd6bb3e77545ac6de777c4b0c9f3024ae654f.tar.gz
portato-aeffd6bb3e77545ac6de777c4b0c9f3024ae654f.tar.bz2
portato-aeffd6bb3e77545ac6de777c4b0c9f3024ae654f.zip
9 files changed, 512 insertions, 361 deletions
diff --git a/portato/gui/templates/AboutWindow.ui b/portato/gui/templates/AboutWindow.ui
index 56a7ff6..ce612b3 100644
--- a/portato/gui/templates/AboutWindow.ui
+++ b/portato/gui/templates/AboutWindow.ui
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
-<!--*- mode: xml -*-->
 <interface>
+  <requires lib="gtk+" version="2.14"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAboutDialog" id="AboutWindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">About Portato</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="urgency_hint">True</property>
@@ -31,11 +32,12 @@ Portugese (Brazilian) - Alberto Federman Neto
 Spanish - Daniel Halens
 Turkish - G&#xFC;rkan 'seqizz' G&#xFC;r</property>
     <property name="artists">p4r4d0x (inspired by wolfden)</property>
-    <signal handler="close" name="response"/>
+    <signal name="response" handler="close"/>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <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>
         <property name="spacing">2</property>
         <child>
           <placeholder/>
@@ -44,11 +46,12 @@ Turkish - G&#xFC;rkan 'seqizz' G&#xFC;r</property>
           <object class="GtkHButtonBox" id="dialog-action_area1">
             <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="layout_style">GTK_BUTTONBOX_END</property>
+            <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
diff --git a/portato/gui/templates/MailInfoWindow.ui b/portato/gui/templates/MailInfoWindow.ui
index a469bd3..4551cdb 100644
--- a/portato/gui/templates/MailInfoWindow.ui
+++ b/portato/gui/templates/MailInfoWindow.ui
@@ -1,20 +1,22 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Mon Sep 15 20:20:19 2008 -->
 <interface>
+  <requires lib="gtk+" version="2.14"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="MailInfoWindow">
     <property name="title" translatable="yes">Send Bug Mail ...</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <property name="default_width">450</property>
     <property name="default_height">230</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
     <property name="urgency_hint">True</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <child>
           <object class="GtkTable" id="table1">
             <property name="visible">True</property>
@@ -22,16 +24,13 @@
             <property name="n_columns">2</property>
             <property name="row_spacing">10</property>
             <child>
-              <placeholder/>
-            </child>
-            <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">&lt;b&gt;&lt;u&gt;Additional Information&lt;/u&gt;&lt;/b&gt;
 
 (all optional)</property>
                 <property name="use_markup">True</property>
-                <property name="justify">GTK_JUSTIFY_CENTER</property>
+                <property name="justify">center</property>
               </object>
               <packing>
                 <property name="right_attach">2</property>
@@ -115,9 +114,9 @@ what did you do to hit the bug?</property>
               <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
                 <child>
                   <object class="GtkTextView" id="commentEntry">
                     <property name="height_request">50</property>
@@ -136,10 +135,11 @@ what did you do to hit the bug?</property>
             </child>
             <child>
               <object class="GtkCheckButton" id="logCheck">
+                <property name="label" translatable="yes">Attach _Logfile</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="tooltip-text" translatable="yes">Attaches the logfile to the mail. This log only contains debug information.</property>
-                <property name="label" translatable="yes">Attach _Logfile</property>
+                <property name="receives_default">False</property>
+                <property name="tooltip_text" translatable="yes">Attaches the logfile to the mail. This log only contains debug information.</property>
                 <property name="use_underline">True</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
@@ -150,32 +150,41 @@ what did you do to hit the bug?</property>
                 <property name="x_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="padding">5</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox1">
             <property name="visible">True</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="cancelBtn">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="label">gtk-cancel</property>
                 <property name="use_stock">True</property>
-                <signal handler="cb_cancel_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_cancel_clicked"/>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="sendBtn">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <signal handler="cb_send_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_send_clicked"/>
                 <child>
                   <object class="GtkHBox" id="hbox1">
                     <property name="visible">True</property>
@@ -186,6 +195,9 @@ what did you do to hit the bug?</property>
                         <property name="xalign">1</property>
                         <property name="stock">gtk-ok</property>
                       </object>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label5">
@@ -203,6 +215,8 @@ what did you do to hit the bug?</property>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/portato/gui/templates/MainWindow.menu b/portato/gui/templates/MainWindow.menu
new file mode 100644
index 0000000..1cce3be
--- /dev/null
+++ b/portato/gui/templates/MainWindow.menu
@@ -0,0 +1,207 @@
+<?xml version="1.0"?>
+<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>
+</interface>
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">
diff --git a/portato/gui/templates/PluginWindow.ui b/portato/gui/templates/PluginWindow.ui
index 83d52d8..42a3156 100644
--- a/portato/gui/templates/PluginWindow.ui
+++ b/portato/gui/templates/PluginWindow.ui
@@ -1,13 +1,14 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.5 on Fri Jul  4 15:24:27 2008 -->
 <interface>
+  <requires lib="gtk+" version="2.14"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="PluginWindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Plugins</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
@@ -16,13 +17,14 @@
       <object class="GtkVBox" id="vbox5">
         <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>
         <property name="spacing">5</property>
         <child>
           <object class="GtkScrolledWindow" id="pluginListScroll">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-            <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">never</property>
             <child>
               <object class="GtkTreeView" id="pluginList">
                 <property name="visible">True</property>
@@ -32,6 +34,9 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <object class="GtkFrame" id="frame1">
@@ -45,19 +50,19 @@
                 <property name="row_spacing">10</property>
                 <child>
                   <object class="GtkButton" id="installBtn">
+                    <property name="label" translatable="yes">_Install dependencies</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="label" translatable="yes">_Install dependencies</property>
                     <property name="use_underline">True</property>
-                    <signal handler="cb_install_clicked" name="clicked"/>
+                    <signal name="clicked" handler="cb_install_clicked"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <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>
                     <property name="x_padding">10</property>
                   </packing>
                 </child>
@@ -70,7 +75,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="headers_visible">False</property>
-                        <property name="headers_clickable">True</property>
                       </object>
                     </child>
                     <child type="label">
@@ -131,46 +135,63 @@
                     <property name="visible">True</property>
                     <property name="spacing">5</property>
                     <property name="homogeneous">True</property>
-                    <property name="layout_style">GTK_BUTTONBOX_EDGE</property>
+                    <property name="layout_style">edge</property>
                     <child>
                       <object class="GtkRadioButton" id="enabledRB">
+                        <property name="label" translatable="yes">Enabled</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Enabled</property>
+                        <property name="receives_default">False</property>
                         <property name="active">True</property>
-                        <signal handler="cb_state_toggled" name="toggled"/>
+                        <property name="draw_indicator">False</property>
+                        <signal name="toggled" handler="cb_state_toggled"/>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="tempEnabledRB">
+                        <property name="label" translatable="yes">Temporarily enabled</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Temporarily enabled</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">False</property>
                         <property name="group">enabledRB</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="tempDisabledRB">
+                        <property name="label" translatable="yes">Temporarily disabled</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Temporarily disabled</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">False</property>
                         <property name="group">enabledRB</property>
-                        <signal handler="cb_state_toggled" name="toggled"/>
+                        <signal name="toggled" handler="cb_state_toggled"/>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="disabledRB">
+                        <property name="label" translatable="yes">Disabled</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="label" translatable="yes">Disabled</property>
+                        <property name="receives_default">False</property>
+                        <property name="draw_indicator">False</property>
                         <property name="group">enabledRB</property>
-                        <signal handler="cb_state_toggled" name="toggled"/>
+                        <signal name="toggled" handler="cb_state_toggled"/>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -188,7 +209,7 @@
                 </child>
               </object>
             </child>
-            <child type="label">
+            <child type="label_item">
               <placeholder/>
             </child>
           </object>
@@ -201,29 +222,36 @@
             <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="homogeneous">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+            <property name="layout_style">spread</property>
             <child>
               <object class="GtkButton" id="cancelBtn">
+                <property name="label">gtk-cancel</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-cancel</property>
                 <property name="use_stock">True</property>
-                <signal handler="close" name="clicked"/>
+                <signal name="clicked" handler="close"/>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="okBtn">
+                <property name="label">gtk-apply</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-apply</property>
                 <property name="use_stock">True</property>
-                <signal handler="cb_ok_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_ok_clicked"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/portato/gui/templates/PreferenceWindow.ui b/portato/gui/templates/PreferenceWindow.ui
index a257859..c7a00e0 100644
--- a/portato/gui/templates/PreferenceWindow.ui
+++ b/portato/gui/templates/PreferenceWindow.ui
@@ -18,6 +18,7 @@
     <child>
       <object class="GtkVBox" id="mainVB">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">5</property>
         <child>
           <object class="GtkNotebook" id="notebook2">
@@ -29,6 +30,7 @@
                 <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="border_width">5</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="generalFrame">
                     <property name="visible">True</property>
@@ -43,6 +45,7 @@
                         <child>
                           <object class="GtkVBox" id="generalVB">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkCheckButton" id="debugCheck">
                                 <property name="label" translatable="yes">Debug</property>
@@ -129,6 +132,7 @@
                         <child>
                           <object class="GtkVBox" id="databaseVB">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkHBox" id="hbox5">
                                 <property name="visible">True</property>
@@ -232,6 +236,7 @@
             <child>
               <object class="GtkVBox" id="vbox5">
                 <property name="visible">True</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="updateFrame">
                     <property name="visible">True</property>
@@ -245,6 +250,7 @@
                         <child>
                           <object class="GtkVBox" id="updateVB">
                             <property name="visible">True</property>
+                            <property name="orientation">vertical</property>
                             <child>
                               <object class="GtkCheckButton" id="deepCheck">
                                 <property name="label">--deep</property>
@@ -634,6 +640,7 @@
                   <object class="GtkVBox" id="vbox4">
                     <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="GtkFrame" id="visualGeneralFrame">
                         <property name="visible">True</property>
@@ -650,6 +657,7 @@
                               <object class="GtkVBox" id="vbox6">
                                 <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="GtkCheckButton" id="systrayCheck">
                                     <property name="label" translatable="yes">Enable systray</property>
@@ -741,6 +749,7 @@
                               <object class="GtkVBox" id="vbox7">
                                 <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>
                                 <property name="spacing">5</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox2">
@@ -776,6 +785,7 @@
                                   <object class="GtkHBox" id="hbox4">
                                     <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>
                                     <property name="homogeneous">True</property>
                                     <child>
                                       <object class="GtkLabel" id="label21">
@@ -836,6 +846,7 @@
                             <child>
                               <object class="GtkVBox" id="vbox3">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkCheckButton" id="showSlotsCheck">
                                     <property name="label" translatable="yes">Show slots in the version list</property>
@@ -898,6 +909,7 @@ As an example: &lt;i&gt;app-admin&lt;/i&gt;, &lt;i&gt;app-emacs&lt;/i&gt;, and &
                             <child>
                               <object class="GtkVBox" id="vbox1">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox1">
                                     <property name="visible">True</property>
@@ -1001,6 +1013,7 @@ As an example: &lt;i&gt;app-admin&lt;/i&gt;, &lt;i&gt;app-emacs&lt;/i&gt;, and &
                             <child>
                               <object class="GtkVBox" id="vbox8">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox7">
                                     <property name="visible">True</property>
@@ -1125,6 +1138,8 @@ As an example: &lt;i&gt;app-admin&lt;/i&gt;, &lt;i&gt;app-emacs&lt;/i&gt;, and &
                 <signal name="clicked" handler="cb_cancel_clicked"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
@@ -1139,6 +1154,8 @@ As an example: &lt;i&gt;app-admin&lt;/i&gt;, &lt;i&gt;app-emacs&lt;/i&gt;, and &
                 <signal name="clicked" handler="cb_ok_clicked"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/portato/gui/templates/SearchWindow.ui b/portato/gui/templates/SearchWindow.ui
index 26fa6a8..f62d259 100644
--- a/portato/gui/templates/SearchWindow.ui
+++ b/portato/gui/templates/SearchWindow.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.1 on Fri Feb 29 00:01:28 2008 -->
 <interface>
+  <requires lib="gtk+" version="2.14"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="SearchWindow">
     <property name="width_request">350</property>
     <property name="height_request">250</property>
@@ -13,13 +14,14 @@
       <object class="GtkVBox" id="vbox1">
         <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="GtkScrolledWindow" id="scrolledwindow2">
             <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="GtkTreeView" id="searchList">
                 <property name="visible">True</property>
@@ -27,53 +29,65 @@
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="headers_visible">False</property>
                 <property name="rules_hint">True</property>
-                <signal handler="ok" name="row_activated"/>
+                <signal name="row_activated" handler="ok"/>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox3">
             <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="homogeneous">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+            <property name="layout_style">spread</property>
             <child>
               <object class="GtkButton" id="cancelBtn">
+                <property name="label">gtk-cancel</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-cancel</property>
                 <property name="use_stock">True</property>
-                <signal handler="close" name="clicked"/>
+                <signal name="clicked" handler="close"/>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="jumpBtn">
+                <property name="label">gtk-jump-to</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-jump-to</property>
                 <property name="use_stock">True</property>
-                <signal handler="jump" name="clicked"/>
+                <signal name="clicked" handler="jump"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="okBtn">
+                <property name="label">gtk-ok</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-ok</property>
                 <property name="use_stock">True</property>
-                <signal handler="ok" name="clicked"/>
+                <signal name="clicked" handler="ok"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
diff --git a/portato/gui/templates/SplashScreen.ui b/portato/gui/templates/SplashScreen.ui
index 4529fcc..c136062 100644
--- a/portato/gui/templates/SplashScreen.ui
+++ b/portato/gui/templates/SplashScreen.ui
@@ -1,12 +1,13 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.1 on Fri Feb 29 00:02:46 2008 -->
 <interface>
+  <requires lib="gtk+" version="2.14"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="SplashScreen">
     <property name="width_request">300</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_SPLASHSCREEN</property>
+    <property name="window_position">center-always</property>
+    <property name="type_hint">splashscreen</property>
     <property name="urgency_hint">True</property>
     <property name="focus_on_map">False</property>
     <property name="decorated">False</property>
@@ -23,12 +24,16 @@
           <object class="GtkVBox" id="vbox3">
             <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="GtkImage" id="image">
                 <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="stock">gtk-missing-image</property>
               </object>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkLabel" id="generalLabel">
diff --git a/portato/gui/templates/UpdateWindow.ui b/portato/gui/templates/UpdateWindow.ui
index 69b668d..ec8288e 100644
--- a/portato/gui/templates/UpdateWindow.ui
+++ b/portato/gui/templates/UpdateWindow.ui
@@ -1,25 +1,27 @@
 <?xml version="1.0"?>
-<!--Generated with glade3 3.4.4 on Thu May 15 21:45:30 2008 -->
 <interface>
+  <requires lib="gtk+" version="2.14"/>
+  <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkWindow" id="UpdateWindow">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="title" translatable="yes">Updatable Packages</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="urgency_hint">True</property>
-    <signal handler="cb_set_size" name="realize"/>
+    <signal name="realize" handler="cb_set_size"/>
     <child>
       <object class="GtkVBox" id="mainVB">
         <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>
         <property name="spacing">5</property>
         <child>
           <object class="GtkScrolledWindow" id="scrolledwindow1">
             <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="GtkTreeView" id="packageList">
                 <property name="visible">True</property>
@@ -28,53 +30,65 @@
                 <property name="headers_visible">False</property>
                 <property name="reorderable">True</property>
                 <property name="rules_hint">True</property>
-                <signal handler="cb_package_selected" name="cursor_changed"/>
+                <signal name="cursor_changed" handler="cb_package_selected"/>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="updateBB">
             <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="homogeneous">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
+            <property name="layout_style">spread</property>
             <child>
               <object class="GtkButton" id="closeBtn">
+                <property name="label" translatable="yes">_Close</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" translatable="yes">_Close</property>
                 <property name="use_underline">True</property>
-                <signal handler="close" name="clicked"/>
+                <signal name="clicked" handler="close"/>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="selectAllBtn">
+                <property name="label" translatable="yes">Select _All</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" translatable="yes">Select _All</property>
                 <property name="use_underline">True</property>
-                <signal handler="cb_select_all_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_select_all_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="installBtn">
+                <property name="label" translatable="yes">_Install Selected</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" translatable="yes">_Install Selected</property>
                 <property name="use_underline">True</property>
-                <signal handler="cb_install_clicked" name="clicked"/>
+                <signal name="clicked" handler="cb_install_clicked"/>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
             </child>
author	René 'Necoro' Neumann <necoro@necoro.net>	2009-09-06 01:46:45 +0200
committer	René 'Necoro' Neumann <necoro@necoro.net>	2009-09-06 01:46:45 +0200
commit	aeffd6bb3e77545ac6de777c4b0c9f3024ae654f (patch)
tree	2ab74d4b3b47fd35ec3a3b3f2f115a7430f9f006 /portato/gui/templates
parent	bf86fab5906e1466984d072cc9a0309b38b55a43 (diff)
parent	30b9a89aaf90e5ea0edeadee6d6f1a9f05c40703 (diff)
download	portato-aeffd6bb3e77545ac6de777c4b0c9f3024ae654f.tar.gz portato-aeffd6bb3e77545ac6de777c4b0c9f3024ae654f.tar.bz2 portato-aeffd6bb3e77545ac6de777c4b0c9f3024ae654f.zip