Merge lp:~quickly-committers/quickly/gtk3-projects into lp:quickly

[Michael Terry]

Woo! Gtk3/PyGI/GSettings all wrapped into one branch (because they can't be done separately).

Lots of changes. I dropped desktopcouch for gsettings (as discussed in mailing list). Rest of changes are pretty expected.

Tests all pass now (with latest python-distutils-extra in precise).

[Didier Roche-Tolomelli (didrocks)]

Excellent work Michael! It's even frustrating that I have nothing to say about it as your much as your work there rocks!

Just a small questions though, in the test apport file:
1154 -quickly upgrade 0.3 0.4
1155 +quickly upgrade 0.3
at multiple time, do you need that and why?

However, I get a lot of error in the testsuite here. Seems to be more a setup issue than anything and not really have the time to run it. So if you confirm that all the tests are passing, please, feel free to merge :)

review: Approve

[Michael Terry (mterry)]

I missed your review comment! I was sitting here thinking, "Man, didrocks is taking forever with gtk3... What?! He's on holiday!? Son of a..." Then I checked and you had approved! :)

The "quickly upgrade 0.3" changes were just a spot of cleanup because the "0.4" argument was not actually doing anything. Merged it after double confirming that tests pass.

[Didier Roche-Tolomelli (didrocks)]

See, don't be so mean ;)

=== modified file 'data/templates/ubuntu-application/create.py'
--- data/templates/ubuntu-application/create.py	2011-06-06 10:14:40 +0000
+++ data/templates/ubuntu-application/create.py	2011-11-08 16:10:57 +0000
@@ -107,10 +107,22 @@
 bzr_instance.wait()
 bzr_instance = subprocess.Popen(["bzr", "commit", "-m", "Initial project creation with Quickly!"], stderr=subprocess.PIPE)
 
+# Compile schema if present
+schemapath = os.path.abspath("data/glib-2.0/schemas")
+if os.path.exists(schemapath):
+    subprocess.call(["glib-compile-schemas", schemapath])
+
+    env = os.environ.copy()
+    datadir = os.path.abspath("data")
+    if 'XDG_DATA_DIRS' in env:
+        env['XDG_DATA_DIRS'] = "%s:%s" % (datadir, env['XDG_DATA_DIRS'])
+    else:
+        env['XDG_DATA_DIRS'] = datadir
+
 # run the new application if X display
 if templatetools.is_X_display() and os.path.isfile(exec_file):
     print _("Launching your newly created project!")
-    subprocess.call(['./' + project_name], cwd='bin/')
+    subprocess.call(['./' + project_name], cwd='bin/', env=env)
 
 bzr_instance.wait()
 

=== modified file 'data/templates/ubuntu-application/help/code/JottyWindow.py'
--- data/templates/ubuntu-application/help/code/JottyWindow.py	2011-04-04 13:55:18 +0000
+++ data/templates/ubuntu-application/help/code/JottyWindow.py	2011-11-08 16:10:57 +0000
@@ -7,7 +7,7 @@
 from gettext import gettext as _
 gettext.textdomain('jotty')
 
-import gtk
+from gi.repository import Gtk # pylint: disable=E0611
 import logging
 logger = logging.getLogger('jotty')
 

=== modified file 'data/templates/ubuntu-application/help/tutorial.xml'
--- data/templates/ubuntu-application/help/tutorial.xml	2011-09-26 13:02:43 +0000
+++ data/templates/ubuntu-application/help/tutorial.xml	2011-11-08 16:10:57 +0000
@@ -3,7 +3,7 @@
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 
  <!ENTITY appname "<application>Quickly</application>" >
- <!ENTITY appversion "11.10" >
+ <!ENTITY appversion "11.11" >
 ] >
 
 <book lang="en" id="index">

=== added file 'data/templates/ubuntu-application/project_root/.bzrignore'
--- data/templates/ubuntu-application/project_root/.bzrignore	1970-01-01 00:00:00 +0000
+++ data/templates/ubuntu-application/project_root/.bzrignore	2011-11-08 16:10:57 +0000
@@ -0,0 +1,1 @@
+data/glib-2.0/schemas/gschemas.compiled

=== added directory 'data/templates/ubuntu-application/project_root/data/glib-2.0'
=== added directory 'data/templates/ubuntu-application/project_root/data/glib-2.0/schemas'
=== added file 'data/templates/ubuntu-application/project_root/data/glib-2.0/schemas/net.launchpad.project_name.gschema.xml'
--- data/templates/ubuntu-application/project_root/data/glib-2.0/schemas/net.launchpad.project_name.gschema.xml	1970-01-01 00:00:00 +0000
+++ data/templates/ubuntu-application/project_root/data/glib-2.0/schemas/net.launchpad.project_name.gschema.xml	2011-11-08 16:10:57 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist gettext-domain="project_name">
+  <schema id="net.launchpad.project_name" path="/net/launchpad/project_name/">
+    <key name="example" type="s">
+      <default>''</default>
+      <summary>Sample setting</summary>
+      <description>Longer description of this sample setting.  Talk about allowed values and what it does.</description>
+    </key>
+  </schema>
+</schemalist>

=== modified file 'data/templates/ubuntu-application/project_root/data/ui/Aboutcamel_case_nameDialog.ui'
--- data/templates/ubuntu-application/project_root/data/ui/Aboutcamel_case_nameDialog.ui	2010-12-20 15:44:44 +0000
+++ data/templates/ubuntu-application/project_root/data/ui/Aboutcamel_case_nameDialog.ui	2011-11-08 16:10:57 +0000
@@ -1,39 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
   <!-- interface-requires about_python_name_dialog 1.0 -->
-  <!-- interface-naming-policy project-wide -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="Aboutcamel_case_nameDialog" id="about_python_name_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="icon">../media/project_name.svg</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <property name="program_name">sentence_name</property>
-    <property name="version"></property>
-    <property name="copyright"></property>
-    <property name="website"></property>
-    <property name="license"></property>
     <property name="authors"></property>
     <property name="logo">../media/project_name.svg</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child>
-          <placeholder/>
-        </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>

=== modified file 'data/templates/ubuntu-application/project_root/data/ui/Preferencescamel_case_nameDialog.ui'
--- data/templates/ubuntu-application/project_root/data/ui/Preferencescamel_case_nameDialog.ui	2010-12-20 15:44:44 +0000
+++ data/templates/ubuntu-application/project_root/data/ui/Preferencescamel_case_nameDialog.ui	2011-11-08 16:10:57 +0000
@@ -1,88 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires preferences_python_name_dialog 1.0 -->
-  <!-- interface-naming-policy project-wide -->
   <object class="Preferencescamel_case_nameDialog" id="preferences_python_name_dialog">
-    <property name="border_width">5</property>
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">sentence_name Preferences</property>
     <property name="icon">../media/project_name.svg</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
-        <property name="spacing">2</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="btn_help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="btn_close">
+                <property name="label">gtk-close</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
-          <object class="GtkTable" id="table1">
+          <object class="GtkGrid" id="table1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="row_spacing">6</property>
+            <property name="column_spacing">6</property>
+            <property name="n_rows">1</property>
             <property name="n_columns">2</property>
-            <property name="column_spacing">6</property>
-            <property name="row_spacing">6</property>
             <child>
               <object class="GtkEntry" id="example_entry">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="hexpand">True</property>
                 <property name="invisible_char">•</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="example_entry_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">_Example entry:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">example_entry</property>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="btn_help">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-                <property name="secondary">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="btn_close">
-                <property name="label">gtk-close</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
       </object>
     </child>
     <action-widgets>

=== modified file 'data/templates/ubuntu-application/project_root/data/ui/camel_case_nameWindow.ui'
--- data/templates/ubuntu-application/project_root/data/ui/camel_case_nameWindow.ui	2011-04-01 21:02:04 +0000
+++ data/templates/ubuntu-application/project_root/data/ui/camel_case_nameWindow.ui	2011-11-08 16:10:57 +0000
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires python_name_window 1.0 -->
-  <!-- interface-naming-policy project-wide -->
   <!-- interface-local-resource-path ../media -->
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>

