Merge lp:~evfool/software-properties/twolineitems into lp:software-properties

[Robert Roth]

This branch improves the display of Other sources with comments by wrapping them into two lines, the first one for everything else except the URL, and the second one with the URL.
See comparison:
CUrrent layout : https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/930827/+attachment/2732465/+files/Screenshot%20at%202012-02-12%2004%3A11%3A00.png
Proposed layout : https://bugs.launchpad.net/ubuntu/+source/software-properties/+bug/930827/+attachment/2732467/+files/Screenshot%20at%202012-02-12%2004%3A10%3A58.png

In my opinion the proposed layout improves readability, reduces the cases when we need a horizontal scrollbar, and makes the commented sources representation consistent with the Partners and Independent items representation (at least in terms of line count, aka item height)

[Iain Lane (laney)]

(right merge this time), thanks!

review: Approve

=== modified file 'softwareproperties/SoftwareProperties.py'
--- softwareproperties/SoftwareProperties.py	2013-06-18 19:34:47 +0000
+++ softwareproperties/SoftwareProperties.py	2013-06-19 19:54:29 +0000
@@ -488,19 +488,21 @@
     """Render a nice output to show the source in a treeview"""
     if source.template == None:
         if source.comment:
-            contents = "<b>%s</b> (%s %s" % (escape(source.comment).strip(),
-                                              source.uri, source.dist)
+            contents = "<b>%s</b> %s" % (escape(source.comment).strip(),
+                                         source.dist)
             # Only show the components if there are more than one
             if len(source.comps) > 1:
                 for c in source.comps:
                     contents += " %s" % c
-            contents += ")"
+            if source.type in ("deb-src", "rpm-src"):
+                contents += " %s" % _("(Source Code)")
+            contents += "\n%s" % source.uri
         else:
             contents = "<b>%s %s</b>" % (source.uri, source.dist)
             for c in source.comps:
                 contents += " %s" % c
-        if source.type in ("deb-src", "rpm-src"):
-            contents += " %s" % _("(Source Code)")
+            if source.type in ("deb-src", "rpm-src"):
+                contents += " %s" % _("(Source Code)")
         return contents
     else:
         # try to make use of a corresponding template