Applied split

10 files changed, 1222 insertions, 1176 deletions

diff --git a/portato/gui/gtk/basic.py b/portato/gui/gtk/basic.py
index 27c932e..513edf6 100644
--- a/portato/gui/gtk/basic.py
+++ b/portato/gui/gtk/basic.py
@@ -18,6 +18,7 @@ import gtk.glade
 import gobject
 
 from functools import wraps
+import os.path
 
 from ...constants import TEMPLATE_DIR, APP_ICON, APP, LOCALE_DIR
 
@@ -27,9 +28,19 @@ GLADE_FILE = TEMPLATE_DIR+"portato.glade"
 
 class Window (object):
 	def __init__ (self):
-		self.tree = self.get_tree(self.__class__.__name__)
+
+		if not hasattr(self, "__tree__"):
+			self.__tree__ = self.__class__.__name__
+
+		if not hasattr(self, "__window__"):
+			self.__window__ = self.__class__.__name__
+
+		if not hasattr(self, "__file__"):
+			self.__file__ = self.__class__.__name__
+
+		self.tree = self.get_tree(self.__tree__)
 		self.tree.signal_autoconnect(self)
-		self.window = self.tree.get_widget(self.__class__.__name__)
+		self.window = self.tree.get_widget(self.__window__)
 		self.window.set_icon_from_file(APP_ICON)
 
 	@staticmethod
@@ -55,7 +66,7 @@ class Window (object):
 		return wrapper
 
 	def get_tree (self, name):
-		return gtk.glade.XML(GLADE_FILE, name)
+		return gtk.glade.XML(os.path.join(TEMPLATE_DIR, self.__file__+".glade"), name)
 
 class AbstractDialog (Window):
 	"""A class all our dialogs get derived from. It sets useful default vars and automatically handles the ESC-Button."""
@@ -89,8 +100,8 @@ class AbstractDialog (Window):
 
 class Popup (object):
 
-	def __init__ (self, name, parent):
-		self.tree = gtk.glade.XML(GLADE_FILE, root = name)
+	def __init__ (self, name, parent, file = "popups"):
+		self.tree = gtk.glade.XML(os.path.join(TEMPLATE_DIR, file+".glade"), root = name)
 		self.tree.signal_autoconnect(parent)
 		self._popup = self.tree.get_widget(name)
 
diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py
index c7dc79b..11588c4 100644
--- a/portato/gui/gtk/windows.py
+++ b/portato/gui/gtk/windows.py
@@ -1038,8 +1038,8 @@ class MainWindow (Window):
 		self.packageTable = PackageTable(self)
 
 		# popups
-		self.queuePopup = Popup("queuePopup", self)
-		self.consolePopup = Popup("consolePopup", self)
+		self.queuePopup = Popup("queuePopup", self, self.__file__)
+		self.consolePopup = Popup("consolePopup", self, self.__file__)
 		self.trayPopup = Popup("systrayPopup", self)
 
 		# pause menu items
diff --git a/portato/gui/templates/AboutWindow.glade b/portato/gui/templates/AboutWindow.glade
new file mode 100644
index 0000000..3c25550
--- /dev/null
+++ b/portato/gui/templates/AboutWindow.glade
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
+<glade-interface>
+  <widget 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="destroy_with_parent">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="skip_taskbar_hint">True</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="urgency_hint">True</property>
+    <property name="has_separator">False</property>
+    <property name="program_name">Portato</property>
+    <property name="copyright" translatable="yes">This software is licensed under the terms of the GPLv2.
+Copyright (C) 2006-2007 René 'Necoro' Neumann &lt;necoro@necoro.net&gt;</property>
+    <property name="comments">A Portage GUI</property>
+    <property name="website">http://portato.necoro.net</property>
+    <property name="authors">René 'Necoro' Neumann
+
+Thanks goto:
+	- The Porthole team, which often inspired me and gave me hints :)
+	- franzf, who often tested and gave comments
+	- the Sabayon-Distro for making Portato the default Portage-GUI</property>
+    <property name="translator_credits">Catalan - Roger Calvó
+German - René 'Necoro' Neumann
+Polish - Tomasz Osiński</property>
+    <property name="artists">p4r4d0x (inspired by wolfden)</property>
+    <signal name="response" handler="close"/>
+    <child internal-child="vbox">
+      <widget 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="spacing">2</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child internal-child="action_area">
+          <widget 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>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
diff --git a/portato/gui/templates/portato.glade b/portato/gui/templates/MainWindow.glade
index 3ac46a1..a747f12 100644
--- a/portato/gui/templates/portato.glade
+++ b/portato/gui/templates/MainWindow.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<!--Generated with glade3 3.4.1 on Fri Feb 29 00:00:59 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="MainWindow">
     <property name="border_width">2</property>