=== modified file 'data/templates/ubuntu-application/project_root/python/Preferencescamel_case_nameDialog.py'
--- data/templates/ubuntu-application/project_root/python/Preferencescamel_case_nameDialog.py	2011-04-04 14:28:36 +0000
+++ data/templates/ubuntu-application/project_root/python/Preferencescamel_case_nameDialog.py	2011-11-08 16:10:57 +0000
@@ -5,27 +5,11 @@
 
 # This is your preferences dialog.
 #
-# Define your preferences dictionary in the __init__.main() function.
-# The widget names in the PreferencesTestProjectDialog.ui
-# file need to correspond to the keys in the preferences dictionary.
-#
-# Each preference also need to be defined in the 'widget_methods' map below
-# to show up in the dialog itself.  Provide three bits of information:
-#  1) The first entry is the method on the widget that grabs a value from the
-#     widget.
-#  2) The second entry is the method on the widget that sets the widgets value
-#      from a stored preference.
-#  3) The third entry is a signal the widget will send when the contents have
-#     been changed by the user. The preferences dictionary is always up to
-# date and will signal the rest of the application about these changes.
-# The values will be saved to desktopcouch when the application closes.
-#
-# TODO: replace widget_methods with your own values
-
-
-widget_methods = {
-    'example_entry': ['get_text', 'set_text', 'changed'],
-}
+# Define your preferences in
+# data/glib-2.0/schemas/net.launchpad.project_name.gschema.xml
+# See http://developer.gnome.org/gio/stable/GSettings.html for more info.
+
+from gi.repository import Gio # pylint: disable=E0611
 
 import gettext
 from gettext import gettext as _
@@ -43,9 +27,9 @@
         """Set up the preferences dialog"""
         super(Preferencescamel_case_nameDialog, self).finish_initializing(builder)
 
-        # populate the dialog from the preferences dictionary
-        # using the methods from widget_methods
-        self.widget_methods = widget_methods
-        self.set_widgets_from_preferences() # pylint: disable=E1101
+        # Bind each preference widget to gsettings
+        settings = Gio.Settings("net.launchpad.project_name")
+        widget = self.builder.get_object('example_entry')
+        settings.bind("example", widget, "text", Gio.SettingsBindFlags.DEFAULT)
 
         # Code for other initialization actions should be added here.

=== modified file 'data/templates/ubuntu-application/project_root/python/__init__.py'
--- data/templates/ubuntu-application/project_root/python/__init__.py	2011-03-31 15:19:55 +0000
+++ data/templates/ubuntu-application/project_root/python/__init__.py	2011-11-08 16:10:57 +0000
@@ -9,11 +9,11 @@
 from gettext import gettext as _
 gettext.textdomain('project_name')
 
-import gtk
+from gi.repository import Gtk # pylint: disable=E0611
 
 from python_name import camel_case_nameWindow
 
-from python_name_lib import set_up_logging, preferences, get_version
+from python_name_lib import set_up_logging, get_version
 
 def parse_options():
     """Support for command line options"""
@@ -29,20 +29,7 @@
     'constructor for your class instances'
     parse_options()
 
-    # preferences
-    # set some values for our first session
-    # TODO: replace defaults with your own values
-    default_preferences = {
-    'example_entry': 'I remember stuff',
-    }
-    preferences.update(default_preferences)
-    # user's stored preferences are used for 2nd and subsequent sessions
-    preferences.db_connect()
-    preferences.load()
-
     # Run the application.    
     window = camel_case_nameWindow.camel_case_nameWindow()
     window.show()
-    gtk.main()
-    
-    preferences.save()
+    Gtk.main()

=== modified file 'data/templates/ubuntu-application/project_root/python/camel_case_nameWindow.py'
--- data/templates/ubuntu-application/project_root/python/camel_case_nameWindow.py	2011-04-04 14:28:36 +0000
+++ data/templates/ubuntu-application/project_root/python/camel_case_nameWindow.py	2011-11-08 16:10:57 +0000
@@ -7,7 +7,7 @@
 from gettext import gettext as _
 gettext.textdomain('project_name')
 
-import gtk
+from gi.repository import Gtk # pylint: disable=E0611
 import logging
 logger = logging.getLogger('python_name')
 

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/AboutDialog.py'
--- data/templates/ubuntu-application/project_root/python_lib/AboutDialog.py	2011-03-31 17:05:41 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/AboutDialog.py	2011-11-08 16:10:57 +0000
@@ -3,11 +3,11 @@
 # This file is in the public domain
 ### END LICENSE
 
-import gtk
+from gi.repository import Gtk # pylint: disable=E0611
 
 from . helpers import get_builder
 
-class AboutDialog(gtk.AboutDialog):
+class AboutDialog(Gtk.AboutDialog):
     __gtype_name__ = "AboutDialog"
 
     def __new__(cls):

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/Builder.py'
--- data/templates/ubuntu-application/project_root/python_lib/Builder.py	2011-09-06 07:47:36 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/Builder.py	2011-11-08 16:10:57 +0000
@@ -5,9 +5,8 @@
 
 '''Enhances builder connections, provides object to access glade objects'''
 
-import gobject  # pylint: disable=E0611
+from gi.repository import GObject, Gtk # pylint: disable=E0611
 
-import gtk
 import inspect
 import functools
 import logging
@@ -23,8 +22,8 @@
 
 
 # pylint: disable=R0904
-# the many public methods is a feature of gtk.Builder
-class Builder(gtk.Builder):
+# the many public methods is a feature of Gtk.Builder
+class Builder(Gtk.Builder):
     ''' extra features
     connects glade defined handler to default_handler if necessary
     auto connects widget to handler with matching name or alias
@@ -34,7 +33,7 @@
     '''
 
     def __init__(self):
-        gtk.Builder.__init__(self)
+        Gtk.Builder.__init__(self)
         self.widgets = {}
         self.glade_handler_dict = {}
         self.connections = []
@@ -50,7 +49,7 @@
     An apprentice guru might wonder which signal does what he wants,
     now he can define any likely candidates in glade and notice which
     ones get triggered when he plays with the project.
-    this method does not appear in gtk.Builder'''
+    this method does not appear in Gtk.Builder'''
         logger.debug('''tried to call non-existent function:%s()
         expected in %s
         args:%s
@@ -60,12 +59,12 @@
     def get_name(self, widget):
         ''' allows a handler to get the name (id) of a widget
 
-        this method does not appear in gtk.Builder'''
+        this method does not appear in Gtk.Builder'''
         return self._reverse_widget_dict.get(widget)
 
     def add_from_file(self, filename):
         '''parses xml file and stores wanted details'''
-        gtk.Builder.add_from_file(self, filename)
+        Gtk.Builder.add_from_file(self, filename)
 
         # extract data for the extra interfaces
         tree = ElementTree()
@@ -121,7 +120,7 @@
                  item[0], filename)
 
         # connect glade define handlers
-        gtk.Builder.connect_signals(self, connection_dict)
+        Gtk.Builder.connect_signals(self, connection_dict)
 
         # let's tell the user how we applied the glade design
         for connection in self.connections:
