Merge lp:~evfool/software-center/history-enhancements into lp:software-center

[Robert Roth]

This branch contains the following changes (specified at https://wiki.ubuntu.com/SoftwareCenter#History_enhancements):
* display text-sized icons in history, not double-sized ones
* use padding between the icon and the package name
* right-align the time of the history action
* display the action +time (installed/updated/removed) if the filter is all changes, otherwise only display the time
* removed markup from the translatable string, to avoid translation mistakes with markup

[Michael Vogt (mvo)]

Thanks, that is fine for trunk.

review: Approve

=== modified file 'softwarecenter/ui/gtk3/panes/historypane.py'
--- softwarecenter/ui/gtk3/panes/historypane.py	2012-03-15 00:52:10 +0000
+++ softwarecenter/ui/gtk3/panes/historypane.py	2012-05-17 18:24:19 +0000
@@ -25,6 +25,7 @@
 
 from gettext import gettext as _
 
+from softwarecenter.ui.gtk3.em import get_em
 from softwarecenter.ui.gtk3.widgets.spinner import SpinnerNotebook
 from basepane import BasePane
 from softwarecenter.enums import Icons
@@ -49,8 +50,8 @@
 
     (ALL, INSTALLED, REMOVED, UPGRADED) = range(4)
 
-    ICON_SIZE = 32
-    PADDING = 6
+    ICON_SIZE = 1.2 * get_em()
+    PADDING = 4
 
     # pages for the spinner notebook
     (PAGE_HISTORY_VIEW,
@@ -143,12 +144,19 @@
         self.column = Gtk.TreeViewColumn(_('Date'))
         self.view.append_column(self.column)
         self.cell_icon = Gtk.CellRendererPixbuf()
+        self.cell_icon.set_padding(self.PADDING, self.PADDING/2)
         self.column.pack_start(self.cell_icon, False)
         self.column.set_cell_data_func(self.cell_icon, self.render_cell_icon)
         self.cell_text = Gtk.CellRendererText()
         self.column.pack_start(self.cell_text, True)
         self.column.set_cell_data_func(self.cell_text, self.render_cell_text)
+        self.cell_time = Gtk.CellRendererText()
+        self.cell_time.set_padding(6, 0)
+        self.cell_time.set_alignment(1.0, 0.5)
+        self.column.pack_end(self.cell_time, False)
+        self.column.set_cell_data_func(self.cell_time, self.render_cell_time)
 
+       
         # busy cursor
         self.busy_cursor = Gdk.Cursor.new(Gdk.CursorType.WATCH)
 
@@ -351,22 +359,7 @@
         if isinstance(when, datetime.datetime):
             action = store.get_value(iter, self.COL_ACTION)
             pkg = store.get_value(iter, self.COL_PKG)
-            subs = {'pkgname': pkg,
-                    'color': '#8A8A8A',
-                    # Translators : time displayed in history, display hours
-                    # (0-12), minutes and AM/PM. %H should be used instead
-                    # of %I to display hours 0-24
-                    'time': when.time().strftime(_('%I:%M %p')),
-                   }
-            if action == self.INSTALLED:
-                text = _('%(pkgname)s <span color="%(color)s">'
-                    'installed %(time)s</span>') % subs
-            elif action == self.REMOVED:
-                text = _('%(pkgname)s <span color="%(color)s">'
-                    'removed %(time)s</span>') % subs
-            elif action == self.UPGRADED:
-                text = _('%(pkgname)s <span color="%(color)s">'
-                    'updated %(time)s</span>') % subs
+            text = pkg
         elif isinstance(when, datetime.date):
             today = datetime.date.today()
             monday = today - datetime.timedelta(days=today.weekday())
@@ -384,6 +377,27 @@
                     text = when.strftime(_('%d %B %Y'))
         cell.set_property('markup', text)
 
+    def render_cell_time(self, column, cell, store, iter, user_data):
+        when = store.get_value(iter, self.COL_WHEN)
+        text = ''
+        if isinstance(when, datetime.datetime):
+            action = store.get_value(iter, self.COL_ACTION)
+            # Translators : time displayed in history, display hours
+            # (0-12), minutes and AM/PM. %H should be used instead
+            # of %I to display hours 0-24
+            time_text = when.time().strftime(_('%I:%M %p'))
+            if self.filter is not self.ALL:
+                action_text = time_text
+            else:
+                if action == self.INSTALLED:
+                    action_text = _('installed %s') % time_text
+                elif action == self.REMOVED:
+                    action_text = _('removed %s') % time_text
+                elif action == self.UPGRADED:
+                    action_text = _('updated %s') % time_text
+            text = '<span color="%(color)s">%(action)s</span>'% {'color': '#8A8A8A', 'action': action_text } 
+        cell.set_property('markup', text)
+
 
 def get_test_window():