@@ -30,7 +30,7 @@
                         <signal name="activate" handler="cb_preferences_clicked"/>
                         <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="image1">
+                          <widget class="GtkImage" id="menu-item-image8">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
@@ -47,7 +47,7 @@
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="cb_reload_clicked"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="image2">
+                          <widget class="GtkImage" id="menu-item-image9">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
@@ -91,7 +91,7 @@
                         <signal name="activate" handler="cb_package_emerge_clicked"/>
                         <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image9">
+                          <widget class="GtkImage" id="menu-item-image10">
                             <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 | GDK_ENTER_NOTIFY_MASK</property>
                             <property name="stock">gtk-add</property>
@@ -107,7 +107,7 @@
                         <signal name="activate" handler="cb_package_unmerge_clicked"/>
                         <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image10">
+                          <widget class="GtkImage" id="menu-item-image11">
                             <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 | GDK_ENTER_NOTIFY_MASK</property>
                             <property name="stock">gtk-remove</property>
@@ -155,7 +155,7 @@
                         <signal name="activate" handler="cb_sync_clicked"/>
                         <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image11">
+                          <widget class="GtkImage" id="menu-item-image12">
                             <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 | GDK_ENTER_NOTIFY_MASK</property>
                             <property name="stock">gtk-refresh</property>
@@ -170,7 +170,7 @@
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="cb_save_flags_clicked"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image12">
+                          <widget class="GtkImage" id="menu-item-image13">
                             <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 | GDK_ENTER_NOTIFY_MASK</property>
                             <property name="stock">gtk-save</property>
@@ -200,7 +200,7 @@
                         <signal name="activate" handler="cb_kill_clicked"/>
                         <accelerator key="K" modifiers="GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image13">
+                          <widget class="GtkImage" id="menu-item-image14">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
@@ -248,7 +248,7 @@
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="cb_copy_clicked"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image8">
+                          <widget class="GtkImage" id="menu-item-image17">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
@@ -265,7 +265,7 @@
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="cb_kill_clicked"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="image25">
+                          <widget class="GtkImage" id="menu-item-image18">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
@@ -314,7 +314,7 @@
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="cb_about_clicked"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="image31">
+                          <widget class="GtkImage" id="menu-item-image19">
                             <property name="visible">True</property>
                             <property name="xalign">0</property>
                             <property name="yalign">0</property>
@@ -332,7 +332,7 @@
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="cb_plugins_clicked"/>
                         <child internal-child="image">
-                          <widget class="GtkImage" id="menu-item-image14">
+                          <widget class="GtkImage" id="menu-item-image20">
                             <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-connect</property>
@@ -403,6 +403,26 @@
           </packing>
         </child>
         <child>
+          <widget class="GtkAlignment" id="alignment4">
+            <property name="visible">True</property>
+            <property name="top_padding">5</property>
+            <child>
+              <widget class="GtkLabel" id="statusLabel">
+                <property name="visible">True</property>
+                <property name="xalign">0</property>
+                <property name="yalign">0</property>
+                <property name="label">Portato - A Portage GUI</property>
+                <property name="single_line_mode">True</property>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
           <widget class="GtkVPaned" id="vpaned">
             <property name="visible">True</property>
             <property name="position">300</property>
@@ -1192,1163 +1212,7 @@
             </child>
           </widget>
           <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkAlignment" id="alignment4">