@@ -133,7 +132,7 @@
         '''Creates the ui object with widgets as attributes
 
         connects signals by 2 methods
-        this method does not appear in gtk.Builder'''
+        this method does not appear in Gtk.Builder'''
 
         result = UiFactory(self.widgets)
 
@@ -196,9 +195,25 @@
     return pyname
 
 
+# Until bug https://bugzilla.gnome.org/show_bug.cgi?id=652127 is fixed, we 
+# need to reimplement inspect.getmembers.  GObject introspection doesn't
+# play nice with it.
+def getmembers(obj, check):
+    members = []
+    for k in dir(obj):
+        try:
+            attr = getattr(obj, k)
+        except:
+            continue
+        if check(attr):
+            members.append((k, attr))
+    members.sort()
+    return members
+
+
 def dict_from_callback_obj(callback_obj):
     '''a dictionary interface to callback_obj'''
-    methods = inspect.getmembers(callback_obj, inspect.ismethod)
+    methods = getmembers(callback_obj, inspect.ismethod)
 
     aliased_methods = [x[1] for x in methods if hasattr(x[1], 'aliases')]
 
@@ -238,11 +253,11 @@
         try:
             widget_type = type(widget)
             while widget_type:
-                signal_ids.extend(gobject.signal_list_ids(widget_type))
-                widget_type = gobject.type_parent(widget_type)
+                signal_ids.extend(GObject.signal_list_ids(widget_type))
+                widget_type = GObject.type_parent(widget_type)
         except RuntimeError:  # pylint wants a specific error
             pass
-        signal_names = [gobject.signal_name(sid) for sid in signal_ids]
+        signal_names = [GObject.signal_name(sid) for sid in signal_ids]
 
         # Now, automatically find any the user didn't specify in glade
         for sig in signal_names:

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/PreferencesDialog.py'
--- data/templates/ubuntu-application/project_root/python_lib/PreferencesDialog.py	2011-03-31 17:05:41 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/PreferencesDialog.py	2011-11-08 16:10:57 +0000
@@ -3,23 +3,16 @@
 # This file is in the public domain
 ### END LICENSE
 
-"""this dialog adjusts values in the preferences dictionary
-
-requirements:
-in module preferences: defaults[key] has a value
-self.builder.get_object(key) is a suitable widget to adjust value
-widget_methods[key] provides method names for the widget
-each widget calls set_preference(...) when it has adjusted value
+"""this dialog adjusts values in gsettings
 """
 
-import gtk
+from gi.repository import Gtk # pylint: disable=E0611
 import logging
 logger = logging.getLogger('python_name_lib')
 
 from . helpers import get_builder, show_uri, get_help_uri
-from . preferences import preferences
 
-class PreferencesDialog(gtk.Dialog):
+class PreferencesDialog(Gtk.Dialog):
     __gtype_name__ = "PreferencesDialog"
 
     def __new__(cls):
@@ -49,80 +42,6 @@
         self.ui = builder.get_ui(self, True)
 
         # code for other initialization actions should be added here
-        self.widget_methods = []
-
-    def set_widgets_from_preferences(self):
-        ''' these widgets show values in the preferences dictionary '''
-        for key in preferences.keys():
-            self.set_widget_from_preference(key)
-
-    def set_widget_from_preference(self, key):
-        '''set widget value from item in preferences'''
-
-        value = preferences.get(key)
-        widget = self.builder.get_object(key)
-        if widget is None:
-            # this preference is not adjustable by this dialog
-            # for example: window and dialog geometries
-            logger.debug('no widget for preference: %s' % key)
-            return
-
-        logger.debug('set_widget_from_preference: %s' % key)
-        try:
-            write_method_name = self.widget_methods[key][1]
-        except KeyError:
-            logger.warn('%s not in widget_methods' % key)
-            return
-
-        try:
-            method = getattr(widget, write_method_name)
-        except AttributeError:
-            logger.warn("""'%s' does not have a '%s' method.
-Please edit 'widget_methods' in %s"""
-            % (key, write_method_name, self.__gtype_name__))
-            return
-
-        try:
-            widget.connect(self.widget_methods[key][2], self.set_preference)
-        except TypeError:
-            logger.warn("""'%s' unknown signal name '%s'
-Please edit 'widget_methods' in %s"""
-            % (key, self.widget_methods[key][2], self.__gtype_name__))
-
-        method(value)
-
-    def get_key_for_widget(self, widget):
-        key = None
-        for key_try in preferences.keys():
-            obj = self.builder.get_object(key_try)
-            if obj == widget:
-                key = key_try
-        return key
- 
-    def set_preference(self, widget, data=None):
-        '''set a preference from a widget'''
-        key = self.get_key_for_widget(widget)
-        if key is None:
-            logger.warn('''This widget will not write to a preference.
-The preference must already exist so add this widget's name
-to default_preferences in your main function''')
-            return
-
-        # set_widget_from_preference is called first
-        # so no KeyError test is needed here
-        read_method_name = self.widget_methods[key][0]
-
-        try:
-            read_method = getattr(widget, read_method_name)
-        except AttributeError:
-            logger.warn("""'%s' does not have a '%s' method.
-Please edit 'widget_methods' in %s"""
-            % (key, read_method_name, self.__gtype_name__))
-            return
-
-        value=read_method()
-        logger.debug('set_preference: %s = %s' % (key, str(value)))
-        preferences[key] = value
 
     def on_btn_close_clicked(self, widget, data=None):
         self.destroy()

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/Window.py'
--- data/templates/ubuntu-application/project_root/python_lib/Window.py	2011-04-04 14:28:36 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/Window.py	2011-11-08 16:10:57 +0000
@@ -3,16 +3,15 @@
 # This file is in the public domain
 ### END LICENSE
 
-import gtk
+from gi.repository import Gio, Gtk # pylint: disable=E0611
 import logging
 logger = logging.getLogger('python_name_lib')
 
 from . helpers import get_builder, show_uri, get_help_uri
-from . preferences import preferences
 
 # This class is meant to be subclassed by camel_case_nameWindow.  It provides
 # common functions and some boilerplate.
-class Window(gtk.Window):
+class Window(Gtk.Window):
     __gtype_name__ = "Window"
 
     # To construct a new instance of this method, the following notable 
@@ -50,14 +49,15 @@
         self.preferences_dialog = None # instance
         self.AboutDialog = None # class
 
-        preferences.connect('changed', self.on_preferences_changed)
+        self.settings = Gio.Settings("net.launchpad.project_name")
+        self.settings.connect('changed', self.on_preferences_changed)
 
         # Optional Launchpad integration
         # This shouldn't crash if not found as it is simply used for bug reporting.
         # See https://wiki.ubuntu.com/UbuntuDevelopment/Internationalisation/Coding
         # for more information about Launchpad integration.
         try:
-            import LaunchpadIntegration
+            from gi.repository import LaunchpadIntegration # pylint: disable=E0611
             LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
             LaunchpadIntegration.set_sourcepackagename('project_name')
         except ImportError:
@@ -111,12 +111,10 @@
     def on_destroy(self, widget, data=None):
         """Called when the camel_case_nameWindow is closed."""
         # Clean up code for saving application state should be added here.
-        gtk.main_quit()
+        Gtk.main_quit()
 
-    def on_preferences_changed(self, widget, data=None):
-        logger.debug('main window received preferences changed')
-        for key in data:
-            logger.debug('preference changed: %s = %s' % (key, preferences[key]))
+    def on_preferences_changed(self, settings, key, data=None):
+        logger.debug('preference changed: %s = %s' % (key, str(settings.get_value(key))))
 
     def on_preferences_dialog_destroyed(self, widget, data=None):
         '''only affects gui

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/__init__.py'
--- data/templates/ubuntu-application/project_root/python_lib/__init__.py	2011-03-31 17:05:41 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/__init__.py	2011-11-08 16:10:57 +0000
@@ -7,7 +7,6 @@
 
 while keeping its api constant'''
 from . helpers import set_up_logging
-from . preferences import preferences
 from . Window import Window
 from . python_nameconfig import get_version
 

=== modified file 'data/templates/ubuntu-application/project_root/python_lib/helpers.py'
--- data/templates/ubuntu-application/project_root/python_lib/helpers.py	2011-03-31 17:05:41 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/helpers.py	2011-11-08 16:10:57 +0000
@@ -7,8 +7,6 @@
 import logging
 import os
 
-import gtk
-
 from . python_nameconfig import get_data_file
 from . Builder import Builder
 
@@ -17,7 +15,7 @@
 gettext.textdomain('project_name')
 
 def get_builder(builder_file_name):
-    """Return a fully-instantiated gtk.Builder instance from specified ui 
+    """Return a fully-instantiated Gtk.Builder instance from specified ui 
     file
     
     :param builder_file_name: The name of the builder file, without extension.
@@ -87,8 +85,9 @@
     return help_uri
 
 def show_uri(parent, link):
+    from gi.repository import Gtk # pylint: disable=E0611
     screen = parent.get_screen()
-    gtk.show_uri(screen, link, gtk.get_current_event_time())
+    Gtk.show_uri(screen, link, Gtk.get_current_event_time())
 
 def alias(alternative_function_name):
     '''see http://www.drdobbs.com/web-development/184406073#l9'''

