From 812dbac4e61849a1206544121a95b1a98a300d34 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 18 Feb 2009 22:01:40 +0100 Subject: Converted glade files --- portato/gui/templates/MainWindow.ui | 1122 +++++++++++++++++++++++++++++++++++ 1 file changed, 1122 insertions(+) create mode 100644 portato/gui/templates/MainWindow.ui (limited to 'portato/gui/templates/MainWindow.ui') diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui new file mode 100644 index 0000000..168c661 --- /dev/null +++ b/portato/gui/templates/MainWindow.ui @@ -0,0 +1,1122 @@ + + + + + + + + + fileMenuItem + _File + + + + + gtk-preferences + prefItem + _Preferences + + + + + + + gtk-refresh + reloadItem + Re_load Portage + + + + + + + + gtk-quit + closeItem + + + + + + emergeMenuItem + _Emerge + + + + + gtk-add + emergeItem + _Install + + + + + + + gtk-remove + unmergeItem + _Uninstall + + + + + + + updateItem + Update _World + + + + + + showUpdatesItem + Show Updatable P_ackages + + + + + + showInstalledItem + Show _Only Installed Packages + + + + + + + gtk-refresh + syncItem + _Sync + + + + + + + gtk-save + saveFlagsItem + Save _Flags + + + + + + pauseItemMenu + Emerge _Paused + + + + + + gtk-stop + killItem + _Kill Emerge + + + + + + + hiddenConsoleMenu + Console + + + + + gtk-copy + copyItem + _Copy + + + + + + gtk-stop + killItemPopup + _Kill Emerge + + + + + + pauseItemPopup + Emerge _Paused + + + + + pluginMenuItem + Plu_gins + + + + + helpMenuItem + _? + + + + + gtk-about + aboutItem + _About + + + + + + gtk-connect + pluginsItem + _Plugins + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2 + GTK_WIN_POS_CENTER + + + + + + True + + + True + + + False + + + + + True + 3 + + + True + + + + + + 5 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-delete + True + + + + False + 5 + 1 + + + + + True + gtk-find + True + + + + False + 5 + 2 + + + + + False + False + 1 + + + + + True + 300 + + + True + 0 + 0 + GTK_SHADOW_IN + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + True + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + 0 + + + + + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + 0 + + + + + 1 + + + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + 1 + + + + + 2 + + + + + + + + + + True + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + label + PANGO_ELLIPSIZE_START + True + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Install onto system + GTK_RELIEF_NONE + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-add + + + + + False + 1 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Uninstall from system + GTK_RELIEF_NONE + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-remove + + + + + False + 2 + + + + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Revert changes + GTK_RELIEF_NONE + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-undo + + + + + False + 3 + + + + + False + 4 + + + + + True + GTK_POS_BOTTOM + True + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_RESIZE_QUEUE + GTK_SHADOW_NONE + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + 9 + 2 + 5 + 5 + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + 0 + label + True + + + 1 + 2 + 3 + 4 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>License:</b> + True + True + + + 3 + 4 + GTK_FILL + + 5 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + <b>Installed, but not in portage anymore</b> + True + + + 2 + 5 + 6 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + <span foreground='red'><b>MISSING KEYWORD</b></span> + True + + + 2 + 5 + 6 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + + + + + + 1 + 2 + 2 + 3 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Description:</b> + True + True + + + GTK_FILL + + 5 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + 0 + <b>Overlay:</b> + True + True + + + 1 + 2 + GTK_FILL + + 5 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + label + True + + + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + 0 + label + True + + + 1 + 2 + 1 + 2 + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + <b>Homepage:</b> + True + True + + + 2 + 3 + GTK_FILL + + 5 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Installed + 0 + True + + + + 6 + 7 + GTK_FILL + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Masked + 0 + True + + + + 8 + 9 + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + + + 1 + 2 + 8 + 9 + + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Testing + 0 + True + + + + 7 + 8 + GTK_FILL + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + 0 + <b>Use Flags:</b> + True + True + + + 4 + 5 + GTK_FILL + + 5 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + 0 + use flags + PANGO_ELLIPSIZE_END + True + + + 1 + 2 + 4 + 5 + + + + + + + + + + + + True + General + + + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Use List + + + 1 + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Dependencies + + + 2 + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Ebuild + + + 3 + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Changelog + + + 4 + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Files + + + 5 + False + + + + + 1 + + + + + True + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POS_BOTTOM + True + + + True + + + True + 5 + True + GTK_BUTTONBOX_SPREAD + + + True + Execute the current selected queue + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-execute + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + E_xecute + True + True + + + 1 + + + + + + + + + True + Calculate the packages which will be installed during an "update world" + Update _World + True + + + + 1 + + + + + True + Remove the selected package from the queue + _Remove + True + + + + 2 + + + + + False + False + + + + + True + True + + + True + False + True + --oneshot + True + + + 5 + + + + + + + + + + + False + 1 + + + + + True + False + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + True + False + False + + + + + + + + 2 + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Queue + + + False + + + + + True + + + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Console + True + + + 1 + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False + GTK_WRAP_WORD + False + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Log + + + 2 + False + + + + + True + True + + + + + True + True + + + + + 2 + + + + + True + 5 + + + True + 0 + 0 + Portato - A Portage GUI + True + + + + + False + False + 3 + + + + + + -- cgit v1.2.3-54-g00ecf From 9fc80ac9b4fdb7589e66923d79bbd45e80758630 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 18 Feb 2009 22:02:31 +0100 Subject: Make it start - though there are still itches - esp. with the menu --- portato/gui/templates/MainWindow.ui | 138 ++++++++++++++++-------------------- portato/gui/windows/main.py | 25 ++++--- 2 files changed, 74 insertions(+), 89 deletions(-) (limited to 'portato/gui/templates/MainWindow.ui') diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui index 168c661..3f5f7bf 100644 --- a/portato/gui/templates/MainWindow.ui +++ b/portato/gui/templates/MainWindow.ui @@ -1,28 +1,28 @@ - + - - fileMenuItem + + fileMenuAction _File - + gtk-preferences - prefItem + prefAction _Preferences - + gtk-refresh - reloadItem + reloadAction Re_load Portage @@ -30,86 +30,86 @@ - + gtk-quit - closeItem + closeAction - - emergeMenuItem + + emergeMenuAction _Emerge - + gtk-add - emergeItem + emergeAction _Install - + gtk-remove - unmergeItem + unmergeAction _Uninstall - - updateItem + + updateAction Update _World - - showUpdatesItem + + showUpdatesAction Show Updatable P_ackages - - showInstalledItem + + showInstalledAction Show _Only Installed Packages - + gtk-refresh - syncItem + syncAction _Sync - + gtk-save - saveFlagsItem + saveFlagsAction Save _Flags - - pauseItemMenu + + pauseActionMenu Emerge _Paused - + gtk-stop - killItem + killAction _Kill Emerge @@ -122,51 +122,37 @@ - + gtk-copy - copyItem + copyAction _Copy - - gtk-stop - killItemPopup - _Kill Emerge - - - - - - pauseItemPopup - Emerge _Paused - - - - - pluginMenuItem + + pluginMenuAction Plu_gins - - helpMenuItem + + helpMenuAction _? - + gtk-about - aboutItem + aboutAction _About - + gtk-connect - pluginsItem + pluginsAction _Plugins @@ -175,34 +161,34 @@ - - - + + + - + - - - - - - + + + + + + - - + + - - + + - - - - + + + + - - - - + + + + @@ -217,7 +203,7 @@ True - + True diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 443fa76..5494b25 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -62,7 +62,7 @@ class PackageTable: self.main = main self.tree = main.tree self.window = main.window - self.tree.signal_autoconnect(self) + self.main._builder.connect_signals(self) # all the package data is in this one VB self.vb = self.tree.get_widget("packageVB") @@ -480,14 +480,13 @@ class MainWindow (Window): plugin.load_plugins() menus = [p.menus for p in plugin.get_plugin_queue().get_plugins()] - if menus: - self.tree.get_widget("pluginMenuItem").set_no_show_all(False) - pluginMenu = self.tree.get_widget("pluginMenu") + #if menus: + # pluginMenu = self.tree.get_widget("pluginMenu") - for m in itt.chain(*menus): - item = gtk.MenuItem(m.label) - item.connect("activate", m.call) - pluginMenu.append(item) + # for m in itt.chain(*menus): + # item = gtk.MenuItem(m.label) + # item.connect("activate", m.call) + # pluginMenu.append(item) splash(_("Building frontend")) # set paned position @@ -554,15 +553,15 @@ class MainWindow (Window): self.packageTable = PackageTable(self) # popups - self.consolePopup = Popup("consolePopup", self, self.__file__) - self.trayPopup = Popup("systrayPopup", self) + # self.consolePopup = Popup("consolePopup", self, self.__file__) + # self.trayPopup = Popup("systrayPopup", self) # pause menu items self.emergePaused = False self.pauseItems = {} - self.pauseItems["tray"] = self.trayPopup.tree.get_widget("pauseItemTray") - self.pauseItems["popup"] = self.consolePopup.tree.get_widget("pauseItemPopup") - self.pauseItems["menu"] = self.tree.get_widget("pauseItemMenu") + # self.pauseItems["tray"] = self.trayPopup.tree.get_widget("pauseItemTray") + # self.pauseItems["popup"] = self.consolePopup.tree.get_widget("pauseItemPopup") + # self.pauseItems["menu"] = self.tree.get_widget("pauseItemMenu") for k,v in self.pauseItems.iteritems(): self.pauseItems[k] = (v, v.connect_after("activate", self.cb_pause_emerge(k))) -- cgit v1.2.3-54-g00ecf From a01af63eeaf34926dab56b9458e490fce0378de8 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 18 Feb 2009 22:07:43 +0100 Subject: Hide console menu --- portato/gui/templates/MainWindow.ui | 1 + 1 file changed, 1 insertion(+) (limited to 'portato/gui/templates/MainWindow.ui') diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui index 3f5f7bf..914207b 100644 --- a/portato/gui/templates/MainWindow.ui +++ b/portato/gui/templates/MainWindow.ui @@ -117,6 +117,7 @@ + False hiddenConsoleMenu Console -- cgit v1.2.3-54-g00ecf From c0046edcf062eda241d9285806e3ac9c21754129 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 18 Feb 2009 22:25:04 +0100 Subject: Fix popups --- portato/gui/templates/MainWindow.ui | 32 ++++++++++++++++------------ portato/gui/templates/popups.ui | 42 ------------------------------------- portato/gui/windows/main.py | 4 ++-- 3 files changed, 21 insertions(+), 57 deletions(-) delete mode 100644 portato/gui/templates/popups.ui (limited to 'portato/gui/templates/MainWindow.ui') diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui index 914207b..39d7d4e 100644 --- a/portato/gui/templates/MainWindow.ui +++ b/portato/gui/templates/MainWindow.ui @@ -3,7 +3,7 @@ - + fileMenuAction @@ -115,13 +115,6 @@ - - - False - hiddenConsoleMenu - Console - - gtk-copy @@ -181,19 +174,32 @@ - - - - - + + + + + + + + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 2 GTK_WIN_POS_CENTER diff --git a/portato/gui/templates/popups.ui b/portato/gui/templates/popups.ui deleted file mode 100644 index 52d2450..0000000 --- a/portato/gui/templates/popups.ui +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - pauseItemTray - Emerge _Paused - - - - - gtk-stop - killItemTray - _Kill Emerge - - - - - - gtk-quit - closeItemTray - - - - - - - - - - - - - - - True - GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - - diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 5494b25..b043532 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -553,8 +553,8 @@ class MainWindow (Window): self.packageTable = PackageTable(self) # popups - # self.consolePopup = Popup("consolePopup", self, self.__file__) - # self.trayPopup = Popup("systrayPopup", self) + self.consolePopup = self.tree.get_widget("uimanager").get_widget("ui/consolePopup") + self.trayPopup = self.tree.get_widget("uimanager").get_widget("ui/systrayPopup") # pause menu items self.emergePaused = False -- cgit v1.2.3-54-g00ecf From af31f8ecc8465984d7dfc7b824ff5f8ca037a37a Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 18 Feb 2009 22:35:04 +0100 Subject: Remove the 'pause' hack --- portato/gui/templates/MainWindow.ui | 1 + portato/gui/windows/main.py | 60 +++++-------------------------------- 2 files changed, 9 insertions(+), 52 deletions(-) (limited to 'portato/gui/templates/MainWindow.ui') diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui index 39d7d4e..3a30907 100644 --- a/portato/gui/templates/MainWindow.ui +++ b/portato/gui/templates/MainWindow.ui @@ -103,6 +103,7 @@ pauseActionMenu Emerge _Paused + diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index b043532..33a5ee4 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -558,13 +558,6 @@ class MainWindow (Window): # pause menu items self.emergePaused = False - self.pauseItems = {} - # self.pauseItems["tray"] = self.trayPopup.tree.get_widget("pauseItemTray") - # self.pauseItems["popup"] = self.consolePopup.tree.get_widget("pauseItemPopup") - # self.pauseItems["menu"] = self.tree.get_widget("pauseItemMenu") - - for k,v in self.pauseItems.iteritems(): - self.pauseItems[k] = (v, v.connect_after("activate", self.cb_pause_emerge(k))) # systray if self.cfg.get_boolean("showSystray", "GUI"): @@ -1771,50 +1764,13 @@ class MainWindow (Window): self.queue.append(package, update = True, oneshot = set, forceUpdate = True) - def cb_pause_emerge (self, curr): - """ - This method returns a callback for a "pause emerge" toggle button. - It is needed as there are different toggle buttons of this type and if one is clicked, - the others should be marked too. - - @param curr: The button to return the callback for. - @type curr: gtk.ToggleButton - """ - def pause (cb): - """ - The actual callback. - - Mark all other buttons too. - - @param cb: The button which got toggled. - @type cb: gtk.ToggleButton - """ - - # pause or continue - self.emergePaused = cb.get_active() - if not self.emergePaused: - self.queue.continue_emerge() - #self.tray.set_from_file(APP_ICON) - else: - self.queue.stop_emerge() - #self.tray.set_from_file(os.path.join(ICON_DIR, "pausing.png")) - - # block the handlers of the other buttons - # so that calling "set_active" does not call this callback recursivly - for v in self.pauseItems.itervalues(): - v[0].handler_block(v[1]) - - # mark the others - for k, v in self.pauseItems.iteritems(): - if k != curr: - v[0].set_active(self.emergePaused) - - # unblock - for v in self.pauseItems.itervalues(): - v[0].handler_unblock(v[1]) - - return False - return pause + def cb_pause_emerge (self, action): + # pause or continue + self.emergePaused = action.get_active() + if not self.emergePaused: + self.queue.continue_emerge() + else: + self.queue.stop_emerge() def cb_kill_clicked (self, *args): """ @@ -1822,7 +1778,7 @@ class MainWindow (Window): """ self.queue.kill_emerge() if self.emergePaused: # unmark the "pause emerge" buttons - self.pauseItems["menu"][0].set_active(False) # calling one button is enough (see: cb_pause_emerge) + self.tree.get_widget("generalActionGroup").get_action("pauseAction").set_active(False) def cb_copy_clicked (self, *args): """ -- cgit v1.2.3-54-g00ecf From 4dfc7b063ec7dc476462e843bfecd07fd02cb25e Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 18 Feb 2009 23:14:37 +0100 Subject: Make the plugin menu work again --- portato/gui/templates/MainWindow.ui | 16 ++++++++++------ portato/gui/windows/main.py | 24 ++++++++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) (limited to 'portato/gui/templates/MainWindow.ui') diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui index 3a30907..98da2ad 100644 --- a/portato/gui/templates/MainWindow.ui +++ b/portato/gui/templates/MainWindow.ui @@ -2,6 +2,16 @@ + + + + + pluginMenuAction + Plu_gins + + + + @@ -124,12 +134,6 @@ - - - pluginMenuAction - Plu_gins - - helpMenuAction diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 437d305..2ee4447 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -479,13 +479,25 @@ class MainWindow (Window): plugin.load_plugins() menus = [p.menus for p in plugin.get_plugin_queue().get_plugins()] - # if menus: - # pluginMenu = self.tree.get_ui("pluginMenu") + if menus: + uim = self.tree.get_widget("uimanager") + ag = self.tree.get_widget("pluginActionGroup") - # for m in itt.chain(*menus): - # item = gtk.MenuItem(m.label) - # item.connect("activate", m.call) - # pluginMenu.append(item) + ctr = 0 + for m in itt.chain(*menus): + + # create action + aname = "plugin%d" % ctr + a = gtk.Action(aname, m.label, None, None) + a.connect("activate", m.call) + ag.add_action(a) + + # add to UI + mid = uim.new_merge_id() + uim.add_ui(mid, "ui/menubar/pluginMenu", aname, aname, gtk.UI_MANAGER_MENUITEM, False) + + ctr += 1 + splash(_("Building frontend")) # set paned position -- cgit v1.2.3-54-g00ecf