-            <property name="visible">True</property>
-            <property name="top_padding">5</property>
-            <child>
-              <widget class="GtkLabel" id="statusLabel">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="yalign">0</property>
-                <property name="label">Portato - A Portage GUI</property>
-                <property name="single_line_mode">True</property>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="SearchWindow">
-    <property name="width_request">350</property>
-    <property name="height_request">250</property>
-    <property name="title" translatable="yes">Search Results</property>
-    <property name="default_width">1</property>
-    <property name="default_height">1</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="skip_taskbar_hint">True</property>
-    <child>
-      <widget 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>
-        <child>
-          <widget 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>
-            <child>
-              <widget class="GtkTreeView" id="searchList">
-                <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="headers_visible">False</property>
-                <property name="rules_hint">True</property>
-                <signal name="row_activated" handler="ok"/>
-              </widget>
-            </child>
-          </widget>
-        </child>
-        <child>
-          <widget 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>
-            <child>
-              <widget class="GtkButton" id="cancelBtn">
-                <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">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="close"/>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="jumpBtn">
-                <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">gtk-jump-to</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="jump"/>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="okBtn">
-                <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">gtk-ok</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="ok"/>
-              </widget>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkWindow" id="PreferenceWindow">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Preferences</property>
-    <property name="modal">True</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="skip_taskbar_hint">True</property>
-    <child>
-      <widget class="GtkVBox" id="mainVB">
-        <property name="visible">True</property>
-        <property name="spacing">5</property>
-        <child>
-          <widget class="GtkNotebook" id="notebook2">
-            <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>
-            <child>
-              <widget class="GtkVBox" id="vbox2">
-                <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>
-                <child>
-                  <widget class="GtkFrame" id="generalFrame">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment1">
-                        <property name="visible">True</property>
-                        <property name="bottom_padding">5</property>
-                        <property name="left_padding">12</property>
-                        <property name="right_padding">5</property>
-                        <child>
-                          <widget class="GtkVBox" id="generalVB">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="debugCheck">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Debug</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                            </child>
-                            <child>
-                              <widget class="GtkHBox" id="hbox3">
-                                <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>
-                                <child>
-                                  <widget class="GtkLabel" id="browserLabel">
-                                    <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">Browser command: </property>
-                                  </widget>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <widget class="GtkEntry" id="browserEdit">
-                                    <property name="visible">True</property>
-                                  </widget>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;General Options&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="updateFrame">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment2">
-                        <property name="visible">True</property>
-                        <property name="left_padding">12</property>
-                        <child>
-                          <widget class="GtkVBox" id="updateVB">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkCheckButton" id="deepCheck">
-                                <property name="visible">True</property>
-                                <property name="label">--deep</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="fill">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="newUseCheck">
-                                <property name="visible">True</property>
-                                <property name="label">--newuse</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Update World Options&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="syncFrame">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment5">
-                        <property name="visible">True</property>
-                        <property name="bottom_padding">5</property>
-                        <property name="left_padding">12</property>
-                        <property name="right_padding">5</property>
-                        <child>
-                          <widget class="GtkHBox" id="syncHB">
-                            <property name="visible">True</property>
-                            <child>
-                              <widget class="GtkLabel" id="syncLabel">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Sync command: </property>
-                              </widget>
-                              <packing>
-                                <property name="expand">False</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkEntry" id="syncCommandEdit">
-                                <property name="visible">True</property>
-                              </widget>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Sync Options&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
-                      </widget>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="keywordFrame">
-                    <property name="visible">True</property>
-                    <property name="label_xalign">0</property>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment3">
-                        <property name="visible">True</property>
-                        <property name="bottom_padding">5</property>
-                        <property name="left_padding">12</property>
-                        <property name="right_padding">5</property>
-                        <child>
-                          <widget class="GtkTable" id="keywordTable">
-                            <property name="visible">True</property>
-                            <property name="n_rows">10</property>
-                            <property name="n_columns">2</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <placeholder/>
-                            </child>
-                            <child>
-                              <widget class="GtkEntry" id="useFileEdit">
-                                <property name="visible">True</property>
-                              </widget>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="useEditLabel">
-                                <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">File name to use, if package.use is a directory: </property>
-                                <property name="single_line_mode">True</property>
-                              </widget>
-                              <packing>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="usePerVersionCheck">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Add only exact version to package.use</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">2</property>
-                                <property name="bottom_attach">3</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkCheckButton" id="testPerVersionCheck">
-                                <property name="visible">True</property>
-                                <property name="label" translatable="yes">Add only exact version to package.keywords</property>
-                                <property name="response_id">0</property>
-                                <property name="draw_indicator">True</property>
-                              </widget>
-                              <packing>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">5</property>
-                                <property name="bottom_attach">6</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <widget class="GtkLabel" id="testEditLabel">
-                                <property name="visible">True</property>
-                                <property name="xalig