From 09e693a8061d0b96c3aac8aae6ae12d6272b2c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Mon, 30 Jun 2008 21:06:17 +0200 Subject: Now the new design is able to do the same as the old one --- portato/gui/templates/PluginWindow.glade | 265 +++++++++++++++---------------- portato/gui/windows/plugin.py | 84 ++++++---- portato/plugin.py | 1 + 3 files changed, 182 insertions(+), 168 deletions(-) (limited to 'portato') diff --git a/portato/gui/templates/PluginWindow.glade b/portato/gui/templates/PluginWindow.glade index 28b46e6..01db971 100644 --- a/portato/gui/templates/PluginWindow.glade +++ b/portato/gui/templates/PluginWindow.glade @@ -1,11 +1,12 @@ - + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Plugins + False True GTK_WIN_POS_CENTER_ON_PARENT True @@ -18,183 +19,177 @@ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 - + True - True - 120 - True + False + GTK_POLICY_NEVER + GTK_POLICY_NEVER - + True - False - GTK_POLICY_NEVER - GTK_POLICY_NEVER - - - True - True - False - - + False + True + False - - True - False - + + + + + True + 4 + 2 + 5 - + True - 4 - 2 + 5 + True + GTK_BUTTONBOX_EDGE - + True - label + True + Enabled + 0 + True + - - 2 - GTK_FILL - - + True - label + True + Temporarily enabled + 0 + enabledRB - 1 - 2 - GTK_FILL + 1 - + True - label + True + Temporarily disabled + 0 + enabledRB + - 1 - 2 - 1 - 2 - GTK_FILL + 2 - + True - 5 - True - GTK_BUTTONBOX_EDGE - - - True - True - Enabled - 0 - True - - - True - - - - - True - True - Temporarily enabled - 0 - True - radiobutton1 - - - 1 - True - - - - - True - True - Temporarily disabled - 0 - True - radiobutton1 - - - 2 - True - - - - - True - True - Disabled - 0 - True - radiobutton1 - - - 3 - True - - + True + Disabled + 0 + enabledRB + - 2 - 3 - 4 - GTK_FILL + False + False + 3 + + + 2 + 3 + 4 + GTK_FILL + + + + + True + 0 + label + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + True + <b>Author:</b> + True + True + + + 1 + 2 + GTK_FILL + + + + + True + label + + + 2 + GTK_FILL + + + + + True + True - + True - label + True + True - - 2 - 3 - GTK_FILL - - + True - True - - - True - True - True - - - - - True - expander - - - label_item - - + Needed dependencies + True - 1 - 2 - 2 - 3 + label_item - True - False + 2 + 3 + + + + + True + True + True + _Install dependencies + True + 0 + + + 1 + 2 + 2 + 3 + + False + 1 + @@ -232,7 +227,7 @@ False - 1 + 2 diff --git a/portato/gui/windows/plugin.py b/portato/gui/windows/plugin.py index fb9446e..6e8fdab 100644 --- a/portato/gui/windows/plugin.py +++ b/portato/gui/windows/plugin.py @@ -34,48 +34,40 @@ class PluginWindow (AbstractDialog): self.plugins = plugins self.changedPlugins = {} - view = self.tree.get_widget("pluginList") - self.store = gtk.ListStore(str,str,str) + self.buttons = map(self.tree.get_widget, ("disabledRB", "tempEnabledRB", "enabledRB", "tempDisabledRB")) + map(lambda b: b.set_mode(False), self.buttons) + + self.descrLabel = self.tree.get_widget("descrLabel") + self.authorLabel = self.tree.get_widget("authorLabel") + + self.depExpander = self.tree.get_widget("depExpander") + self.installBtn = self.tree.get_widget("installBtn") - view.set_model(self.store) + self.view = self.tree.get_widget("pluginList") + self.store = gtk.ListStore(str) - cell = gtk.CellRendererText() - col = gtk.TreeViewColumn(_("Plugin"), cell, markup = 0) - view.append_column(col) + self.view.set_model(self.store) - col = gtk.TreeViewColumn(_("Authors"), cell, text = 1) - view.append_column(col) - - ccell = gtk.CellRendererCombo() - ccell.set_property("model", self.statsStore) - ccell.set_property("text-column", 0) - ccell.set_property("has-entry", False) - ccell.set_property("editable", True) - ccell.connect("edited", self.cb_status_changed) - col = gtk.TreeViewColumn(_("Status"), ccell, markup = 2) - view.append_column(col) + cell = gtk.CellRendererText() + col = gtk.TreeViewColumn("Plugin", cell, markup = 0) + self.view.append_column(col) - for p in ((""+p.name+"", p.author, _(self.statsStore[p.status][0])) for p in plugins): - self.store.append(p) + for p in plugins: + self.store.append(["%s" % p.name]) - self.window.show_all() + self.view.get_selection().connect("changed", self.cb_list_selection) - def cb_status_changed (self, cell, path, new_text): - path = int(path) - - self.store[path][2] = "%s" % new_text + self.window.show_all() - # convert string to constant - const = None - for num, val in enumerate(self.statsStore): - if val[0] == new_text: - const = num - break + def cb_state_toggled (self, rb): + + plugin = self.get_actual() - assert (const is not None) + if plugin: + state = self.buttons.index(rb) - self.changedPlugins.update({self.plugins[path] : const}) - debug("new changed plugins: %s => %d", self.plugins[path].name, const) + self.changedPlugins[plugin] = state + debug("new changed plugins: %s => %d", plugin.name, state) def cb_ok_clicked (self, btn): for plugin, val in self.changedPlugins.iteritems(): @@ -83,3 +75,29 @@ class PluginWindow (AbstractDialog): self.close() return True + + def cb_list_selection (self, selection): + plugin = self.get_actual() + + if plugin: + if not plugin.description: + self.descrLabel.hide() + else: + self.descrLabel.set_label(plugin.description) + self.descrLabel.show() + + self.authorLabel.set_label(plugin.author) + + status = self.changedPlugins.get(plugin, plugin.status) + self.buttons[status].set_active(True) + + self.installBtn.hide() + self.depExpander.hide() + + def get_actual (self): + store, it = self.view.get_selection().get_selected() + + if it: + return self.plugins[int(store.get_path(it)[0])] + else: + return None diff --git a/portato/plugin.py b/portato/plugin.py index ae89a1c..cbadfd1 100644 --- a/portato/plugin.py +++ b/portato/plugin.py @@ -176,6 +176,7 @@ class Plugin: self.file = file self.name = name.firstChild.nodeValue.strip() self.author = author.firstChild.nodeValue.strip() + self.description = "" self._import = None self.hooks = [] self.menus = [] -- cgit v1.2.3