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(-) (limited to 'UpdateManager') 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(-) (limited to 'UpdateManager') 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