From 49f225344b917b88a5caf6e575398f86950e33cc Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebastian.heinlein@web.de>
Date: Tue, 18 Apr 2006 23:59:26 +0200
Subject: * load the dialog icon of update-manager at runtime   (should be
 replaced by an icon_set in the future)

---
 UpdateManager/UpdateManager.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'UpdateManager/UpdateManager.py')

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 45638838..a42a49e8 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -226,6 +226,7 @@ class UpdateManager(SimpleGladeApp):
     SimpleGladeApp.__init__(self, datadir+"glade/UpdateManager.glade",
                             None, domain="update-manager")
 
+    self.image_logo.set_from_pixbuf(logo)
     self.window_main.set_sensitive(False)
     self.window_main.grab_focus()
     self.button_close.grab_focus()
-- 
cgit v1.2.3


From 65b8d2037f671cff8d3903d73fe94ef06e682a7b Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebastian.heinlein@web.de>
Date: Wed, 19 Apr 2006 00:19:12 +0200
Subject: * remove all uses of update-manager.png in the glade files * always
 show the download size of the currently selected updates   fix fo bug #39579

---
 UpdateManager/UpdateManager.py | 4 ++++
 data/SoftwareProperties.glade  | 1 -
 data/UpdateManager.glade       | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'UpdateManager/UpdateManager.py')

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index a42a49e8..12931f29 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -411,6 +411,8 @@ class UpdateManager(SimpleGladeApp):
     if name in self.packages:
       self.packages.remove(name)
       self.dl_size -= pkg.packageSize
+      self.label_downsize.set_markup(_("Download size: %s" % \
+                                     apt_pkg.SizeToStr(self.dl_size)))
       if len(self.packages) == 0:
         self.button_install.set_sensitive(False)
 
@@ -419,6 +421,8 @@ class UpdateManager(SimpleGladeApp):
     if name not in self.packages:
       self.packages.append(name)
       self.dl_size += pkg.packageSize
+      self.label_downsize.set_markup(_("Download size: %s" % \
+                                     apt_pkg.SizeToStr(self.dl_size)))
       if len(self.packages) > 0:
         self.button_install.set_sensitive(True)
 
diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade
index 57f7542d..58584826 100644
--- a/data/SoftwareProperties.glade
+++ b/data/SoftwareProperties.glade
@@ -13,7 +13,6 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">update-manager.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade
index d5980735..01660613 100644
--- a/data/UpdateManager.glade
+++ b/data/UpdateManager.glade
@@ -12,7 +12,6 @@
   <property name="default_height">600</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
-  <property name="icon">update-manager.png</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
-- 
cgit v1.2.3


From f8724e0b2329dbd497419123e38bb36d7bbeed71 Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebastian.heinlein@web.de>
Date: Wed, 19 Apr 2006 00:43:09 +0200
Subject: * greatly improve the icon loading code

---
 SoftwareProperties/SoftwareProperties.py | 7 +------
 UpdateManager/UpdateManager.py           | 9 ++-------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'UpdateManager/UpdateManager.py')

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index d80781e0..237ffbdd 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -57,12 +57,7 @@ CONF_MAP = {
 class SoftwareProperties(SimpleGladeApp):
 
   def __init__(self, datadir=None, options=None, parent=None):
-    icons = gtk.icon_theme_get_default()
-    try:
-      logo=icons.load_icon("software-properties", 48, 0)
-      gtk.window_set_default_icon_list(logo)
-    except:
-      pass
+    gtk.window_set_default_icon_name("software-properties")
 
     # FIXME: some saner way is needed here
     if datadir == None:
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 12931f29..83ca5d57 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -215,18 +215,13 @@ class UpdateList:
 class UpdateManager(SimpleGladeApp):
 
   def __init__(self, datadir):
-    icons = gtk.icon_theme_get_default()
-    try:
-        logo=icons.load_icon("update-manager", 48, 0)
-        gtk.window_set_default_icon_list(logo)
-    except:
-        pass
+    gtk.window_set_default_icon_name("update-manager")
 
     self.datadir = datadir
     SimpleGladeApp.__init__(self, datadir+"glade/UpdateManager.glade",
                             None, domain="update-manager")
 
-    self.image_logo.set_from_pixbuf(logo)
+    self.image_logo.set_from_icon_name("update-manager", gtk.ICON_SIZE_DIALOG)
     self.window_main.set_sensitive(False)
     self.window_main.grab_focus()
     self.button_close.grab_focus()
-- 
cgit v1.2.3