Ubuntu Software Center

Merge lp:~mpt/software-center/fit-and-finish into lp:software-center

  1. fit-and-finish
  2. Merge into trunk
Proposed by Matthew Paul Thomas
Status: Merged
Merged at revision: 1028
Proposed branch: lp:~mpt/software-center/fit-and-finish
Merge into: lp:software-center
Diff against target: 146 lines (+22/-18)
7 files modified
data/ui/SoftwareCenter.ui (+4/-4)
softwarecenter/distro/Debian.py (+2/-2)
softwarecenter/distro/Ubuntu.py (+1/-1)
softwarecenter/view/catview_gtk.py (+4/-2)
softwarecenter/view/channelpane.py (+1/-1)
softwarecenter/view/historypane.py (+9/-7)
softwarecenter/view/widgets/mkit.py (+1/-1)
To merge this branch: bzr merge lp:~mpt/software-center/fit-and-finish
Reviewer Review Type Date Requested Status
software-store-developers Pending
Review via email: mp+32978@code.launchpad.net

Description of the change

Tweaks ellipses, wording, and borders.

To post a comment you must log in.
lp:~mpt/software-center/fit-and-finish updated
1032. By Matthew Paul Thomas

Uses 'What's New' label consistently.

1033. By Matthew Paul Thomas

Reverts changes that made the section not appear at all.

1034. By Matthew Paul Thomas

