From bbceb6da8e2b066f635be3856f1372a786ddd960 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Mar 2006 17:35:01 +0100 Subject: * fix a typo - #36123 --- data/SoftwareProperties.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/SoftwareProperties.glade b/data/SoftwareProperties.glade index 89a56f11..5d55f68a 100644 --- a/data/SoftwareProperties.glade +++ b/data/SoftwareProperties.glade @@ -371,7 +371,7 @@ True True - _Download updates in the backgound, but do not install them + _Download updates in the background, but do not install them True GTK_RELIEF_NORMAL True -- cgit v1.2.3 From 525417200385386d27e9bed13cb28900d0ce15ad Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Mar 2006 17:43:28 +0100 Subject: * replaced double by single quotes in the channel descriptions * use the correct release date of Dapper in the version number - #36136 --- SoftwareProperties/aptsources.py | 27 +++++++++++++++++---------- channels/Ubuntu.info.in | 8 ++++---- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 03459adf..4252c10c 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -336,23 +336,30 @@ class SourceEntryMatcher: _("Community maintained (Universe)"), _("Non-free (Multiverse)")] # CDs + self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*6.06", + ".*", + _("CD disk with Ubuntu 6.06 'Dapper "\ + "Drake'"), self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10", ".*", - _("CD disk with Ubuntu 5.10 \"Breezy Badger\""), + _("CD disk with Ubuntu 5.10 'Breezy "\ + "Badger'"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04", ".*", - _("CD disk with Ubuntu 5.04 \"Hoary Hedgehog\""), + _("CD disk with Ubuntu 5.04 "\ + "'Hoary Hedgehog'"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10", ".*", - _("CD disk with Ubuntu 4.10 \"Warty Warthog\""), + _("CD disk with Ubuntu 4.10 "\ + "'Warty Warthog'"), ubuntu_comps, ubuntu_comps_descr)) # URIs # Warty self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^warty$", - "Ubuntu 4.10 \"Warty Warthog\"", + "Ubuntu 4.10 'Warty Warthog'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^warty-security$", @@ -377,7 +384,7 @@ class SourceEntryMatcher: ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary$", - "Ubuntu 5.04 \"Hoary Hedgehog\"", + "Ubuntu 5.04 'Hoary Hedgehog'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary-updates$", @@ -394,7 +401,7 @@ class SourceEntryMatcher: ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy$", - "Ubuntu 5.10 \"Breezy Badger\"", + "Ubuntu 5.10 'Breezy Badger'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy-updates$", @@ -403,19 +410,19 @@ class SourceEntryMatcher: # dapper self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper-security$", - _("Ubuntu 6.04 Security Updates"), + _("Ubuntu 6.06 Security Updates"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*security.ubuntu.com/ubuntu", "^dapper-security$", - _("Ubuntu 6.04 Security Updates"), + _("Ubuntu 6.06 Security Updates"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper$", - "Ubuntu 6.04 \"Dapper Drake\"", + "Ubuntu 6.06 'Dapper Drake'", ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper-updates$", - _("Ubuntu 6.04 Updates"), + _("Ubuntu 6.06 Updates"), ubuntu_comps, ubuntu_comps_descr)) diff --git a/channels/Ubuntu.info.in b/channels/Ubuntu.info.in index b0358284..fd017105 100644 --- a/channels/Ubuntu.info.in +++ b/channels/Ubuntu.info.in @@ -3,7 +3,7 @@ _ChangelogURI: http://changelogs.ubuntu.com/changelogs/pool/%s/%s/%s/%s_%s/chang Suite: dapper RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 'Dapper Drake' +_Description: Ubuntu 6.06 'Dapper Drake' Component: main Enabled: 1 _CompDescription: Officially supported @@ -20,7 +20,7 @@ _CompDescription: Non-free (Multiverse) Suite: dapper-security RepositoryType: deb BaseURI: http://security.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 Security Updates +_Description: Ubuntu 6.06 Security Updates Component: main Enabled: 1 _CompDescription: Officially supported @@ -37,7 +37,7 @@ _CompDescription: Non-free (Multiverse) Suite: dapper-updates RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 Updates +_Description: Ubuntu 6.06 Updates Component: main Enabled: 1 _CompDescription: Officially supported @@ -54,7 +54,7 @@ _CompDescription: Non-free (Multiverse) Suite: dapper-backports RepositoryType: deb BaseURI: http://archive.ubuntu.com/ubuntu/ -_Description: Ubuntu 6.04 Backports +_Description: Ubuntu 6.06 Backports Component: main Enabled: 1 _CompDescription: Officially supported -- cgit v1.2.3 From d201e6bd42dbe0b467ca967dbf430ca815d29839 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Mar 2006 17:45:45 +0100 Subject: * fix a forgetten import of sys - #36138 --- update-manager | 1 + 1 file changed, 1 insertion(+) diff --git a/update-manager b/update-manager index 341aa034..04005c74 100644 --- a/update-manager +++ b/update-manager @@ -27,6 +27,7 @@ import os pygtk.require('2.0') import gtk import gtk.glade +import sys from UpdateManager.UpdateManager import UpdateManager import gettext -- cgit v1.2.3 From c4792be3f2c741a8b343468e21410f52e991504a Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Mar 2006 18:18:20 +0100 Subject: * do not select the first update if a new one is added - #36140 --- UpdateManager/UpdateManager.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 1c996a66..47a1cb14 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -428,17 +428,16 @@ class UpdateManager(SimpleGladeApp): self.treeview_update.set_sensitive(False) self.label_downsize.set_text="" self.button_close.grab_default() + return (text_header, text_download, None) else: text_header = ""+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.store), len(self.store))+"" text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size)) - self.treeview_update.set_cursor(0) self.expander_details.set_sensitive(True) self.treeview_update.set_sensitive(True) self.button_install.grab_default() + return (text_header, text_download, 0) - 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() @@ -631,7 +630,10 @@ class UpdateManager(SimpleGladeApp): i = i + 1 - self.update_count() + (text_header, text_download, selected) = self.update_count() + self.label_header.set_markup(text_header) + self.label_downsize.set_markup(text_download) + self.treeview_update.set_cursor(selected) return False def dist_no_longer_supported(self, meta_release): -- cgit v1.2.3 From 95e028c4268ce0b51933d96f0d5a44acc30a6afa Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Mar 2006 18:26:49 +0100 Subject: * fixed a bug in the previous commit * show the watch cursor if we are busy --- UpdateManager/UpdateManager.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 47a1cb14..1cbf03d6 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -497,6 +497,7 @@ class UpdateManager(SimpleGladeApp): # set window to insensitive self.window_main.set_sensitive(False) + self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) lock = thread.allocate_lock() lock.acquire() t = thread.start_new_thread(self.run_synaptic, @@ -509,6 +510,7 @@ class UpdateManager(SimpleGladeApp): gtk.main_iteration() self.fillstore() self.window_main.set_sensitive(True) + self.window_main.window.set_cursor(None) def toggled(self, renderer, path_string): """ a toggle button in the listview was toggled """ @@ -588,6 +590,8 @@ class UpdateManager(SimpleGladeApp): self.window_main.set_sensitive(True) def fillstore(self): + # use the watch cursor + self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) # clean most objects self.packages = [] @@ -630,10 +634,16 @@ class UpdateManager(SimpleGladeApp): i = i + 1 + # show the text messages corresponding to the number of available + # updates (text_header, text_download, selected) = self.update_count() self.label_header.set_markup(text_header) self.label_downsize.set_markup(text_download) - self.treeview_update.set_cursor(selected) + # select the first update + if selected != None: self.treeview_update.set_cursor(selected) + + # use the normal cursor + self.window_main.window.set_cursor(None) return False def dist_no_longer_supported(self, meta_release): -- cgit v1.2.3 From e63e9a9431c22c765213eda4a5198c5d7d0ad9ef Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Mar 2006 18:46:10 +0100 Subject: * added templates for the backports * fixed a bug of a previous commit --- SoftwareProperties/aptsources.py | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/SoftwareProperties/aptsources.py b/SoftwareProperties/aptsources.py index 4252c10c..77de510b 100644 --- a/SoftwareProperties/aptsources.py +++ b/SoftwareProperties/aptsources.py @@ -338,22 +338,23 @@ class SourceEntryMatcher: # CDs self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*6.06", ".*", - _("CD disk with Ubuntu 6.06 'Dapper "\ - "Drake'"), + _("CD disk with Ubuntu 6.06 'Dapper "\ + "Drake'"), + ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.10", ".*", - _("CD disk with Ubuntu 5.10 'Breezy "\ - "Badger'"), + _("CD disk with Ubuntu 5.10 'Breezy "\ + "Badger'"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*5.04", ".*", - _("CD disk with Ubuntu 5.04 "\ - "'Hoary Hedgehog'"), + _("CD disk with Ubuntu 5.04 'Hoary "\ + "Hedgehog'"), ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist("cdrom:\[Ubuntu.*4.10", ".*", - _("CD disk with Ubuntu 4.10 "\ - "'Warty Warthog'"), + _("CD disk with Ubuntu 4.10 "\ + "'Warty Warthog'"), ubuntu_comps, ubuntu_comps_descr)) # URIs # Warty @@ -373,6 +374,10 @@ class SourceEntryMatcher: "^warty-updates$", _("Ubuntu 4.10 Updates"), ubuntu_comps, ubuntu_comps_descr)) + self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", + "^warty-backports$", + _("Ubuntu 4.10 Backports"), + ubuntu_comps, ubuntu_comps_descr)) # Hoary self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^hoary-security$", @@ -390,6 +395,10 @@ class SourceEntryMatcher: "^hoary-updates$", _("Ubuntu 5.04 Updates"), ubuntu_comps, ubuntu_comps_descr)) + self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", + "^hoary-backports$", + _("Ubuntu 5.04 Backports"), + ubuntu_comps, ubuntu_comps_descr)) # Breezy self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy-security$", @@ -403,6 +412,10 @@ class SourceEntryMatcher: "^breezy$", "Ubuntu 5.10 'Breezy Badger'", ubuntu_comps, ubuntu_comps_descr)) + self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", + "^breezy-backports$", + _("Ubuntu 5.10 Backports"), + ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^breezy-updates$", _("Ubuntu 5.10 Updates"), @@ -420,6 +433,10 @@ class SourceEntryMatcher: "^dapper$", "Ubuntu 6.06 'Dapper Drake'", ubuntu_comps, ubuntu_comps_descr)) + self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", + "^dapper-backports$", + _("Ubuntu 6.06 Backports"), + ubuntu_comps, ubuntu_comps_descr)) self.dist_list.append(self.MatchDist(".*archive.ubuntu.com/ubuntu", "^dapper-updates$", _("Ubuntu 6.06 Updates"), -- cgit v1.2.3 From 678e0bcaddb5c1886f877a5588969d1110270562 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Thu, 23 Mar 2006 18:51:46 +0100 Subject: * fixed wrong access key of "check" in an English environment --- data/UpdateManager.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index cfa5176c..f43f4d6f 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -328,7 +328,7 @@ True - _Check + Chec_k True False GTK_JUSTIFY_LEFT -- cgit v1.2.3