From eb44c169eb84087471be224c6086693033e30782 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 17 Jan 2006 17:27:10 +0100 Subject: * improved HIGification --- UpdateManager/UpdateManager.py | 14 ++- data/SoftwareProperties.glade | 82 +++++-------- data/UpdateManager.glade | 255 ++++++++++++++++++++++------------------- 3 files changed, 174 insertions(+), 177 deletions(-) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 0c655ac6..c2f9340f 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -401,11 +401,15 @@ class UpdateManager(SimpleGladeApp): self.update_count() def update_count(self): - text = _("Available updates\n\n" - "The are currently %s software updates availabe. The " - "size of the download is %s." % \ - (len(self.packages), apt_pkg.SizeToStr(self.dl_size))) - self.label_header.set_markup(text) + if len(self.packages) == 0: + text_header= _("No updates available") + text_download = "" + else: + text_header = gettext.ngettext("You can install one update", "You can install %s updates", len(self.packages)) + + text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size)) + self.label_header.set_markup(text_header) + self.label_downsize.set_markup(text_download) def activate_details(self, expander, data): expanded = self.expander_details.get_expanded() diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 778930bb..c0400628 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -31,6 +31,7 @@ + 6 True True True @@ -41,10 +42,10 @@ - 6 + 12 True False - 6 + 12 @@ -60,7 +61,7 @@ 0.5 1 1 - 0 + 6 0 12 0 @@ -276,7 +277,7 @@ 0.5 1 1 - 0 + 6 0 12 0 @@ -297,7 +298,7 @@ True True - Check for updates every + Automatically check for updates True GTK_RELIEF_NORMAL True @@ -314,49 +315,23 @@ - + True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 1 0 100 1 10 10 - + every hour +twice a day +daily +every two days +weekly + + False + True 0 - False + True True - - - - True - day(s) - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - 0 @@ -372,7 +347,7 @@ True - <b>Internet Updates</b> + <b>Internet updates</b> False True GTK_JUSTIFY_LEFT @@ -430,7 +405,7 @@ - 5 + 12 True 0 0.5 @@ -443,7 +418,7 @@ 0.5 1 1 - 0 + 6 0 12 0 @@ -493,8 +468,9 @@ True + Revoke all imported keys and restore the default keys True - Restore Defaults + Restore _Defaults True GTK_RELIEF_NORMAL True @@ -508,14 +484,14 @@ - + True True - gtk-add + gtk-remove True GTK_RELIEF_NORMAL True - + 0 @@ -526,14 +502,15 @@ - + True + Import the public key from a trusted software provider True - gtk-remove - True + _Import Key File + True GTK_RELIEF_NORMAL True - + 0 @@ -622,7 +599,6 @@ - True True True gtk-help diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index 5bd77311..2de8eef8 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -59,7 +59,7 @@ - + True False 6 @@ -67,9 +67,7 @@ True - <big><b>Available updates</b></big> - -The are currently no software updates availabe. + True True GTK_JUSTIFY_LEFT @@ -86,123 +84,28 @@ The are currently no software updates availabe. 0 - True - True + False + False - + True - False - 0 - - - - True - Reload the package information from the server. - -If you have a permanent internet connection this is done automatically. If you are behind an internet connection that needs to be started by hand (e.g. a modem) you should use this button so that update-manager knows about new updates. - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-refresh - 4 - 0.5 - 0.5 - 2 - 2 - - - 0 - False - False - - - - - - True - _Reload - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 2 - 2 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - + Software updates can fix possible security holes, fix possible errors, so called "bugs", or provide new features to you. See futher information in the details. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -253,7 +156,7 @@ If you have a permanent internet connection this is done automatically. If you a True - <b>New release available</b> + False True GTK_JUSTIFY_LEFT @@ -279,7 +182,7 @@ If you have a permanent internet connection this is done automatically. If you a True True - Upgrade + U_pgrade True GTK_RELIEF_NORMAL True @@ -339,6 +242,45 @@ If you have a permanent internet connection this is done automatically. If you a True + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + GTK_PACK_END + + + + + 0 + False + False + + 0 @@ -640,7 +582,7 @@ If you have a permanent internet connection this is done automatically. If you a 6 True False - 6 + 12 @@ -674,6 +616,81 @@ If you have a permanent internet connection this is done automatically. If you a GTK_BUTTONBOX_END 6 + + + True + True + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-refresh + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Reload + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + + + + True -- cgit v1.2.3