From 73338a903877e5b77b3afbb273502e3db42df05e Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Fri, 17 Mar 2006 14:53:03 +0100 Subject: * Use the the number of available and not selected updates to determinate if the system is up-to-date - fixes #35300 --- UpdateManager/UpdateManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 07634d87..6a52a296 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -405,7 +405,7 @@ class UpdateManager(SimpleGladeApp): self.update_count() def update_count(self): - if len(self.packages) == 0: + if self.list.num_updates == 0: text_header= ""+_("Your system is up-to-date")+"" text_download = "" self.expander_details.set_sensitive(False) -- cgit v1.2.3 From 8cfb54ced335aa488ca3cfad00dad434617fb62a Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Mon, 20 Mar 2006 08:24:53 +0100 Subject: * Improve the rendering of the description in the update-manager --- UpdateManager/UpdateManager.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 6a52a296..27e6b7bb 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -346,14 +346,28 @@ class UpdateManager(SimpleGladeApp): iter = model.get_iter(path) # set descr - long_desc = model.get_value(iter, 5) + long_desc = model.get_value(iter, LIST_LONG_DESCR) if long_desc == None: return + # Skip the first line - it's a duplicate of the summary + i = long_desc.find("\n") + long_desc = long_desc[i+1:] + # do some regular expression magic on the description + # Add a newline before each bullet + p = re.compile(r'^(\s|\t)*(\*|0|-)',re.MULTILINE) + long_desc = p.sub('\n*', long_desc) + # replace all newlines by spaces + p = re.compile(r'\n', re.MULTILINE) + long_desc = p.sub(" ", long_desc) + # replace all multiple spaces by newlines + p = re.compile(r'\s\s+', re.MULTILINE) + long_desc = p.sub("\n", long_desc) + desc_buffer = self.textview_descr.get_buffer() desc_buffer.set_text(utf8(long_desc)) # now do the changelog - name = model.get_value(iter, 2) + name = model.get_value(iter, LIST_NAME) if name == None: return @@ -609,7 +623,8 @@ class UpdateManager(SimpleGladeApp): contents = "%s\n%s\n\n" % (name, summary) contents = contents + _("New version: %s (Size: %s)") % (pkg.candidateVersion,apt.SizeToStr(pkg.packageSize)) + "" - iter = self.store.append([True, contents, pkg.name, pkg.summary, pkg.candidateVersion, pkg.description, pkg]) + iter = self.store.append([True, contents, pkg.name, pkg.summary, + pkg.candidateVersion, pkg.description, pkg]) self.add_update(pkg) i = i + 1 -- cgit v1.2.3 From 313d2bb993c4132ad2043ff1ad96234884f82264 Mon Sep 17 00:00:00 2001 From: Sebastian Heinlein Date: Tue, 21 Mar 2006 19:19:32 +0100 Subject: * Fixed reload information * glade file cleanup - should fix some annoyances with focus stealing --- SoftwareProperties/SoftwareProperties.py | 2 +- UpdateManager/UpdateManager.py | 6 ++++-- data/UpdateManager.glade | 16 ++++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-) (limited to 'UpdateManager/UpdateManager.py') diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py index 5f4b5054..099576d0 100644 --- a/SoftwareProperties/SoftwareProperties.py +++ b/SoftwareProperties/SoftwareProperties.py @@ -344,7 +344,7 @@ class SoftwareProperties(SimpleGladeApp): # show a dialog that a reload of the channel information is required # only if there is no parent defined if self.modified == True and \ - self.window_main.get_transient_for() != None: + self.window_main.get_transient_for() == None: d = dialog_cache_outdated.DialogCacheOutdated(self.window_main, self.datadir) res = d.run() diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 27e6b7bb..1c996a66 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -224,6 +224,8 @@ class UpdateManager(SimpleGladeApp): None, domain="update-manager") self.window_main.set_sensitive(False) + self.window_main.grab_focus() + self.button_close.grab_focus() self.packages = [] self.dl_size = 0 @@ -237,7 +239,7 @@ class UpdateManager(SimpleGladeApp): # useful exit stuff self.window_main.connect("delete_event", self.close) - self.button_cancel.connect("clicked", lambda w: self.exit()) + self.button_close.connect("clicked", lambda w: self.exit()) # the treeview (move into it's own code!) self.store = gtk.ListStore(gobject.TYPE_BOOLEAN, str, str, str, str, str, @@ -425,7 +427,7 @@ class UpdateManager(SimpleGladeApp): self.expander_details.set_sensitive(False) self.treeview_update.set_sensitive(False) self.label_downsize.set_text="" - self.button_cancel.grab_default() + self.button_close.grab_default() else: text_header = ""+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.store), len(self.store))+"" diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index ac7a0345..cfa5176c 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -7,7 +7,7 @@ True Software Updates GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER + GTK_WIN_POS_NONE False 600 True @@ -783,7 +783,7 @@ 6 - + True True True @@ -818,7 +818,7 @@ Release Notes GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT - False + True 600 500 True @@ -906,7 +906,7 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT - False + True False False True @@ -1124,7 +1124,7 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT - False + True False False True @@ -1342,8 +1342,8 @@ Your system does not check for updates automatically. You can configure this beh 6 GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False + GTK_WIN_POS_CENTER_ON_PARENT + True False False True @@ -1351,7 +1351,7 @@ Your system does not check for updates automatically. You can configure this beh True GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST - True + False False -- cgit v1.2.3