From 15fefdc8c11b352b10f87d1f4c46dd274213cbdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Mon, 7 Sep 2009 01:10:47 +0200 Subject: Icon added from gnome-icon-theme --- icons/better-package.svg | 186 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) create mode 100644 icons/better-package.svg diff --git a/icons/better-package.svg b/icons/better-package.svg new file mode 100644 index 0000000..d483db0 --- /dev/null +++ b/icons/better-package.svg @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Lapo Calamandrei + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 255e23062788fda92e57855ce216bd0d38a9d958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sat, 6 Mar 2010 13:27:14 +0100 Subject: improved image handling --- portato/gui/windows/about.py | 7 ++----- portato/gui/windows/main.py | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/portato/gui/windows/about.py b/portato/gui/windows/about.py index 937ed8b..1b8a981 100644 --- a/portato/gui/windows/about.py +++ b/portato/gui/windows/about.py @@ -15,7 +15,7 @@ from __future__ import absolute_import import gtk from .basic import AbstractDialog -from ...constants import VERSION, APP_ICON +from ...constants import VERSION class AboutWindow (AbstractDialog): """A window showing the "about"-informations.""" @@ -24,11 +24,8 @@ class AboutWindow (AbstractDialog): AbstractDialog.__init__(self, parent) - img = gtk.Image() - img.set_from_file(APP_ICON) - self.window.set_version(VERSION) - self.window.set_logo(img.get_pixbuf()) + self.window.set_logo(None) self.window.show_all() diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 1b67747..0b0c48d 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -434,8 +434,7 @@ class MainWindow (Window): self.window.set_geometry_hints (self.window, max_height = gtk.gdk.screen_height(), max_width = gtk.gdk.screen_width()) # app icon - self.window.set_icon_from_file(APP_ICON) - gtk.window_set_default_icon(self.window.get_icon()) + gtk.window_set_default_icon_from_file(APP_ICON) # booleans self.doUpdate = False -- cgit v1.2.3 From bd02c66863a03025cac97f453d59d7a158134aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sat, 6 Mar 2010 13:39:08 +0100 Subject: Show icon to signal the best package version --- portato/gui/windows/main.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index 0b0c48d..e00e9e4 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -29,7 +29,7 @@ from ... import get_listener from ...helper import debug, warning, error, info from ...session import Session from ...db import Database -from ...constants import CONFIG_LOCATION, VERSION, APP_ICON +from ...constants import CONFIG_LOCATION, VERSION, APP_ICON, ICON_DIR from ...backend.exceptions import PackageNotFoundException, BlockedException, VersionsNotFoundException # plugin stuff @@ -441,10 +441,20 @@ class MainWindow (Window): self.showAll = True # show only installed or all packages? self.__searchChanged = False + # our own icon factory + fac = gtk.IconFactory() + iSet = gtk.IconSet() + iSource = gtk.IconSource() + iSource.set_filename(os.path.abspath(os.path.join(ICON_DIR, "better-package.svg"))) + iSet.add_source(iSource) + fac.add("portato-better-pkg", iSet) + fac.add_default() + # 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) + self.icons["better"] = self.window.render_icon("portato-better-pkg", gtk.ICON_SIZE_MENU) # get the logging window as soon as possible self.logView = LogView(self.tree.get_widget("logView")) @@ -781,10 +791,14 @@ class MainWindow (Window): if not packages: raise VersionsNotFoundException(cp) + best = system.find_best([x.get_cpv() for x in packages]).get_version() + # append versions for vers, inst, slot in ((x.get_version(), x.is_installed(), get_slot(x)) for x in packages): if inst: icon = self.icons["installed"] + elif vers == best: + icon = self.icons["better"] else: icon = None -- cgit v1.2.3 From 970ab474e07f98304b101caa31dfed69668d4fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sat, 6 Mar 2010 13:56:40 +0100 Subject: Improved better_icon. --- icons/better-package.svg | 116 ++++++++++++++++------------------------------- 1 file changed, 38 insertions(+), 78 deletions(-) diff --git a/icons/better-package.svg b/icons/better-package.svg index d483db0..30e4e5f 100644 --- a/icons/better-package.svg +++ b/icons/better-package.svg @@ -1,8 +1,9 @@ + - - - - - - - - - - - + xlink:href="#linearGradient2786" + id="radialGradient3621" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.5698522,0,0,1.5190305,-15.058824,-10.043684)" + cx="25" + cy="22" + fx="25" + fy="22" + r="17" /> + showborder="false" + inkscape:window-maximized="0"> + + @@ -151,16 +126,9 @@ inkscape:label="Livello 1" inkscape:groupmode="layer" id="layer1"> - - + d="m 11,-7.2520323 c 1.781445,0 3.790132,7.12958977 5.23135,8.17669647 1.441219,1.04710673 8.84258,0.75431763 9.393077,2.44857193 0.550496,1.6942542 -5.609428,5.8077933 -6.159925,7.5020479 -0.550496,1.694254 2.015109,8.64289 0.57389,9.689997 C 18.597174,21.612387 12.781444,17.025105 11,17.025105 9.2185557,17.025104 3.4028256,21.612387 1.9616069,20.56528 0.52038819,19.518174 3.0859941,12.569538 2.5354976,10.875284 1.9850011,9.1810293 -4.1749232,5.0674896 -3.6244266,3.3732353 -3.0739301,1.6789811 4.3274311,1.9717708 5.7686498,0.92466421 7.2098686,-0.12244246 9.2185561,-7.2520323 11,-7.2520323 z" + transform="matrix(1.120396,0,0,1.105138,11.863144,13.932639)" /> -- cgit v1.2.3 From 03b70f264123e9afc8202e29b884c42584108e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Sat, 6 Mar 2010 13:59:33 +0100 Subject: Only show best_icon, if the package can be installed w/o unmasking --- portato/gui/windows/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index e00e9e4..29eb728 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -791,13 +791,13 @@ class MainWindow (Window): if not packages: raise VersionsNotFoundException(cp) - best = system.find_best([x.get_cpv() for x in packages]).get_version() + best = system.find_best_match(cp) # append versions for vers, inst, slot in ((x.get_version(), x.is_installed(), get_slot(x)) for x in packages): if inst: icon = self.icons["installed"] - elif vers == best: + elif best is not None and vers == best.get_version(): icon = self.icons["better"] else: icon = None -- cgit v1.2.3