Merge new (better) plugin system, now allowing to add widgets

3 files changed, 57 insertions, 27 deletions

diff --git a/portato/gui/slots.py b/portato/gui/slots.py
new file mode 100644
index 0000000..2ad4c01
--- /dev/null
+++ b/portato/gui/slots.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+#
+# File: portato/gui/slots.py
+# This file is part of the Portato-Project, a graphical portage-frontend.
+#
+# Copyright (C) 2006-2009 René 'Necoro' Neumann
+# This is free software.  You may redistribute copies of it under the terms of
+# the GNU General Public License version 2.
+# There is NO WARRANTY, to the extent permitted by law.
+#
+# Written by René 'Necoro' Neumann <necoro@necoro.net>
+
+from __future__ import absolute_import, with_statement
+
+import gtk
+from ...plugin import WidgetSlot # other modules might import WidgetSlot from here
+
+class PluginMenuSlot (WidgetSlot):
+
+    def __init__ (self, tree):
+        WidgetSlot.__init__(self, self.create_action, "Plugin Menu")
+        
+        self.ctr = 0 # counter for the plugin actions
+        self.uim = tree.get_widget("uimanager")
+        self.ag = tree.get_widget("pluginActionGroup")
+
+    def create_action (self, label):
+        aname = "plugin%d" % self.ctr
+        a = gtk.Action(aname, label, None, None)
+        self.ctr += 1
+        
+        return a
+
+    def add (self, widget):
+        action = widget.widget
+        self.ag.add_action(action)
+
+        # add to UI
+        mid = self.uim.new_merge_id()
+        self.uim.add_ui(mid, "ui/menubar/pluginMenu", action.get_name(), action.get_name(), gtk.UI_MANAGER_MENUITEM, False)
+
+        self.uim.ensure_update()
diff --git a/portato/gui/templates/MainWindow.ui b/portato/gui/templates/MainWindow.ui
index 383011e..b0a9f18 100644
--- a/portato/gui/templates/MainWindow.ui
+++ b/portato/gui/templates/MainWindow.ui
@@ -963,7 +963,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHBox" id="hbox1">
+                          <object class="GtkHBox" id="optionsHB">
                             <property name="visible">True</property>
                             <property name="homogeneous">True</property>
                             <child>
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index fd327a4..9ca7277 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -23,13 +23,17 @@ from collections import defaultdict
 
 # our backend stuff
 from ...backend import flags, system # must be the first to avoid circular deps
-from ... import get_listener, plugin
+from ... import get_listener
 from ...helper import debug, warning, error, info
 from ...session import Session
 from ...db import Database
 from ...constants import CONFIG_LOCATION, VERSION, APP_ICON
 from ...backend.exceptions import PackageNotFoundException, BlockedException, VersionsNotFoundException
 
+# plugin stuff
+from ... import plugin
+from .. import slots
+
 # more GUI stuff
 from ..utils import Config, GtkThread, get_color
 from ..queue import EmergeQueue
@@ -469,31 +473,6 @@ class MainWindow (Window):
         # package db
         splash(_("Creating Database"))
         self.db = Database(self.cfg.get("type", section = "DATABASE"))
-        
-        # set plugins and plugin-menu
-        splash(_("Loading Plugins"))
-
-        plugin.load_plugins()
-        menus = [p.menus for p in plugin.get_plugin_queue().get_plugins()]
-        if menus:
-            uim = self.tree.get_widget("uimanager")
-            ag = self.tree.get_widget("pluginActionGroup")
-
-            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
@@ -578,6 +557,15 @@ class MainWindow (Window):
         self.queueTree = GtkTree(self.queueList.get_model())
         self.queue = EmergeQueue(console = self.console, tree = self.queueTree, db = self.db, title_update = self.title_update, threadClass = GtkThread)
         
+        # set plugins and plugin-menu
+        splash(_("Loading Plugins"))
+
+        optionsHB = self.tree.get_widget("optionsHB")
+        slots.WidgetSlot(gtk.CheckButton, "Emerge Options", add = lambda w: optionsHB.pack_end(w.widget))
+
+        slots.PluginMenuSlot(self.tree)
+        plugin.load_plugins()
+        
         # session
         splash(_("Restoring Session"))
         try: