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, 50 insertions, 22 deletions

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>