summaryrefslogtreecommitdiff
path: root/portato/gui
diff options
context:
space:
mode:
Diffstat (limited to 'portato/gui')
-rw-r--r--portato/gui/exception_handling.py7
-rw-r--r--portato/gui/queue.py2
-rw-r--r--portato/gui/templates/AboutWindow.ui48
-rw-r--r--portato/gui/templates/MailInfoWindow.ui46
-rw-r--r--portato/gui/templates/MainWindow.menu215
-rw-r--r--portato/gui/templates/MainWindow.ui429
-rw-r--r--portato/gui/templates/PkgListWindow.ui (renamed from portato/gui/templates/UpdateWindow.ui)59
-rw-r--r--portato/gui/templates/PluginWindow.ui72
-rw-r--r--portato/gui/templates/PreferenceWindow.ui17
-rw-r--r--portato/gui/templates/SearchWindow.ui36
-rw-r--r--portato/gui/templates/SplashScreen.ui11
-rw-r--r--portato/gui/utils.py7
-rw-r--r--portato/gui/windows/about.py8
-rw-r--r--portato/gui/windows/basic.py26
-rw-r--r--portato/gui/windows/main.py52
-rw-r--r--portato/gui/windows/pkglist.py (renamed from portato/gui/windows/update.py)69
16 files changed, 697 insertions, 407 deletions
diff --git a/portato/gui/exception_handling.py b/portato/gui/exception_handling.py
index 3928680..0ec1e9a 100644
--- a/portato/gui/exception_handling.py
+++ b/portato/gui/exception_handling.py
@@ -97,14 +97,19 @@ def convert (version):
return ".".join(map(str, version))
def get_version_infos():
- from ..constants import VERSION
+ from ..constants import VERSION, REVISION
from ..backend import system
+ from ..db import _TYPE as db_type
+ if REVISION:
+ VERSION = "%s (git: %s)" % (VERSION, REVISION)
+
return "\n".join((
"Portato version: %s" % VERSION,
"System: %s" % " ".join(get_runsystem()),
"Python version: %s" % sys.version,
"Used backend: %s" % system.get_version(),
+ "Used database type: %s" % db_type,
"pygtk: %s (using GTK+: %s)" % (convert(gtk.pygtk_version), convert(gtk.gtk_version)),
"pygobject: %s (using GLib: %s)" % (convert(gobject.pygobject_version), convert(gobject.glib_version))))
diff --git a/portato/gui/queue.py b/portato/gui/queue.py
index e73891d..6d3d19d 100644
--- a/portato/gui/queue.py
+++ b/portato/gui/queue.py
@@ -144,7 +144,7 @@ class EmergeQueue:
old = system.find_packages(pkg.get_slot_cp(), system.SET_INSTALLED)
if old:
old = old[0] # assume we have only one there
- cmp = pkg.compare_version(old)
+ cmp = pkg.__cmp__(old)
if cmp > 0:
update = True
elif cmp < 0:
diff --git a/portato/gui/templates/AboutWindow.ui b/portato/gui/templates/AboutWindow.ui
index 56a7ff6..ec3ed7e 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,24 +32,59 @@ 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>
+ <object class="GtkHBox" id="gitHB">
+ <property name="visible">True</property>
+ <property name="no_show_all">True</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label">&lt;b&gt;Git revision:&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="gitLabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label">label</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
<child internal-child="action_area">
<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..5d8e8e0
--- /dev/null
+++ b/portato/gui/templates/MainWindow.menu
@@ -0,0 +1,215 @@
+<?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">Up_date 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="GtkAction" id="showWorldPkgsAction">
+ <property name="name">showWorldPkgsAction</property>
+ <property name="label" translatable="yes">Show _World Packages</property>
+ <signal handler="cb_show_world_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="showWorldPkgsMenuItem" action="showWorldPkgsAction" />
+ <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/UpdateWindow.ui b/portato/gui/templates/PkgListWindow.ui
index 69b668d..fdcdb23 100644
--- a/portato/gui/templates/UpdateWindow.ui
+++ b/portato/gui/templates/PkgListWindow.ui
@@ -1,25 +1,26 @@
<?xml version="1.0"?>
-<!--Generated with glade3 3.4.4 on Thu May 15 21:45:30 2008 -->
<interface>
- <object class="GtkWindow" id="UpdateWindow">
+ <requires lib="gtk+" version="2.14"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkWindow" id="PkgListWindow">
<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,56 +29,84 @@
<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>
+ <child>
+ <object class="GtkButton" id="uninstallBtn">
+ <property name="label" translatable="yes">_Uninstall 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="use_underline">True</property>
+ <signal name="clicked" handler="cb_uninstall_clicked"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
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/utils.py b/portato/gui/utils.py
index 8b88b23..47f6fb7 100644
--- a/portato/gui/utils.py
+++ b/portato/gui/utils.py
@@ -21,7 +21,7 @@ from threading import Thread
import gtk
# some backend things
-from ..backend import flags, set_system
+from ..backend import flags, system
from ..helper import debug, info
from ..log import set_log_level
from ..constants import APP, LOCALE_DIR
@@ -90,9 +90,8 @@ class Config (ConfigParser):
set_log_level(level)
def modify_system_config (self):
- """Sets the system config.
- @see: L{backend.set_system()}"""
- set_system(self.get("system"))
+ """Sets the system config."""
+ system.set_system(self.get("system"))
def modify_external_configs (self):
"""Convenience function setting all external configs."""
diff --git a/portato/gui/windows/about.py b/portato/gui/windows/about.py
index 937ed8b..6c6fec5 100644
--- a/portato/gui/windows/about.py
+++ b/portato/gui/windows/about.py
@@ -15,7 +15,7 @@ from __future__ import absolute_import
import gtk
from .basic import AbstractDialog
-from ...constants import VERSION, APP_ICON
+from ...constants import VERSION, REVISION, APP_ICON
class AboutWindow (AbstractDialog):
"""A window showing the "about"-informations."""
@@ -30,5 +30,11 @@ class AboutWindow (AbstractDialog):
self.window.set_version(VERSION)
self.window.set_logo(img.get_pixbuf())
+ if REVISION:
+ gitlabel = self.tree.get_widget("gitLabel")
+ gitlabel.set_label(REVISION)
+ else:
+ self.tree.get_widget("gitHB").hide()
+
self.window.show_all()
diff --git a/portato/gui/windows/basic.py b/portato/gui/windows/basic.py
index 3cedd69..20d8009 100644
--- a/portato/gui/windows/basic.py
+++ b/portato/gui/windows/basic.py
@@ -20,10 +20,11 @@ from functools import wraps
import os.path
from ...constants import TEMPLATE_DIR, APP, LOCALE_DIR
-from ...helper import error
+from ...helper import error, debug
# for the GtkBuilder to translate correctly :)
import ctypes
+from locale import CODESET
try:
getlib = ctypes.cdll.LoadLibrary("libgettextlib.so")
except OSError:
@@ -33,6 +34,13 @@ else:
getlib.bindtextdomain(APP, LOCALE_DIR)
getlib.bind_textdomain_codeset(APP, "UTF-8")
+ # some debugging output about the current codeset used
+ nll = getlib.nl_langinfo
+ nll.restype = ctypes.c_char_p
+ debug("Switching from '%s' to 'UTF-8'.", nll(CODESET))
+
+ getlib.bind_textdomain_codeset(APP, "UTF-8")
+
class WrappedTree (object):
__slots__ = ("klass", "tree", "get_widget", "get_ui")
def __init__ (self, klass, tree):
@@ -70,10 +78,24 @@ class UIBuilder (object):
if not hasattr(self, "__file__"):
self.__file__ = self.__class__.__name__
+ # general setup
self._builder = gtk.Builder()
self._builder.add_from_file(os.path.join(TEMPLATE_DIR, self.__file__+".ui"))
self._builder.set_translation_domain(APP)
+
+ self.tree = WrappedTree(self.__class__.__name__, self._builder)
+ # load menu if existing
+ menufile = os.path.join(TEMPLATE_DIR, self.__file__+".menu")
+ if os.path.exists(menufile):
+ debug("There is a menu-file for '%s'. Trying to load it.", self.__file__)
+ barbox = self.tree.get_widget("menubar_box")
+ if barbox is not None:
+ self._builder.add_from_file(menufile)
+ bar = self.tree.get_ui("menubar")
+ barbox.pack_start(bar, expand = False, fill = False)
+
+ # signal connections
if connector is None: connector = self
unconnected = self._builder.connect_signals(connector)
@@ -82,8 +104,6 @@ class UIBuilder (object):
for uc in set(unconnected):
error("Signal '%s' not connected in class '%s'.", uc, self.__class__.__name__)
- self.tree = WrappedTree(self.__class__.__name__, self._builder)
-
class Window (UIBuilder):
def __init__ (self):
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index 1b67747..5a149f8 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -50,7 +50,7 @@ from .about import AboutWindow
from .plugin import PluginWindow
from .preference import PreferenceWindow
from .search import SearchWindow
-from .update import UpdateWindow
+from .pkglist import UpdateWindow, WorldListWindow
class PackageTable:
"""A window with data about a specfic package."""
@@ -1594,34 +1594,52 @@ class MainWindow (Window):
PluginWindow(self.window, plugins, self.queue)
return True
-
- def cb_show_updates_clicked (self, *args):
- """
- Show the list of updateble packages.
- """
- def __update():
- def cb_idle_show(packages):
- """
- Callback opening the menu when the calculation is finished.
+ def show_package_list (self, pkg_generator, klass, thread_name = "PkgList Update Thread"):
+
+ def cb_idle_show(packages):
+ """
+ Callback opening the menu when the calculation is finished.
- @returns: False to signal that it is finished
- """
- UpdateWindow(self.window, packages, self.queue, self.jump_to)
- return False
-
+ @returns: False to signal that it is finished
+ """
+ klass(self.window, packages, self.queue, self.jump_to)
+ return False
+
+ def __update():
watch = gtk.gdk.Cursor(gtk.gdk.WATCH)
self.window.window.set_cursor(watch)
packages = []
try:
- packages.extend(system.get_updated_packages())
+ packages.extend(pkg_generator())
finally:
self.window.window.set_cursor(None)
gobject.idle_add(cb_idle_show, packages)
- GtkThread(name="Show Updates Thread", target = __update).start()
+ GtkThread(name = thread_name, target = __update).start()
+ return True
+
+ def cb_show_updates_clicked (self, *args):
+ """
+ Show the list of updateble packages.
+ """
+
+ self.show_package_list(
+ lambda: (x.get_cpv() for x in system.get_updated_packages()),
+ UpdateWindow, "Show Updates Thread")
+
+ return True
+
+ def cb_show_world_clicked (self, *args):
+ """
+ Show the list of world packages.
+ """
+ self.show_package_list(
+ lambda: system.find_packages(pkgSet = "world", only_cpv = True),
+ WorldListWindow)
+
return True
def cb_show_installed_toggled (self, *args):
diff --git a/portato/gui/windows/update.py b/portato/gui/windows/pkglist.py
index 8e32dd9..90915cb 100644
--- a/portato/gui/windows/update.py
+++ b/portato/gui/windows/pkglist.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
-# File: portato/gui/windows/update.py
+# File: portato/gui/windows/pkglist.py
# This file is part of the Portato-Project, a graphical portage-frontend.
#
# Copyright (C) 2006-2009 René 'Necoro' Neumann
@@ -19,15 +19,27 @@ from ...backend import system
from ...backend.exceptions import PackageNotFoundException, BlockedException
from ...helper import debug
-class UpdateWindow (AbstractDialog):
+class PkgListWindow (AbstractDialog):
- def __init__ (self, parent, packages, queue, jump_to):
+ # need this, so it can be safely subclassed
+ __file__ = __window__ = "PkgListWindow"
+
+ def __init__ (self, title, parent, packages, queue, jump_to):
AbstractDialog.__init__(self, parent)
+ self.window.set_title(title)
+
+ self.installBtn = self.tree.get_widget("installBtn")
+ self.uninstallBtn = self.tree.get_widget("uninstallBtn")
+
+ self.selectBtnLabels = {
+ False: _("Select _All"),
+ True: _("Unselect _All")}
+
+ self.all_selected = False
self.queue = queue
self.jump = jump_to
-
- self.packages = system.sort_package_list(packages)
+ self.packages = system.sort_package_list(packages, only_cpv = True)
self.build_list()
@@ -48,7 +60,7 @@ class UpdateWindow (AbstractDialog):
self.view.append_column(gtk.TreeViewColumn(_("Package"), cell, text = 1))
for p in self.packages:
- store.append([False, p.get_cpv()])
+ store.append([False, p])
def cb_set_size (self, *args):
"""
@@ -66,16 +78,20 @@ class UpdateWindow (AbstractDialog):
self.window.set_geometry_hints(self.window, min_height = val)
def cb_select_all_clicked (self, btn):
+ sel = self.all_selected = not self.all_selected
+
+ btn.set_label(self.selectBtnLabels[sel])
+
model = self.view.get_model()
iter = model.get_iter_first()
while iter:
- model.set_value(iter, 0, True)
+ model.set_value(iter, 0, sel)
iter = model.iter_next(iter)
return True
- def cb_install_clicked (self, btn):
+ def install_uninstall (self, type):
model = self.view.get_model()
iter = model.get_iter_first()
if iter is None: return
@@ -86,20 +102,30 @@ class UpdateWindow (AbstractDialog):
items.append(model.get_value(iter, 1))
iter = model.iter_next(iter)
- for item in items:
- try:
+ if type == "install":
+ for item in items:
try:
- self.queue.append(item, type = "install", oneshot = True)
- except PackageNotFoundException, e:
- if unmask_dialog(e[0]) == gtk.RESPONSE_YES :
- self.queue.append(item, type = "install", unmask = True, oneshot = True)
-
- except BlockedException, e:
- blocked_dialog(e[0], e[1])
+ try:
+ self.queue.append(item, "install", oneshot = True)
+ except PackageNotFoundException, e:
+ if unmask_dialog(e[0]) == gtk.RESPONSE_YES :
+ self.queue.append(item, "install", unmask = True, oneshot = True)
+
+ except BlockedException, e:
+ blocked_dialog(e[0], e[1])
+ else:
+ for item in items:
+ self.queue.append(item, "uninstall")
self.close()
return True
+ def cb_install_clicked (self, btn):
+ return self.install_uninstall("install")
+
+ def cb_uninstall_clicked (self, btn):
+ return self.install_uninstall("uninstall")
+
def cb_package_selected (self, view):
sel = view.get_selection()
store, it = sel.get_selected()
@@ -115,3 +141,12 @@ class UpdateWindow (AbstractDialog):
store = self.view.get_model()
store[path][0] = not store[path][0]
return True
+
+class UpdateWindow (PkgListWindow):
+ def __init__ (self, *args, **kwargs):
+ PkgListWindow.__init__(self, _("Updatable Packages"), *args, **kwargs)
+
+class WorldListWindow (UpdateWindow):
+ def __init__ (self, *args, **kwargs):
+ PkgListWindow.__init__(self, _("World Packages"), *args, **kwargs)
+ self.installBtn.hide()
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-19 08:41:43 +0000