Merge lp:~evfool/software-center/bug532072 into lp:software-center

Proposed by Robert Roth on 2012-05-09
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~evfool/software-center/bug532072
Merge into: lp:software-center
Diff against target: 30 lines (+3/-3)
2 files modified
softwarecenter/ui/gtk3/views/appdetailsview.py (+2/-2)
softwarecenter/ui/gtk3/widgets/cellrenderers.py (+1/-1)
To merge this branch: bzr merge lp:~evfool/software-center/bug532072
Reviewer Review Type Date Requested Status
Michael Vogt 2012-05-09 Approve on 2012-05-09
Review via email: mp+105192@code.launchpad.net

Description of the change

This branch fixes the following two issues:
- Ellipsize software summary in software list view at trailing end instead of middle, as requested in bug #532072 and specified in the Software center specifications at https://wiki.ubuntu.com/SoftwareCenter#Software_list_view .
- Escape text to display in app details License information and support information to fix bug #993279.

To post a comment you must log in.
lp:~evfool/software-center/bug532072 updated on 2012-05-09
3002. By Robert Roth on 2012-05-09

Escape markup for support info and license (LP: #993279)

Michael Vogt (mvo) wrote :

Thanks! This branch looks good.

review: Approve
Michael Vogt (mvo) wrote :

This is merged to the 5.2 branch now.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview.py'
2--- softwarecenter/ui/gtk3/views/appdetailsview.py 2012-05-01 20:15:01 +0000
3+++ softwarecenter/ui/gtk3/views/appdetailsview.py 2012-05-09 13:48:20 +0000
4@@ -1475,11 +1475,11 @@
5 version = utf8(_("%s (unknown version)")) % utf8(
6 app_details.pkgname)
7 if app_details.license:
8- license = app_details.license
9+ license = GObject.markup_escape_text(app_details.license)
10 else:
11 license = _("Unknown")
12 if app_details.maintenance_status:
13- support = app_details.maintenance_status
14+ support = GObject.markup_escape_text(app_details.maintenance_status)
15 else:
16 support = _("Unknown")
17 # regular label updates
18
19=== modified file 'softwarecenter/ui/gtk3/widgets/cellrenderers.py'
20--- softwarecenter/ui/gtk3/widgets/cellrenderers.py 2012-04-10 16:31:04 +0000
21+++ softwarecenter/ui/gtk3/widgets/cellrenderers.py 2012-05-09 13:48:20 +0000
22@@ -183,7 +183,7 @@
23
24 if lw >= max_layout_width:
25 layout.set_width((max_layout_width) * Pango.SCALE)
26- layout.set_ellipsize(Pango.EllipsizeMode.MIDDLE)
27+ layout.set_ellipsize(Pango.EllipsizeMode.END)
28 lw = max_layout_width
29
30 apptitle_extents = layout.get_line_readonly(0).get_pixel_extents()[1]