From 4530643d34b9a9d469872a6d128e44e126095cf3 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 12:45:31 +0200 Subject: * use PANGO_ELLIPSIZE_END for the action label in the progress dialog to avoid ugly resizes of the dialog * replace "exmaing system" by "starting update manager" to avoid the confusion with checking for updates --- data/glade/UpdateManager.glade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/glade') diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index 372be566..bb78008c 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -1373,7 +1373,7 @@ Your system does not check for updates automatically. You can configure this beh True - <big><b>Examining your system</b></big> + <big><b>Starting update manager</b></big> Software updates correct errors, eliminate security vulnerabilities and provide new features. False @@ -1431,7 +1431,7 @@ Software updates correct errors, eliminate security vulnerabilities and provide 0.5 0 0 - PANGO_ELLIPSIZE_NONE + PANGO_ELLIPSIZE_END -1 False 0 -- cgit v1.2.3 From 2e2c637be425f7ecb4cbaeb8aa27e92c47c54fa0 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 17:16:38 +0200 Subject: * Move the "run full dit upgrade" dialog into the UpdateManager class - to avoid spliting the UI stuff into several classes * Use a glade based dialog with better buttons instead of yes/no * Improved wording --- UpdateManager/UpdateManager.py | 46 ++++-------- data/glade/UpdateManager.glade | 163 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 177 insertions(+), 32 deletions(-) (limited to 'data/glade') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 343dcd85..69308ec6 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -219,7 +219,7 @@ class UpdateList: self.importance = importance self.description = desc - def __init__(self, parent_window): + def __init__(self): # a map of packages under their origin pipe = os.popen("lsb_release -c -s") dist = pipe.read().strip() @@ -236,14 +236,12 @@ class UpdateList: self.pkgs = {} self.matcher = {} self.num_updates = 0 - self.parent_window = parent_window for (origin, archive, desc, importance) in templates: self.matcher[(origin, archive)] = self.UpdateOrigin(desc, importance) self.unknown_origin = self.UpdateOrigin(_("Other updates"), -1) def update(self, cache): held_back = [] - broken = [] # do the upgrade cache.saveDistUpgrade() @@ -268,34 +266,7 @@ class UpdateList: held_back.append(pkg.name) for l in self.pkgs.keys(): self.pkgs[l].sort(lambda x,y: cmp(x.name,y.name)) - - # check if we have held-back something - if cache._depcache.KeepCount > 0: - keepcount = cache._depcache.KeepCount - msg = ("%s\n\n%s" % \ - (_("Cannot install all available updates"), - _("Some of the updates require more extensive changes " - "than expected.\n\n" - "This usually means that you have enabled unoffical " - "repositories, that it is not " - "fully upgraded from the last distribution release or " - "that you run a development release " - "of the distribution.\n\n" - "Would you like to perform a full distribution upgrade " - "now?"))) - dialog = gtk.MessageDialog(self.parent_window, 0, - gtk.MESSAGE_QUESTION, - gtk.BUTTONS_YES_NO,"") - dialog.set_default_response(gtk.RESPONSE_NO) - dialog.set_markup(msg) - dialog.set_title("") - dialog.vbox.set_spacing(6) - res = dialog.run() - if res == gtk.RESPONSE_YES: - os.execl("/usr/bin/gksu", - "/usr/bin/gksu", - "/usr/bin/update-manager --dist-upgrade") - dialog.destroy() + self.keepcount = cache._depcache.KeepCount class UpdateManagerDbusControler(dbus.service.Object): @@ -811,7 +782,7 @@ class UpdateManager(SimpleGladeApp): self.dl_size = 0 self.store.clear() self.initCache() - self.list = UpdateList(self.window_main) + self.list = UpdateList() # fill them again self.list.update(self.cache) @@ -929,6 +900,16 @@ class UpdateManager(SimpleGladeApp): if res == gtk.RESPONSE_YES: self.on_button_reload_clicked(None) + def check_all_updates_installable(self): + """ Check if all available updates can be installed and suggest + to run a distribution upgrade if not """ + if self.list.keepcount > 0: + self.dialog_dist_upgrade.set_transient_for(self.window_main) + res = self.dialog_dist_upgrade.run() + if res == gtk.RESPONSE_YES: + os.execl("/usr/bin/gksu", + "/usr/bin/gksu", + "/usr/bin/update-manager --dist-upgrade") def main(self, options): gconfclient = gconf.client_get_default() @@ -945,5 +926,6 @@ class UpdateManager(SimpleGladeApp): gtk.main_iteration() self.fillstore() + self.check_all_updates_installable() self.check_auto_update() gtk.main() diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index bb78008c..e9fd6bfc 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -1453,4 +1453,167 @@ Software updates correct errors, eliminate security vulnerabilities and provide + + 6 + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + True + False + False + True + True + True + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + True + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + _Distribution Upgrade + True + GTK_RELIEF_NORMAL + True + -8 + + + + + + True + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + gtk-dialog-warning + 6 + 0 + 0 + 0 + 0 + + + 0 + False + True + + + + + + True + False + 12 + + + + True + True + <big><b>Not all updates can be installed</b></big> + False + True + GTK_JUSTIFY_LEFT + False + True + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + + True + Run a distribution upgrade, to install as many updates as possible. + +This can be caused by an uncompleted upgrade, unofficial software packages or by running a development version. + False + False + GTK_JUSTIFY_LEFT + True + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + -- cgit v1.2.3 From ae0d9a877711e2f12cf7e62899d5cc60d50e9bd0 Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Mon, 11 Sep 2006 17:58:30 +0200 Subject: * use a different label for the cache progress dialog if it gets reinitiated * clear the store after the long caching process to reduce visual noise * move the check_all_updates_installable call into fillstore itself --- UpdateManager/UpdateManager.py | 7 ++++--- data/glade/UpdateManager.glade | 29 ++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 6 deletions(-) (limited to 'data/glade') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 623b406d..432a00e0 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -699,6 +699,7 @@ class UpdateManager(SimpleGladeApp): time.sleep(0.05) while gtk.events_pending(): gtk.main_iteration() + self.label_cache_progress_title.set_label("%s" % _("Checking for updates")) self.fillstore() # Allow suspend after synaptic is finished @@ -707,7 +708,6 @@ class UpdateManager(SimpleGladeApp): self.window_main.set_sensitive(True) self.window_main.window.set_cursor(None) - self.check_all_updates_installable() def inhibit_sleep(self): """Send a dbus signal to gnome-power-manager to not suspend @@ -784,8 +784,8 @@ class UpdateManager(SimpleGladeApp): # clean most objects self.dl_size = 0 - self.store.clear() self.initCache() + self.store.clear() self.list = UpdateList() # fill them again @@ -814,6 +814,7 @@ class UpdateManager(SimpleGladeApp): self.store.append([contents, pkg.name, pkg]) self.update_count() self.setBusy(False) + self.check_all_updates_installable() return False def dist_no_longer_supported(self, meta_release): @@ -910,6 +911,7 @@ class UpdateManager(SimpleGladeApp): if self.list.keepcount > 0: self.dialog_dist_upgrade.set_transient_for(self.window_main) res = self.dialog_dist_upgrade.run() + self.dialog_dist_upgrade.hide() if res == gtk.RESPONSE_YES: os.execl("/usr/bin/gksu", "/usr/bin/gksu", @@ -930,6 +932,5 @@ class UpdateManager(SimpleGladeApp): gtk.main_iteration() self.fillstore() - self.check_all_updates_installable() self.check_auto_update() gtk.main() diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index e9fd6bfc..2a4965fd 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -1371,11 +1371,34 @@ Your system does not check for updates automatically. You can configure this beh 12 - + True - <big><b>Starting update manager</b></big> + <big><b>Starting update manager</b></big> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + -Software updates correct errors, eliminate security vulnerabilities and provide new features. + + + True + Software updates correct errors, eliminate security vulnerabilities and provide new features. False True GTK_JUSTIFY_LEFT -- cgit v1.2.3 From e3779b9cfd1f3bdc19841dff4709c8b2d4ad020c Mon Sep 17 00:00:00 2001 From: "glatzor@ubuntu.com" <> Date: Tue, 12 Sep 2006 16:01:17 +0200 Subject: * Avoid the term channel --- data/glade/SoftwarePropertiesDialogs.glade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/glade') diff --git a/data/glade/SoftwarePropertiesDialogs.glade b/data/glade/SoftwarePropertiesDialogs.glade index b4bf6180..7334d67a 100644 --- a/data/glade/SoftwarePropertiesDialogs.glade +++ b/data/glade/SoftwarePropertiesDialogs.glade @@ -164,9 +164,9 @@ True True - <big><b>Enter the complete APT line of the source that you want to add</b></big> + <big><b>Enter the complete APT line of the repository that you want to add as source</b></big> -The APT line includes the type, location and components of a source, for example <i>"deb http://ftp.debian.org sarge main"</i>. +The APT line includes the type, location and components of a repository, for example <i>"deb http://ftp.debian.org sarge main"</i>. False True GTK_JUSTIFY_LEFT @@ -859,9 +859,9 @@ Source True True - <b><big>The channel information is out-of-date</big></b> + <b><big>The information about available software is out-of-date</big></b> -You have to reload the channel information to install software and updates from newly added or changed channels. +To install software and updates from newly added or changed sources, you have to reload the information about available software. You need a working internet connection to continue. False -- cgit v1.2.3 From 4de7b5c16a98fcc5e6d9ff4d32ca289c44a5192b Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Sun, 24 Sep 2006 14:22:27 +0200 Subject: * place the cancel button into the changes textview --- UpdateManager/UpdateManager.py | 7 +++- data/glade/UpdateManager.glade | 90 +----------------------------------------- 2 files changed, 7 insertions(+), 90 deletions(-) (limited to 'data/glade') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 7f62d0f0..f4c34ada 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -507,8 +507,11 @@ class UpdateManager(SimpleGladeApp): lock = thread.allocate_lock() lock.acquire() t=thread.start_new_thread(self.cache.get_changelog,(name,lock)) - changes_buffer.set_text(_("Downloading the list of changes...")) - button = self.button_cancel_dl_changelog + changes_buffer.set_text("%s\n" % _("Downloading list of changes...")) + iter = changes_buffer.get_iter_at_line(1) + anchor = changes_buffer.create_child_anchor(iter) + button = gtk.Button(stock="gtk-cancel") + self.textview_changes.add_child_at_anchor(button, anchor) button.show() id = button.connect("clicked", lambda w,lock: lock.release(), lock) diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index 2a4965fd..a11a5a43 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -468,7 +468,7 @@ True True - False + True 6 @@ -533,92 +533,6 @@ True - - - - True - GTK_BUTTONBOX_END - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-cancel - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Cancel _Download - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - False - - False @@ -1288,7 +1202,7 @@ True <b><big>You must check for updates manually</big></b> -Your system does not check for updates automatically. You can configure this behavior in "System" -> "Administration" -> "Software Properties". +Your system does not check for updates automatically. You can configure this behavior in <i>Software Sources</i> on the <i>Internet Updates</i> tab. False True GTK_JUSTIFY_LEFT -- cgit v1.2.3 From e40dd39c6ad5b1d29644430cdecdfc02bf674a8a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Sep 2006 16:57:26 +0200 Subject: * data/glade/SoftwareProperties.glade: - make add cdrom translatable --- data/glade/SoftwareProperties.glade | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'data/glade') diff --git a/data/glade/SoftwareProperties.glade b/data/glade/SoftwareProperties.glade index f280f8a3..d3947a33 100644 --- a/data/glade/SoftwareProperties.glade +++ b/data/glade/SoftwareProperties.glade @@ -804,7 +804,7 @@ True - Add Cdrom + Add Cdrom True False GTK_JUSTIFY_LEFT diff --git a/debian/changelog b/debian/changelog index 2f067c0e..02ec4d9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +update-manager (0.44.15) edgy; urgency=low + + * data/glade/SoftwareProperties.glade: + - fix missing "translatable" property (lp: #62681) + + -- + update-manager (0.44.14) edgy; urgency=low * UpdateManager/UpdateManager.py: -- cgit v1.2.3 From f12c7850941f961c9b176248e81479cf7332ab6d Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Mon, 9 Oct 2006 16:25:54 +0200 Subject: * fix two non translatable buttons --- data/glade/SoftwarePropertiesDialogs.glade | 2 +- data/glade/UpdateManager.glade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data/glade') diff --git a/data/glade/SoftwarePropertiesDialogs.glade b/data/glade/SoftwarePropertiesDialogs.glade index 7334d67a..f60d8a24 100644 --- a/data/glade/SoftwarePropertiesDialogs.glade +++ b/data/glade/SoftwarePropertiesDialogs.glade @@ -928,7 +928,7 @@ You need a working internet connection to continue. True True True - _Replace + _Replace True GTK_RELIEF_NORMAL True diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index a11a5a43..48388a12 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -784,7 +784,7 @@ True True True - _Upgrade + _Upgrade True GTK_RELIEF_NORMAL True -- cgit v1.2.3