diff options
| author | glatzor@ubuntu.com <> | 2006-09-11 17:58:30 +0200 |
|---|---|---|
| committer | glatzor@ubuntu.com <> | 2006-09-11 17:58:30 +0200 |
| commit | ae0d9a877711e2f12cf7e62899d5cc60d50e9bd0 (patch) | |
| tree | 0ed90cbdd47aefa1d1dd87ced3f5def3dc79d0b1 | |
| parent | 134c1c31fcbdc975d68ebb39e83c01830f078cc3 (diff) | |
| download | python-apt-ae0d9a877711e2f12cf7e62899d5cc60d50e9bd0.tar.gz | |
* 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
| -rw-r--r-- | UpdateManager/UpdateManager.py | 7 | ||||
| -rw-r--r-- | data/glade/UpdateManager.glade | 29 |
2 files changed, 30 insertions, 6 deletions
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("<b><big>%s</big></b>" % _("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 <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label22"> + <widget class="GtkLabel" id="label_cache_progress_title"> <property name="visible">True</property> - <property name="label" translatable="yes"><big><b>Starting update manager</b></big> + <property name="label" translatable="yes"><big><b>Starting update manager</b></big></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">False</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">0</property> + <property name="ypad">0</property> + <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> + <property name="width_chars">-1</property> + <property name="single_line_mode">False</property> + <property name="angle">0</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> -Software updates correct errors, eliminate security vulnerabilities and provide new features.</property> + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="label" translatable="yes">Software updates correct errors, eliminate security vulnerabilities and provide new features.</property> <property name="use_underline">False</property> <property name="use_markup">True</property> <property name="justify">GTK_JUSTIFY_LEFT</property> |