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

1 files changed, 27 insertions, 13 deletions

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>