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

[Robert Roth]

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.

=== modified file 'data/ui/gtk3/SoftwareCenter.ui'
--- data/ui/gtk3/SoftwareCenter.ui	2011-08-18 17:42:33 +0000
+++ data/ui/gtk3/SoftwareCenter.ui	2011-08-23 15:03:57 +0000
@@ -437,7 +437,6 @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImageMenuItem" id="menuitem_help">
-                        <property name="label" translatable="yes">Software Center _Help</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
 
=== modified file 'softwarecenter/ui/gtk3/app.py'
--- softwarecenter/ui/gtk3/app.py	2011-08-19 08:47:58 +0000
+++ softwarecenter/ui/gtk3/app.py	2011-08-23 15:03:57 +0000
@@ -326,6 +326,8 @@
                                                  Gdk.keyval_from_name("KP_Right"),
                                                  Gdk.ModifierType.MOD1_MASK,
                                                  Gtk.AccelFlags.VISIBLE)
+        # TRANSLATORS: this is the help menuitem label, e.g. Ubuntu Software Center _Help
+        self.menuitem_help.set_label(_("%s _Help")%self.distro.get_app_name())
 
         # specify the smallest allowable window size
         self.window_main.set_default_size(700, 400)
 
=== modified file 'softwarecenter/ui/gtk3/panes/historypane.py'
--- softwarecenter/ui/gtk3/panes/historypane.py	2011-08-23 07:38:52 +0000
+++ softwarecenter/ui/gtk3/panes/historypane.py	2011-08-23 15:03:57 +0000
@@ -363,7 +363,9 @@
         elif isinstance(when, datetime.date):
             today = datetime.date.today()
             monday = today - datetime.timedelta(days=today.weekday())
-            if when >= monday:
+            if when == today:
+                text = _("Today")
+            elif when >= monday:
                 # Current week, display the name of the day
                 text = when.strftime(_('%A'))
             else:
 
=== modified file 'softwarecenter/ui/gtk3/views/appdetailsview_gtk.py'
--- softwarecenter/ui/gtk3/views/appdetailsview_gtk.py	2011-08-22 11:56:17 +0000
+++ softwarecenter/ui/gtk3/views/appdetailsview_gtk.py	2011-08-23 15:03:57 +0000
@@ -898,7 +898,7 @@
         self.addons_statusbar.hide()
         return
 
-    def _on_homepage_clicked(self, button):
+    def _on_homepage_clicked(self, label, link):
         import webbrowser
         webbrowser.open_new_tab(self.app_details.website)
         return
@@ -992,8 +992,8 @@
             self.weblive.client.connect("warning", self.on_weblive_warning)
 
         # homepage link button
-        self.homepage_btn = Gtk.Button.new_with_label(_('Developer Web Site'))
-        self.homepage_btn.connect('clicked', self._on_homepage_clicked)
+        self.homepage_btn = Gtk.Label()
+        self.homepage_btn.connect('activate-link', self._on_homepage_clicked)
 
         # add the links footer to the description widget
         footer_hb = Gtk.HBox(spacing=6)
@@ -1154,6 +1154,7 @@
         # show or hide the homepage button and set uri if homepage specified
         if app_details.website:
             self.homepage_btn.show()
+            self.homepage_btn.set_markup("<a href=\"%s\">%s</a>"%(self.app_details.website, _('Developer Web Site')))
             self.homepage_btn.set_tooltip_text(app_details.website)
         else:
             self.homepage_btn.hide()