Merge lp:~flozz/nautilus-image-manipulator/nautilus-3.2-support into lp:nautilus-image-manipulator

Proposed by Fabien LOISON
Status: Merged
Approved by: Emilien Klein
Approved revision: 92
Merge reported by: Emilien Klein
Merged at revision: not available
Proposed branch: lp:~flozz/nautilus-image-manipulator/nautilus-3.2-support
Merge into: lp:nautilus-image-manipulator
Diff against target: 54 lines (+15/-10)
1 file modified
nautilus_image_manipulator/nautilus-image-manipulator-extension.py (+15/-10)
To merge this branch: bzr merge lp:~flozz/nautilus-image-manipulator/nautilus-3.2-support
Reviewer Review Type Date Requested Status
Emilien Klein Approve
Review via email: mp+78864@code.launchpad.net

Commit message

Make Nautilus Image Manipulator work with Nautilus 3.2

Description of the change

Makes Nautilus Image Manipulator working with Nautilus 3.2

NOTE: Works with the patched version of Nautilus Python, see this bug report for more informations:
https://bugzilla.gnome.org/show_bug.cgi?id=660348

To post a comment you must log in.
Revision history for this message
Emilien Klein (emilien-klein) wrote :

Thanks Fabien, everything seems fine. However I don't have a development environment yet that has Nautilus 3.2, so I don't want to merge it yet. As soon as I can handle this I'll merge it in. Thanks!

Revision history for this message
Emilien Klein (emilien-klein) wrote :

Your patch, in conjunction with the package in -proposed (see [0]), makes the extension work in Ubuntu 11.10. Thanks again!

[0] https://bugs.launchpad.net/ubuntu/+source/nautilus-python/+bug/858925

review: Approve
Revision history for this message
Emilien Klein (emilien-klein) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'nautilus_image_manipulator/nautilus-image-manipulator-extension.py'
--- nautilus_image_manipulator/nautilus-image-manipulator-extension.py 2011-05-17 05:19:57 +0000
+++ nautilus_image_manipulator/nautilus-image-manipulator-extension.py 2011-10-10 15:58:23 +0000
@@ -25,36 +25,41 @@
25# or25# or
26# /usr/lib/nautilus/extensions-2.0/python/26# /usr/lib/nautilus/extensions-2.0/python/
2727
28import nautilus, os, subprocess, urllib, gettext28
29import os, subprocess, urllib, gettext
29from gettext import gettext as _30from gettext import gettext as _
30gettext.textdomain('nautilus-image-manipulator')31gettext.textdomain('nautilus-image-manipulator')
3132
32class BackgroundImageExtension(nautilus.MenuProvider):33from gi.repository import Nautilus, GObject
34
35
36class BackgroundImageExtension(GObject.GObject, Nautilus.MenuProvider):
33 def __init__(self):37 def __init__(self):
34 pass38 pass
35 39
36 def menu_activate_cb(self, menu, images):40 def menu_activate_cb(self, menu, images):
37 args = ["nautilus-image-manipulator"]41 args = ["nautilus-image-manipulator"]
38 for ff in images:42 for ff in images:
39 # Remove "file://" and unquote the filename43 # Remove "file://" and unquote the filename
40 args.extend(("-f", urllib.unquote(ff.get_uri()[7:])))44 args.extend(("-f", urllib.unquote(ff.get_uri()[7:])))
41 retVal = subprocess.call(args)45 retVal = subprocess.call(args)
42 46
43 def get_file_items(self, window, files):47 def get_file_items(self, window, files):
44 images = []48 images = []
45 # Extract only the images from the list of selected files49 # Extract only the images from the list of selected files
46 for f in files:50 for f in files:
47 if f.get_mime_type()[:6] == "image/":51 if f.get_mime_type()[:6] == "image/":
48 images.append(f)52 images.append(f)
49 53
50 # Don't display this option in the menu if there is not a single image in the selection54 # Don't display this option in the menu if there is not a single images
55 # in the selection
51 if not images:56 if not images:
52 return57 return
53 58
54 # TODO: Update the extension's menu label and tooltip message59 # TODO: Update the extension's menu label and tooltip message
55 item = nautilus.MenuItem('NautilusImageManipulator::resize',60 item = Nautilus.MenuItem(name='NautilusImageManipulator::resize',
56 _("_Resize images..."),61 label=_("_Resize images..."),
57 _("Resize each selected image"))62 tip=_("Resize each selected image"))
58 item.connect('activate', self.menu_activate_cb, images)63 item.connect('activate', self.menu_activate_cb, images)
59 return item,64 return item,
6065

Subscribers

People subscribed via source and target branches

to all changes: