Merge lp:~quickly-committers/quickly/nautilus-bar-updates into lp:quickly

[Michael Terry]

This is an update to the ubuntudevbar.py nautilus extension we have. It updates it to work with nautilus 3.0 (and thus uses gtk3, pygi, and the latest nautilus-python from oneiric).

The bar is still kinda crappy. It takes up lots of space, seems to slow down nautilus's first launch, and some buttons don't seem to work right (like edit) despite me making sure that we are running the command behind the scenes.

This will get the extension back to where it once was (in a runnable state), but I suspect that we should stop shipping it in the Ubuntu packaging until yet more work is done on it.

Note that this is relatively easy to test:
1) Install python-nautilus from oneiric
2) Drop ubuntudevbar.py into ~/.local/share/nautilus-python/extensions/
3) Install the quickly icon from data/icons/48x48/apps/ into /usr/share/icons/hicolor/48x48/apps and regenerate the icon cache (I generally just reinstall some app like so: "sudo apt-get install deja-dup --reinstall" because I can never remember the command)

Unmerged revisions

623. By Michael Terry on 2011-07-06

make nautilus bar mostly work

=== added directory 'data/icons/48x48'
=== added directory 'data/icons/48x48/apps'
=== renamed file 'data/icons/quickly48x48.png' => 'data/icons/48x48/apps/quickly.png'
=== modified file 'ubuntudevbar.py'
--- ubuntudevbar.py	2010-12-02 16:03:30 +0000
+++ ubuntudevbar.py	2011-07-06 18:13:31 +0000
@@ -1,10 +1,8 @@
 #!/usr/bin/python
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 
-import nautilus
-import pygtk
-import gtk
-import vte
+import gobject
+from gi.repository import GLib, Gtk, Nautilus, Vte # pylint: disable=E0611
 
 try:
     from quickly import api as quicklyapi
@@ -16,11 +14,9 @@
 command_order = ('create', 'edit', 'design', 'save', 'package', 'share', 'release', 'tutorial')
 command_without_output = ('edit', 'design', 'save', 'tutorial')
 
-class DevBar(nautilus.LocationWidgetProvider):
-    pass
+class DevBar(gobject.GObject, Nautilus.LocationWidgetProvider):
     def __init__(self):
         self.bars = {}