=== removed file 'data/templates/ubuntu-application/project_root/python_lib/preferences.py'
--- data/templates/ubuntu-application/project_root/python_lib/preferences.py	2011-03-31 15:19:55 +0000
+++ data/templates/ubuntu-application/project_root/python_lib/preferences.py	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-### BEGIN LICENSE
-# This file is in the public domain
-### END LICENSE
-
-"""Provides a shared preferences dictionary"""
-
-from desktopcouch.records.server import CouchDatabase
-from desktopcouch.records.record import Record
-import gtk
-import gobject
-
-class User_dict(dict):
-    ''' a dictionary with extra methods:
-
-    persistence: load, save and db_connect
-    gobject signals: connect and emit.
-    
-    Don't use this directly. Please use the preferences instance.'''
-    
-    def __init__(self, *args, **kwds):
-        dict.__init__(self, *args, **kwds)
-        # Set up couchdb.
-        self._db_name = "project_name"
-        self._key = None
-        self._database = None
-        
-        self._record_type = (
-            "http://wiki.ubuntu.com/Quickly/RecordTypes/camel_case_name/"
-            "Preferences")
-        
-        class Publisher(gtk.Invisible): # pylint: disable=R0904
-            '''set up signals in a separate class
-            
-            gtk.Invisible has 230 public methods'''
-            __gsignals__ = {'changed' : (gobject.SIGNAL_RUN_LAST,
-                 gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,)),
-                 'loaded' : (gobject.SIGNAL_RUN_LAST,
-                 gobject.TYPE_NONE, (gobject.TYPE_PYOBJECT,))}
-        
-        publisher = Publisher()
-        self.emit  = publisher.emit
-        self.connect  = publisher.connect
-
-    def db_connect(self):
-        '''connect to couchdb
-        
-        create if necessary'''
-        # logging.basicConfig will be called now
-        self._database = CouchDatabase(self._db_name, create=True)
-
-    def save(self):
-        'save to couchdb'
-        self._database.update_fields(self._key, self)
-
- 
-    def load(self):
-        'load from couchdb'
-        self.update({"record_type": self._record_type})
-
-        results = self._database.get_records(
-            record_type=self._record_type, create_view=True)
-
-        if len(results.rows) == 0:
-            # No preferences have ever been saved
-            # save them before returning.
-            self._key = self._database.put_record(Record(self))
-        else:
-            self.update(results.rows[0].value)
-            del self['_rev']
-            self._key = results.rows[0].value["_id"]
-        self.emit('loaded', None)
-
-    def update(self, *args, **kwds):
-        ''' interface for dictionary
-        
-        send changed signal when appropriate '''
-        
-        # parse args
-        new_data = {}
-        new_data.update(*args, **kwds)
-
-        changed_keys = []
-        for key in new_data.keys():
-            if new_data.get(key) != dict.get(self, key):
-                changed_keys.append(key)
-        dict.update(self, new_data)
-        if changed_keys:
-            self.emit('changed', tuple(changed_keys))
-
-    def __setitem__(self, key, value):
-        ''' interface for dictionary
-        
-        send changed signal when appropriate '''
-        if value != dict.get(self, key):
-            dict.__setitem__(self, key, value)
-            self.emit('changed', (key,))
-
-preferences = User_dict()
-

=== modified file 'data/templates/ubuntu-application/project_root/tests/test_example.py'
--- data/templates/ubuntu-application/project_root/tests/test_example.py	2011-03-02 22:59:32 +0000
+++ data/templates/ubuntu-application/project_root/tests/test_example.py	2011-11-08 16:10:57 +0000
@@ -14,7 +14,7 @@
 class TestExample(unittest.TestCase):
     def setUp(self):
         self.Aboutcamel_case_nameDialog_members = [
-        'Aboutcamel_case_nameDialog', 'get_builder', 'gettext', 'gtk']
+        'Aboutcamel_case_nameDialog', 'get_builder', 'gettext', 'Gtk']
 
     def test_Aboutcamel_case_nameDialog_members(self):
         all_members = dir(Aboutcamel_case_nameDialog)

=== modified file 'data/templates/ubuntu-application/run.py'
--- data/templates/ubuntu-application/run.py	2011-07-22 10:47:34 +0000
+++ data/templates/ubuntu-application/run.py	2011-11-08 16:10:57 +0000
@@ -50,6 +50,18 @@
     print _("Can't access to X server, so can't run gtk application")
     sys.exit(1)
 
+# Compile schema if present
+schemapath = os.path.abspath("data/glib-2.0/schemas")
+if os.path.exists(schemapath):
+    subprocess.call(["glib-compile-schemas", schemapath])
+
+    env = os.environ.copy()
+    datadir = os.path.abspath("data")
+    if 'XDG_DATA_DIRS' in env:
+        env['XDG_DATA_DIRS'] = "%s:%s" % (datadir, env['XDG_DATA_DIRS'])
+    else:
+        env['XDG_DATA_DIRS'] = datadir
+
 project_bin = 'bin/' + configurationhandler.project_config['project']
 command_line = [project_bin]
 command_line.extend([arg for arg in sys.argv[1:] if arg != "--"])
@@ -58,7 +70,7 @@
 st = os.stat(project_bin)
 mode = st[stat.ST_MODE]
 if mode & stat.S_IEXEC:
-    subprocess.call(command_line)
+    subprocess.call(command_line, env=env)
 else:
     print _("Can't execute %s") % project_bin
     sys.exit(1)

=== modified file 'data/templates/ubuntu-application/store/data/ui/dialog_camel_case_nameDialog.ui'
--- data/templates/ubuntu-application/store/data/ui/dialog_camel_case_nameDialog.ui	2010-12-20 15:44:44 +0000
+++ data/templates/ubuntu-application/store/data/ui/dialog_camel_case_nameDialog.ui	2011-11-08 16:10:57 +0000
@@ -1,24 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires dialog_python_name_dialog 1.0 -->
-  <!-- interface-naming-policy project-wide -->
   <object class="dialog_camel_case_nameDialog" id="dialog_python_name_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="icon">../media/project_name.svg</property>
     <property name="type_hint">normal</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <child>
-          <placeholder/>
-        </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
+          <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="btn_cancel">
@@ -26,6 +24,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -40,6 +39,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -51,10 +51,14 @@
           </object>
           <packing>
             <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
     <action-widgets>

=== modified file 'data/templates/ubuntu-application/store/data/ui/dialog_python_name_dialog.xml'
--- data/templates/ubuntu-application/store/data/ui/dialog_python_name_dialog.xml	2010-03-03 08:07:21 +0000
+++ data/templates/ubuntu-application/store/data/ui/dialog_python_name_dialog.xml	2011-11-08 16:10:57 +0000
@@ -1,4 +1,4 @@
-<glade-catalog name="dialog_name_dialog" domain="glade-3" 
+<glade-catalog name="dialog_python_name_dialog" domain="glade-3" 
                depends="gtk+" version="1.0">
   <glade-widget-classes>
     <glade-widget-class title="dialog_sentence_name Dialog" name="dialog_camel_case_nameDialog" 

