diff options
Diffstat (limited to '')
| -rw-r--r-- | portato/gui/windows/main.py | 40 |
1 files changed, 14 insertions, 26 deletions
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: |