From 933b7e68f19d6107bff06b29fbbce7f364fba74a Mon Sep 17 00:00:00 2001 From: Necoro <> Date: Fri, 11 Jan 2008 17:02:28 +0000 Subject: r598@Devoty: necoro | 2008-01-10 16:36:29 +0100 Handle the new useflag format correctly --- portato/gui/gtk/windows.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'portato/gui') diff --git a/portato/gui/gtk/windows.py b/portato/gui/gtk/windows.py index fb9836c..7ab564c 100644 --- a/portato/gui/gtk/windows.py +++ b/portato/gui/gtk/windows.py @@ -472,8 +472,7 @@ class PackageTable: def fill_use_list(self): pkg = self.actual_package() - pkg_flags = pkg.get_iuse_flags() - pkg_flags.sort() + pkg_flags = flags.sort_use_flag_list(pkg.get_iuse_flags(keep = True)) actual_exp = None actual_exp_it = None @@ -484,6 +483,12 @@ class PackageTable: store = self.useList.get_model() for use in pkg_flags: + if use.startswith(("+","-")): + forced = (use[0] == "+") + use = use[1:] + else: + forced = None + exp = pkg.use_expanded(use, suggest = actual_exp) if exp is not None: if exp != actual_exp: @@ -493,7 +498,7 @@ class PackageTable: actual_exp_it = None actual_exp = None - enabled = use in euse + enabled = forced or use in euse installed = use in instuse store.append(actual_exp_it, [enabled, installed, use, system.get_use_desc(use, self.cp)]) @@ -1147,11 +1152,10 @@ class MainWindow (Window): disabled = [] expanded = set() - pkg_flags = pkg.get_iuse_flags() + pkg_flags = flags.sort_use_flag_list(pkg.get_iuse_flags(keep = True)) if not pkg_flags: # no flags - stop here return None - pkg_flags.sort() actual = pkg.get_actual_use_flags() if pkg.is_installed(): @@ -1164,15 +1168,21 @@ class MainWindow (Window): installed = [] for use in pkg_flags: + if use.startswith(("+","-")): + forced = (use[0] == "+") + use = use[1:] + else: + forced = None + exp = pkg.use_expanded(use) if exp: expanded.add(exp) else: useStr = use - if installed and ((use in actual) != (use in installed)): + if installed and ((use in actual) != (use in installed)) and not (forced == (use in installed)): useStr += " %" - if use in actual: + if use in actual or forced: enabled.append(useStr) else: disabled.append(useStr) -- cgit v1.2.3-54-g00ecf to.py?id=d572410a8899f9be35274db073eed6fa3037c93c&follow=1'>portato.py (unfollow)
Commit message (Expand)AuthorFilesLines
2007-04-24added dialogs to warn you when the queue is running on quitting portatonecoro8-214/+267
2007-04-20Made qt plugin-ready; lots of documentationnecoro15-81/+351
2007-04-18nomsgnecoro1-1/+0
2007-04-18finished Qt-Frontendnecoro5-15/+117
2007-04-17marking installed packages in pkglistnecoro5-14/+50
2007-04-16added ebuild window for Qt-Frontendnecoro4-2/+229
2007-04-16added preferences for Qt-Frontendnecoro9-279/+710
2007-04-13Improved masking display and made most of the Qt-Frontend worknecoro7-35/+334
2007-04-10Some more functionality for the Qt-Frontend (complete emerge)necoro8-217/+347
2007-04-07Some more functionality for the Qt-Frontendnecoro11-88/+463
2007-04-07Added Qt-Terminalnecoro4-4/+213
2007-04-06First qt draftnecoro6-1/+796
2007-04-04showed masked packages unmasked by the user similar to stable marked testing ...necoro5-13/+40
2007-03-31changed changelognecoro1-1/+2
2007-03-31Some small changes for etcproposals 1.1necoro1-2/+2
2007-03-31Some small changes for etcproposals 1.1necoro2-3/+3
2007-03-31Some small changes for etcproposals 1.1necoro1-6/+13
2007-03-31Allowed Plugins to have a menunecoro7-201/+315
2007-03-15Added etc-proposals pluginnecoro7-28/+121
2007-03-10Added USE_EXPAND-supportnecoro5-11/+63
2007-03-10Added plugin-data to about-dialognecoro3-197/+264