From 9eb714ea374b04cc8beed223106f1c9615accc60 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 9 Jul 2008 21:20:04 +0200 Subject: Added set selection in preferences --- portato/gui/windows/preference.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) (limited to 'portato/gui/windows/preference.py') diff --git a/portato/gui/windows/preference.py b/portato/gui/windows/preference.py index d35666d..ae95cc5 100644 --- a/portato/gui/windows/preference.py +++ b/portato/gui/windows/preference.py @@ -14,6 +14,8 @@ from __future__ import absolute_import import gtk +from ...backend import system + from .basic import AbstractDialog from ..dialogs import io_ex_dialog from ...helper import debug @@ -106,6 +108,12 @@ class PreferenceWindow (AbstractDialog): self.tree.get_widget(edit).\ set_text(self.cfg.get(val)) + # the set list + self.setList = self.tree.get_widget("setList") + if system.has_set_support(): + self.fill_setlist() + self.tree.get_widget("setFrame").show() + # the console font button self.consoleFontBtn = self.tree.get_widget("consoleFontBtn") self.consoleFontBtn.set_font_name(self.cfg.get("consolefont", section = "GUI")) @@ -144,6 +152,8 @@ class PreferenceWindow (AbstractDialog): else: self.cfg.set(val,self.tree.get_widget(edit).get_text()) + self.cfg.set("updatesets", ", ".join(sorted(name for enabled, markup, descr, name in self.setList.get_model() if enabled))) + font = self.consoleFontBtn.get_font_name() self.cfg.set("consolefont", font, section = "GUI") self.console_fn(font) @@ -162,6 +172,29 @@ class PreferenceWindow (AbstractDialog): self.catmodel_fn() + def fill_setlist (self): + store = gtk.ListStore(bool, str, str, str) + + enabled = [x.strip() for x in self.cfg.get("updatesets").split(",")] + + for set, descr in system.get_sets(): + store.append([set in enabled, "%s" % set, descr, set]) + + tCell = gtk.CellRendererToggle() + tCell.set_property("activatable", True) + tCell.connect("toggled", self.cb_check_toggled) # emulate the normal toggle behavior ... + + sCell = gtk.CellRendererText() + + col = gtk.TreeViewColumn(_("Package Set"), tCell, active = 0) + col.pack_start(sCell) + col.add_attribute(sCell, "markup", 1) + self.setList.append_column(col) + + self.setList.append_column(gtk.TreeViewColumn(_("Description"), sCell, text = 2)) + + self.setList.set_model(store) + def cb_ok_clicked(self, button): """Saves, writes to config-file and closes the window.""" self._save() @@ -175,3 +208,9 @@ class PreferenceWindow (AbstractDialog): def cb_cancel_clicked (self, button): """Just closes - w/o saving.""" self.window.destroy() + + def cb_check_toggled (self, cell, path): + # for whatever reason we have to define normal toggle behavior explicitly + store = self.setList.get_model() + store[path][0] = not store[path][0] + return True -- cgit v1.2.3-54-g00ecf From 09f790063e70515fbcb828676f639740b1c67885 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 9 Jul 2008 21:49:33 +0200 Subject: Make update_world set compatible --- portato/backend/portage/system.py | 14 +++++++++----- portato/backend/portage/system_22.py | 7 +++++-- portato/gui/windows/main.py | 8 +++++++- portato/gui/windows/preference.py | 2 +- 4 files changed, 22 insertions(+), 9 deletions(-) (limited to 'portato/gui/windows/preference.py') diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py index 229bcc9..246f20c 100644 --- a/portato/backend/portage/system.py +++ b/portato/backend/portage/system.py @@ -20,6 +20,7 @@ except ImportError: import portage_dep from collections import defaultdict +import itertools as itt from . import VERSION from .package import PortagePackage @@ -45,8 +46,11 @@ class PortageSystem (SystemInterface): def has_set_support (self): return False - def get_sets (self): - return (("world", "The world set."), ("system", "The system set.")) + def get_sets (self, description = False): + if description: + return (("world", "The world set."), ("system", "The system set.")) + else: + return ("world", "system") def get_version (self): return "Portage %s" % portage.VERSION @@ -342,9 +346,9 @@ class PortageSystem (SystemInterface): packages = [x for x in packages if x is not None and not x.is_installed()] return packages - def update_world (self, newuse = False, deep = False): - packages = self.find_packages(pkgSet="world", with_version = False) - packages.extend(self.find_packages(pkgSet = "system", with_version = False)) + def update_world (self, sets = ("world", "system"), newuse = False, deep = False): + packages = set() + map(packages.add, itt.chain(*(self.find_packages(pkgSet = s, with_version = False) for s in sets))) states = [(["RDEPEND", "PDEPEND"], True)] if self.with_bdeps(): diff --git a/portato/backend/portage/system_22.py b/portato/backend/portage/system_22.py index 88d968b..289849c 100644 --- a/portato/backend/portage/system_22.py +++ b/portato/backend/portage/system_22.py @@ -33,8 +33,11 @@ class PortageSystem_22 (PortageSystem): def has_set_support (self): return True - def get_sets (self): - return ((name, set.description) for name, set in self.settings.setsconfig.getSets().iteritems()) + def get_sets (self, description = False): + if description: + return ((name, set.description) for name, set in self.settings.setsconfig.getSets().iteritems()) + else: + return tuple(self.settings.setsconfig.getSets()) def new_package (self, cpv): return PortagePackage_22(cpv) diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 364810d..8f456d9 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -1422,7 +1422,13 @@ class MainWindow (Window): watch = gtk.gdk.Cursor(gtk.gdk.WATCH) self.window.window.set_cursor(watch) try: - updating = system.update_world(newuse = self.cfg.get_boolean("newuse"), deep = self.cfg.get_boolean("deep")) + sets = ("world", "system") # default + if system.has_set_support(): + confsets = [x.strip() for x in self.cfg.get("updatesets").split(",")] + syssets = system.get_sets() + sets = [s for s in confsets if s in syssets] + + updating = system.update_world(sets = sets, newuse = self.cfg.get_boolean("newuse"), deep = self.cfg.get_boolean("deep")) debug("updating list: %s --> length: %s", [(x.get_cpv(), y.get_cpv()) for x,y in updating], len(updating)) gobject.idle_add(cb_idle_append, updating) finally: diff --git a/portato/gui/windows/preference.py b/portato/gui/windows/preference.py index ae95cc5..8aabbba 100644 --- a/portato/gui/windows/preference.py +++ b/portato/gui/windows/preference.py @@ -177,7 +177,7 @@ class PreferenceWindow (AbstractDialog): enabled = [x.strip() for x in self.cfg.get("updatesets").split(",")] - for set, descr in system.get_sets(): + for set, descr in system.get_sets(description = True): store.append([set in enabled, "%s" % set, descr, set]) tCell = gtk.CellRendererToggle() -- cgit v1.2.3-54-g00ecf