diff options
Diffstat (limited to 'portato/gui/windows/main.py')
| -rw-r--r-- | portato/gui/windows/main.py | 15 |
1 files changed, 10 insertions, 5 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)() |