From 47f19eb647bc35af73815087a84ac45220f557b2 Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebastian.heinlein@web.de>
Date: Mon, 13 Feb 2006 18:46:23 +0100
Subject: * Destroy all gtk.messagedialogs after use

---
 UpdateManager/UpdateManager.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'UpdateManager/UpdateManager.py')

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 0638916f..2adb64da 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -660,6 +660,7 @@ class UpdateManager(SimpleGladeApp):
               dialog.set_markup(primary);
               dialog.format_secondary_text(secondary);
               dialog.run()
+              dialog.destroy()
           except IOError:
               primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
                         _("Could not download the release notes")
@@ -670,6 +671,7 @@ class UpdateManager(SimpleGladeApp):
               dialog.set_markup(primary);
               dialog.format_secondary_text(secondary);
               dialog.run()
+              dialog.destroy()
           self.window_main.set_sensitive(True)
           self.window_main.window.set_cursor(None)
           # user clicked cancel
@@ -718,6 +720,7 @@ class UpdateManager(SimpleGladeApp):
               dialog.set_markup(primary);
               dialog.format_secondary_text(secondary);
               dialog.run()
+              dialog.destroy()
           else:
               #print "runing: %s" % script
               os.execv(script,[])
@@ -797,6 +800,7 @@ class UpdateManager(SimpleGladeApp):
         dialog.set_markup(msg)
         dialog.vbox.set_spacing(6)
         dialog.run()
+        dialog.destroy()
         sys.exit(1)
     #apt_pkg.Config.Set("Debug::pkgPolicy","1")
     #self.depcache = apt_pkg.GetDepCache(self.cache)
-- 
cgit v1.2.3


From de0af64f747c8f5783ed09efd9fc80f9ee9759a0 Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebastian.heinlein@web.de>
Date: Mon, 13 Feb 2006 19:32:04 +0100
Subject: * Remove dependency on python-gnome - call yelp manually * Use same
 height for all butons in the bottom row * Fix bad denglish wording:
 "downloading at..." - thanks Jorge Bernal

---
 DistUpgrade/DistUpgradeViewGtk.py |  4 ++--
 UpdateManager/UpdateManager.py    |  4 +---
 data/UpdateManager.glade          | 26 +++++++++-----------------
 3 files changed, 12 insertions(+), 22 deletions(-)

(limited to 'UpdateManager/UpdateManager.py')

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>
 
-- 
cgit v1.2.3