computer-janitor

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

pygi
Merge into trunk

Proposed by Martin Pitt on 2011-01-19

Status:	Merged
Approved by:	Barry Warsaw on 2011-02-16
Approved revision:	257
Merged at revision:	254
Proposed branch:	lp://staging/~pitti/computer-janitor/pygi
Merge into:	lp://staging/computer-janitor
Diff against target:	365 lines (+74/-51) 7 files modified computerjanitorapp/gtk/dialogs.py (+14/-14) computerjanitorapp/gtk/store.py (+5/-5) computerjanitorapp/gtk/ui.py (+31/-23) data/ComputerJanitor.ui (+0/-2) debian/changelog (+18/-0) debian/control (+6/-6) run_from_checkout.sh (+0/-1)
To merge this branch:	bzr merge lp://staging/~pitti/computer-janitor/pygi
Related bugs:	Link a bug report
Related blueprints:	GNOME plans for the natty cycle (High)

Reviewer	Date Requested	Status
Barry Warsaw	2011-01-19	Approve on 2011-02-16
Martin Pitt		Needs Resubmitting on 2011-02-16
Review via email: mp+46779@code.staging.launchpad.net

Description of the change

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.

Revision history for this message

Martin Pitt (pitti) wrote on 2011-01-31:

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.

Revision history for this message

Barry Warsaw (barry) wrote on 2011-01-31:

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

lp://staging/~pitti/computer-janitor/pygi updated on 2011-02-16

257. By Martin Pitt on 2011-02-16: merge with trunk

Revision history for this message

Martin Pitt (pitti) wrote on 2011-02-16:

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

review: Needs Resubmitting

Revision history for this message

Barry Warsaw (barry) wrote on 2011-02-16:

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

Revision history for this message

Martin Pitt (pitti) wrote on 2011-02-16:

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.