Ubuntu Software Center

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

  1. gtk3fixes
  2. Merge into trunk
Proposed by Robert Roth
Status: Merged
Merged at revision: 2170
Proposed branch: lp:~evfool/software-center/gtk3fixes
Merge into: lp:software-center
Diff against target: 71 lines (+9/-5)
4 files modified
data/ui/gtk3/SoftwareCenter.ui (+0/-1)
softwarecenter/ui/gtk3/app.py (+2/-0)
softwarecenter/ui/gtk3/panes/historypane.py (+3/-1)
softwarecenter/ui/gtk3/views/appdetailsview_gtk.py (+4/-3)
To merge this branch: bzr merge lp:~evfool/software-center/gtk3fixes
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+72588@code.launchpad.net

Description of the change

The branch uses the distro-specific name of the application in the help menu, replaces the Developer website button on the app details page with a developer website label, and shows Today on today's installations/updates/removals in the history pane.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/ui/gtk3/SoftwareCenter.ui'
2--- data/ui/gtk3/SoftwareCenter.ui 2011-08-18 17:42:33 +0000
3+++ data/ui/gtk3/SoftwareCenter.ui 2011-08-23 15:03:57 +0000
4@@ -437,7 +437,6 @@
5 <property name="can_focus">False</property>
6 <child>
7 <object class="GtkImageMenuItem" id="menuitem_help">
8- <property name="label" translatable="yes">Software Center _Help</property>
9 <property name="visible">True</property>
10 <property name="can_focus">False</property>
11 <property name="use_action_appearance">False</property>
12
13=== modified file 'softwarecenter/ui/gtk3/app.py'
14--- softwarecenter/ui/gtk3/app.py 2011-08-19 08:47:58 +0000
15+++ softwarecenter/ui/gtk3/app.py 2011-08-23 15:03:57 +0000
16@@ -326,6 +326,8 @@
17 Gdk.keyval_from_name("KP_Right"),
18 Gdk.ModifierType.MOD1_MASK,
19 Gtk.AccelFlags.VISIBLE)
20+ # TRANSLATORS: this is the help menuitem label, e.g. Ubuntu Software Center _Help
21+ self.menuitem_help.set_label(_("%s _Help")%self.distro.get_app_name())
22
23 # specify the smallest allowable window size
24 self.window_main.set_default_size(700, 400)
25
26=== modified file 'softwarecenter/ui/gtk3/panes/historypane.py'
27--- softwarecenter/ui/gtk3/panes/historypane.py 2011-08-23 07:38:52 +0000
28+++ softwarecenter/ui/gtk3/panes/historypane.py 2011-08-23 15:03:57 +0000
29@@ -363,7 +363,9 @@
30 elif isinstance(when, datetime.date):
31 today = datetime.date.today()
32 monday = today - datetime.timedelta(days=today.weekday())
33- if when >= monday:
34+ if when == today:
35+ text = _("Today")
36+ elif when >= monday:
37 # Current week, display the name of the day
38 text = when.strftime(_('%A'))
39 else:
40
41=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview_gtk.py'
42--- softwarecenter/ui/gtk3/views/appdetailsview_gtk.py 2011-08-22 11:56:17 +0000
43+++ softwarecenter/ui/gtk3/views/appdetailsview_gtk.py 2011-08-23 15:03:57 +0000
44@@ -898,7 +898,7 @@
45 self.addons_statusbar.hide()
46 return
47
48- def _on_homepage_clicked(self, button):
49+ def _on_homepage_clicked(self, label, link):
50 import webbrowser
51 webbrowser.open_new_tab(self.app_details.website)
52 return
53@@ -992,8 +992,8 @@
54 self.weblive.client.connect("warning", self.on_weblive_warning)
55
56 # homepage link button
57- self.homepage_btn = Gtk.Button.new_with_label(_('Developer Web Site'))
58- self.homepage_btn.connect('clicked', self._on_homepage_clicked)
59+ self.homepage_btn = Gtk.Label()
60+ self.homepage_btn.connect('activate-link', self._on_homepage_clicked)
61
62 # add the links footer to the description widget
63 footer_hb = Gtk.HBox(spacing=6)
64@@ -1154,6 +1154,7 @@
65 # show or hide the homepage button and set uri if homepage specified
66 if app_details.website:
67 self.homepage_btn.show()
68+ self.homepage_btn.set_markup("<a href=\"%s\">%s</a>"%(self.app_details.website, _('Developer Web Site')))
69 self.homepage_btn.set_tooltip_text(app_details.website)
70 else:
71 self.homepage_btn.hide()