Adds missing ellipsis to 'Reinstall Previous Purchases'.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ui/SoftwareCenter.ui'
2--- data/ui/SoftwareCenter.ui 2010-08-02 12:56:50 +0000
3+++ data/ui/SoftwareCenter.ui 2010-08-20 14:56:43 +0000
4@@ -60,7 +60,7 @@
5 <child>
6 <object class="GtkMenuItem" id="menuitem_reinstall_purchases">
7 <property name="visible">True</property>
8- <property name="label" translatable="yes">Reinstall Previous Purchases</property>
9+ <property name="label" translatable="yes">Reinstall Previous Purchases&#8230;</property>
10 <property name="use_underline">True</property>
11 <signal name="activate" handler="on_menuitem_reinstall_purchases_activate"/>
12 </object>
13@@ -188,7 +188,7 @@
14 </child>
15 <child>
16 <object class="GtkImageMenuItem" id="menuitem_search">
17- <property name="label" translatable="yes">Search...</property>
18+ <property name="label" translatable="yes">Search&#8230;</property>
19 <property name="visible">True</property>
20 <property name="use_underline">True</property>
21 <property name="image">image2</property>
22@@ -204,7 +204,7 @@
23 </child>
24 <child>
25 <object class="GtkImageMenuItem" id="menuitem_software_sources">
26- <property name="label" translatable="yes">_Software Sources...</property>
27+ <property name="label" translatable="yes">_Software Sources&#8230;</property>
28 <property name="visible">True</property>
29 <property name="use_underline">True</property>
30 <property name="image">image4</property>
31@@ -455,7 +455,7 @@
32 <child>
33 <object class="GtkLabel" id="label_rebuilding">
34 <property name="visible">True</property>
35- <property name="label" translatable="yes">Rebuilding application catalog...</property>
36+ <property name="label" translatable="yes">Rebuilding software catalog&#8230;</property>
37 <attributes>
38 <attribute name="weight" value="bold"/>
39 </attributes>
40
41=== modified file 'softwarecenter/distro/Debian.py'
42--- softwarecenter/distro/Debian.py 2010-07-07 11:57:16 +0000
43+++ softwarecenter/distro/Debian.py 2010-08-20 14:56:43 +0000
44@@ -81,9 +81,9 @@
45
46 def get_license_text(self, component):
47 if component in ("main",):
48- return _("Open Source")
49+ return _("Open source")
50 elif component == "contrib":
51- return _("Open Source with proprietary parts")
52+ return _("Open source, with proprietary parts")
53 elif component == "restricted":
54 return _("Proprietary")
55
56
57=== modified file 'softwarecenter/distro/Ubuntu.py'
58--- softwarecenter/distro/Ubuntu.py 2010-08-11 18:57:46 +0000
59+++ softwarecenter/distro/Ubuntu.py 2010-08-20 14:56:43 +0000
60@@ -90,7 +90,7 @@
61
62 def get_license_text(self, component):
63 if component in ("main", "universe"):
64- return _("Open Source")
65+ return _("Open source")
66 elif component == "restricted":
67 return _("Proprietary")
68
69
70=== modified file 'softwarecenter/view/catview_gtk.py'
71--- softwarecenter/view/catview_gtk.py 2010-08-13 09:48:45 +0000
72+++ softwarecenter/view/catview_gtk.py 2010-08-20 14:56:43 +0000
73@@ -205,14 +205,16 @@
74 global_icon_cache=False,
75 nonapps_visible=True)
76 self.newapps_carousel = CarouselView(
77- new_apps, _("What's New"), self.icons, start_random=False)
78+ new_apps, _(u"What\u2019s New"), self.icons,
79+ start_random=False)
80+ # "What's New", a section for new software.
81 self.newapps_carousel.more_btn.connect('clicked',
82 self._on_category_clicked,
83 new_cat)
84 # pack new carousel into hbox
85 self.hbox_inner.pack_start(self.newapps_carousel, False)
86
87- # append carousel's to lobby page
88+ # append carousels to lobby page
89 self.vbox.pack_start(self.hbox_inner, False)
90 return
91
92
93=== modified file 'softwarecenter/view/channelpane.py'
94--- softwarecenter/view/channelpane.py 2010-07-27 09:16:40 +0000
95+++ softwarecenter/view/channelpane.py 2010-08-20 14:56:43 +0000
96@@ -164,7 +164,7 @@
97 dialog.set_title("")
98 dialog.set_markup("<big><b>%s</b></big>" % _("Add channel"))
99 dialog.format_secondary_text(_("The selected channel is not yet "
100- "added, do you want to add it now?"))
101+ "added. Do you want to add it now?"))
102 dialog.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
103 gtk.STOCK_ADD, gtk.RESPONSE_YES)
104 res = dialog.run()
105
106=== modified file 'softwarecenter/view/historypane.py'
107--- softwarecenter/view/historypane.py 2010-08-02 13:49:15 +0000
108+++ softwarecenter/view/historypane.py 2010-08-20 14:56:43 +0000
109@@ -107,15 +107,17 @@
110 installs_button = installs_action.create_tool_item()
111 self.toolbar.insert(installs_button, 1)
112
113- removals_action = gtk.RadioAction('filter_removals', _('All Removals'), None, None, self.REMOVED)
114+ upgrades_action = gtk.RadioAction(
115+ 'filter_upgrads', _('Updates'), None, None, self.UPGRADED)
116+ upgrades_action.set_group(all_action)
117+ upgrades_button = upgrades_action.create_tool_item()
118+ self.toolbar.insert(upgrades_button, 2)
119+
120+ removals_action = gtk.RadioAction(
121+ 'filter_removals', _('Removals'), None, None, self.REMOVED)
122 removals_action.set_group(all_action)
123 removals_button = removals_action.create_tool_item()
124- self.toolbar.insert(removals_button, 2)
125-
126- upgrades_action = gtk.RadioAction('filter_upgrads', _('All Upgrades'), None, None, self.UPGRADED)
127- upgrades_action.set_group(all_action)
128- upgrades_button = upgrades_action.create_tool_item()
129- self.toolbar.insert(upgrades_button, 3)
130+ self.toolbar.insert(removals_button, 3)
131
132 self.view = gtk.TreeView()
133 self.view.show()
134
135=== modified file 'softwarecenter/view/widgets/mkit.py'
136--- softwarecenter/view/widgets/mkit.py 2010-08-10 20:31:50 +0000
137+++ softwarecenter/view/widgets/mkit.py 2010-08-20 14:56:43 +0000
138@@ -151,7 +151,7 @@
139 SPACING_SMALL = max(1, int(0.333*EM+0.5))
140
141 # recommended corner radius
142-CORNER_RADIUS = max(2, int(0.2*EM+0.5))
143+CORNER_RADIUS = 0
144
145 # use the link color as the clicked color for labels
146 _scheme = get_gtk_color_scheme_dict()