Merge lp:~pitti/computer-janitor/pygi into lp:computer-janitor

[Martin Pitt]

This branch ports from pygtk to pygi. With GTK3 it works perfectly, with GTK2 we have to disable the "select all/none" right-click popup menu, but I think we can live with that (see changelog and code comment for details).

Note that I had to fix some stuff in pygobject for this, so I bumped the dependency to a not-yet-released version. I'll upload a new git snapshot of pygobject to natty soon, but for now if you want to play with this, do

  git clone git://git.gnome.org/pygobject
  ./autogen.sh && make
  export PYTHONPATH=`pwd`:$PYTHONPATH

and then run "./run_from_checkout.sh" in the computer-janitor branch.

I think it should work with the current gtk2 that we have in Natty (I tested it), but I also did a lot of fixes there recently for porting other software. So please let me know if you get crashes or malfunctions.

[Martin Pitt (pitti)]

Note that I just uploaded a recent git snapshot of pygobject into natty, which now works with this branch. We also have the hot and fresh gtk 2.24.0 release with lots of annotation fixes, so this branch works fine on current natty now.

[Barry Warsaw (barry)]

Thanks Martin! I'll give it another try tomorrow.

[lp:~pitti/computer-janitor/pygi]

257. By Martin Pitt on 2011-02-16

merge with trunk

[Martin Pitt (pitti)]

I merged my branch with trunk for yesterday's upload, and ported the new bits.

review: Needs Resubmitting

[Barry Warsaw (barry)]

Thanks Martin, this looks really good. I'm going to go ahead and merge it, with a few minor changes (which I'll make after the merge):

* Bump version number to 2.1
* Update copyright years
* Tweak a few Python style things
* Use logging instead of stderr for the popup message

On the latter, what do you think about adding an Edit menu that has the following items:

Select all
Select all packages
Select all other
---
Unselect all
Unselect all packages
Unselect all other

That would at least provide the missing functionality elsewhere, and we could even keep that when using gtk3.

review: Approve

[Martin Pitt (pitti)]

Thanks Barry! An Edit menu sounds fine to me, and it's also more obvious than the right click menu. But in the next Ubuntu release we'll have GTK 3, and thus can have the menu back.

=== modified file 'computerjanitorapp/gtk/dialogs.py'
--- computerjanitorapp/gtk/dialogs.py	2011-02-15 22:24:27 +0000
+++ computerjanitorapp/gtk/dialogs.py	2011-02-16 13:45:44 +0000
@@ -23,7 +23,7 @@
     ]
 
 
-import gtk
+from gi.repository import Gtk
 
 from operator import mod as interpolate
 
@@ -71,15 +71,15 @@
         if ok_button is None:
             # The user de-selected all cruft from the ui, so there's actually
             # nothing to clean up.
-            dialog = gtk.MessageDialog(
+            dialog = Gtk.MessageDialog(
                 parent=self._ui.widgets['window'],
-                type=gtk.MESSAGE_WARNING,
-                buttons=gtk.BUTTONS_NONE,
+                type=Gtk.MessageType.WARNING,
+                buttons=Gtk.ButtonsType.NONE,
                 message_format=_('There is nothing to clean up'),
                 )
             dialog.set_title(_('Clean up'))
             dialog.format_secondary_markup(message)
-            dialog.add_button(_('Ok'), gtk.RESPONSE_YES)
+            dialog.add_button(_('Ok'), Gtk.ResponseType.YES)
             dialog.show_all()
             dialog.run()
             dialog.hide()
@@ -88,20 +88,20 @@
         # but that would require a richer interface to the dbus service,
         # and probably to the cruft plugin architecture underneath that.
         message = _('Are you sure you want to clean your system?')
-        dialog = gtk.MessageDialog(
+        dialog = Gtk.MessageDialog(
             parent=self._ui.widgets['window'],
-            type=gtk.MESSAGE_WARNING,
-            buttons=gtk.BUTTONS_NONE,
+            type=Gtk.MessageType.WARNING,
+            buttons=Gtk.ButtonsType.NONE,
             message_format=message)
         dialog.set_title(_('Clean up'))
         dialog.format_secondary_markup(message)
-        dialog.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CLOSE)
-        dialog.add_button(ok_button, gtk.RESPONSE_YES)
+        dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CLOSE)
+        dialog.add_button(ok_button, Gtk.ResponseType.YES)
         # Show the dialog and get the user's response.
         dialog.show_all()
         response = dialog.run()
         dialog.hide()
