diff options
Diffstat (limited to 'portato/gui/windows')
| -rw-r--r-- | portato/gui/windows/main.py | 15 | ||||
| -rw-r--r-- | portato/gui/windows/preference.py | 12 |
2 files changed, 16 insertions, 11 deletions
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 7ce66b8..cde7461 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -254,7 +254,12 @@ class PackageTable: orit = store.append(it, [self.icons["or"], _("One of the following")]) for dep in ordep.dep: - store.append(orit, [get_icon(dep), dep.dep]) + if isinstance(dep, dependency.AllOfDependency): # a list inside or + allit = store.append(orit, [None, _("All of the following")]) + for adep in dep.dep: + store.append(allit, [get_icon(adep), adep.dep]) + else: + store.append(orit, [get_icon(dep), dep.dep]) # normal def sort_key (x): @@ -744,7 +749,7 @@ class MainWindow (Window): # notebooks self.sysNotebook = self.tree.get_widget("systemNotebook") self.pkgNotebook = self.tree.get_widget("packageNotebook") - self.set_notebook_tabpos(map(PreferenceWindow.tabpos.get, map(int, (self.cfg.get("packageTabPos", "GTK"), self.cfg.get("systemTabPos", "GTK"))))) + self.set_notebook_tabpos(map(PreferenceWindow.tabpos.get, map(int, (self.cfg.get("packageTabPos", "GUI"), self.cfg.get("systemTabPos", "GUI"))))) # the different scrolls ebuildScroll = self.tree.get_widget("ebuildScroll") @@ -820,7 +825,7 @@ class MainWindow (Window): self.console.set_scrollback_lines(1024) self.console.set_scroll_on_output(True) - self.console.set_font_from_string(self.cfg.get("consolefont", "GTK")) + self.console.set_font_from_string(self.cfg.get("consolefont", "GUI")) self.console.connect("button-press-event", self.cb_right_click) self.termHB.pack_start(self.console, True, True) @@ -1687,7 +1692,7 @@ class MainWindow (Window): """ Main. """ - plugin.hook("thread_init")(gobject.threads_init)() + gobject.threads_init() # now subthreads can run normally, but are not allowed to touch the GUI. If threads should change sth there - use gobject.idle_add(). # for more informations on threading and gtk: http://www.async.com.br/faq/pygtk/index.py?req=show&file=faq20.006.htp - gtk.main() + plugin.hook("main")(gtk.main)() diff --git a/portato/gui/windows/preference.py b/portato/gui/windows/preference.py index d69c99c..41db921 100644 --- a/portato/gui/windows/preference.py +++ b/portato/gui/windows/preference.py @@ -104,7 +104,7 @@ class PreferenceWindow (AbstractDialog): # the console font button self.consoleFontBtn = self.tree.get_widget("consoleFontBtn") - self.consoleFontBtn.set_font_name(self.cfg.get("consolefont", section = "GTK")) + self.consoleFontBtn.set_font_name(self.cfg.get("consolefont", section = "GUI")) # the comboboxes self.systemTabCombo = self.tree.get_widget("systemTabCombo") @@ -116,8 +116,8 @@ class PreferenceWindow (AbstractDialog): for i in (_("Top"), _("Bottom"), _("Left"), _("Right")): m.append((i,)) - self.systemTabCombo.set_active(int(self.cfg.get("systemTabPos", section = "GTK"))-1) - self.pkgTabCombo.set_active(int(self.cfg.get("packageTabPos", section = "GTK"))-1) + self.systemTabCombo.set_active(int(self.cfg.get("systemTabPos", section = "GUI"))-1) + self.pkgTabCombo.set_active(int(self.cfg.get("packageTabPos", section = "GUI"))-1) self.window.show_all() @@ -137,14 +137,14 @@ class PreferenceWindow (AbstractDialog): self.cfg.set(val,self.tree.get_widget(edit).get_text()) font = self.consoleFontBtn.get_font_name() - self.cfg.set("consolefont", font, section = "GTK") + self.cfg.set("consolefont", font, section = "GUI") self.console_fn(font) pkgPos = self.pkgTabCombo.get_active()+1 sysPos = self.systemTabCombo.get_active()+1 - self.cfg.set("packageTabPos", str(pkgPos), section = "GTK") - self.cfg.set("systemTabPos", str(sysPos), section = "GTK") + self.cfg.set("packageTabPos", str(pkgPos), section = "GUI") + self.cfg.set("systemTabPos", str(sysPos), section = "GUI") self.tabpos_fn(map(self.tabpos.get, (pkgPos, sysPos))) |