diff options
| -rw-r--r-- | DistUpgrade/DistUpgradeViewGtk.py | 4 | ||||
| -rw-r--r-- | UpdateManager/UpdateManager.py | 4 | ||||
| -rw-r--r-- | data/UpdateManager.glade | 26 |
3 files changed, 12 insertions, 22 deletions
diff --git a/DistUpgrade/DistUpgradeViewGtk.py b/DistUpgrade/DistUpgradeViewGtk.py index bf4acf0c..11b5d9c6 100644 --- a/DistUpgrade/DistUpgradeViewGtk.py +++ b/DistUpgrade/DistUpgradeViewGtk.py @@ -102,10 +102,10 @@ class GtkFetchProgressAdapter(apt.progress.FetchProgress): currentItem = self.totalItems if self.currentCPS > 0: - self.status.set_text(_("Downloading file %li of %li with %s/s" % (currentItem, self.totalItems, apt_pkg.SizeToStr(self.currentCPS)))) + self.status.set_text(_("Downloading file %li of %li at %s/s" % (currentItem, self.totalItems, apt_pkg.SizeToStr(self.currentCPS)))) self.progress.set_text(_("%s remaining" % apt_pkg.TimeToStr(self.eta))) else: - self.status.set_text(_("Downloading file %li of %li with unknown speed" % (currentItem, self.totalItems))) + self.status.set_text(_("Downloading file %li of %li at unknown speed" % (currentItem, self.totalItems))) self.progress.set_text(" ") while gtk.events_pending(): diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py index 2adb64da..a9e7b036 100644 --- a/UpdateManager/UpdateManager.py +++ b/UpdateManager/UpdateManager.py @@ -29,7 +29,6 @@ import gtk import gtk.gdk import gtk.glade import gobject -import gnome import apt import apt_pkg import gettext @@ -223,7 +222,6 @@ class UpdateManager(SimpleGladeApp): self.datadir = datadir SimpleGladeApp.__init__(self, datadir+"glade/UpdateManager.glade", None, domain="update-manager") - self.gnome_program = gnome.init("update-manager", "0.41") self.window_main.set_sensitive(False) @@ -462,7 +460,7 @@ class UpdateManager(SimpleGladeApp): self.fillstore() def on_button_help_clicked(self, widget): - gnome.help_display_desktop(self.gnome_program, "update-manager", "update-manager", "") + subprocess.Popen(["/usr/bin/yelp", "ghelp:update-manager"]) def on_button_install_clicked(self, widget): #print "on_button_install_clicked" diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade index dfd54dc3..e9f2b32d 100644 --- a/data/UpdateManager.glade +++ b/data/UpdateManager.glade @@ -665,28 +665,20 @@ <property name="spacing">12</property> <child> - <widget class="GtkHButtonBox" id="hbuttonbox5"> + <widget class="GtkButton" id="button_help"> <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="button_help"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-help</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_button_help_clicked" last_modification_time="Thu, 24 Mar 2005 17:16:46 GMT"/> - </widget> - </child> + <property name="can_default">True</property> + <property name="can_focus">True</property> + <property name="label">gtk-help</property> + <property name="use_stock">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="on_button_help_clicked" last_modification_time="Thu, 24 Mar 2005 17:16:46 GMT"/> </widget> <packing> <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> </packing> </child> |