diff options
| -rw-r--r-- | UpdateManager/UpdateManager.py | 65 | ||||
| -rw-r--r-- | data/glade/UpdateManager.glade | 1 | ||||
| -rw-r--r-- | debian/changelog | 7 |
3 files changed, 65 insertions, 8 deletions
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 5bdea61a..1cf97da0 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -43,6 +43,7 @@ import os import os.path import urllib2 import re +import locale import tempfile import pango import subprocess @@ -589,14 +590,31 @@ class UpdateManager(SimpleGladeApp): self.remove_update(pkg) iter = self.store.iter_next(iter) + def humanize_size(self, bytes): + """ + Convert a given size in bytes to a nicer better readable unit + """ + if bytes == 0: + # TRANSLATORS: download size is 0 + return _("None") + elif bytes < 1024: + # TRANSLATORS: download size of very small updates + return _("1 KB") + elif bytes < 1024 * 1024: + # TRANSLATORS: download size of small updates, e.g. "250 KB" + return locale.format(_("%.0f KB"), bytes/1024) + else: + # TRANSLATORS: download size of updates, e.g. "2.3 MB" + return locale.format(_("%.1f MB"), bytes / 1024 / 1024) + def remove_update(self, pkg): name = pkg.name if name in self.packages: self.packages.remove(name) self.dl_size -= pkg.packageSize # TRANSLATORS: b stands for Bytes - self.label_downsize.set_markup(_("Download size: %sb" % \ - apt_pkg.SizeToStr(self.dl_size))) + self.label_downsize.set_markup(_("Download size: %s" % \ + self.humanize_size(self.dl_size))) if len(self.packages) == 0: self.button_install.set_sensitive(False) @@ -606,7 +624,7 @@ class UpdateManager(SimpleGladeApp): self.packages.append(name) self.dl_size += pkg.packageSize self.label_downsize.set_markup(_("Download size: %s" % \ - apt_pkg.SizeToStr(self.dl_size))) + self.humanize_size(self.dl_size))) if len(self.packages) > 0: self.button_install.set_sensitive(True) @@ -629,7 +647,7 @@ class UpdateManager(SimpleGladeApp): "You can install %s updates", self.list.num_updates) % \ self.list.num_updates + "</b></big>" - text_download = _("Download size: %s") % apt_pkg.SizeToStr(self.dl_size) + text_download = _("Download size: %s") % self.humanize_size(self.dl_size) self.notebook_details.set_sensitive(True) self.treeview_update.set_sensitive(True) self.button_install.grab_default() @@ -694,6 +712,9 @@ class UpdateManager(SimpleGladeApp): # don't display apt-listchanges, we already showed the changelog os.environ["APT_LISTCHANGES_FRONTEND"]="none" + # Do not suspend during the update process + (dev, cookie) = self.inhibit_sleep() + # set window to insensitive self.window_main.set_sensitive(False) self.window_main.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) @@ -708,12 +729,36 @@ class UpdateManager(SimpleGladeApp): while gtk.events_pending(): gtk.main_iteration() self.fillstore() + + # Allow suspend after synaptic is finished + if cookie != False: + self.allow_sleep(dev, cookie) self.window_main.set_sensitive(True) self.window_main.window.set_cursor(None) - def toggled(self, renderer, path_string): + def inhibit_sleep(self): + """Send a dbus signal to gnome-power-manager to not suspend + the system""" + try: + import dbus + bus = dbus.Bus(dbus.Bus.TYPE_SESSION) + devobj = bus.get_object('org.gnome.PowerManager', + '/org/gnome/PowerManager') + dev = dbus.Interface(devobj, "org.gnome.PowerManager") + cookie = dev.Inhibit('UpdateManager', 'Updating system') + return (dev, cookie) + except: + print "could not send the dbus InhibitInactiveSleep signal" + return (False, False) + + def allow_sleep(self, dev, cookie): + """Send a dbus signal to gnome-power-manager to allow a suspending + the system""" + dev.UnInhibit(cookie) + + def toggled(self, renderer, path): """ a toggle button in the listview was toggled """ - iter = self.store.get_iter_from_string(path_string) + iter = self.store.get_iter(path) if self.store.get_value(iter, LIST_INSTALL): self.store.set_value(iter, LIST_INSTALL, False) self.remove_update(self.store.get_value(iter, LIST_PKG)) @@ -721,6 +766,12 @@ class UpdateManager(SimpleGladeApp): self.store.set_value(iter, LIST_INSTALL, True) self.add_update(self.store.get_value(iter, LIST_PKG)) + def on_treeview_update_row_activated(self, treeview, path, column, *args): + """ + If an update row was activated (by pressing space), toggle the + install check box + """ + self.toggled(None, path) def exit(self): """ exit the application, save the state """ @@ -780,7 +831,7 @@ class UpdateManager(SimpleGladeApp): else: contents += _("Version %s") % pkg.candidateVersion #TRANSLATORS: the b stands for Bytes - contents += " " + _("(Size: %sb)") % apt.SizeToStr(pkg.packageSize) + contents += " " + _("(Size: %s)") % self.humanize_size(pkg.packageSize) contents += "</small>" iter = self.store.append([True, contents, pkg.name, pkg]) diff --git a/data/glade/UpdateManager.glade b/data/glade/UpdateManager.glade index 1221e78c..372be566 100644 --- a/data/glade/UpdateManager.glade +++ b/data/glade/UpdateManager.glade @@ -233,6 +233,7 @@ <atkproperty name="AtkObject::accessible_name" translatable="yes">updates</atkproperty> </accessibility> <signal name="cursor_changed" handler="on_treeview_update_cursor_changed" last_modification_time="Tue, 29 Nov 2005 17:19:48 GMT"/> + <signal name="row_activated" handler="on_treeview_update_row_activated" last_modification_time="Fri, 11 Aug 2006 14:28:59 GMT"/> </widget> </child> </widget> diff --git a/debian/changelog b/debian/changelog index 9de7e07a..f03a4583 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,13 @@ update-manager (0.44.3) edgy; urgency=low * help/C/update-manager-C.omf: - fix url (thanks to daniel holbach, lp: #45548) + * show the units better + * don't jump around on row activation + (thanks to Sebastian Heinlein) + * send "inhibit sleep" to power-manager while applying + updates (lp #40697) - -- + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 18:06:53 +0200 update-manager (0.44.2) edgy; urgency=low |