=== modified file 'data/templates/ubuntu-application/store/dialog.py'
--- data/templates/ubuntu-application/store/dialog.py	2011-07-22 10:47:34 +0000
+++ data/templates/ubuntu-application/store/dialog.py	2011-11-08 16:10:57 +0000
@@ -31,7 +31,7 @@
 help_text= _("""Here, dialog-name is one or more words separated with dash
 
 For instance 'quickly add dialog dialog-name' will create:
-1. A subclass of gtk.Dialog called DialogNameDialog in the module
+1. A subclass of Gtk.Dialog called DialogNameDialog in the module
    DialogNameDialog.py
 2. A glade file called DialogNameDialog.ui in the ui directory
 3. A catalog file called dialog_name_dialog.xml also in the ui directory

=== modified file 'data/templates/ubuntu-application/store/python/dialog_camel_case_nameDialog.py'
--- data/templates/ubuntu-application/store/python/dialog_camel_case_nameDialog.py	2011-04-01 21:03:53 +0000
+++ data/templates/ubuntu-application/store/python/dialog_camel_case_nameDialog.py	2011-11-08 16:10:57 +0000
@@ -3,7 +3,7 @@
 # This file is in the public domain
 ### END LICENSE
 
-import gtk
+from gi.repository import Gtk # pylint: disable=E0611
 
 from python_name_lib.helpers import get_builder
 
@@ -11,7 +11,7 @@
 from gettext import gettext as _
 gettext.textdomain('project_name')
 
-class dialog_camel_case_nameDialog(gtk.Dialog):
+class dialog_camel_case_nameDialog(Gtk.Dialog):
     __gtype_name__ = "dialog_camel_case_nameDialog"
 
     def __new__(cls):
@@ -40,14 +40,14 @@
     def on_btn_ok_clicked(self, widget, data=None):
         """The user has elected to save the changes.
 
-        Called before the dialog returns gtk.RESONSE_OK from run().
+        Called before the dialog returns Gtk.ResponseType.OK from run().
         """
         pass
 
     def on_btn_cancel_clicked(self, widget, data=None):
         """The user has elected cancel changes.
 
-        Called before the dialog returns gtk.RESPONSE_CANCEL for run()
+        Called before the dialog returns Gtk.ResponseType.CANCEL for run()
         """
         pass
 
@@ -55,4 +55,4 @@
 if __name__ == "__main__":
     dialog = dialog_camel_case_nameDialog()
     dialog.show()
-    gtk.main()
+    Gtk.main()

=== modified file 'data/templates/ubuntu-application/store/python/indicator.py'
--- data/templates/ubuntu-application/store/python/indicator.py	2011-07-29 18:57:04 +0000
+++ data/templates/ubuntu-application/store/python/indicator.py	2011-11-08 16:10:57 +0000
@@ -6,7 +6,8 @@
 
 """Code to add AppIndicator."""
 
-import gtk
+from gi.repository import Gtk # pylint: disable=E0611
+from gi.repository import AppIndicator3 # pylint: disable=E0611
 
 from python_name_lib.helpers import get_media_file
 
@@ -14,12 +15,10 @@
 from gettext import gettext as _
 gettext.textdomain('project_name')
 
-import appindicator
-
 class Indicator:
     def __init__(self, window):
-        self.indicator = appindicator.Indicator('project_name','',appindicator.CATEGORY_APPLICATION_STATUS)
-        self.indicator.set_status(appindicator.STATUS_ACTIVE)
+        self.indicator = AppIndicator3.Indicator('project_name', '', AppIndicator3.IndicatorCategory.APPLICATION_STATUS)
+        self.indicator.set_status(AppIndicator3.IndicatorStatus.ACTIVE)
 
         icon_uri = get_media_file("project_name.svg")
         icon_path = icon_uri.replace("file:///", '')
@@ -28,18 +27,18 @@
         #Uncomment and choose an icon for attention state. 
         #self.indicator.set_attention_icon("ICON-NAME")
         
-        self.menu = gtk.Menu()
+        self.menu = Gtk.Menu()
 
         # Add items to Menu and connect signals.
         
         #Adding preferences button 
         #window represents the main Window object of your app
-        self.preferences = gtk.MenuItem("Preferences")
+        self.preferences = Gtk.MenuItem("Preferences")
         self.preferences.connect("activate",window.on_mnu_preferences_activate)
         self.preferences.show()
         self.menu.append(self.preferences)
 
-        self.quit = gtk.MenuItem("Quit")
+        self.quit = Gtk.MenuItem("Quit")
         self.quit.connect("activate",window.on_mnu_close_activate)
         self.quit.show()
         self.menu.append(self.quit)

=== modified file 'data/templates/ubuntu-application/test/apport/apport.sh'
--- data/templates/ubuntu-application/test/apport/apport.sh	2011-11-08 00:50:34 +0000
+++ data/templates/ubuntu-application/test/apport/apport.sh	2011-11-08 16:10:57 +0000
@@ -12,6 +12,7 @@
 cd test-project
 
 grep LaunchpadIntegration. test_project_lib/Window.py
+#             from gi.repository import LaunchpadIntegration # pylint: disable=E0611
 #             LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
 #             LaunchpadIntegration.set_sourcepackagename('test-project')
 
@@ -25,6 +26,7 @@
 # Creating new apport hooks
 
 grep LaunchpadIntegration. test_project_lib/Window.py
+#             from gi.repository import LaunchpadIntegration # pylint: disable=E0611
 #             LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
 #             LaunchpadIntegration.set_sourcepackagename('test-project')
 
@@ -54,6 +56,7 @@
 # Updating project name references in existing apport crashdb configuration
 
 grep LaunchpadIntegration. test_project_lib/Window.py
+#             from gi.repository import LaunchpadIntegration # pylint: disable=E0611
 #             LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
 #             LaunchpadIntegration.set_sourcepackagename('test-project')
 
@@ -119,6 +122,7 @@
 # Updating project name references in existing apport crashdb configuration
 
 grep LaunchpadIntegration. test_project_lib/Window.py
+#             from gi.repository import LaunchpadIntegration # pylint: disable=E0611
 #             LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
 #             LaunchpadIntegration.set_sourcepackagename('test-project')
 
@@ -149,6 +153,7 @@
 # Creating new apport hooks
 
 grep LaunchpadIntegration. test_project_lib/Window.py
+#             from gi.repository import LaunchpadIntegration # pylint: disable=E0611
 #             LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
 #             LaunchpadIntegration.set_sourcepackagename('test-project')
 
@@ -188,6 +193,7 @@
 # Updating project name references in existing apport crashdb configuration
 
 grep LaunchpadIntegration. test_project_lib/Window.py
+#             from gi.repository import LaunchpadIntegration # pylint: disable=E0611
 #             LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
 #             LaunchpadIntegration.set_sourcepackagename('test-project')
 
@@ -283,7 +289,7 @@
 # modified etc/apport/crashdb.conf.d/test-project-crashdb.conf
 # Committed revision 4.
 
-quickly upgrade 0.3 0.4
+quickly upgrade 0.3
 
 bzr status
 
@@ -309,11 +315,12 @@
 
 bzr status
 
-quickly upgrade 0.3 0.4
+quickly upgrade 0.3
 # Creating new apport crashdb configuration
 # Creating new apport hooks
 
 grep LaunchpadIntegration. test_project_lib/Window.py
+#             from gi.repository import LaunchpadIntegration # pylint: disable=E0611
 #             LaunchpadIntegration.add_items(self.ui.helpMenu, 1, True, True)
 #             LaunchpadIntegration.set_sourcepackagename('test-project')
 
@@ -359,7 +366,7 @@
 
 grep helpMenu test_project_lib/Window.py
 
-quickly upgrade 0.3 0.4
+quickly upgrade 0.3
 # Adding launchpad integration to existing application
 # Creating new apport crashdb configuration
 # Creating new apport hooks
@@ -388,7 +395,7 @@
 # modified test_project_lib/Window.py
 # Committed revision 6.
 
-quickly upgrade 0.3 0.4
+quickly upgrade 0.3
 # Creating new apport crashdb configuration
 # Creating new apport hooks
 
@@ -409,4 +416,4 @@
 
 grep helpMenu test_project_lib/Window.py
 
-quickly upgrade 0.3 0.4
+quickly upgrade 0.3

=== modified file 'data/templates/ubuntu-application/test/builder/builder.py'
--- data/templates/ubuntu-application/test/builder/builder.py	2011-06-08 13:48:05 +0000
+++ data/templates/ubuntu-application/test/builder/builder.py	2011-11-08 16:10:57 +0000
@@ -4,7 +4,7 @@
 import unittest
 import sys
 import os
-import gtk
+from gi.repository import Gtk # pylint: disable=E0611
 import inspect
 import logging
 import glob
@@ -85,7 +85,7 @@
         'wind?o-w two', 'wind_o_w_two', 'window'] # sorted list
 
     def test_interface(self):
-        builder = dir(gtk.Builder)
+        builder = dir(Gtk.Builder)
         
         # sanity test
         self.assertTrue('add_from_file' in builder)

=== modified file 'data/templates/ubuntu-application/test/configure.sh'
--- data/templates/ubuntu-application/test/configure.sh	2010-10-15 20:26:19 +0000
+++ data/templates/ubuntu-application/test/configure.sh	2011-11-08 16:10:57 +0000
@@ -17,7 +17,6 @@
 #     #url='https://launchpad.net/test-project',
 
 grep website data/ui/AboutTestProjectDialog.ui
-#     <property name="website"></property>
 
 grep lp_id .quickly
 
@@ -33,7 +32,7 @@
 grep url= setup.py
 #     url='https://launchpad.net/gpoweroff',
 
-grep website data/ui/AboutTestProjectDialog.ui
+grep website data/ui/AboutTestProjectDialog.ui | sed 's|</property>.*|</property>|'
 #     <property name="website">https://launchpad.net/gpoweroff</property>
 
 (echo hudson-notifier > tmp)
@@ -49,7 +48,7 @@
 grep url= setup.py
 #     url='https://launchpad.net/hudson-notifier',
 
-grep website data/ui/AboutTestProjectDialog.ui
+grep website data/ui/AboutTestProjectDialog.ui | sed 's|</property>.*|</property>|'
 #     <property name="website">https://launchpad.net/hudson-notifier</property>
 
 ## Test configure bzr

=== modified file 'data/templates/ubuntu-application/test/filelist.sh'
--- data/templates/ubuntu-application/test/filelist.sh	2011-03-31 15:19:55 +0000
+++ data/templates/ubuntu-application/test/filelist.sh	2011-11-08 16:10:57 +0000
@@ -13,12 +13,16 @@
 
 bzr status
 
-bzr ls -R
+bzr ls -RV
+# .bzrignore
 # .quickly
 # AUTHORS
 # bin/
 # bin/test-project
 # data/
+# data/glib-2.0/
+# data/glib-2.0/schemas/
+# data/glib-2.0/schemas/net.launchpad.test-project.gschema.xml
 # data/media/
 # data/media/background.png
 # data/media/test-project.svg
@@ -50,7 +54,6 @@
 # test_project_lib/Window.py
 # test_project_lib/__init__.py
 # test_project_lib/helpers.py
-# test_project_lib/preferences.py
 # test_project_lib/test_projectconfig.py
 # tests/
 # tests/test_example.py

=== modified file 'data/templates/ubuntu-application/test/metadata.sh'
--- data/templates/ubuntu-application/test/metadata.sh	2011-11-08 00:50:34 +0000
+++ data/templates/ubuntu-application/test/metadata.sh	2011-11-08 16:10:57 +0000
@@ -38,10 +38,8 @@
 # XB-Icon: test-project.svg
 # Depends: ${misc:Depends},
 #  ${python:Depends},
-#  python-gobject-2,
-#  python-launchpad-integration,
-#  python-gtk2,
-#  python-desktopcouch-records,
+#  gir1.2-glib-2.0,
+#  gir1.2-launchpad-integration-3.0,
 #  yelp
 # Description: UNKNOWN
 #  UNKNOWN

=== removed file 'data/templates/ubuntu-application/test/preferences.py'
--- data/templates/ubuntu-application/test/preferences.py	2011-03-31 17:38:31 +0000
+++ data/templates/ubuntu-application/test/preferences.py	1970-01-01 00:00:00 +0000
@@ -1,151 +0,0 @@
-import unittest
-import os
-import sys
-import glob
-
-proj_root = os.path.abspath(os.path.join(os.path.dirname(__file__),"..","project_root"))
-sys.path.insert(0, proj_root)
-import logging
-logging.debug(sys.path[0])
-
-from python_lib.preferences import User_dict, preferences
-
-# Clean up after ourselves
-for f in glob.glob(os.path.join(proj_root, 'python_lib', '*.pyc')):
-    os.remove(f)
-
-class TestUser_dict(unittest.TestCase):
-
-    def test_interface(self):
-        foo = User_dict()
-        # provides gobject signals
-        self.assertTrue(callable(foo.emit))
-        self.assertTrue(callable(foo.connect))
-        
-        # provides load and save
-        self.assertTrue(callable(foo.load))
-        self.assertTrue(callable(foo.save))
-
-    def test_update_from_dict(self):
-        foo = User_dict()
-        bar = {'pluto':2}
-        foo.update(bar)
-        self.assertEqual(foo.get('pluto'), 2)
-
-    def test_update_from_pairs(self):
-        a = User_dict([['position', 'Public Relations'], ['name', 'Jayne Cobb']])
-        b = {'name': 'Jayne Cobb', 'position': 'Public Relations'}
-        self.assertEqual(a, b)
-
-    def test_serialisation(self):
-        # used in couchdb for instance
-        import json
-        a = User_dict([['position', 'Public Relations'], ['name', 'Jayne Cobb']])
-        b = {'name': 'Jayne Cobb', 'position': 'Public Relations'}
-        c =  json.loads(json.dumps(a))
-        self.assertEqual(a, c)
-
-    def test__setitem__(self):
-        foo = User_dict()
-        foo[2] = 3
-        self.assertEqual(foo.get(2), 3)
-
-    def test__delitem__(self):
-        foo = User_dict()
-        foo[2] = 3
-        self.assertEqual(foo.get(2), 3)
-        del foo[2]
-        self.assertEqual(foo.get(2, 'default'), 'default')
-
-    def test__getitem__(self):
-        foo = User_dict()
-        foo[2] = 3
-        self.assertEqual(foo[2], 3)
-
-class TestSignals(unittest.TestCase):
-
-    def setUp(self):
-        self.foo = User_dict()
-        self.messages = []
-        self.foo.connect('changed', self.callback)
-
-    def callback(self, *args):
-        self.messages.append(args)
-
-    def test_update_with_additions(self):
-        bar = {'foobar': 7}
-        self.foo.update({'foobar': 7})
-        self.assertEqual(self.messages[0][1], ('foobar',))
-        self.foo.update({'fooey': 2})
-        self.assertEqual(self.messages[1][1], ('fooey',))
-        self.assertEqual(len(self.messages), 2)
-
-    def test_update_with_changes(self):
-        bar = {'foobar': 7}
-        self.foo.update({'foobar': 7})
-        self.assertEqual(self.messages[0][1], ('foobar',))
-        self.foo.update({'foobar': 8})
-        self.assertEqual(self.messages[1][1], ('foobar',))
-        self.assertEqual(len(self.messages), 2)
-
-    def test_update_without_changes(self):
-        bar = {'foobar': 7}
-        self.foo.update({'foobar': 7})
-        self.assertEqual(self.messages[0][1], ('foobar',))
-        self.foo.update({'foobar': 7})
-        self.assertEqual(len(self.messages), 1)
-
-    def test_update_with_several_items(self):
-        data = {'pluto': 7, 'mickey': 8, 'minnie': 9}
-        self.foo.update(data)
-        self.assertEqual(self.messages[0][1], ('mickey', 'minnie', 'pluto'))
-        self.assertEqual(len(self.messages), 1)
-        data = {'mickey': 1, 'minnie': 2}
-        self.foo.update(data)
-        self.assertEqual(self.messages[1][1], ('mickey', 'minnie'))
-        self.assertEqual(len(self.messages), 2)
-
-    def test__setitem__with_additions(self):
-        self.foo['too'] = 3
-        self.assertEqual(self.messages[0][1], ('too',))
-
-    def test__setitem__with_changes(self):
-        self.foo['too'] = 3
-        self.assertEqual(self.messages[0][1], ('too',))
-        self.assertEqual(len(self.messages), 1)
-        self.foo['too'] = 4
-        self.assertEqual(len(self.messages), 2)
-
-    def test__setitem__without_changes(self):
-        self.foo['too'] = 3
-        self.assertEqual(self.messages[0][1], ('too',))
-        self.assertEqual(len(self.messages), 1)
-        self.foo['too'] = 3
-        self.assertEqual(len(self.messages), 1)
-
-class TestPreferences(unittest.TestCase):
-    ''' this one we really need '''
-
-    def setUp(self):
-        self.messages = []
-        preferences.connect('changed', self.callback)
-
-    def callback(self, *args):
-        self.messages.append(args)
-
-    def test_update(self):
-        preferences.update({'foobar': 7})
-        self.assertEqual(self.messages[0][1], ('foobar',))
-        self.assertEqual(len(self.messages), 1)
-        # preferences persist so we need to clean our changes
-        del preferences['foobar']
-
-    def test__setitem__(self):
-        preferences['too'] = 3
-        self.assertEqual(self.messages[0][1], ('too',))
-        self.assertEqual(len(self.messages), 1)
-        # preferences persist so we need to clean our changes
-        del preferences['too']
-
-if __name__ == '__main__':
-    unittest.main()

=== modified file 'data/templates/ubuntu-application/upgrade.py'
--- data/templates/ubuntu-application/upgrade.py	2011-10-03 18:05:30 +0000
+++ data/templates/ubuntu-application/upgrade.py	2011-11-08 16:10:57 +0000
@@ -34,6 +34,8 @@
 # get project version and template version if no argument given
 if len(sys.argv) < 3:
     (project_version, template_version) = templatetools.get_project_and_template_versions("ubuntu-application")
+    if len(sys.argv) == 2: # we have been given project but not template version
+        project_version = sys.argv[1]
 else:
     project_version = sys.argv[1]
     template_version = sys.argv[2]
@@ -201,8 +203,8 @@
         except templatetools.CantUpdateFile, e:
             print _("WARNING: can't update your project to support /opt. This doesn't matter if you don't plan to submit your project to the application review board. Cause is: %s" % e)
 
-### 11.09 update
-if project_version < '11.09':
+### 11.09 update (but only through 11.10; later versions don't want this change)
+if project_version < '11.09' and template_version <= '11.10':
     filename = './%s_lib/Builder.py' % python_name
     try:
         with open(filename) as fileobj:

=== removed file 'data/templates/ubuntu-flash-game/internal/apportutils.py'
--- data/templates/ubuntu-flash-game/internal/apportutils.py	2011-06-06 10:14:40 +0000
+++ data/templates/ubuntu-flash-game/internal/apportutils.py	1970-01-01 00:00:00 +0000
@@ -1,143 +0,0 @@
-import os
-import shutil
-import subprocess
-
-from gettext import gettext as _
-
-import quickly
-import quicklyutils
-
-from lxml import etree
-
-LPI_import_block = """
-# optional Launchpad integration
-# this shouldn't crash if not found as it is simply used for bug reporting
-try:
-    import LaunchpadIntegration
-    launchpad_available = True
-except:
-    launchpad_available = False
-
-"""
-
-LPI_init_menu_block = """
-        global launchpad_available
-        if launchpad_available:
-            # see https://wiki.ubuntu.com/UbuntuDevelopment/Internationalisation/Coding for more information
-            # about LaunchpadIntegration
-            helpmenu = self.builder.get_object('%(help_menu)s')
-            if helpmenu:
-                LaunchpadIntegration.set_sourcepackagename('%(project_name)s')
-                LaunchpadIntegration.add_items(helpmenu, 0, False, True)
-            else:
-                launchpad_available = False"""
-
-def update_apport(project_name, old_lp_project, new_lp_project):
-    if not new_lp_project:
-        return
-    # crashdb file doesn't support spaces or dashes in the crash db name
-    safe_project_name = project_name.replace(" ", "_").replace("-","_")
-    crashdb_file = "%s-crashdb.conf"%project_name
-    hook_file = "source_%s.py"%project_name
-
-
-    pathname = quickly.templatetools.get_template_path_from_project()
-    template_pr_path = os.path.join(os.path.abspath(pathname), "store",
-                                    "apport")
-    relative_crashdb_dir = os.path.join("etc", "apport", "crashdb.conf.d")
-    relative_apport_dir = "apport"
-    
-    existing_crashdb = os.path.join(relative_crashdb_dir, crashdb_file)
-    existing_hook = os.path.join(relative_apport_dir, hook_file)
-    
-    template_crashdb_dir = os.path.join(template_pr_path, relative_crashdb_dir)
-    template_hook_dir = os.path.join(template_pr_path, relative_apport_dir)
-
-    # if the project name has changed, or any of the files are missing, then
-    # attempt to set up the apport configuration and hooks
-    if  not old_lp_project == new_lp_project \
-        or not os.path.isfile(existing_crashdb) \
-        or not os.path.isfile(existing_hook):
-
-        subst_existing = ((old_lp_project, new_lp_project),)
-        subst_new = (   ("safe_project_name", safe_project_name),
-                        ("project_name", project_name),
-                        ("lp_project", new_lp_project))
-
-        if os.path.isfile(existing_crashdb):
-            print _("Updating project name references in existing apport crashdb configuration")
-            templatetools.file_from_template(relative_crashdb_dir, crashdb_file, relative_crashdb_dir, subst_existing)
-        elif os.path.isdir(template_crashdb_dir):
-            print _("Creating new apport crashdb configuration")
-            if not os.path.isdir(relative_crashdb_dir):
-                os.makedirs(relative_crashdb_dir)
-            templatetools.file_from_template(template_crashdb_dir, "project_name-crashdb.conf", relative_crashdb_dir, subst_new)
-
-        if not os.path.isfile(existing_hook) and os.path.isdir(template_hook_dir):
-            print _("Creating new apport hooks")
-            if not os.path.isdir(relative_apport_dir):
-                os.makedirs(relative_apport_dir)
-            templatetools.file_from_template(template_hook_dir, "source_project_name.py", relative_apport_dir, subst_new)
-
-def insert_lpi_if_required(project_name):
-    existing_bin_filename = os.path.join("bin",project_name)
-    camel_case_project_name = quickly.templatetools.get_camel_case_name(project_name)
-    existing_ui_filename = os.path.join("data","ui", "%sWindow.ui"%camel_case_project_name)
-    
-    if os.path.isfile(existing_bin_filename) and os.path.isfile(existing_ui_filename):
-        tree = etree.parse(existing_ui_filename)
-        help_menu = find_about_menu(tree)
-        
-        if help_menu:
-            existing_bin_file = file(existing_bin_filename, "r")
-            existing_lines = existing_bin_file.readlines()
-            existing_bin_file.close()
-            new_lines = detect_or_insert_lpi(existing_lines, project_name, help_menu)
-            if new_lines:
-                print _("Adding launchpad integration to existing application")
-                ftarget_file_name_out = file(existing_bin_file.name + '.new', 'w')
-                ftarget_file_name_out.writelines(new_lines)
-                ftarget_file_name_out.close()
-                quickly.templatetools.apply_file_rights(existing_bin_file.name, ftarget_file_name_out.name)
-                os.rename(ftarget_file_name_out.name, existing_bin_file.name)
-            return True
-    return False
-        
-def detect_or_insert_lpi(existing_lines, project_name, help_menu):
-    integration_present = False
-    import_insert_line = None
-    init_insert_line = None
-    current_line = 0
-    for line in existing_lines:
-        if "import LaunchpadIntegration" in line \
-            or "if launchpad_available:" in line:
-            integration_present = True
-            break
-        if not import_insert_line and "import gtk" in line:
-            import_insert_line = current_line
-        if not init_insert_line and "self.builder.connect_signals(self)" in line:
-            init_insert_line = current_line
-        current_line += 1
-    
-    if not integration_present \
-        and import_insert_line \
-        and init_insert_line \
-        and import_insert_line < init_insert_line:
-        init_menu_block = LPI_init_menu_block%{"project_name":project_name, "help_menu":help_menu}
-        existing_lines = existing_lines[:import_insert_line+1] + \
-            ["%s\n"%l for l in LPI_import_block.splitlines()] + \
-            existing_lines[import_insert_line+1:init_insert_line+1] + \
-            ["%s\n"%l for l in init_menu_block.splitlines()] + \
-            existing_lines[init_insert_line+1:]
-        return existing_lines
-    else:
-        return None
-
-
-def find_about_menu(tree):
-    """Finds the current help menu in the passed xml document by looking for the gtk-about element"""
-    help_item = tree.xpath('//property[@name="label" and .="gtk-about"]/../../../@id')
-    if len(help_item) == 1: # only one element matching this should be found
-        return help_item[0]
-    else:
-        return None

=== modified file 'data/templates/ubuntu-flash-game/project_root/bin/project_name'
--- data/templates/ubuntu-flash-game/project_root/bin/project_name	2011-01-03 16:05:40 +0000
+++ data/templates/ubuntu-flash-game/project_root/bin/project_name	2011-11-08 16:10:57 +0000
@@ -18,7 +18,7 @@
 ###########################################################################
 
 
-import webkit, gtk, gio
+from gi.repository import WebKit, Gtk, Gio
 import json, os
 
 # Where your project will look for your data (for instance, images and ui
@@ -55,17 +55,18 @@
 
 
 if __name__ == "__main__":
-    w = gtk.Window()
-    v = webkit.WebView()
+    w = Gtk.Window()
+    v = WebKit.WebView()
     w.add(v)
     w.show_all() # have to have this before set_size_request
-    w.connect("destroy", lambda q: gtk.main_quit())
+    w.connect("destroy", lambda q: Gtk.main_quit())
     w.set_title(GAME_NAME)
-    htmlfp = gio.File(get_data_file('index.html'))
+    htmlfp = Gio.file_new_for_path(get_data_file('index.html'))
     uri = htmlfp.get_uri()
-    html, _, _ = htmlfp.load_contents()
+    _, html, _ = htmlfp.load_contents(None)
+    print html, "hello", uri
     v.load_html_string(html, uri)
     w.set_size_request(*WINDOW_SIZE)
     v.queue_resize() # force a reallocation, https://bugs.webkit.org/show_bug.cgi?id=47742
-    gtk.main()
+    Gtk.main()
 

=== modified file 'quickly/quicklyconfig.py'
--- quickly/quicklyconfig.py	2011-09-26 13:02:43 +0000
+++ quickly/quicklyconfig.py	2011-11-08 16:10:57 +0000
@@ -20,7 +20,7 @@
 # you're warned :)
 
 # quickly version used for project format compatibility
-__version__ = '11.10'
+__version__ = '11.11'
 
 # where quickly will head for quickly data (for instance, templates)
 # by default, this is ../data, relative to trunk layout

=== modified file 'quickly/test/pylint.sh'
--- quickly/test/pylint.sh	2010-12-04 17:28:41 +0000
+++ quickly/test/pylint.sh	2011-11-08 16:10:57 +0000
@@ -2,4 +2,4 @@
 
 if ! which pylint >/dev/null; then echo 'Please install pylint'; fi
 
-(pylint -E --output-format=parseable --include-ids=y --ignored-classes=Credentials,Launchpad $(find "$ORIGINAL_DIR" -name '*.py' | grep -v "^$ORIGINAL_DIR/debian" | grep -v "^$ORIGINAL_DIR/build") 2>/dev/null)
+(pylint -E --output-format=parseable --include-ids=y --disable=E1101 --ignored-classes=Credentials,Launchpad $(find "$ORIGINAL_DIR" -name '*.py' | grep -v "^$ORIGINAL_DIR/debian" | grep -v "^$ORIGINAL_DIR/build") 2>/dev/null)

=== modified file 'setup.py'
--- setup.py	2011-09-26 13:02:43 +0000
+++ setup.py	2011-11-08 16:10:57 +0000
@@ -18,7 +18,7 @@
 
 
 # UPDATE VERSION WHEN NEEDED (it updates all versions needed to be updated)
-VERSION = '11.10'
+VERSION = '11.11'
 
 import glob
 import os

=== modified file 'ubuntudevbar.py'
--- ubuntudevbar.py	2010-12-02 16:03:30 +0000
+++ ubuntudevbar.py	2011-11-08 16:10:57 +0000
@@ -1,10 +1,7 @@
 #!/usr/bin/python
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 
-import nautilus
-import pygtk
-import gtk
-import vte
+from gi.repository import GLib, GdkPixbuf, Gtk, Nautilus, Vte # pylint: disable=E0611
 
 try:
     from quickly import api as quicklyapi
@@ -16,7 +13,7 @@
 command_order = ('create', 'edit', 'design', 'save', 'package', 'share', 'release', 'tutorial')
 command_without_output = ('edit', 'design', 'save', 'tutorial')
 
-class DevBar(nautilus.LocationWidgetProvider):
+class DevBar(Nautilus.LocationWidgetProvider):
     pass
     def __init__(self):
         self.bars = {}
@@ -73,12 +70,12 @@
         return bar
 
 
-class UbuntuDevBar(gtk.HBox):
+class UbuntuDevBar(Gtk.HBox):
     '''Container to all buttons in nautilus.'''
 
     def __init__(self, *args, **kwargs):
         '''create a Ubuntu Dev Bar'''
-        super(UbuntuDevBar, self).__init__(*args, **kwargs)
+        Gtk.HBox.__init__(*args, **kwargs)
         self._logo = None
         self._image = None
         self._subtitle = None
@@ -87,16 +84,16 @@
 
     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 = 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)
+        pixbuf = GdkPixbuf.Pixbuf.new_from_file(image_name)
         if pixbuf:
-            scaled_pixbuf = pixbuf.scale_simple(48, 48, gtk.gdk.INTERP_BILINEAR)
+            scaled_pixbuf = pixbuf.scale_simple(48, 48, GdkPixbuf.InterpType.BILINEAR)
             self._image.set_from_pixbuf(scaled_pixbuf)
             self._image.show()
         if subtitle:
-            self._subtitle = gtk.Label(subtitle)
+            self._subtitle = Gtk.Label(subtitle)
             self._logo.pack_start(self._subtitle, expand=True, fill=True, padding=0)
             self._subtitle.show()
         self.pack_start(self._logo, expand=False, fill=False, padding=0)
@@ -104,17 +101,17 @@
 
     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 = Gtk.VBox(homogeneous=False, spacing=0)
         vbox.pack_start(button, expand=True, fill=False, padding=0)
         vbox.show()
         self._buttons.append(button)
@@ -123,21 +120,21 @@
     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 = 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)
         self._buttons_with_selection.append((combobox,button))
@@ -158,13 +155,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 +170,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