From ddec7f64a92f4705d713dcf23754a68e7dd1bcd3 Mon Sep 17 00:00:00 2001
From: Sebastian Heinlein <sebastian.heinlein@web.de>
Date: Mon, 23 Jan 2006 09:26:58 +0100
Subject: * Fixed some spacings * Wording: "No updates available" -> "Your
 system is up-to-date" * Wording: starting header - "Available Updates"   ->
 "Install software updates" * Wording: "_Install Updates" -> "_Install". the
 former one was just too long,   espcially in translations * If there are no
 availabe updates:    - unset sensitive treeview_update    - set default to
 button "cancel"    - hide label_downsize   Else:    - set default to button
 "install"

---
 UpdateManager/UpdateManager.py | 13 ++++++++++---
 data/UpdateManager.glade       | 13 ++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 7f832c06..17cdcbd1 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -387,12 +387,20 @@ class UpdateManager(SimpleGladeApp):
 
   def update_count(self):
       if len(self.packages) == 0:
-          text_header= _("<big><b>No updates available</b></big>")
+          text_header= "<big><b>"+_("Your system is up-to-date")+"</b></big>"
           text_download = ""
+          self.expander_details.set_sensitive(False)
+          self.treeview_update.set_sensitive(False)
+          self.label_downsize.hide()
+          self.button_cancel.grab_default()
       else:
-          text_header = gettext.ngettext("<big><b>You can install one update</b></big>", "<big><b>You can install %s updates</b></big>" % len(self.packages), len(self.packages))
+          text_header = "<big><b>"+gettext.ngettext("You can install one update", "You can install %s updates" % len(self.packages), len(self.packages))+"</b></big>"
           
           text_download = _("Download size: %s" % apt_pkg.SizeToStr(self.dl_size))
+          self.expander_details.set_sensitive(True)
+          self.treeview_update.set_sensitive(False)
+          self.label_downsize.show()
+          self.button_install.grab_default()
       self.label_header.set_markup(text_header)
       self.label_downsize.set_markup(text_download)
 
@@ -665,7 +673,6 @@ class UpdateManager(SimpleGladeApp):
       text = "<big><b>%s</b></big>\n\n%s" % (_("Your system is up-to-date"),
                                              _("There are no updates available."))
       self.label_header.set_markup(text)
-      self.store.append([False, _("Your system is up-to-date!"), None, None, None, None, None])
       # make sure no install is possible
       self.button_install.set_sensitive(False)
       self.textview_changes.get_buffer().set_text("")
diff --git a/data/UpdateManager.glade b/data/UpdateManager.glade
index 80f82a12..c9b50999 100644
--- a/data/UpdateManager.glade
+++ b/data/UpdateManager.glade
@@ -26,7 +26,7 @@
       <property name="border_width">6</property>
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">12</property>
+      <property name="spacing">6</property>
 
       <child>
 	<widget class="GtkVBox" id="vbox10">
@@ -37,7 +37,6 @@
 
 	  <child>
 	    <widget class="GtkHBox" id="hbox3">
-	      <property name="border_width">6</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">12</property>
@@ -67,7 +66,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label_header">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes" context="yes">&lt;big&gt;&lt;b&gt;Available Updates&lt;/b&gt;&lt;/big&gt;</property>
+		      <property name="label" translatable="yes" context="yes">&lt;big&gt;&lt;b&gt;Install software updates&lt;/b&gt;&lt;/big&gt;</property>
 		      <property name="use_underline">True</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -251,7 +250,6 @@
 
 		  <child>
 		    <widget class="GtkLabel" id="label_downsize">
-		      <property name="visible">True</property>
 		      <property name="label" translatable="yes"></property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
@@ -753,7 +751,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="label16">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Install Updates</property>
+			      <property name="label" translatable="yes">_Install</property>
 			      <property name="use_underline">True</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -953,13 +951,13 @@ Need to get the changes from the central server</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
+  <property name="has_separator">False</property>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox3">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+      <property name="spacing">6</property>
 
       <child internal-child="action_area">
 	<widget class="GtkHButtonBox" id="dialog-action_area3">
@@ -1002,6 +1000,7 @@ Need to get the changes from the central server</property>
 
       <child>
 	<widget class="GtkScrolledWindow" id="scrolledwindow5">
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
 	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-- 
cgit v1.2.3