-        return response == gtk.RESPONSE_YES
+        return response == Gtk.ResponseType.YES
 
 
 class CleanupProblem(DialogBase):
@@ -116,10 +116,10 @@
         message = _('System clean up could not complete. '
                     'Be sure no other package manager such as Synaptic or '
                     'Update Manager is running.')
-        dialog = gtk.MessageDialog(
+        dialog = Gtk.MessageDialog(
             parent=self._ui.widgets['window'],
-            type=gtk.MESSAGE_ERROR,
-            buttons=gtk.BUTTONS_OK,
+            type=Gtk.MessageType.ERROR,
+            buttons=Gtk.ButtonsType.OK,
             message_format=message)
         dialog.set_title(_('System clean up failure'))
         dialog.show_all()

=== modified file 'computerjanitorapp/gtk/store.py'
--- computerjanitorapp/gtk/store.py	2010-03-22 18:17:11 +0000
+++ computerjanitorapp/gtk/store.py	2011-02-16 13:45:44 +0000
@@ -24,7 +24,7 @@
     ]
 
 
-import gtk
+from gi.repository import Gtk
 import gobject
 
 
@@ -49,7 +49,7 @@
 
 
 class Store:
-    """The higher level wrapper around the gtk.ListStore."""
+    """The higher level wrapper around the Gtk.ListStore."""
 
     def __init__(self, janitord):
         """Create the Store.
@@ -63,7 +63,7 @@
         # of cruft.  See ListStoreColumns for details.
         #
         # XXX 2010-03-04 barry: pygtk does not like 'unicode'.
-        self.store = gtk.ListStore(str, str, str, bool, bool, bool, bool, bool)
+        self.store = Gtk.ListStore(str, str, str, bool, bool, bool, bool, bool)
 
     def find_cruft(self):
         """Find cruft and populate the backing store.
@@ -139,7 +139,7 @@
 
 # Filter functions for use with TreeView column display.
 
-def unused(store, iter):
+def unused(store, iter, data):
     """True if the cruft is not being ignored and is package cruft.
 
     :param store: The ListStore instance.
@@ -150,7 +150,7 @@
     return show and is_package_cruft
 
 
-def optimize(store, iter):
+def optimize(store, iter, data):
     """True if the cruft is not package cruft.
 
     :param store: The ListStore instance.

=== modified file 'computerjanitorapp/gtk/ui.py'
--- computerjanitorapp/gtk/ui.py	2010-08-23 13:56:29 +0000
+++ computerjanitorapp/gtk/ui.py	2011-02-16 13:45:44 +0000
@@ -23,11 +23,12 @@
 
 
 import os
-import gtk
+from gi.repository import Gtk
+Gtk.require_version('2.0')
 import sys
 import dbus
 import glib
-import pango
+from gi.repository import Pango
 import gobject
 
 from operator import mod
@@ -86,7 +87,7 @@
 
     def run(self):
         """Set up the widgets and run the main loop."""
-        builder = gtk.Builder()
+        builder = Gtk.Builder()
         builder.set_translation_domain('computerjanitor')
         # Load the glade ui file, which can be overridden from the environment
         # for testing purposes.
@@ -109,7 +110,7 @@
         root.set_default_size(ROOT_WIDTH, ROOT_HEIGHT)
         # Map the root window and go!
         root.show()
-        gtk.main()
+        Gtk.main()
 
     def find_and_bind_widgets(self, builder):
         """Bind widgets and callbacks."""
@@ -117,8 +118,8 @@
         # keeping track of them as mapped to their name.
         self.widgets = {}
         for ui_object in builder.get_objects():
-            if issubclass(type(ui_object), gtk.Buildable):
-                widget_name = gtk.Buildable.get_name(ui_object)
+            if issubclass(type(ui_object), Gtk.Buildable):
+                widget_name = Gtk.Buildable.get_name(ui_object)
                 self.widgets[widget_name] = ui_object
                 # Search through the attributes of this instance looking for
                 # callbacks for this widget.  We use the naming convention
