Merge lp:~and471/update-manager/fix-bug-386196 into lp:update-manager

[Andrew]

(see commit message and bug report https://bugs.launchpad.net/update-manager/+bug/386196)

[Matthew Paul Thomas (mpt)]

This change is in line with the specification I'm working on for how updates should be presented.

=== modified file 'UpdateManager/UpdateManager.py'
--- UpdateManager/UpdateManager.py	2010-06-24 12:43:24 +0000
+++ UpdateManager/UpdateManager.py	2010-06-26 16:22:23 +0000
@@ -193,6 +193,8 @@
     init_proxy(self.gconfclient)
     # init show version
     self.show_versions = self.gconfclient.get_bool("/apps/update-manager/show_versions")
+    # init summary_before_name
+    self.summary_before_name = self.gconfclient.get_bool("/apps/update-manager/summary_before_name")
     # keep track when we run (for update-notifier)
     self.gconfclient.set_int("/apps/update-manager/launch_time", int(time.time()))
 
@@ -816,7 +818,10 @@
           if not pkg.is_installed:
               name += _(" (New install)")
           summary = xml.sax.saxutils.escape(pkg.summary)
-          contents = "<b>%s</b>\n<small>%s</small>" % (name, summary)
+          if self.summary_before_name:
+              contents = "<b>%s</b>\n<small>%s</small>" % (name, summary)
+          else:
+              contents = "<b>%s</b>\n<small>%s</small>" % (summary, name)
           #TRANSLATORS: the b stands for Bytes
           size = _("(Size: %s)") % humanize_size(pkg.packageSize)
           if pkg.installedVersion != None:

=== modified file 'data/update-manager.schemas.in'
--- data/update-manager.schemas.in	2010-03-03 16:12:17 +0000
+++ data/update-manager.schemas.in	2010-06-26 16:22:23 +0000
@@ -96,6 +96,21 @@
       </locale>
     </schema>
     <schema>
+      <key>/schemas/apps/update-manager/summary_before_name</key>
+      <applyto>/apps/update-manager/summary_before_name</applyto>
+      <owner>update-manager</owner>
+      <type>bool</type>
+      <default>True</default>
+		
+      <locale name="C">
+        <short>Show package summary before package name in update list</short>
+        <long>
+	  If this key is set, the main update list window will
+	  show the package summary before the package name.
+        </long>
+      </locale>
+    </schema>
+    <schema>
       <key>/schemas/apps/update-manager/first_run</key>
       <applyto>/apps/update-manager/first_run</applyto>
       <owner>update-manager</owner>