Ubuntu Software Center

Merge lp:~mmcg069/software-center/Bug830218 into lp:software-center

  1. Bug830218
  2. Merge into trunk
Proposed by Matthew Paul Thomas
Status: Merged
Merged at revision: 2185
Proposed branch: lp:~mmcg069/software-center/Bug830218
Merge into: lp:software-center
Diff against target: 25 lines (+9/-0) (has conflicts)
1 file modified
softwarecenter/ui/gtk3/widgets/buttons.py (+9/-0)
Text conflict in softwarecenter/ui/gtk3/widgets/buttons.py
To merge this branch: bzr merge lp:~mmcg069/software-center/Bug830218
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+72409@code.launchpad.net

Description of the change

Removes category info from the home screen tiles, because it's raw data that doesn't match the USC categories and subcategories.

Bug 831024 covers adding properly formatted category info.

To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks :) I saw this branch and was playing with a fix that would actually extract the right category from the DB. I have code for this here:
 lp:~mvo/software-center/proper-but-slow-get-categories-string
But its a bit slow, so either needs improvement or delayed loading and updates as results arrive.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'softwarecenter/ui/gtk3/widgets/buttons.py'
--- softwarecenter/ui/gtk3/widgets/buttons.py 2011-08-22 09:35:39 +0000
+++ softwarecenter/ui/gtk3/widgets/buttons.py 2011-08-22 11:47:36 +0000
@@ -144,12 +144,21 @@
144 self.title.set_ellipsize(Pango.EllipsizeMode.END)144 self.title.set_ellipsize(Pango.EllipsizeMode.END)
145 self.content_right.pack_start(self.title, False, False, 0)145 self.content_right.pack_start(self.title, False, False, 0)
146146
147<<<<<<< TREE
147 if categories is not None:148 if categories is not None:
148 self.category = Gtk.Label.new('<span font_desc="Italic %i">%s</span>' % (em(0.45), categories))149 self.category = Gtk.Label.new('<span font_desc="Italic %i">%s</span>' % (em(0.45), categories))
149 self.category.set_use_markup(True)150 self.category.set_use_markup(True)
150 self.category.set_alignment(0.0, 0.0)151 self.category.set_alignment(0.0, 0.0)
151 self.category.set_ellipsize(Pango.EllipsizeMode.END)152 self.category.set_ellipsize(Pango.EllipsizeMode.END)
152 self.content_right.pack_start(self.category, False, False, 4)153 self.content_right.pack_start(self.category, False, False, 4)
154=======
155 #~ if category is not None:
156 #~ self.category = Gtk.Label.new('<span font_desc="Italic %i">%s</span>' % (em(0.45), category))
157 #~ self.category.set_use_markup(True)
158 #~ self.category.set_alignment(0.0, 0.0)
159 #~ self.category.set_ellipsize(Pango.EllipsizeMode.END)
160 #~ self.content_right.pack_start(self.category, False, False, 4)
161>>>>>>> MERGE-SOURCE
153162
154 if stats is not None:163 if stats is not None:
155 self.stars = Star()164 self.stars = Star()