@@ -143,29 +144,29 @@
         # Each TreeView contains two columns.  The leftmost one is a toggle
         # that when select tells c-j to act on that cruft.  Deselecting the
         # toggle ignores the package for next time.
-        toggle_cr = gtk.CellRendererToggle()
+        toggle_cr = Gtk.CellRendererToggle()
         toggle_cr.connect('toggled', self._toggled, treeview)
         toggle_cr.set_property('yalign', 0)
-        toggle_col = gtk.TreeViewColumn()
-        toggle_col.pack_start(toggle_cr)
+        toggle_col = Gtk.TreeViewColumn()
+        toggle_col.pack_start(toggle_cr, True)
         toggle_col.add_attribute(toggle_cr, 'active', ListStoreColumns.active)
         treeview.append_column(toggle_col)
         # The rightmost column contains the details of the cruft.  It will
         # always contain the cruft name and can be expanded to display cruft
         # details.  Tell the column to get its toggle's active state from the
         # model.
-        name_cr = gtk.CellRendererText()
+        name_cr = Gtk.CellRendererText()
         name_cr.set_property('yalign', 0)
-        name_cr.set_property('wrap-mode', pango.WRAP_WORD)
-        name_col = gtk.TreeViewColumn()
-        name_col.pack_start(name_cr)
+        name_cr.set_property('wrap-mode', Pango.WrapMode.WORD)
+        name_col = Gtk.TreeViewColumn()
+        name_col.pack_start(name_cr, True)
         name_col.add_attribute(name_cr, 'markup', ListStoreColumns.text)
         treeview.append_column(name_col)
         self.cruft_name_columns.add(name_col)
         # The individual crufts may or may not be visible in this TreeView.
         # It's the filter function that controls this, so set that now.
-        filter_store = self.store.filter_new()
-        filter_store.set_visible_func(filter_func)
+        filter_store = self.store.filter_new(None)
+        filter_store.set_visible_func(filter_func, None)
         treeview.set_model(filter_store)
         # Each TreeView has a popup menu for select or deselecting all visible
         # cruft.
@@ -176,12 +177,12 @@
 
         :param treeview: The `TreeView` to attach the menu to.
         """
-        select_all = gtk.MenuItem(label='Select all')
+        select_all = Gtk.MenuItem(label='Select all')
         select_all.connect('activate', self.popup_menu_select_all, treeview)
-        unselect_all = gtk.MenuItem(label='Unselect all')
+        unselect_all = Gtk.MenuItem(label='Unselect all')
         unselect_all.connect('activate',
                              self.popup_menu_unselect_all, treeview)
-        menu = gtk.Menu()
+        menu = Gtk.Menu()
         menu.append(select_all)
         menu.append(unselect_all)
         menu.show_all()
@@ -389,7 +390,7 @@
         # Don't quit while we're working.
         if self.working:
             return True
-        gtk.main_quit()
+        Gtk.main_quit()
 
     on_window_delete_event = on_quit_menuitem_activate
 
@@ -402,7 +403,7 @@
         """
         # Original comment: This is slightly tricky and probably a source of
         # bugs.  Oh well.
-        if event.button == 1:
+        if event.button.button == 1:
             # Left button event.  Select the row being clicked on.  If the
             # click is on the cruft name, show or hide its long description.
             # If the click the click is elsewhere do not handle it.  This
@@ -423,7 +424,7 @@
                 # We are not handling this event so that the toggle button
                 # handling can occur.
                 return False
-        elif event.button == 3:
+        elif event.button.button == 3:
             # Right button event.  Pop up the select/deselect all menu.
             treeview.grab_focus()
             x = int(event.x)
@@ -434,7 +435,14 @@
                 path, column, cell_x, cell_y = pathinfo
                 treeview.set_cursor(path, column, False)
             menu = self.popup_menus[treeview]
-            menu.popup(None, None, None, event.button, time)
+            try:
+                menu.popup_for_device(None, None, None, None, None,
+                        event.button.button, time)
+            except AttributeError:
+                # popup_for_device() is introspection safe, but only exists in
+                # GTK3. popup() isn't introspectable, so in GTK 2 we need to
+                # disable the popup menu functionality
+                print >> sys.stderr, 'popup menu not supported when using GTK2'
             return True
         else:
             # No other events are handled by us.
@@ -454,7 +462,7 @@
         # Get the rightmost of the two columns in the TreeView, i.e. the one
         # containing the text.
         column = treeview.get_column(1)
