From 14725b447adaa7055243ed9fc374ed94e85df9ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <necoro@necoro.net>
Date: Sun, 5 Jul 2009 03:55:44 +0200
Subject: Sort plugins in the window

---
 plugins/package_details.py  |  4 ++++
 portato/gui/windows/main.py | 21 ++++++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/plugins/package_details.py b/plugins/package_details.py
index 044cb54..3c96cf6 100644
--- a/plugins/package_details.py
+++ b/plugins/package_details.py
@@ -54,6 +54,7 @@ class ScrolledDetail (Detail):
 
 class ChangelogDetail (ScrolledDetail):
     __description__ = _("Shows the Changelog of a package")
+    __name__ = "Detail: Changelog"
     _widget_name_ = _("Changelog")
 
     def widget_init (self):
@@ -65,6 +66,7 @@ class ChangelogDetail (ScrolledDetail):
 
 class EbuildDetail (ScrolledDetail):
     __description__ = _("Shows the ebuild of a package")
+    __name__ = "Detail: Ebuild"
     _widget_name_ = _("Ebuild")
     
     def widget_init(self):
@@ -73,6 +75,7 @@ class EbuildDetail (ScrolledDetail):
 
 class FilesDetail (ScrolledDetail):
     __description__ = _("Shows the installed files of a package")
+    __name__ = "Detail: Files"
     _widget_name_ = _("Files")
 
     def widget_init (self):
@@ -88,6 +91,7 @@ class FilesDetail (ScrolledDetail):
 
 class DependencyDetail (ScrolledDetail):
     __description__ = _("Shows the dependencies of a package")
+    __name__ = "Detail: Dependency"
     _widget_name_ = _("Dependencies")
 
     def widget_init (self):
diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py
index 814a764..574fa14 100644
--- a/portato/gui/windows/main.py
+++ b/portato/gui/windows/main.py
@@ -20,6 +20,7 @@ import vte
 # other
 import os
 import itertools as itt
+import operator as op
 from collections import defaultdict
 
 # our backend stuff
@@ -40,7 +41,7 @@ from .. import dialogs
 from ..utils import Config, GtkThread, GtkTree, get_color
 from ..queue import EmergeQueue
 from ..session import SESSION_VERSION, SessionException, OldSessionException, NewSessionException
-from ..views import LogView, HighlightView, InstalledOnlyView, LazyStoreView
+from ..views import LogView, LazyStoreView
 from ..exceptions import PreReqError
 
 # even more GUI stuff
@@ -95,12 +96,7 @@ class PackageTable:
         self.unmergeBtn = self.tree.get_widget("pkgUnmergeBtn")
         self.revertBtn = self.tree.get_widget("pkgRevertBtn")
         
-        # views
-        self.views = map (lambda x: self.tree.get_widget(x).get_child(),
-                [
-                    "useListScroll"
-                ])
-
+        # useList
         self.useList = self.tree.get_widget("useListScroll").get_child()
 
 
@@ -217,9 +213,9 @@ class PackageTable:
     def _update_table (self, *args):
         pkg = self.pkg
 
+        # update useList if needed
         nb_page = self.notebook.get_nth_page(self.notebook.get_current_page())
-        for v in self.views:
-            v.update(pkg, force = nb_page == v.get_parent())
+        self.useList.update(pkg, force = nb_page == self.useList.get_parent())
         
         @plugin.hook("update_table", pkg = pkg, page = self.notebook.get_nth_page(self.notebook.get_current_page()))
         def _update():
@@ -449,6 +445,7 @@ class MainWindow (Window):
         # icons
         self.icons = {}
         self.icons["installed"] = self.window.render_icon(gtk.STOCK_YES, gtk.ICON_SIZE_MENU)
+        self.icons["or"] = self.window.render_icon(gtk.STOCK_MEDIA_PAUSE, gtk.ICON_SIZE_MENU)
         
         # get the logging window as soon as possible
         self.logView = LogView(self.tree.get_widget("logView"))
@@ -517,8 +514,7 @@ class MainWindow (Window):
         self.set_notebook_tabpos(map(PreferenceWindow.tabpos.get, map(int, (self.cfg.get("packageTabPos", "GUI"), self.cfg.get("systemTabPos", "GUI")))))
         slots.NotebookSlot(self.pkgNotebook, gtk.Widget, "Package Notebook")
         
-        # the different scrolls
-
+        # the useScroll
         useScroll = self.tree.get_widget("useListScroll")
         useScroll.add(self.build_use_list())
         
@@ -544,7 +540,6 @@ 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)
         
-        
         # session
         splash(_("Restoring Session"))
         try:
@@ -1595,7 +1590,7 @@ class MainWindow (Window):
         if queue is None:
             plugins = []
         else:
-            plugins = list(queue.get_plugins())
+            plugins = list(sorted(queue.get_plugins(), key = op.attrgetter("name")))
 
         PluginWindow(self.window, plugins, self.queue)
         return True
-- 
cgit v1.2.3