-        pass
 
     def get_widget(self, uri, window):
         """Draw Ubuntu dev widgets depending on context
@@ -56,7 +52,7 @@
                     if command.name not in command_order:
                         sorted_commands.append(command)
                 
-                bar.add_image("/usr/share/quickly/icons/quickly48x48.png", current_template)
+                bar.add_image("quickly", current_template)
                 commands_already_listed = []
                 for command in sorted_commands:
                     if command.name in commands_already_listed:
@@ -73,7 +69,7 @@
         return bar
 
 
-class UbuntuDevBar(gtk.HBox):
+class UbuntuDevBar(Gtk.HBox):
     '''Container to all buttons in nautilus.'''
 
     def __init__(self, *args, **kwargs):
@@ -87,62 +83,58 @@
 
     def add_image(self, image_name, subtitle=None):
         """Add an image to the bar and a subtitle below if one."""
-        self._logo = gtk.VBox(homogeneous=False, spacing=0)
-        self._image = gtk.Image()
-        self._logo.pack_start(self._image, expand=True, fill=True, padding=0)
-        pixbuf = gtk.gdk.pixbuf_new_from_file(image_name)
-        if pixbuf:
-            scaled_pixbuf = pixbuf.scale_simple(48, 48, gtk.gdk.INTERP_BILINEAR)
-            self._image.set_from_pixbuf(scaled_pixbuf)
-            self._image.show()
+        self._logo = Gtk.VBox(homogeneous=False, spacing=0)
+        self._image = Gtk.Image.new_from_icon_name(image_name, Gtk.IconSize.DIALOG)
+        self._logo.pack_start(self._image, True, True, 0)
+        self._image.show()
         if subtitle:
-            self._subtitle = gtk.Label(subtitle)
-            self._logo.pack_start(self._subtitle, expand=True, fill=True, padding=0)
+            self._subtitle = Gtk.Label(subtitle)
+            self._logo.pack_start(self._subtitle, True, True, 0)
             self._subtitle.show()
-        self.pack_start(self._logo, expand=False, fill=False, padding=0)
+        self.pack_start(self._logo, False, False, 0)
         self._logo.show()
 
     def add_button(self, signal, label, command_line, path, icon=None):
         """Adds a new new button to the bar widget."""
-        button = gtk.Button()
+        button = Gtk.Button()
         button.connect("clicked", signal, command_line, path)
         button.set_label(label)
         if icon:
-            image = gtk.Image()
+            image = Gtk.Image()
             image.set_from_file(icon)
             settings = button.get_settings()
             settings.set_property("gtk-button-images", True)
             button.set_image(image)
         button.show()
-        vbox = gtk.VBox(homogeneous=False, spacing=0)
-        vbox.pack_start(button, expand=True, fill=False, padding=0)
+        vbox = Gtk.VBox(homogeneous=False, spacing=0)
+        vbox.pack_start(button, True, False, 0)
         vbox.show()
         self._buttons.append(button)
-        self.pack_start(vbox, expand=False, fill=False, padding=0)
+        self.pack_start(vbox, False, False, 0)
 
     def add_button_with_selection(self, signal, label, selection, command_line,
                                   path, icon=None):
         """Adds a new button with a multiple selection widget"""
-        combobox = gtk.combo_box_new_text()
+        combobox = Gtk.ComboBoxText()
         for item in selection:
             combobox.append_text(item)
         combobox.show()
-        button = gtk.Button()
+        button = Gtk.Button()
         button.set_label(label)
         button.connect("clicked", signal, command_line, path, combobox)
         if icon:
-            image = gtk.Image()
+            image = Gtk.Image()
             image.set_from_file(icon)
             settings = button.get_settings()
             settings.set_property("gtk-button-images", True)
             button.set_image(image)
         button.show()
-        vbox = gtk.VBox(homogeneous=False, spacing=0)
-        vbox.pack_start(combobox, expand=True, fill=False, padding=0)
-        vbox.pack_start(button, expand=True, fill=False, padding=0)
+        vbox = Gtk.VBox(homogeneous=False, spacing=0)
+        vbox.pack_start(combobox, True, False, 0)
+        vbox.pack_start(button, True, False, 0)
         self._buttons_with_selection.append((combobox,button))
         vbox.show()
-        self.pack_start(vbox, expand=False, fill=False, padding=0)
+        self.pack_start(vbox, False, False, 0)
 
     def click_on_quickly_button(self, widget, *argscommand):
         """Quickly buttons can have a template associated"""
@@ -158,13 +150,14 @@
         except IndexError:
             pass
         command = self.add_additional_actions(command)
-        v = vte.Terminal()
-        v.fork_command(command[0], argv=command, directory=argscommand[1])
-        window = gtk.Window()
+        v = Vte.Terminal()
+        v.fork_command_full(Vte.PtyFlags.DEFAULT, argscommand[1], command,
+                            None, GLib.SpawnFlags.SEARCH_PATH, None, None)
+        window = Gtk.Window()
         window.add(v)
         if command[1] not in command_without_output:
             window.show_all()
-        gtk.main()
+        Gtk.main()
 
     def add_additional_actions(self, command):
         """Some commands needs additional args, filter them here"""
@@ -172,7 +165,7 @@
         # TODO: Add missing prompts module
         #if command[1] == "create":
         #    response, val = prompts.string("Project Name","Please enter a project name")
-        #    if response == gtk.RESPONSE_OK:
+        #    if response == Gtk.ResponseType.OK:
         #        command.append(val)
 
         return command