-        name_cr = column.get_cell_renderers()[0]
+        name_cr = column.get_cells()[0]
         # Wrap to the entire width of the column.
         width = column.get_width()
         name_cr.set_property('wrap-width', width)

=== modified file 'data/ComputerJanitor.ui'
--- data/ComputerJanitor.ui	2010-09-20 12:31:47 +0000
+++ data/ComputerJanitor.ui	2011-02-16 13:45:44 +0000
@@ -266,7 +266,6 @@
     <property name="border_width">5</property>
     <property name="type_hint">normal</property>
     <property name="transient_for">window</property>
-    <property name="has_separator">False</property>
     <property name="program_name">Computer Janitor</property>
     <property name="version">x.y</property>
     <property name="copyright" translatable="yes">Copyright  2008, 2009, 2010  Canonical Ltd.
@@ -305,7 +304,6 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">normal</property>
     <property name="transient_for">window</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox2">
         <property name="visible">True</property>

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-15 23:20:27 +0000
+++ debian/changelog	2011-02-16 13:45:44 +0000
@@ -1,3 +1,21 @@
+computer-janitor (2.0.6-0ubuntu1) UNRELEASED; urgency=low
+
+  * data/ComputerJanitor.ui: Drop obsolete has_separator properties.
+  * run_from_checkout.sh: Drop setting of $PYTHONPATH. Current directory is
+    there by default anyway, and this breaks setting it from the environment.
+  * computerjanitorapp/gtk/*: Port from pygtk2 to pygi. Works fully with GTK3
+    now, with GTK2 we need to disable the right-click popup menu
+    (popup_for_device() is introspection safe, but only exists in GTK3.
+    popup() isn't introspectable).
+  * computerjanitorapp/gtk/ui.py: Force GTK2 for now, as we do not yet have a
+    GTK3 theme in Natty, and don't carry the GTK3 stack in the default
+    install.
+  * debian/control: Update dependencies for the pygtk → pygi switch.
+  * debian/control: Drop obsolete system-cleaner conflicts and gksu
+    dependency.
+
+ -- Martin Pitt <[e-mail]>  Sat, 15 Jan 2011 11:31:02 -0600
+
 computer-janitor (2.0.5-0ubuntu1) natty; urgency=low
 
   * python-dbus cannot type-convert a set, so use a tuple for the package

=== modified file 'debian/control'
--- debian/control	2011-01-12 19:16:56 +0000
+++ debian/control	2011-02-16 13:45:44 +0000
@@ -18,8 +18,6 @@
     python-argparse (>= 1.1),
     dbus,
     update-manager-core (>= 1:0.98.1)
-Conflicts: system-cleaner
-Replaces: system-cleaner
 XB-Python-Version: ${python:Versions}
 Description: Clean up a system so it's more like a freshly installed one
  Over time, a computer system tends to get cluttered. For example,
@@ -35,10 +33,12 @@
 
 Package: computer-janitor-gtk
 Architecture: all
-Depends: ${python:Depends}, computer-janitor (=${source:Version}), 
-    python-gtk2 (>= 2.16), ${misc:Depends}, gksu
-Conflicts: system-cleaner-gtk
-Replaces: system-cleaner-gtk
+Depends: ${python:Depends}, 
+    computer-janitor (=${source:Version}), 
+    python-gobject (>= 2.27.0+git20110116),
+    gir1.2-gtk-2.0 (>= 2.23.90-0ubuntu3), 
+    gir1.2-pango-2.0,
+    ${misc:Depends}
 XB-Python-Version: ${python:Versions}
 Description: Clean up a system so it's more like a freshly installed one
  Over time, a computer system tends to get cluttered. For example,

=== modified file 'run_from_checkout.sh'
--- run_from_checkout.sh	2009-11-10 20:09:40 +0000
+++ run_from_checkout.sh	2011-02-16 13:45:44 +0000
@@ -3,7 +3,6 @@
 # wrapper to make it easy to run c-j from a bzr checkout
 #
 
-export PYTHONPATH=. 
 export COMPUTER_JANITOR_PLUGINS=./plugins 
 export COMPUTER_JANITOR_GLADE=./data/ComputerJanitor.ui
 export COMPUTER_JANITOR_DEBUG=yes