Merge lp:~pcabido/gtg/plugin-engine into lp:~gtg/gtg/old-trunk

[Paulo Cabido]

[lp:~pcabido/gtg/plugin-engine]

303. By Paulo Cabido on 2009-07-29

fixed a bug in the plugin-engine, LoadPlugins and loadPlugin where changed

304. By Paulo Cabido on 2009-07-29

changed some of the names of the methos in the plugin api and corrected the plugins

305. By Paulo Cabido on 2009-07-29

fixed a small typo error in the hello world plugin and commented a debug line

306. By Paulo Cabido on 2009-07-29

commented some more debug prints on the engine

[Bertrand Rousseau (bertrand-rousseau)]

review: Approve

=== modified file 'AUTHORS'
--- AUTHORS	2009-07-24 06:16:28 +0000
+++ AUTHORS	2009-07-29 15:14:01 +0000
@@ -34,3 +34,4 @@
 * Ryan Paul <[e-mail]>
 * Jonathan Lange <[e-mail]>
 * Kevin Mehall <[e-mail]>
+* Paulo Cabido <[e-mail]>
 
=== modified file 'GTG/__init__.py'
--- GTG/__init__.py	2009-07-23 20:14:01 +0000
+++ GTG/__init__.py	2009-07-29 15:14:01 +0000
@@ -68,3 +68,9 @@
     DATA_DIR = DIST_ROOTDIR
 else:
     DATA_DIR = os.path.join(LOCAL_ROOTDIR,'data')
+    
+#GTG plugin dir setup
+if not os.path.isdir( os.path.join(LOCAL_ROOTDIR,'GTG/plugins/') ) :
+    PLUGIN_DIR = [DIST_ROOTDIR]
+else:
+    PLUGIN_DIR = [os.path.join(LOCAL_ROOTDIR,'GTG/plugins/')]
 
=== added directory 'GTG/core/plugins'
=== added file 'GTG/core/plugins/__init__.py'
--- GTG/core/plugins/__init__.py	1970-01-01 00:00:00 +0000
+++ GTG/core/plugins/__init__.py	2009-07-07 15:12:42 +0000
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Gettings Things Gnome! - a personnal organizer for the GNOME desktop
+# Copyright (c) 2008-2009 - Lionel Dricot & Bertrand Rousseau
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------
+
+
+#This is the tool package. It contains some useful function and tool
+#that could be useful for any part of GTG.
+
+import os
+
+class GnomeConfig :
+    current_rep = os.path.dirname(os.path.abspath(__file__))
+    GLADE_FILE    = os.path.join(current_rep,"pluginmanager.glade")
 
=== added file 'GTG/core/plugins/api.py'
--- GTG/core/plugins/api.py	1970-01-01 00:00:00 +0000
+++ GTG/core/plugins/api.py	2009-07-28 00:41:33 +0000
@@ -0,0 +1,185 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Gettings Things Gnome! - a personnal organizer for the GNOME desktop
+# Copyright (c) 2008-2009 - Lionel Dricot & Bertrand Rousseau
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------
+import gtk
+
+class PluginAPI:
+    def __init__(self, window, config, wTree, requester, taskview, workview_task_filter, \
+                 tagpopup, tagview, task=None, textview=None):
+        # private vars       
+        self.__window = window
+        self.config = config
+        self.__wTree = wTree
+        self.__requester = requester
+        
+        self.taskview = taskview
+        self.__workview_task_filter = workview_task_filter
+        
+        self.__tagpopup = tagpopup
+        self.tagview = tagview
+        
+        if task:
+            self.task = task
+                 
+        if textview:
+            self.textview = textview
+        
+    # adds items to the MenuBar of the Main Window (TaskBrowser)
+    def AddMenuItem(self, item):
+        self.__wTree.get_widget('menu_plugin').get_submenu().append(item)
+        item.show()
+    
+    # removes the item from the MenuBar        
+    def RemoveMenuItem(self, item):
+        try:
+            self.__wTree.get_widget('menu_plugin').get_submenu().remove(item)
+        except Exception, e:
+            print "Error removing menu item: %s" % e
+        
+    def AddToolbarItem(self, item):
+        # calculates the number of items on the ToolBar and adds the item 
+        # on the end
+        try:
+            i = 0
+            while self.__wTree.get_widget('task_tb').get_nth_item(i) is not None:
+                i = i + 1
+            self.__wTree.get_widget('task_tb').insert(item, i)
+            item.show()
+            return i
+        except Exception, e:
+            print "Error adding a toolbar item: %s" % e
+    
+    def RemoveToolbarItem(self, item, n=None):
+        try:
+            if not n:
+                self.__wTree.get_widget('task_tb').remove(item)
+            else:
+                i = 0
+                while self.__wTree.get_widget('task_tb').get_nth_item(i) is not None:
+                    if i == n:
+                        self.__wTree.get_widget('task_tb').remove(self.__wTree.get_widget('task_tb').get_nth_item(i))
+                    i = i + 1
+        except Exception, e:
+            print "Error removing a toolbar item: %s" % e
+    
+    # adds items to the Task Menu 
+    def AddTaskToolbarItem(self, item):
+        try:
+            i = 0
+            while self.__wTree.get_widget('task_tb1').get_nth_item(i) is not None:
+                i = i + 1
+            self.__wTree.get_widget('task_tb1').insert(item, i)
+            item.show()
+        except Exception, e:
+            print "Error adding a toolbar item in to the TaskEditor: %s" % e
+            
+    # passes the requester to the plugin
+    def getRequester(self):
+        return self.__requester
+            
+    # changes the tasks TreeStore
+    def changeTaskTreeStore(self, treestore):
+        task_tview = self.__wTree.get_widget("task_tview")
+        task_tview.set_model(treestore)
+    
+    def get_all_tasks(self):
+        return self.__requester.get_tasks_list()    
+    
+    # this method returns the task by tid or the current task in case 
+    # of the edit task window
+    # by default returns the current task, in other words, it's default action
+    # is to use with the onTaskOpened method
+    def get_task(self, tid=None):
+        if tid:
+            return self.__requester.get_task(tid)
+        else:
+            return self.task
+    
+    # this method only works for the onTaskOpened method 
+    def get_task_title(self):
+        return self.task.get_title() 
+    
+    # adds a tag, updated the text buffer, inserting the tag at the end of
+    # the task
+    # this method only works for the onTaskOpened method
+    def add_tag(self, tag):
+        self.task.add_tag("@" + tag)
+        #self.textview.insert_text("@" + tag)
+        self.textview.insert_tag("@" + tag)
+        
+    # adds a attribute to a tag
+    # this method only works for the onTaskOpened method
+    def add_tag_attribute(self, tag, attrib_name, attrib_value):
+        try:
+            tags = self.task.get_tags()
+            for t in tags:
+                if t.get_name() == tag:
+                    t.set_attribute(attrib_name, attrib_value)
+                    return True
+        except:
+            return False
+    
+    # pass all the tags to the plug-in
+    # this method only works for the onTaskOpened method
+    def get_tags(self):
+        return self.task.get_tags()
+        
+    # this will allow plugins to use the textview properties
+    def get_textview(self):
+        return self.textview
+    
+    # defines the child's parent window
+    def set_parent_window(self, child):
+        child.set_transient_for(self.__window)
+        
+    # add's a menu to the tagpopup
+    def add_menu_tagpopup(self, item):
+        self.__tagpopup.append(item)
+        item.show()
+        
+    def remove_menu_tagpopup(self, item):
+        self.__tagpopup.remove(item)
+        
+    # get's the selected tag in the tag view
+    def get_tagpopup_tag(self):
+        selected = self.tagview.get_selection()
+        model, iter = selected.get_selected()
+        tag = model.get_value(iter, 0)
+        return tag
+    
+    # returns the task view in the main window (task browser)
+    def get_taskview(self):
+        return self.taskview
+    
+    # returns the selected task in the task view
+    def get_selected_task(self):
+        selected = self.taskview.get_selection()
+        model, iter = selected.get_selected()
+        if iter:
+            return self.__requester.get_task(model.get_value(iter, 0))
+        else:
+            return None
+        
+    # returns the config object
+    def get_config(self):
+        return self.config
+    
+    # add's a tid to the workview filter
+    def add_task_to_workview_filter(self, tid):
+        self.__workview_task_filter.append(tid)
+        
 \ No newline at end of file
 
=== added file 'GTG/core/plugins/engine.py'
--- GTG/core/plugins/engine.py	1970-01-01 00:00:00 +0000
+++ GTG/core/plugins/engine.py	2009-07-26 22:24:46 +0000
@@ -0,0 +1,152 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Gettings Things Gnome! - a personnal organizer for the GNOME desktop
+# Copyright (c) 2008-2009 - Lionel Dricot & Bertrand Rousseau
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------
+
+import pkgutil
+import imp
+import os
+
+try:
+    import pygtk
+    pygtk.require("2.0")
+except:
+    sys.exit(1)
+try:
+    import gtk
+except:
+    sys.exit(1)
+
+
+
+# this class manages the plug-ins
+class PluginEngine:
+	
+    # initializes the plug-in engine
+    # NOTE: the path has to be a list of paths
+    def __init__(self, plugin_path):
+        self.Plugins = []
+        self.plugin_path = plugin_path
+        self.initialized_plugins = []
+		
+    # loads the plugins from the plugin dir
+    def LoadPlugins(self):
+        plugins = {}
+        
+        # find all the folders in the plugin dir
+        plugin_dirs = []
+        plugin_dirs.append(self.plugin_path[0])
+        for f in os.listdir(self.plugin_path[0]):
+            if os.path.isdir(os.path.join(self.plugin_path[0], f)):
+                plugin_dirs.append(os.path.join(self.plugin_path[0], f))
+        
+        try:
+            for loader, name, ispkg in pkgutil.iter_modules(plugin_dirs):
+                file, pathname, desc = imp.find_module(name, plugin_dirs)
+                plugins[name] = imp.load_module(name, file, pathname, desc)
+        except Exception, e:
+            print "Error: %s" % e
+            
+        for name, plugin in plugins.items():
+            tmp_plgin = self.loadPlugin(plugin)
+            if tmp_plgin:
+                self.Plugins.append(tmp_plgin)
+			
+        return self.Plugins
+		
+    # checks if the module loaded is a plugin and gets the main class
+    def loadPlugin(self, plugin):
+        plugin_locals = plugin.__dict__
+        is_plugin = False
+        loaded_plugin = {}
+        
+        # find the plugin class
+        for key in plugin_locals.keys():
+            try:
+                is_plugin = getattr(plugin_locals[key], 'PLUGIN_NAME', None)
+            except TypeError:
+                continue
+            
+            # loads the plugin info
+            if is_plugin:
+                try:
+                    loaded_plugin['plugin'] = plugin.__name__
+                    loaded_plugin['class_name'] = key
+                    loaded_plugin['class'] = plugin_locals[key]
+                    loaded_plugin['name'] = plugin_locals[key].PLUGIN_NAME
+                    loaded_plugin['version'] = plugin_locals[key].PLUGIN_VERSION
+                    loaded_plugin['authors'] = plugin_locals[key].PLUGIN_AUTHORS
+                    loaded_plugin['description'] = plugin_locals[key].PLUGIN_DESCRIPTION
+                    loaded_plugin['state'] = plugin_locals[key].PLUGIN_ENABLED
+                    loaded_plugin['instance'] = None
+                except:
+                    continue
+		
+        if not loaded_plugin:
+            return None	
+        return loaded_plugin
+	
+    def enabledPlugins(self, plugins):
+        pe = []
+        for p in plugins:
+            if p['state']:
+                pe.append(p['name'])
+        return pe
+    
+    def disabledPlugins(self, plugins):
+        pd = []
+        for p in plugins:
+            if not p['state']:
+                pd.append(p['name'])
+        return pd
+    
+    # activates the plugins
+    def activatePlugins(self, plugins, plugin_api):
+        for plgin in plugins:
+            if plgin['state']:
+                plgin['instance'] = plgin['class']()
+                plgin['instance'].activate(plugin_api)
+                
+    # deactivate the enabled plugins
+    def deactivatePlugins(self, plugins, plugin_api):
+        for plgin in plugins:
+            if plgin['state']:
+                plgin['instance'].deactivate(plugin_api)
+				
+    # loads the plug-in features for a task
+    def onTaskLoad(self, plugins, plugin_api):
+        for plgin in plugins:
+            if plgin['state']:
+                plgin['instance'].onTaskOpened(plugin_api)
+                
+	# rechecks the plug-ins to see if any changes where done to the state
+    def recheckPlugins(self, plugins, plugin_api):
+        for plgin in plugins:
+            if plgin['instance'] != None and plgin['state'] == False:
+                try:
+                    print "deactivating plugin: " + plgin['name']
+                    plgin['instance'].deactivate(plugin_api)
+                    plgin['instance'] = None
+                except Exception, e:
+                    print "Error: %s" % e
+            elif plgin['instance'] == None and plgin['state'] == True:
+                try:    
+                    print "activating plugin: " + plgin['name']
+                    plgin['instance'] = plgin['class']()
+                    plgin['instance'].activate(plugin_api)
+                except Exception, e:
+                    print "Error: %s" % e
 
=== added file 'GTG/core/plugins/manager.py'
--- GTG/core/plugins/manager.py	1970-01-01 00:00:00 +0000
+++ GTG/core/plugins/manager.py	2009-07-17 02:01:48 +0000
@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+# -----------------------------------------------------------------------------
+# Gettings Things Gnome! - a personnal organizer for the GNOME desktop
+# Copyright (c) 2008-2009 - Lionel Dricot & Bertrand Rousseau
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+# -----------------------------------------------------------------------------
+
+from GTG.core.plugins 		 import GnomeConfig
+# not being used
+#from GTG.core.plugins.engine import PluginEngine
+#from GTG.core.plugins.engine import PluginAPI
+
+import sys
+import gobject
+
+try:
+    import pygtk
+    pygtk.require("2.0")
+except:
+    sys.exit(1)
+try:
+    import gtk
+except:
+    sys.exit(1)
+
+class PluginManager:
+	
+    def __init__(self, parent, plugins, pengine, plugin_api):
+        self.plugins = plugins
+        self.pengine = pengine
+        self.plugin_api = plugin_api
+        self.gladefile = GnomeConfig.GLADE_FILE
+        self.wTree = gtk.glade.XML(self.gladefile, "PluginManagerDialog")
+		
+        self.dialog = self.wTree.get_widget("PluginManagerDialog")
+		
+        # stuff to populate
+        self.lblPluginName = self.wTree.get_widget("lblPluginName")
+        self.lblPluginVersion = self.wTree.get_widget("lblPluginVersion")
+        self.lblPluginAuthors = self.wTree.get_widget("lblPluginAuthors")
+        self.txtPluginDescription = self.wTree.get_widget("txtPluginDescription")
+        
+        #self.btnClose = self.wTree.get_widget("close_btn")
+        #self.btnClose.connect('clicked', self.close, None)
+		
+        # liststore
+        self.PluginList = gtk.ListStore(gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, gobject.TYPE_STRING)
+        for plgin in self.plugins:
+            #print "file name :", name
+            self.PluginList.append([plgin['state'], plgin['name'], plgin['version']])
+        # end - liststore
+		
+        # treeview
+        self.pluginTree = self.wTree.get_widget("pluginTree")
+		
+        self.rendererToggle = gtk.CellRendererToggle()
+        self.rendererToggle.set_property('activatable', True)
+        self.rendererToggle.connect('toggled', self.colToggledClicked, self.PluginList)
+        self.colToggle = gtk.TreeViewColumn("Enabled", self.rendererToggle)
+        self.colToggle.add_attribute(self.rendererToggle, "active", 0)
+		
+        self.rendererText = gtk.CellRendererText()
+        self.colName = gtk.TreeViewColumn("Name", self.rendererText, text=1)
+        self.colVersion = gtk.TreeViewColumn("Version", self.rendererText, text=2)
+		
+        self.pluginTree.append_column(self.colToggle)
+        self.pluginTree.append_column(self.colName)
+        self.pluginTree.append_column(self.colVersion)
+		
+        self.pluginTree.set_model(self.PluginList)
+        self.pluginTree.set_search_column(2)
+        # end - treeview
+		
+        self.dialog.set_transient_for(parent)
+		
+        # connect signals 
+        self.dialog.connect("delete_event", self.close)
+        self.dialog.connect("response", self.close)
+        self.pluginTree.connect("cursor-changed", self.pluginExtraInfo, self.plugins)
+		
+        self.dialog.show_all()
+		
+
+    def close(self, widget, response=None):
+        # get the plugins that are going to be initialized and the ones
+        # that are going do be desabled
+        self.pengine.recheckPlugins(self.plugins, self.plugin_api)
+        self.dialog.destroy()
+        return True
+    
+    #def delete(self, widget, response=None):
+    #    self.dialog.destroy()
+    #    return True
+
+    def colToggledClicked(self, cell, path, model):
+        model[path][0] = not model[path][0]
+        if path:
+            iter = model.get_iter(path)
+            for plgin in self.plugins:
+                if model[path][1] == plgin['name'] and model[path][2] == plgin['version']:
+                    plgin['state'] = not plgin['state']
+
+    def pluginExtraInfo(self, treeview, plugins):
+        path = treeview.get_cursor()[0]
+        if path:
+            model = treeview.get_model()
+            iter = treeview.get_model().get_iter(path)
+			
+            for plgin in plugins:
+                if (model.get_value(iter,1) == plgin['name']) and (model.get_value(iter,2) == plgin['version']):
+                    self.lblPluginName.set_label("<b>" + plgin['name'] + "</b>")
+                    self.lblPluginVersion.set_label(plgin['version'])
+                    self.lblPluginAuthors.set_label(plgin['authors'])
+                    self.txtPluginDescription.get_buffer().set_text(plgin['description'].replace("\n", " ").replace(r'\n', "\n"))
 
=== added file 'GTG/core/plugins/pluginmanager.glade'
--- GTG/core/plugins/pluginmanager.glade	1970-01-01 00:00:00 +0000
+++ GTG/core/plugins/pluginmanager.glade	2009-07-07 15:12:42 +0000
@@ -0,0 +1,351 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+<requires lib="gnome"/>
+
+<widget class="GtkDialog" id="PluginManagerDialog">
+  <property name="width_request">670</property>
+  <property name="height_request">410</property>
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Plugin Manager</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox2">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area2">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="close_btn">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-7</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHBox" id="hbox3">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkScrolledWindow" id="scrolledwindow3">
+	      <property name="width_request">240</property>
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	      <child>
+		<widget class="GtkTreeView" id="pluginTree">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="headers_visible">True</property>
+		  <property name="rules_hint">False</property>
+		  <property name="reorderable">False</property>
+		  <property name="enable_search">True</property>
+		  <property name="fixed_height_mode">False</property>
+		  <property name="hover_selection">False</property>
+		  <property name="hover_expand">False</property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame2">
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment2">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkVBox" id="vbox2">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox5">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label10">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Version: </property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">1</property>
+			      <property name="ypad">4</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="lblPluginVersion">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes"></property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">1</property>
+			      <property name="ypad">4</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox6">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label11">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Authors:  </property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">1</property>
+			      <property name="ypad">4</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="lblPluginAuthors">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes"></property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">True</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label14">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Description:</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">4</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkScrolledWindow" id="scrolledwindow4">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			  <property name="shadow_type">GTK_SHADOW_IN</property>
+			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+			  <child>
+			    <widget class="GtkTextView" id="txtPluginDescription">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">False</property>
+			      <property name="overwrite">False</property>
+			      <property name="accepts_tab">True</property>
+			      <property name="justification">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap_mode">GTK_WRAP_WORD</property>
+			      <property name="cursor_visible">False</property>
+			      <property name="pixels_above_lines">0</property>
+			      <property name="pixels_below_lines">0</property>
+			      <property name="pixels_inside_wrap">0</property>
+			      <property name="left_margin">0</property>
+			      <property name="right_margin">0</property>
+			      <property name="indent">0</property>
+			      <property name="text" translatable="yes"></property>
+			    </widget>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="lblPluginName">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;No Plugin Selected&lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">10</property>
+		  <property name="ypad">4</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">2</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
 
=== added directory 'GTG/plugins'
=== added directory 'GTG/plugins/geolocalized-tasks'
=== added file 'GTG/plugins/geolocalized-tasks/geolocalized-tasks.py'
--- GTG/plugins/geolocalized-tasks/geolocalized-tasks.py	1970-01-01 00:00:00 +0000
+++ GTG/plugins/geolocalized-tasks/geolocalized-tasks.py	2009-07-29 16:20:32 +0000
@@ -0,0 +1,572 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2009 - Paulo Cabido <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import gtk, pygtk
+import os, sys
+from time import sleep
+
+from xdg.BaseDirectory import *
+from configobj import ConfigObj
+
+import Geoclue
+
+import clutter, cluttergtk
+import champlain, champlaingtk 
+
+# IMPORTANT This add's the plugin's path to python sys path
+sys.path.insert(0,os.path.dirname(os.path.abspath(__file__)))
+from marker import MarkerLayer
+
+
+from GTG.core.plugins.engine import PluginEngine
+
+class geolocalizedTasks:
+    PLUGIN_NAME = 'Geolocalized Tasks'
+    PLUGIN_AUTHORS = 'Paulo Cabido <[e-mail]>'
+    PLUGIN_VERSION = '0.1'
+    PLUGIN_DESCRIPTION = 'This plugin adds geolocalized tasks to GTG!.\n \
+                          WARNING: This plugin is still heavy development.'
+                          
+    PLUGIN_ENABLED = False
+    
+    def __init__(self):
+        self.geoclue = Geoclue.DiscoverLocation()
+        self.geoclue.init()
+        self.location = self.geoclue.get_location_info()
+        
+        self.plugin_path = os.path.dirname(os.path.abspath(__file__))
+        self.glade_file = os.path.join(self.plugin_path, "geolocalized.glade")
+        
+        # the preference menu for the plugin
+        self.menu_item = gtk.MenuItem("Geolocalized-tasks Preferences")
+        
+        # toolbar button for the new Location view
+        # create the pixbuf with the icon and it's size.
+        # 24,24 is the TaskEditor's toolbar icon size
+        image_geolocalization_path = os.path.join(self.plugin_path, "icons/hicolor/24x24/geolocalization.png")
+        pixbuf_geolocalization = gtk.gdk.pixbuf_new_from_file_at_size(image_geolocalization_path, 24, 24)
+        
+        image_assign_location_path = os.path.join(self.plugin_path, "icons/hicolor/16x16/assign-location.png")
+        pixbug_assign_location = gtk.gdk.pixbuf_new_from_file_at_size(image_assign_location_path, 16, 16)
+        
+        # create the image and associate the pixbuf
+        self.icon_geolocalization = gtk.Image()
+        self.icon_geolocalization.set_from_pixbuf(pixbuf_geolocalization)
+        self.icon_geolocalization.show()
+        
+        image_assign_location = gtk.Image()
+        image_assign_location.set_from_pixbuf(pixbug_assign_location)
+        image_assign_location.show()
+        
+        # the menu intem for the tag context
+        self.context_item = gtk.ImageMenuItem("Assign a location to this tag")
+        self.context_item.set_image(image_assign_location)
+        # TODO: add a short cut to the menu
+        
+        # toolbar button for the location_view
+        self.btn_location_view = gtk.ToggleToolButton()
+        self.btn_location_view.set_icon_widget(self.icon_geolocalization)
+        self.btn_location_view.set_label("Location View")
+        
+        self.PROXIMITY_FACTOR = 5  # 5 km
+        self.LOCATION_ACCURACY = 3 # Locality
+        self.LOCATION_DETERMINATION_METHOD = ["network", "gps", "cellphone"]
+        #for provider in self.geoclue.get_available_providers():
+        #    if provider['position'] and (provider['provider'] != "Example Provider" and provider['provider'] != "Plazes"):
+        #        self.LOCATION_DETERMINATION_METHOD.append(provider["provider"])
+            
+        
+    
+    def activate(self, plugin_api):
+        self.menu_item.connect('activate', self.on_geolocalized_preferences, plugin_api)
+        plugin_api.AddMenuItem(self.menu_item)
+        
+        self.context_item.connect('activate', self.on_contextmenu_tag_location, plugin_api)
+        plugin_api.add_menu_tagpopup(self.context_item)
+        
+        # get the user settings from the config file
+        self.config = plugin_api.get_config()
+        if self.config.has_key("geolocalized-tasks"):
+            if self.config["geolocalized-tasks"].has_key("proximity_factor"):
+                self.PROXIMITY_FACTOR = self.config["geolocalized-tasks"]["proximity_factor"]
+            
+            if self.config["geolocalized-tasks"].has_key("accuracy"):
+                self.LOCATION_ACCURACY = self.config["geolocalized-tasks"]["accuracy"]
+        
+            if self.config["geolocalized-tasks"].has_key("location_determination_method"):
+                self.LOCATION_DETERMINATION_METHOD = self.config["geolocalized-tasks"]["location_determination_method"]
+                
+        # filter the tasks location for the workview
+        self.filter_workview_by_location(plugin_api)
+    
+    def deactivate(self, plugin_api):
+        plugin_api.RemoveMenuItem(self.menu_item)
+        plugin_api.remove_menu_tagpopup(self.context_item)
+        #plugin_api.RemoveToolbarItem(None, self.seperator_location_view)
+        
+        self.config["geolocalized-tasks"] = {}
+        self.config["geolocalized-tasks"]["proximity_factor"] = self.PROXIMITY_FACTOR
+        self.config["geolocalized-tasks"]["accuracy"] = self.LOCATION_ACCURACY
+        self.config["geolocalized-tasks"]["location_determination_method"] = self.LOCATION_DETERMINATION_METHOD
+    
+    def onTaskOpened(self, plugin_api):
+        plugin_api.AddTaskToolbarItem(gtk.SeparatorToolItem())
+        
+        btn_set_location = gtk.ToolButton()
+        btn_set_location.set_icon_widget(self.icon_geolocalization)
+        btn_set_location.set_label("Set/View location")
+        btn_set_location.connect('clicked', self.set_task_location, plugin_api)
+        plugin_api.AddTaskToolbarItem(btn_set_location)
+    
+    # the task location filter
+    def filter_workview_by_location(self, plugin_api):
+        # TODO: if the location has a delay in being calculated it may not exist at
+        # this point
+        if self.location.has_key("latitude") and self.location.has_key("longitude"):
+            tasks = plugin_api.get_all_tasks()
+                
+            tasks_with_location = []
+            tasks_without_location = []
+            
+            for tid in tasks:
+                task = plugin_api.get_task(tid)
+                tags = task.get_tags()
+                for tag in tags:
+                    if "location" in tag.get_all_attributes():
+                        tasks_with_location.append(task)
+                    else:
+                        tasks_without_location.append(task)
+                
+            for task in tasks_with_location:
+                if task.is_workable():
+                    tags = task.get_tags()
+                    for tag in tags:
+                        if tag.get_attribute("location"):
+                            position = eval(tag.get_attribute("location"))
+                            if not self.geoclue.compare_position(position[0], position[1], float(self.PROXIMITY_FACTOR)):
+                                plugin_api.add_task_to_workview_filter(task.get_id())
+                                
+                                
+    #=== GEOLOCALIZED PREFERENCES===================================================    
+    def on_geolocalized_preferences(self, widget, plugin_api):
+        wTree = gtk.glade.XML(self.glade_file, "Preferences")
+        dialog = wTree.get_widget("Preferences")
+        dialog.connect("response", self.preferences_close)
+        plugin_api.set_parent_window(dialog)
+        
+        cmb_accuracy = wTree.get_widget("cmb_accuracy")
+        for i in range(len(cmb_accuracy.get_model())):
+            if str(self.accuracy_to_value(cmb_accuracy.get_model()[i][0])) == str(self.LOCATION_ACCURACY):
+                cmb_accuracy.set_active(i)
+        cmb_accuracy.connect("changed", self.cmb_accuracy_changed)
+        self.tmp_location_accuracy = self.LOCATION_ACCURACY
+        
+        check_network = wTree.get_widget("check_network")
+        check_cellphone = wTree.get_widget("check_cellphone")
+        check_gps = wTree.get_widget("check_gps")
+        
+        if "network" in self.LOCATION_DETERMINATION_METHOD:
+            check_network.set_active(True)
+            
+        if "cellphone" in self.LOCATION_DETERMINATION_METHOD:
+            check_cellphone.set_active(True)
+            
+        if "gps" in self.LOCATION_DETERMINATION_METHOD:
+            check_gps.set_active(True)
+        
+        
+        spin_proximityfactor = wTree.get_widget("spin_proximityfactor")
+        spin_proximityfactor.set_value(float(self.PROXIMITY_FACTOR))
+        spin_proximityfactor.connect("changed", self.spin_proximityfactor_changed)
+        self.tmp_proximityfactor = float(self.PROXIMITY_FACTOR)
+        
+        dialog.show_all()
+        
+    # converts the accuracy to a value
+    def accuracy_to_value(self, accuracy):
+        if not accuracy:
+            return 0
+        elif accuracy.lower() == "Country".lower():
+            return 1
+        elif accuracy.lower() == "Region".lower():
+            return 2
+        elif accuracy.lower() == "Locality".lower():
+            return 3
+        elif accuracy.lower() == "Postalcode".lower():
+            return 4
+        elif accuracy.lower() == "Street".lower():
+            return 5
+        elif accuracy.lower() == "Detailed".lower():
+            return 6
+        return 0 
+    
+    # converts the value of a accuracy to the accuracy
+    def value_to_accuracy(self, value):
+        if not value:
+            return None
+        elif value == 1:
+            return "Country"
+        elif value == 2:
+            return "Region"
+        elif value == 3:
+            return "Locality"
+        elif value == 4:
+            return "Postalcode"
+        elif value == 5:
+            return "Street"
+        elif value == 6:
+            return "Detailed"
+        return None
+        
+    def cmb_accuracy_changed(self, comboboxentry):
+        index = comboboxentry.get_active()
+        model = comboboxentry.get_model()
+        self.tmp_location_accuracy = self.accuracy_to_value(model[index][0])
+        
+    def spin_proximityfactor_changed(self, spinbutton):
+        self.tmp_proximityfactor = spinbutton.get_value()
+        
+    def preferences_close(self, dialog, response=None):
+        if response == gtk.RESPONSE_OK:
+            self.LOCATION_ACCURACY = self.tmp_location_accuracy 
+            self.PROXIMITY_FACTOR = float(self.tmp_proximityfactor) 
+            dialog.destroy()
+        else:
+            dialog.destroy()
+            
+    #=== GEOLOCALIZED PREFERENCES===================================================
+    
+    #=== SET TASK LOCATION =========================================================
+    def set_task_location(self, widget, plugin_api, location=None):
+        location = self.geoclue.get_location_info()
+        self.plugin_api = plugin_api
+        
+        wTree = gtk.glade.XML(self.glade_file, "SetTaskLocation")
+        dialog = wTree.get_widget("SetTaskLocation")
+        self.plugin_api.set_parent_window(dialog)
+        
+        btn_zoom_in = wTree.get_widget("btn_zoom_in")
+        btn_zoom_out = wTree.get_widget("btn_zoom_out")
+        
+        self.radiobutton1 = wTree.get_widget("radiobutton1")
+        self.radiobutton2 = wTree.get_widget("radiobutton2")
+        self.txt_new_tag = wTree.get_widget("txt_new_tag")
+        self.cmb_existing_tag = wTree.get_widget("cmb_existing_tag")
+        
+        tabela = wTree.get_widget("tabela_set_task")
+        vbox_map = wTree.get_widget("vbox_map")
+        vbox_opt = wTree.get_widget("vbox_opt")
+        
+        champlain_view = champlain.View()
+        champlain_view.set_property("scroll-mode", champlain.SCROLL_MODE_KINETIC)
+        #champlain_view.set_property("zoom-on-double-click", False)
+        
+        # create a list of the tags and their attributes
+        tag_list = []
+        for tag in plugin_api.get_tags():
+            tmp_tag = {}
+            for attr in tag.get_all_attributes():
+                if attr == "color":
+                    tmp_tag[attr] = self.HTMLColorToRGB(tag.get_attribute(attr))
+                    tmp_tag['has_color'] = "yes"
+                elif attr == "location":
+                    tmp_tag[attr] = eval(tag.get_attribute(attr))
+                else:
+                    tmp_tag[attr] = tag.get_attribute(attr)
+            tag_list.append(tmp_tag)                 
+           
+        # checks if there is one tag with a location     
+        task_has_location = False
+        for tag in tag_list:
+            for key, item in tag.items():
+                if key == "location":
+                    task_has_location = True
+                    break
+        
+        # set the markers
+        layer = MarkerLayer()
+        
+        self.marker_list = []
+        if task_has_location:
+            for tag in tag_list:
+                for key, item in tag.items():
+                    if key == "location":
+                        color = None
+                        try:
+                            if tag['has_color'] == "yes":
+                                color = tag['color']
+                        except:
+                            # PROBLEM: the tag doesn't have color
+                            # Possibility, use a color from another tag
+                            pass
+                        
+                        self.marker_list.append(layer.add_marker(plugin_api.get_task_title(), tag['location'][0], tag['location'][1], color))
+        else:
+            try:
+                if location['longitude'] and location['latitude']:
+                    self.marker_list.append(layer.add_marker(plugin_api.get_task_title(), location['latitude'], location['longitude']))
+            except:
+                self.marker_list.append(layer.add_marker(plugin_api.get_task_title(), None, None))
+        
+        champlain_view.add_layer(layer)
+        
+        embed = cluttergtk.Embed()
+        embed.set_size_request(400, 300)
+        
+        if not task_has_location:
+            # method that will change the marker's position
+            champlain_view.set_reactive(True)
+            champlain_view.connect("button-release-event", self.champlain_change_marker, champlain_view)
+        
+        layer.show_all()
+        
+        if task_has_location:
+            champlain_view.set_property("zoom-level", 9)
+        elif location:
+            champlain_view.set_property("zoom-level", 5)
+        else:
+            champlain_view.set_property("zoom-level", 1)
+            
+        vbox_map.add(embed)
+        
+        embed.realize()
+        stage = embed.get_stage()
+        champlain_view.set_size(400, 300)
+        stage.add(champlain_view)
+        
+        # connect the toolbar buttons for zoom
+        btn_zoom_in.connect("clicked", self.zoom_in, champlain_view)
+        btn_zoom_out.connect("clicked", self.zoom_out, champlain_view)
+        dialog.connect("response", self.set_task_location_close)
+        
+        #if there is no location set, we want to set it
+        if not task_has_location:
+            self.location_defined = False
+            if len(plugin_api.get_tags()) > 0:
+                liststore = gtk.ListStore(str)
+                self.cmb_existing_tag.set_model(liststore)
+                for tag in plugin_api.get_tags():    
+                    liststore.append([tag.get_attribute("name")])
+                self.cmb_existing_tag.set_text_column(0)
+                self.cmb_existing_tag.set_active(0)             
+            else:
+                #remove radiobutton2 and the comboboxentry
+                tabela.remove(self.radiobutton1)
+                tabela.remove(self.radiobutton2)
+                tabela.remove(self.cmb_existing_tag)
+                label = gtk.Label()
+                label.set_text("Associate with new tag: ")
+                tabela.attach(label, 0, 1, 0, 1)
+                label.show()
+        else:
+            self.location_defined = True
+            vbox_opt.remove(tabela)
+            dialog.set_title("View the task's location")
+        
+        dialog.show_all()
+        
+        if task_has_location:
+            marker_position = (self.marker_list[0].get_property('latitude'), self.marker_list[0].get_property('longitude'))
+            champlain_view.center_on(marker_position[0], marker_position[1])
+        else:
+            try:
+                if location['longitude'] and location['latitude']:
+                    champlain_view.center_on(location['latitude'], location['longitude'])
+            except:
+                pass
+    
+    def set_task_location_close(self, dialog, response=None):
+        if response == gtk.RESPONSE_OK:
+            # ok
+            # tries to get the radiobuttons value, witch may not exist
+            if not self.location_defined:
+                if self.radiobutton1.get_active():
+                    # radiobutton1
+                    if self.txt_new_tag.get_text().strip() != "":
+                        marker_position = (self.marker_list[0].get_property('latitude'), self.marker_list[0].get_property('longitude'))
+                       
+                        # because users sometimes make mistakes, I'll check if the tag exists
+                        tmp_tag = ""
+                        for tag in self.plugin_api.get_tags():
+                            t = "@" + self.txt_new_tag.get_text().replace("@", "")
+                            if tag.get_attribute("name") == t:
+                                tmp_tag = t
+                        if tmp_tag:
+                            self.plugin_api.add_tag_attribute(self.txt_new_tag.get_text().replace("@", ""), 
+                                                              "location",  
+                                                              marker_position)
+                        else:
+                            self.plugin_api.add_tag(self.txt_new_tag.get_text().replace("@", ""))
+                            self.plugin_api.add_tag_attribute("@" + self.txt_new_tag.get_text().replace("@", ""), 
+                                                              "location",  
+                                                              marker_position)
+                        dialog.destroy()
+                    else:
+                        self.errorDialog(dialog, "Error: No tag defined", "The tag has to be defined so that the location can be associated with it.")
+                else:
+                    # radiobutton2
+                    marker_position = (self.marker_list[0].get_property('latitude'), self.marker_list[0].get_property('longitude'))
+                    index = self.cmb_existing_tag.get_active()
+                    model = self.cmb_existing_tag.get_model()
+                    self.plugin_api.add_tag_attribute(model[index][0], "location", marker_position)
+            dialog.destroy()
+        else:
+            # cancel
+            dialog.destroy()
+    
+    def champlain_change_marker(self, widget, event, view):
+        if event.button != 1 or event.click_count > 1:
+            return False
+        
+        (latitude, longitude) = view.get_coords_at(int(event.x), int(event.y))
+        self.marker_list[0].set_position(latitude, longitude)
+    
+    #=== SET TASK LOCATION =========================================================
+        
+    #=== TAG VIEW CONTEXT MENU =====================================================
+    def on_contextmenu_tag_location(self, widget, plugin_api):
+        location = self.geoclue.get_location_info()
+        self.plugin_api_context = plugin_api
+        
+        wTree = gtk.glade.XML(self.glade_file, "TagLocation")
+        dialog = wTree.get_widget("TagLocation")
+        self.plugin_api_context.set_parent_window(dialog)
+        
+        btn_zoom_in = wTree.get_widget("btn_zoom_in")
+        btn_zoom_out = wTree.get_widget("btn_zoom_out")
+        vbox_map = wTree.get_widget("vbox_map")
+        
+        tag = self.plugin_api_context.get_tagpopup_tag()
+        dialog.set_title(tag.get_attribute("name") + "'s Location")
+        
+        # get the tag's location
+        try:
+            tag_location = eval(tag.get_attribute("location"))
+        except:
+            tag_location = None
+            
+        # get the tag's color
+        try:
+            tag_color = self.HTMLColorToRGB(tag.get_attribute("color"))
+        except:
+            tag_color = None
+        
+        champlain_view = champlain.View()
+        champlain_view.set_property("scroll-mode", champlain.SCROLL_MODE_KINETIC)
+        
+        layer = MarkerLayer()
+        
+        marker_tag = None
+        if tag_location:
+            marker_tag = layer.add_marker(tag.get_attribute("name"), tag_location[0], tag_location[1], tag_color)
+        else:
+            try:
+                if location['longitude'] and location['latitude']:
+                    marker_tag = layer.add_marker(tag.get_attribute("name"), location['latitude'], location['longitude'], tag_color)
+            except:
+                marker_tag = layer.add_marker(tag.get_attribute("name"), None, None)
+        
+        champlain_view.add_layer(layer)
+        
+        embed = cluttergtk.Embed()
+        embed.set_size_request(400, 300)
+        
+        champlain_view.set_reactive(True)
+        champlain_view.connect("button-release-event", self.champlain__tag_change_marker, champlain_view, marker_tag)
+        
+        layer.show_all()
+        
+        if tag_location:
+            champlain_view.set_property("zoom-level", 9)
+        elif location:
+            champlain_view.set_property("zoom-level", 5)
+        else:
+            champlain_view.set_property("zoom-level", 1)      
+        
+        vbox_map.add(embed)
+        
+        embed.realize()
+        stage = embed.get_stage()
+        champlain_view.set_size(400, 300)
+        stage.add(champlain_view)
+        
+        # connect the toolbar buttons for zoom
+        btn_zoom_in.connect("clicked", self.zoom_in, champlain_view)
+        btn_zoom_out.connect("clicked", self.zoom_out, champlain_view)
+        dialog.connect("response", self.tag_location_close, tag, marker_tag)
+        
+        dialog.show_all()
+        
+        if tag_location:
+            marker_position = (marker_tag.get_property('latitude'), marker_tag.get_property('longitude'))
+            champlain_view.center_on(marker_position[0], marker_position[1])
+        else:
+            try:
+                if location['longitude'] and location['latitude']:
+                    champlain_view.center_on(location['latitude'], location['longitude'])
+            except:
+                pass
+    
+    def champlain__tag_change_marker(self, widget, event, view, marker):
+        if event.button != 1 or event.click_count > 1:
+            return False
+        
+        (latitude, longitude) = view.get_coords_at(int(event.x), int(event.y))
+        marker.set_position(latitude, longitude)
+    
+    def tag_location_close(self, dialog, response=None, tag=None, marker=None):
+        if response == gtk.RESPONSE_OK:
+            tag_location = str((marker.get_property('latitude'), marker.get_property('longitude')))
+            tag.set_attribute("location", tag_location)
+            dialog.destroy()
+        else:
+            dialog.destroy()
+    
+    #=== TAG VIEW CONTEXT MENU =====================================================
+    
+    def zoom_in(self, widget, view):
+        view.zoom_in()
+
+    def zoom_out(self, widget, view):
+        view.zoom_out()
+
+    # http://code.activestate.com/recipes/266466/
+    # original by Paul Winkler
+    def HTMLColorToRGB(self, colorstring):
+        """ convert #RRGGBB to a clutter color var """
+        colorstring = colorstring.strip()
+        if colorstring[0] == '#': colorstring = colorstring[1:]
+        if len(colorstring) != 6:
+            raise ValueError, "input #%s is not in #RRGGBB format" % colorstring
+        r, g, b = colorstring[:2], colorstring[2:4], colorstring[4:]
+        r, g, b = [int(n, 16) for n in (r, g, b)]
+        return clutter.Color(r, g, b)
+    
+    # error dialog
+    def errorDialog(self, parent, header, msg):
+         """
+         Show an error message.
+         """
+
+         dialog = gtk.MessageDialog(parent,
+                               flags=gtk.DIALOG_MODAL,
+                               type=gtk.MESSAGE_ERROR,
+                               buttons=gtk.BUTTONS_CLOSE)
+         dialog.set_title("")
+         dialog.set_markup("<big><b>%s</b></big>\n\n%s" % (header, msg))
+         dialog.realize()
+         dialog.run()
+         dialog.destroy()
 \ No newline at end of file
 
=== added file 'GTG/plugins/geolocalized-tasks/geolocalized.glade'
--- GTG/plugins/geolocalized-tasks/geolocalized.glade	1970-01-01 00:00:00 +0000
+++ GTG/plugins/geolocalized-tasks/geolocalized.glade	2009-07-29 15:30:45 +0000
@@ -0,0 +1,790 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkDialog" id="SetTaskLocation">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Set the task's location</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox2">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area2">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="cancelbutton2">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="okbutton2">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkVBox" id="vbox_map">
+	  <property name="width_request">400</property>
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkToolbar" id="toolbar2">
+	      <property name="visible">True</property>
+	      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+	      <property name="tooltips">True</property>
+	      <property name="show_arrow">True</property>
+
+	      <child>
+		<widget class="GtkToolButton" id="btn_zoom_in">
+		  <property name="visible">True</property>
+		  <property name="stock_id">gtk-zoom-in</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">False</property>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkToolButton" id="btn_zoom_out">
+		  <property name="visible">True</property>
+		  <property name="stock_id">gtk-zoom-out</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">False</property>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox_map">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<placeholder/>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox_opt">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkTable" id="tabela_set_task">
+		  <property name="visible">True</property>
+		  <property name="n_rows">2</property>
+		  <property name="n_columns">2</property>
+		  <property name="homogeneous">False</property>
+		  <property name="row_spacing">0</property>
+		  <property name="column_spacing">0</property>
+
+		  <child>
+		    <widget class="GtkRadioButton" id="radiobutton1">
+		      <property name="width_request">198</property>
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Associate with new tag</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
+		      <property name="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkRadioButton" id="radiobutton2">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Associate with existing tag</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		      <property name="group">radiobutton1</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">0</property>
+		      <property name="right_attach">1</property>
+		      <property name="top_attach">1</property>
+		      <property name="bottom_attach">2</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkEntry" id="txt_new_tag">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="editable">True</property>
+		      <property name="visibility">True</property>
+		      <property name="max_length">0</property>
+		      <property name="text" translatable="yes"></property>
+		      <property name="has_frame">True</property>
+		      <property name="invisible_char">●</property>
+		      <property name="activates_default">False</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">1</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">0</property>
+		      <property name="bottom_attach">1</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkComboBoxEntry" id="cmb_existing_tag">
+		      <property name="visible">True</property>
+		      <property name="add_tearoffs">False</property>
+		      <property name="has_frame">True</property>
+		      <property name="focus_on_click">True</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">1</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">1</property>
+		      <property name="bottom_attach">2</property>
+		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">2</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkDialog" id="TagLocation">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes"></property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox3">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area3">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="cancelbutton3">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="okbutton3">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkVBox" id="vbox3">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkToolbar" id="toolbar3">
+	      <property name="visible">True</property>
+	      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+	      <property name="tooltips">True</property>
+	      <property name="show_arrow">True</property>
+
+	      <child>
+		<widget class="GtkToolButton" id="btn_zoom_in">
+		  <property name="visible">True</property>
+		  <property name="stock_id">gtk-zoom-in</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">False</property>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkToolButton" id="btn_zoom_out">
+		  <property name="visible">True</property>
+		  <property name="stock_id">gtk-zoom-out</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">False</property>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox_map">
+	      <property name="width_request">400</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<placeholder/>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkDialog" id="Preferences">
+  <property name="width_request">350</property>
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Geolocalized-tasks Preferences</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox4">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area4">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="cancelbutton4">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="okbutton4">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkVBox" id="vbox4">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame3">
+	      <property name="border_width">3</property>
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment3">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox4">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkComboBoxEntry" id="cmb_accuracy">
+			  <property name="visible">True</property>
+			  <property name="items" translatable="yes">Country
+Region
+Locality
+Postalcode
+Street
+Detailed</property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="has_frame">True</property>
+			  <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label5">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Accuracy&lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame4">
+	      <property name="border_width">3</property>
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment4">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox5">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox5">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="check_network">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Use network</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="check_cellphone">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Use cellphone (if available)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="check_gps">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Use gps (if available)</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label6">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Location Determination Method&lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame5">
+	      <property name="border_width">3</property>
+	      <property name="visible">True</property>
+	      <property name="label_xalign">0</property>
+	      <property name="label_yalign">0.5</property>
+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment5">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">1</property>
+		  <property name="yscale">1</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">12</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox3">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkSpinButton" id="spin_proximityfactor">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="climb_rate">1</property>
+			  <property name="digits">1</property>
+			  <property name="numeric">False</property>
+			  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+			  <property name="snap_to_ticks">False</property>
+			  <property name="wrap">False</property>
+			  <property name="adjustment">5 1 100 0.10000000149 10 10</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label8">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">km</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">4</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label7">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">&lt;b&gt;Proximity Factor&lt;/b&gt;</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">True</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
 
=== added directory 'GTG/plugins/geolocalized-tasks/icons'
=== added directory 'GTG/plugins/geolocalized-tasks/icons/hicolor'
=== added directory 'GTG/plugins/geolocalized-tasks/icons/hicolor/16x16'
=== added file 'GTG/plugins/geolocalized-tasks/icons/hicolor/16x16/assign-location.png'
 Binary files GTG/plugins/geolocalized-tasks/icons/hicolor/16x16/assign-location.png	1970-01-01 00:00:00 +0000 and GTG/plugins/geolocalized-tasks/icons/hicolor/16x16/assign-location.png	2009-07-27 14:37:04 +0000 differ
=== added directory 'GTG/plugins/geolocalized-tasks/icons/hicolor/24x24'
=== added file 'GTG/plugins/geolocalized-tasks/icons/hicolor/24x24/geolocalization.png'
 Binary files GTG/plugins/geolocalized-tasks/icons/hicolor/24x24/geolocalization.png	1970-01-01 00:00:00 +0000 and GTG/plugins/geolocalized-tasks/icons/hicolor/24x24/geolocalization.png	2009-07-27 14:37:04 +0000 differ
=== added directory 'GTG/plugins/geolocalized-tasks/icons/hicolor/svg'
=== added file 'GTG/plugins/geolocalized-tasks/icons/hicolor/svg/assign-location.svg'
--- GTG/plugins/geolocalized-tasks/icons/hicolor/svg/assign-location.svg	1970-01-01 00:00:00 +0000
+++ GTG/plugins/geolocalized-tasks/icons/hicolor/svg/assign-location.svg	2009-07-27 14:37:04 +0000
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="16" height="16" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="assign-location.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" inkscape:export-filename="/home/kj/Dropbox/Public/assign-location.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90">
+  <defs id="defs4">
+    <linearGradient inkscape:collect="always" id="linearGradient7943">
+      <stop style="stop-color: rgb(249, 166, 166); stop-opacity: 1;" offset="0" id="stop7945"/>
+      <stop style="stop-color: rgb(243, 156, 156); stop-opacity: 1;" offset="1" id="stop7947"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient7935">
+      <stop style="stop-color: rgb(132, 0, 0); stop-opacity: 1;" offset="0" id="stop7937"/>
+      <stop style="stop-color: rgb(203, 0, 0); stop-opacity: 1;" offset="1" id="stop7939"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient7874">
+      <stop style="stop-color: rgb(182, 178, 140); stop-opacity: 0.941785;" offset="0" id="stop7876"/>
+      <stop style="stop-color: rgb(145, 140, 92); stop-opacity: 1;" offset="1" id="stop7878"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient7741">
+      <stop style="stop-color: rgb(254, 244, 164); stop-opacity: 1;" offset="0" id="stop7743"/>
+      <stop style="stop-color: rgb(255, 252, 225); stop-opacity: 1;" offset="1" id="stop7745"/>
+    </linearGradient>
+    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" id="perspective10"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7741" id="linearGradient8081" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.07143, 0, 0, 1.06757, -13.9643, -7.45285)" x1="15.727029" y1="6.9999995" x2="23.542524" y2="14.983313"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7874" id="linearGradient8083" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.07143, 0, 0, 1.06757, -46.1072, -7.45285)" x1="44.812893" y1="7.2946024" x2="52.456104" y2="21.549175"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7874" id="linearGradient8085" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.07143, 0, 0, 1.06757, -46.1072, -7.45285)" x1="47.146225" y1="11.041414" x2="52.339439" y2="21.968351"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7935" id="linearGradient8117" gradientUnits="userSpaceOnUse" x1="57.438805" y1="14.430664" x2="54.385418" y2="9.703125"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7943" id="linearGradient8119" gradientUnits="userSpaceOnUse" x1="55.795582" y1="10.903276" x2="55.84375" y2="14.84375"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="15.281524" inkscape:cy="5.7182209" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:snap-bbox="true" inkscape:snap-nodes="false" inkscape:window-width="1440" inkscape:window-height="794" inkscape:window-x="0" inkscape:window-y="25" showborder="false">
+    <inkscape:grid type="xygrid" id="grid8091" visible="true" enabled="true"/>
+  </sodipodi:namedview>
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1">
+    <rect style="overflow: visible; marker: none; fill: url(#linearGradient8081) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: url(#linearGradient8083) rgb(0, 0, 0); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect7868" width="14.999999" height="14.946039" x="0.50000006" y="0.55396086" rx="1.9905777" ry="1.9905777"/>
+    <rect transform="matrix(0, 1, -1, 0, 0, 0)" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(193, 190, 157); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect7905" width="14.946039" height="2" x="0.55396086" y="-12.5" rx="0" ry="0"/>
+    <rect ry="0" rx="0" y="2.5539608" x="0.50000006" height="2.9460392" width="15" id="rect7907" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(193, 190, 157); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
+    <rect ry="0" rx="0" y="-5.5" x="0.55396086" height="2" width="14.946039" id="rect7909" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(193, 190, 157); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" transform="matrix(0, 1, -1, 0, 0, 0)"/>
+    <rect style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(193, 190, 157); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect7911" width="15" height="2" x="0.50000006" y="10.553965" rx="0" ry="0"/>
+    <rect ry="1.9905776" rx="1.9905776" y="0.55396092" x="0.50000012" height="14.946039" width="15" id="rect7913" style="overflow: visible; marker: none; fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: url(#linearGradient8085) rgb(0, 0, 0); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
+    <rect style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect7915" width="12" height="1.9460392" x="1" y="3.0539608" rx="0" ry="0"/>
+    <rect ry="0" rx="0" y="2.0539608" x="4" height="11" width="1" id="rect7917" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
+    <rect style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect7919" width="1" height="11" x="11" y="2.0539608" rx="0" ry="0"/>
+    <rect ry="0" rx="0" y="11.053965" x="1" height="1" width="12" id="rect7921" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
+    <g id="g8112" transform="translate(1, -2)">
+      <path transform="matrix(0.685714, 0, 0, 0.680851, -30.2929, 2.44758)" d="M 58.03125,12.640625 A 2.1875,2.203125 0 1 1 53.65625,12.640625 A 2.1875,2.203125 0 1 1 58.03125,12.640625 z" sodipodi:ry="2.203125" sodipodi:rx="2.1875" sodipodi:cy="12.640625" sodipodi:cx="55.84375" id="path7925" style="overflow: visible; marker: none; fill: rgb(242, 72, 72); fill-opacity: 1; fill-rule: nonzero; stroke: url(#linearGradient8117) rgb(0, 0, 0); stroke-width: 1.46353px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="overflow: visible; marker: none; fill: url(#linearGradient8119) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1.46353px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="path7933" sodipodi:cx="55.84375" sodipodi:cy="12.640625" sodipodi:rx="2.1875" sodipodi:ry="2.203125" d="M 58.03125,12.640625 A 2.1875,2.203125 0 1 1 53.65625,12.640625 A 2.1875,2.203125 0 1 1 58.03125,12.640625 z" transform="matrix(0.228571, 0, 0, 0.22695, -5.26429, 7.68517)"/>
+      <path sodipodi:type="arc" style="overflow: visible; marker: none; opacity: 0.303738; fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: rgb(255, 255, 255); stroke-width: 0.87812px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="path7951" sodipodi:cx="55.84375" sodipodi:cy="12.640625" sodipodi:rx="2.1875" sodipodi:ry="2.203125" d="M 58.03125,12.640625 A 2.1875,2.203125 0 1 1 53.65625,12.640625 A 2.1875,2.203125 0 1 1 58.03125,12.640625 z" transform="matrix(1.14286, 0, 0, 1.13475, -55.8214, -3.29)"/>
+    </g>
+    <rect style="overflow: visible; marker: none; opacity: 0.350962; fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: rgb(255, 255, 255); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect8093" width="13.000001" height="13.053962" x="1.5" y="1.5" rx="1.2367706" ry="1.2367706"/>
+  </g>
+</svg>
 \ No newline at end of file
 
=== added file 'GTG/plugins/geolocalized-tasks/icons/hicolor/svg/geolocalization.svg'
--- GTG/plugins/geolocalized-tasks/icons/hicolor/svg/geolocalization.svg	1970-01-01 00:00:00 +0000
+++ GTG/plugins/geolocalized-tasks/icons/hicolor/svg/geolocalization.svg	2009-07-27 14:37:04 +0000
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" height="24" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="geolocalization.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" inkscape:export-filename="/home/kj/Dropbox/Public/geolocalization.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90">
+  <defs id="defs4">
+    <linearGradient inkscape:collect="always" id="linearGradient7943">
+      <stop style="stop-color: rgb(249, 166, 166); stop-opacity: 1;" offset="0" id="stop7945"/>
+      <stop style="stop-color: rgb(243, 156, 156); stop-opacity: 1;" offset="1" id="stop7947"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient7935">
+      <stop style="stop-color: rgb(132, 0, 0); stop-opacity: 1;" offset="0" id="stop7937"/>
+      <stop style="stop-color: rgb(203, 0, 0); stop-opacity: 1;" offset="1" id="stop7939"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient7874">
+      <stop style="stop-color: rgb(182, 178, 140); stop-opacity: 0.941785;" offset="0" id="stop7876"/>
+      <stop style="stop-color: rgb(145, 140, 92); stop-opacity: 1;" offset="1" id="stop7878"/>
+    </linearGradient>
+    <linearGradient id="linearGradient7838" inkscape:collect="always">
+      <stop id="stop7840" offset="0" style="stop-color: rgb(250, 173, 173); stop-opacity: 1;"/>
+      <stop id="stop7842" offset="1" style="stop-color: rgb(204, 0, 0); stop-opacity: 1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient7765" inkscape:collect="always">
+      <stop id="stop7767" offset="0" style="stop-color: rgb(238, 238, 236); stop-opacity: 1;"/>
+      <stop id="stop7769" offset="1" style="stop-color: rgb(173, 173, 173); stop-opacity: 1;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient7757" inkscape:collect="always">
+      <stop id="stop7759" offset="0" style="stop-color: rgb(85, 87, 83); stop-opacity: 1;"/>
+      <stop id="stop7761" offset="1" style="stop-color: rgb(146, 148, 144); stop-opacity: 1;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient7741">
+      <stop style="stop-color: rgb(254, 244, 164); stop-opacity: 1;" offset="0" id="stop7743"/>
+      <stop style="stop-color: rgb(255, 252, 225); stop-opacity: 1;" offset="1" id="stop7745"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient7081">
+      <stop style="stop-color: rgb(182, 178, 140); stop-opacity: 1;" offset="0" id="stop7083"/>
+      <stop style="stop-color: rgb(145, 140, 92); stop-opacity: 1;" offset="1" id="stop7085"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient7013">
+      <stop style="stop-color: rgb(125, 0, 0); stop-opacity: 1;" offset="0" id="stop7015"/>
+      <stop style="stop-color: rgb(204, 0, 0); stop-opacity: 1;" offset="1" id="stop7017"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient7003">
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 1;" offset="0" id="stop7005"/>
+      <stop style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" offset="1" id="stop7007"/>
+    </linearGradient>
+    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" id="perspective10"/>
+    <filter inkscape:collect="always" id="filter7386" x="-0.18793105" width="1.3758621" y="-0.26054078" height="1.5210816">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.59707262" id="feGaussianBlur7388"/>
+    </filter>
+    <inkscape:perspective id="perspective7482" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 526.18109 : 1" sodipodi:type="inkscape:persp3d"/>
+    <filter inkscape:collect="always" id="filter7589" x="-0.077992738" width="1.1559855" y="-0.38996369" height="1.7799274">
+      <feGaussianBlur inkscape:collect="always" stdDeviation="0.64993949" id="feGaussianBlur7591"/>
+    </filter>
+    <inkscape:perspective id="perspective7600" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" inkscape:vp_z="744.09448 : 526.18109 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 526.18109 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7081" id="linearGradient7707" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.904762, 0, 0, 1, 1.14286, 0)" x1="5.2149124" y1="15.558913" x2="6.9804454" y2="22"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7741" id="linearGradient7747" x1="-25.013903" y1="4" x2="-18" y2="17.119036" gradientUnits="userSpaceOnUse" gradientTransform="translate(30)"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7765" id="linearGradient7828" gradientUnits="userSpaceOnUse" gradientTransform="translate(20, 3)" x1="13.866498" y1="13.029231" x2="15.55635" y2="5.924583"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7757" id="linearGradient7830" gradientUnits="userSpaceOnUse" gradientTransform="translate(20, 3)" x1="15.642897" y1="9.4588156" x2="13.90625" y2="8.4726801"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient7838" id="radialGradient7832" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.088672, 0.799838, -1.00097, 0.100044, 17.8398, -9.21998)" cx="14.825197" cy="3.6196058" fx="14.825197" fy="3.6196058" r="3.524409"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7013" id="linearGradient7834" gradientUnits="userSpaceOnUse" x1="16.304688" y1="8.2946424" x2="14.868303" y2="4.9375"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7003" id="linearGradient7836" gradientUnits="userSpaceOnUse" x1="14.844542" y1="9.349679" x2="18.449074" y2="0.33173633"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7874" id="linearGradient7880" x1="44.812893" y1="7.2946024" x2="52.456104" y2="21.549175" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7741" id="linearGradient7903" gradientUnits="userSpaceOnUse" gradientTransform="translate(30)" x1="15.727029" y1="6.9999995" x2="23.542524" y2="14.983313"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7874" id="linearGradient7923" gradientUnits="userSpaceOnUse" x1="44.812893" y1="7.2946024" x2="54.206104" y2="20.549175"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7935" id="linearGradient7941" x1="57.438805" y1="14.430664" x2="54.385418" y2="9.703125" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient7943" id="linearGradient7949" x1="55.795582" y1="10.903276" x2="55.84375" y2="14.84375" gradientUnits="userSpaceOnUse"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="44.238097" inkscape:cy="9.3925275" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:snap-bbox="true" inkscape:snap-nodes="false" inkscape:window-width="1440" inkscape:window-height="794" inkscape:window-x="0" inkscape:window-y="25" showborder="false">
+    <inkscape:grid type="xygrid" id="grid6922" visible="true" enabled="true"/>
+  </sodipodi:namedview>
+  <metadata id="metadata7">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1">
+    <rect style="overflow: visible; marker: none; opacity: 0.191589; fill: rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline; filter: url(#filter7589);" id="rect7089" width="20" height="4" x="2" y="19" rx="2.1022727" ry="1.5416666" transform="matrix(1.1, 0, 0, 1.5, -1.2, -11.5)"/>
+    <rect style="overflow: visible; marker: none; fill: url(#linearGradient7747) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect6924" width="18" height="17" x="3" y="4" rx="0" ry="0"/>
+    <rect style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(193, 190, 157); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect6943" width="19" height="3" x="2.5" y="5.5" rx="0" ry="0"/>
+    <rect ry="0" rx="0" y="-9.5" x="11.5" height="2" width="9.9999981" id="rect6945" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(193, 190, 157); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" transform="matrix(0, 1, -1, 0, 0, 0)"/>
+    <rect ry="0" rx="0" y="12.5" x="2.4999998" height="2" width="15.999999" id="rect7488" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(193, 190, 157); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
+    <rect transform="matrix(0, 1, -1, 0, 0, 0)" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(193, 190, 157); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect6949" width="12.000001" height="2" x="9.5" y="-19.5" rx="0" ry="0"/>
+    <rect style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect7509" width="1" height="7" x="8" y="13"/>
+    <rect ry="0.92807764" rx="0.92807764" y="3.5" x="2.5" height="18" width="19" id="rect6969" style="overflow: visible; marker: none; fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: url(#linearGradient7707) rgb(0, 0, 0); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
+    <rect ry="0.16215134" rx="0.16215134" y="4.5" x="3.5" height="16.000002" width="16.999998" id="rect6967" style="overflow: visible; marker: none; opacity: 0.266355; fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: rgb(255, 255, 255); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
+    <rect y="13" x="17" height="1" width="1" id="rect7781" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;"/>
+    <g id="g7820" transform="translate(-19, -1)">
+      <path sodipodi:nodetypes="ccccc" transform="matrix(1.18033, 0, 0, 1.09091, 18.0164, 1)" id="path7135" d="M 10.947049,16.958333 C 14.13631,17.001634 16.454712,14.258591 17.969243,11.734888 L 17.760387,11.041703 L 11.189471,14.412416 L 10.947049,16.958333 z" style="opacity: 0.420561; fill: rgb(0, 0, 0); fill-rule: evenodd; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1; filter: url(#filter7386);"/>
+      <path sodipodi:nodetypes="cccccc" id="path6955" d="M 35.558846,7.5 L 31.53125,16.562501 L 31.553739,18.537462 L 33.477077,17.548192 L 37.40625,8.3643436 L 35.558846,7.5 z" style="fill: url(#linearGradient7828) rgb(0, 0, 0); fill-opacity: 1; fill-rule: evenodd; stroke: url(#linearGradient7830) rgb(0, 0, 0); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;"/>
+      <path style="opacity: 0.257009; fill: rgb(0, 0, 0); fill-rule: evenodd; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-opacity: 1;" d="M 33.481904,10.990773 C 34.207813,11.574681 34.893276,11.98175 36.351844,12 L 37.081048,10.464566 L 34.318912,9 L 33.481904,10.990773 z" id="path7771" sodipodi:nodetypes="ccccc"/>
+      <path transform="matrix(1.29293, 0, 0, 1.3617, 17.4192, -0.223404)" d="M 18.625,4.9375 A 3.09375,2.9375 0 1 1 12.4375,4.9375 A 3.09375,2.9375 0 1 1 18.625,4.9375 z" sodipodi:ry="2.9375" sodipodi:rx="3.09375" sodipodi:cy="4.9375" sodipodi:cx="15.53125" id="path6953" style="overflow: visible; marker: none; fill: url(#radialGradient7832) rgb(0, 0, 0); fill-opacity: 1; fill-rule: nonzero; stroke: url(#linearGradient7834) rgb(0, 0, 0); stroke-width: 0.753653px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" sodipodi:type="arc"/>
+      <path sodipodi:type="arc" style="overflow: visible; marker: none; opacity: 0.429907; fill: none; fill-opacity: 1; fill-rule: nonzero; stroke: url(#linearGradient7836) rgb(0, 0, 0); stroke-width: 1.00487px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="path6979" sodipodi:cx="15.53125" sodipodi:cy="4.9375" sodipodi:rx="3.09375" sodipodi:ry="2.9375" d="M 18.625,4.9375 A 3.09375,2.9375 0 1 1 12.4375,4.9375 A 3.09375,2.9375 0 1 1 18.625,4.9375 z" transform="matrix(0.969697, 0, 0, 1.02128, 22.4394, 1.45745)"/>
+    </g>
+    <rect style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect7854" width="8.8817842e-16" height="3" x="5" y="11"/>
+    <rect ry="0" rx="0" y="-9.5" x="9.5" height="2" width="5" id="rect7864" style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: rgb(193, 190, 157); stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" transform="matrix(0, 1, -1, 0, 0, 0)"/>
+    <rect style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect7866" width="1" height="8" x="8" y="7"/>
+    <rect style="overflow: visible; marker: none; fill: rgb(255, 253, 236); fill-opacity: 1; fill-rule: nonzero; stroke: none; stroke-width: 1px; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-dashoffset: 0pt; stroke-opacity: 1; visibility: visible; display: inline;" id="rect7490" width="6" height="1" x="5" y="13"/>
+  </g>
+</svg>
 \ No newline at end of file
 
=== added file 'GTG/plugins/geolocalized-tasks/marker.py'
--- GTG/plugins/geolocalized-tasks/marker.py	1970-01-01 00:00:00 +0000
+++ GTG/plugins/geolocalized-tasks/marker.py	2009-07-25 18:58:39 +0000
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2009 - Paulo Cabido <[e-mail]>
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import clutter
+import champlain
+import champlaingtk
+
+class MarkerLayer(champlain.Layer):
+
+    def __init__(self):
+        champlain.Layer.__init__(self)
+        # a marker can also be set in RGB with ints
+        self.gray = clutter.Color(51, 51, 51)
+        
+        #RGBA
+        self.white = clutter.Color(0xff, 0xff, 0xff, 0xff)
+        self.black = clutter.Color(0x00, 0x00, 0x00, 0xff)
+        
+        self.hide()
+        
+    def add_marker(self, text, latitude, longitude, bg_color=None, text_color=None, font="Airmole 8"):
+        if not text_color:
+            text_color = self.white
+            
+        if not bg_color:
+            bg_color = self.gray
+        
+        marker = champlain.marker_new_with_text(text, font, text_color, bg_color)
+
+        #marker.set_position(38.575935, -7.921326)
+        if latitude and longitude:
+            marker.set_position(latitude, longitude)
+        self.add(marker)
+        return marker
 \ No newline at end of file
 
=== added directory 'GTG/plugins/helloworld'
=== added file 'GTG/plugins/helloworld/hello_world.glade'
--- GTG/plugins/helloworld/hello_world.glade	1970-01-01 00:00:00 +0000
+++ GTG/plugins/helloworld/hello_world.glade	2009-07-14 16:32:20 +0000
@@ -0,0 +1,122 @@
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
+<glade-interface>
+
+<widget class="GtkDialog" id="helloworld">
+  <property name="width_request">300</property>
+  <property name="height_request">150</property>
+  <property name="title" translatable="yes">Hello World</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox1">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area1">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="btn_close">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-close</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-7</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkVBox" id="vbox1">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="label1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Hello World Plugin</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">6</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="lbl_helloworld">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">True</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">24</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+</glade-interface>
 
=== added file 'GTG/plugins/helloworld/helloworld.py'
--- GTG/plugins/helloworld/helloworld.py	1970-01-01 00:00:00 +0000
+++ GTG/plugins/helloworld/helloworld.py	2009-07-17 02:27:18 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+import gtk, pygtk
+import os
+
+class pluginTest:
+
+    PLUGIN_NAME = 'Hello World'
+    PLUGIN_AUTHORS = 'Paulo Cabido <[e-mail]>'
+    PLUGIN_VERSION = '0.1.1'
+    PLUGIN_DESCRIPTION = 'Plugin Description goes here. Helo World!'
+    PLUGIN_ENABLED = False
+
+    def __init__(self):
+        self.menu_item = gtk.MenuItem("Hello World Plugin")
+        self.menu_item.connect('activate', self.onTesteMenu)
+		
+        self.tb_button = gtk.ToolButton(gtk.STOCK_INFO)
+        self.tb_button.set_label("Hello World")
+        self.tb_button.connect('clicked', self.onTbButton)
+		
+
+	# plugin engine methods	
+    def activate(self, plugin_api):
+		# add a menu item to the menu bar
+        plugin_api.AddMenuItem(self.menu_item)
+        		
+        # saves the separator's index to later remove it
+        self.separator = plugin_api.AddToolbarItem(gtk.SeparatorToolItem())
+        # add a item (button) to the ToolBar
+        plugin_api.AddToolbarItem(self.tb_button)
+
+    def onTaskOpened(self, plugin_api):
+		# add a item (button) to the ToolBar
+        self.tb_Taskbutton = gtk.ToolButton(gtk.STOCK_EXECUTE)
+        self.tb_Taskbutton.set_label("Hello World")
+        self.tb_Taskbutton.connect('clicked', self.onTbTaskButton, plugin_api)
+        plugin_api.AddTaskToolbarItem(gtk.SeparatorToolItem())
+        plugin_api.AddTaskToolbarItem(self.tb_Taskbutton)
+		
+    def deactivate(self, plugin_api):
+        plugin_api.RemoveMenuItem(self.menu_item)
+        plugin_api.RemoveToolbarItem(self.tb_button)
+        plugin_api.RemoveToolbarItem(None, self.separator)
+		
+    #load a dialog with a String
+    def loadDialog(self, msg):
+        path = os.path.dirname(os.path.abspath(__file__))
+        glade_file = os.path.join(path, "hello_world.glade")
+        wTree = gtk.glade.XML(glade_file, "helloworld")
+        self.dialog = wTree.get_widget("helloworld")
+        lblHelloWorld = wTree.get_widget("lbl_helloworld")
+        lblHelloWorld.set_text(msg)
+        
+        self.dialog.connect("delete_event", self.close_dialog)
+        self.dialog.connect("response", self.close_dialog)
+        
+        self.dialog.show_all()
+    
+    def close_dialog(self, widget, data=None):
+    	self.dialog.destroy()
+        return True    
+	
+	# plugin features
+    def onTesteMenu(self, widget):
+        self.loadDialog("Hello World! From the MenuBar! :-)")
+		
+    def onTbButton(self, widget):
+        self.loadDialog("Hello World! From the ToolBar! :-)")
+		
+    def onTbTaskButton(self, widget, plugin_api):
+        self.loadDialog("Hello World! The tag @hello_world was just added to the end of the task!")
+        plugin_api.add_tag("hello_world")
+		#plugin_api.add_tag_attribute("@addingtag", "atrrib_teste", "teste")
+        
+    def teste(self):
+        print "TESTE!"
+	
 
=== modified file 'GTG/taskbrowser/browser.py'
--- GTG/taskbrowser/browser.py	2009-07-28 15:57:10 +0000
+++ GTG/taskbrowser/browser.py	2009-07-29 15:14:01 +0000
@@ -40,6 +40,9 @@
 from GTG.taskbrowser                  import GnomeConfig
 from GTG.taskbrowser                  import browser_tools
 from GTG.tools                        import colors, openurl
+from GTG.core.plugins.manager         import PluginManager
+from GTG.core.plugins.engine          import PluginEngine
+from GTG.core.plugins.api             import PluginAPI
 
 #=== OBJECTS ==================================================================
 
@@ -120,6 +123,9 @@
 
         # Define accelerator keys
         self.init_accelerators()
+        
+        # Initialize the plugin-engine
+        self.init_plugin_engine()
 
         # NOTES
         self.init_note_support()
@@ -138,6 +144,7 @@
         self.priv['selected_rows']            = None
         self.priv['workview']                 = False
         self.priv['noteview']                 = False
+        self.priv['workview_task_filter']     = []
 
     def init_icon_theme(self):
         icon_dirs = [GTG.DATA_DIR, os.path.join(GTG.DATA_DIR, "icons")]
@@ -262,7 +269,10 @@
             "on_about_close":
                 self.on_about_close,
             "on_nonworkviewtag_toggled":
-                self.on_nonworkviewtag_toggled}
+                self.on_nonworkviewtag_toggled,
+            "on_pluginmanager_activate": 
+                self.on_pluginmanager_activate
+        }
 
         self.wTree.signal_autoconnect(SIGNAL_CONNECTIONS_DIC)
         if (self.window):
@@ -329,6 +339,33 @@
         key, mod = gtk.accelerator_parse('<Control>i')
         task_dismiss.add_accelerator(
             'activate', agr, key, mod, gtk.ACCEL_VISIBLE)
+        
+    def init_plugin_engine(self):
+        # plugins - Init
+        self.pengine = PluginEngine(GTG.PLUGIN_DIR)
+        # loads the plugins in the plugin dir
+        self.plugins = self.pengine.LoadPlugins()
+        
+        # checks the conf for user settings
+        if self.config.has_key("plugins"):
+            if self.config["plugins"].has_key("enabled"):
+                plugins_enabled = self.config["plugins"]["enabled"]
+                for p in self.plugins:
+                    if p['name'] in plugins_enabled:
+                        p['state'] = True
+                    
+            if self.config["plugins"].has_key("disabled"):
+                plugins_disabled = self.config["plugins"]["disabled"]
+                for p in self.plugins:    
+                    if p['name'] in plugins_disabled:
+                        p['state'] = False
+        
+        # initializes the plugin api class
+        self.plugin_api = PluginAPI(self.window, self.config, self.wTree, self.req, \
+                                    self.task_tview, self.priv['workview_task_filter'], \
+                                    self.tagpopup, self.tag_tview, None, None)
+        # initializes and activates each plugin (that is enabled)
+        self.pengine.activatePlugins(self.plugins, self.plugin_api)
 
     def init_note_support(self):
         self.notes  = EXPERIMENTAL_NOTES
@@ -667,9 +704,9 @@
             self.opened_task[uid].present()
         else:
             tv = TaskEditor(
-                self.req, t, self.do_refresh, self.on_delete_task,
-                self.close_task, self.open_task, self.get_tasktitle,
-                notes=self.notes)
+                self.req, t, self.plugins, self.do_refresh, 
+                self.on_delete_task, self.close_task, self.open_task, 
+                self.get_tasktitle, notes=self.notes)
             #registering as opened
             self.opened_task[uid] = tv
 
@@ -861,6 +898,9 @@
             view = "workview"
         else:
             view = "default"
+            
+        # plugins are deactivated
+        self.pengine.deactivatePlugins(self.plugins, self.plugin_api)
 
         # Populate configuration dictionary
         self.config["browser"] = {
@@ -899,6 +939,11 @@
         self.config["browser"]["view"]              = view
         if self.notes:
             self.config["browser"]["experimental_notes"] = True
+        
+        # adds the plugin settings to the conf
+        self.config["plugins"] = {}
+        self.config["plugins"]["disabled"] = self.pengine.disabledPlugins(self.plugins)
+        self.config["plugins"]["enabled"] = self.pengine.enabledPlugins(self.plugins)
 
     def on_about_clicked(self, widget):
         self.about.show()
@@ -1275,6 +1320,9 @@
         if selection.count_selected_rows() > 0:
             self.ctask_tview.get_selection().unselect_all()
             self.task_tview.get_selection().unselect_all()
+    
+    def on_pluginmanager_activate(self, widget) :
+        PluginManager(self.window, self.plugins, self.pengine, self.plugin_api)
 
     def on_close(self, widget=None):
         """Closing the window."""
@@ -1358,6 +1406,10 @@
             if self.priv['workview']:
                 count = len(\
                     self.req.get_active_tasks_list(tags=[tag], workable=True))
+                for tid in self.priv['workview_task_filter']:
+                    for t in self.req.get_task(tid).get_tags():
+                        if tag == t:
+                            count = count -1
             else:
                 count = len(\
                     self.req.get_tasks_list(started_only=False, tags=[tag]))
@@ -1399,9 +1451,10 @@
                 tags=tag_list, notag_only=notag_only, workable=True,
                 started_only=False)
             for tid in tasks:
-                self.add_task_tree_to_list(
-                    new_taskts, tid, None, selected_uid, treeview=False)
-            nbr_of_tasks = len(tasks)
+                if tid not in self.priv['workview_task_filter']: # this filters out tasks
+                    self.add_task_tree_to_list(new_taskts,tid, None,\
+                                               selected_uid, treeview=False)
+            nbr_of_tasks = len(tasks) - len(self.priv['workview_task_filter'])
 
         else:
             #building the classical treeview
 
=== modified file 'GTG/taskbrowser/taskbrowser.glade'
--- GTG/taskbrowser/taskbrowser.glade	2009-07-14 13:02:15 +0000
+++ GTG/taskbrowser/taskbrowser.glade	2009-07-29 15:14:01 +0000
@@ -1,991 +1,1353 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue Mar 31 14:57:26 2009 -->
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+
 <glade-interface>
-  <widget class="GtkWindow" id="MainWindow">
-    <property name="title" translatable="yes">Getting Things Gnome!</property>
-    <property name="default_width">640</property>
-    <property name="default_height">480</property>
-    <signal name="configure_event" handler="on_move"/>
-    <signal name="size_allocate" handler="on_size_allocate"/>
-    <signal name="delete_event" handler="on_delete"/>
-    <child>
-      <widget class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <child>
-          <widget class="GtkMenuBar" id="browser_menu">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkMenuItem" id="menuitem1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_File</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu1">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="file_quit">
-                        <property name="visible">True</property>
-                        <property name="label">gtk-quit</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="gtk_main_quit"/>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="menu_edit">
-                <property name="label" translatable="yes">_Edit</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu2">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="edit_undo">
-                        <property name="visible">True</property>
-                        <property name="label">gtk-undo</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="edit_redo">
-                        <property name="visible">True</property>
-                        <property name="label">gtk-redo</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="menu_view">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_View</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu5">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkCheckMenuItem" id="view_workview">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Work View</property>
-                        <property name="use_underline">True</property>
-                        <signal name="toggled" handler="on_view_workview_toggled"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="separator1">
-                        <property name="visible">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkCheckMenuItem" id="bgcol_enable">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Background Colors</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <signal name="toggled" handler="on_bg_color_toggled"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                        <property name="visible">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkCheckMenuItem" id="view_sidebar">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Tags Sidebar</property>
-                        <property name="use_underline">True</property>
-                        <signal name="toggled" handler="on_view_sidebar_toggled"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkCheckMenuItem" id="view_closed">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Closed Tasks Pane</property>
-                        <property name="use_underline">True</property>
-                        <signal name="toggled" handler="on_view_closed_toggled"/>
-                      </widget>
-                    </child>
-                    <child><widget class="GtkCheckMenuItem" id="view_toolbar">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">T_oolbar</property>
-                        <property name="use_underline">True</property>
-                        <signal name="toggled" handler="on_view_toolbar_toggled" />
-                      </widget></child>
-                    <child>
-                      <widget class="GtkCheckMenuItem" id="view_quickadd">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">_Quick Add Entry</property>
-                        <property name="use_underline">True</property>
-                        <signal name="toggled" handler="on_view_quickadd_toggled"/>
-                      </widget>
-                    </child></widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="bm_task">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Tasks</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu4">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="new_task_mi">
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Create a new task</property>
-                        <property name="label" translatable="yes">New _Task</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_add_task"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image1">
-                            <property name="visible">True</property>
-                            <property name="pixel_size">16</property>
-                            <property name="icon_name">gtg-task-new</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="new_subtask_mi">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">New _Subtask</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_add_subtask"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image2">
-                            <property name="visible">True</property>
-                            <property name="pixel_size">16</property>
-                            <property name="icon_name">gtg-task-new</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="edit_mi">
-                        <property name="visible">True</property>
-                        <property name="label">gtk-edit</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_edit_active_task"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
-                        <property name="visible">True</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="mark_done_mi">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Mark as _Done</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_mark_as_done"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image3">
-                            <property name="visible">True</property>
-                            <property name="pixel_size">16</property>
-                            <property name="icon_name">gtg-task-done</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="task_dismiss">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">D_ismiss</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_dismiss_task"/>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image4">
-                            <property name="visible">True</property>
-                            <property name="pixel_size">16</property>
-                            <property name="icon_name">gtg-task-dismiss</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="delete_mi">
-                        <property name="visible">True</property>
-                        <property name="label">gtk-delete</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_delete_task"/>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkMenuItem" id="menuitem4">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">_Help</property>
-                <property name="use_underline">True</property>
-                <child>
-                  <widget class="GtkMenu" id="menu3">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImageMenuItem" id="imagemenuitem10">
-                        <property name="visible">True</property>
-                        <property name="label">gtk-about</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_about_clicked"/>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkToolbar" id="task_tb">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkToolButton" id="new_task_b">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">New Task</property>
-                <property name="icon_name">gtg-task-new</property>
-                <signal name="clicked" handler="on_add_task"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="new_subtask_b">
-                <property name="label" translatable="yes">New Subtask</property>
-                <property name="icon_name">gtg-task-new</property>
-                <signal name="clicked" handler="on_add_subtask"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="new_note_button">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">New Note</property>
-                <property name="icon_name">gtg-note-new</property>
-                <signal name="clicked" handler="on_add_note"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="edit_b">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Edit</property>
-                <property name="stock_id">gtk-edit</property>
-                <signal name="clicked" handler="on_edit_active_task"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="&lt;separateur&gt;">
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="Undo">
-                <property name="label" translatable="yes">Undo</property>
-                <property name="stock_id">gtk-undo</property>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="Redo">
-                <property name="label" translatable="yes">Redo</property>
-                <property name="stock_id">gtk-redo</property>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton2">
-                <property name="visible">True</property>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="mark_as_done_b">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Mark as Done</property>
-                <property name="icon_name">gtg-task-done</property>
-                <signal name="clicked" handler="on_mark_as_done"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="dismiss">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Dismiss</property>
-                <property name="icon_name">gtg-task-dismiss</property>
-                <signal name="clicked" handler="on_dismiss_task"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="toolbutton1">
-                <property name="visible">True</property>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToggleToolButton" id="note_toggle">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">View Notes</property>
-                <property name="stock_id">gtk-file</property>
-                <signal name="toggled" handler="on_note_toggled"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToggleToolButton" id="workview_toggle">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">Work View</property>
-                <property name="stock_id">gtk-index</property>
-                <signal name="toggled" handler="on_workview_toggled"/>
-              </widget>
-              <packing>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHPaned" id="hpaned1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="position">200</property>
-            <property name="position_set">True</property>
-            <child>
-              <widget class="GtkVBox" id="sidebar">
-                <child>
-                  <widget class="GtkHBox" id="hbox4">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImage" id="image8">
-                        <property name="visible">True</property>
-                        <property name="xpad">5</property>
-                        <property name="icon_name">gtg-tag</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Tags</property>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="button-sidebar-close">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_view_sidebar_toggled"/>
-                        <child>
-                          <widget class="GtkImage" id="image9">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-close</property>
-                            <property name="icon_size">1</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkScrolledWindow" id="sidebar-scroll">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <child>
-                      <widget class="GtkTreeView" id="tag_tview">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <signal name="button_press_event" handler="on_tag_treeview_button_press_event"/>
-                        <signal name="row_activated" handler="on_select_tag"/>
-                        <signal name="cursor_changed" handler="on_select_tag"/>
-                      </widget>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox2">
-                <property name="visible">True</property>
-                <child>
-                  <widget class="GtkHBox" id="quickadd_pane">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkEntry" id="quickadd_field">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="has_focus">True</property>
-                        <property name="is_focus">True</property>
-                        <property name="can_default">True</property>
-                        <signal name="activate" handler="on_quickadd_field_activate"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="button1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="label">gtk-add</property>
-                        <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_quickadd_button_activate"/>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkVPaned" id="vpaned1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="position">330</property>
-                    <property name="position_set">True</property>
-                    <child>
-                      <widget class="GtkScrolledWindow" id="main_pane">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <child>
-                          <widget class="GtkTreeView" id="task_tview">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="reorderable">True</property>
-                            <property name="rules_hint">True</property>
-                            <property name="enable_search">False</property>
-                            <property name="search_column">8</property>
-                            <property name="rubber_banding">True</property>
-                            <property name="enable_tree_lines">True</property>
-                            <signal name="button_press_event" handler="on_task_treeview_button_press_event"/>
-                            <signal name="key_press_event" handler="on_task_treeview_key_press_event"/>
-                            <signal name="row_activated" handler="on_edit_active_task"/>
-                            <signal name="cursor_changed" handler="on_task_tview_cursor_changed"/>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="resize">True</property>
-                        <property name="shrink">True</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkScrolledWindow" id="closed_pane">
-                        <property name="height_request">200</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                        <child>
-                          <widget class="GtkTreeView" id="taskdone_tview">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="rules_hint">True</property>
-                            <property name="search_column">8</property>
-                            <signal name="button_press_event" handler="on_closed_task_treeview_button_press_event"/>
-                            <signal name="key_press_event" handler="on_closed_task_treeview_key_press_event"/>
-                            <signal name="row_activated" handler="on_edit_done_task"/>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="resize">True</property>
-                        <property name="shrink">True</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkStatusbar" id="statusbar1">
-            <property name="visible">True</property>
-            <property name="spacing">2</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="confirm_delete">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Confirm task deletion</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <signal name="close" handler="on_delete_cancel"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkHBox" id="hbox3">
-            <property name="visible">True</property>
-            <child>
-              <widget class="GtkImage" id="image5">
-                <property name="visible">True</property>
-                <property name="stock">gtk-dialog-question</property>
-                <property name="icon_size">6</property>
-              </widget>
-              <packing>
-                <property name="fill">False</property>
-                <property name="padding">16</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">&lt;span weight="bold" size="large"&gt;Are you sure you want delete this task?&lt;/span&gt;
+
+<widget class="GtkWindow" id="MainWindow">
+  <property name="title" translatable="yes">Getting Things Gnome!</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="default_width">640</property>
+  <property name="default_height">480</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <signal name="configure_event" handler="on_move"/>
+  <signal name="size_allocate" handler="on_size_allocate"/>
+  <signal name="delete_event" handler="on_delete"/>
+
+  <child>
+    <widget class="GtkVBox" id="vbox1">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<widget class="GtkMenuBar" id="browser_menu">
+	  <property name="visible">True</property>
+	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="menuitem1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">_File</property>
+	      <property name="use_underline">True</property>
+
+	      <child>
+		<widget class="GtkMenu" id="menuitem1_menu">
+
+		  <child>
+		    <widget class="GtkImageMenuItem" id="file_quit">
+		      <property name="visible">True</property>
+		      <property name="label">gtk-quit</property>
+		      <property name="use_stock">True</property>
+		      <signal name="activate" handler="gtk_main_quit"/>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="menu_edit">
+	      <property name="label" translatable="yes">_Edit</property>
+	      <property name="use_underline">True</property>
+
+	      <child>
+		<widget class="GtkMenu" id="menu_edit_menu">
+
+		  <child>
+		    <widget class="GtkImageMenuItem" id="edit_undo">
+		      <property name="visible">True</property>
+		      <property name="label">gtk-undo</property>
+		      <property name="use_stock">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkImageMenuItem" id="edit_redo">
+		      <property name="visible">True</property>
+		      <property name="label">gtk-redo</property>
+		      <property name="use_stock">True</property>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="menu_view">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">_View</property>
+	      <property name="use_underline">True</property>
+
+	      <child>
+		<widget class="GtkMenu" id="menu_view_menu">
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="view_workview">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Work View</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_view_workview_toggled"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorMenuItem" id="separator1">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="bgcol_enable">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Background Colors</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">True</property>
+		      <signal name="toggled" handler="on_bg_color_toggled"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="view_sidebar">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Tags Sidebar</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_view_sidebar_toggled"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="view_closed">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Closed Tasks Pane</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_view_closed_toggled"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="view_toolbar">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">T_oolbar</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_view_toolbar_toggled"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="view_quickadd">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Quick Add Entry</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_view_quickadd_toggled"/>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="bm_task">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">_Tasks</property>
+	      <property name="use_underline">True</property>
+
+	      <child>
+		<widget class="GtkMenu" id="bm_task_menu">
+
+		  <child>
+		    <widget class="GtkMenuItem" id="new_task_mi">
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Create a new task</property>
+		      <property name="label" translatable="yes">New _Task</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_add_task"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkMenuItem" id="new_subtask_mi">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">New _Subtask</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_add_subtask"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkImageMenuItem" id="edit_mi">
+		      <property name="visible">True</property>
+		      <property name="label">gtk-edit</property>
+		      <property name="use_stock">True</property>
+		      <signal name="activate" handler="on_edit_active_task"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorMenuItem" id="separatormenuitem2">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkMenuItem" id="mark_done_mi">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Mark as _Done</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_mark_as_done"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkMenuItem" id="task_dismiss">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">D_ismiss</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_dismiss_task"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkImageMenuItem" id="delete_mi">
+		      <property name="visible">True</property>
+		      <property name="label">gtk-delete</property>
+		      <property name="use_stock">True</property>
+		      <signal name="activate" handler="on_delete_task"/>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="menu_plugin">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">_Plugins</property>
+	      <property name="use_underline">True</property>
+
+	      <child>
+		<widget class="GtkMenu" id="menu_plugin_menu">
+
+		  <child>
+		    <widget class="GtkMenuItem" id="pluginmanager_menu">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Plugin Preferences</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="on_pluginmanager_activate" last_modification_time="Wed, 29 Jul 2009 14:36:59 GMT"/>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="menuitem4">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">_Help</property>
+	      <property name="use_underline">True</property>
+
+	      <child>
+		<widget class="GtkMenu" id="menuitem4_menu">
+
+		  <child>
+		    <widget class="GtkImageMenuItem" id="imagemenuitem10">
+		      <property name="visible">True</property>
+		      <property name="label">gtk-about</property>
+		      <property name="use_stock">True</property>
+		      <signal name="activate" handler="on_about_clicked"/>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkToolbar" id="task_tb">
+	  <property name="visible">True</property>
+	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+	  <property name="tooltips">True</property>
+	  <property name="show_arrow">True</property>
+
+	  <child>
+	    <widget class="GtkToolButton" id="new_task_b">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">New Task</property>
+	      <property name="use_underline">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <signal name="clicked" handler="on_add_task"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="new_subtask_b">
+	      <property name="label" translatable="yes">New Subtask</property>
+	      <property name="use_underline">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <signal name="clicked" handler="on_add_subtask"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="new_note_button">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">New Note</property>
+	      <property name="use_underline">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <signal name="clicked" handler="on_add_note"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="edit_b">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Edit</property>
+	      <property name="use_underline">True</property>
+	      <property name="stock_id">gtk-edit</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <signal name="clicked" handler="on_edit_active_task"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkSeparatorToolItem" id="&lt;separateur&gt;">
+	      <property name="draw">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="Undo">
+	      <property name="label" translatable="yes">Undo</property>
+	      <property name="use_underline">True</property>
+	      <property name="stock_id">gtk-undo</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="Redo">
+	      <property name="label" translatable="yes">Redo</property>
+	      <property name="use_underline">True</property>
+	      <property name="stock_id">gtk-redo</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkSeparatorToolItem" id="toolbutton2">
+	      <property name="visible">True</property>
+	      <property name="draw">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="mark_as_done_b">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Mark as Done</property>
+	      <property name="use_underline">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <signal name="clicked" handler="on_mark_as_done"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="dismiss">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Dismiss</property>
+	      <property name="use_underline">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <signal name="clicked" handler="on_dismiss_task"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkSeparatorToolItem" id="toolbutton1">
+	      <property name="visible">True</property>
+	      <property name="draw">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToggleToolButton" id="note_toggle">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">View Notes</property>
+	      <property name="use_underline">True</property>
+	      <property name="stock_id">gtk-file</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <property name="active">False</property>
+	      <signal name="toggled" handler="on_note_toggled"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToggleToolButton" id="workview_toggle">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Work View</property>
+	      <property name="use_underline">True</property>
+	      <property name="stock_id">gtk-index</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <property name="active">False</property>
+	      <signal name="toggled" handler="on_workview_toggled"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHPaned" id="hpaned1">
+	  <property name="visible">True</property>
+	  <property name="can_focus">True</property>
+	  <property name="position">200</property>
+
+	  <child>
+	    <widget class="GtkVBox" id="sidebar">
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox4">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkImage" id="image8">
+		      <property name="visible">True</property>
+		      <property name="icon_size">4</property>
+		      <property name="icon_name">gtg-tag</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">5</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label4">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Tags</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="button-sidebar-close">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="relief">GTK_RELIEF_NONE</property>
+		      <property name="focus_on_click">True</property>
+		      <signal name="clicked" handler="on_view_sidebar_toggled"/>
+
+		      <child>
+			<widget class="GtkImage" id="image9">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-close</property>
+			  <property name="icon_size">1</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkScrolledWindow" id="sidebar-scroll">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		  <property name="shadow_type">GTK_SHADOW_IN</property>
+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		  <child>
+		    <widget class="GtkTreeView" id="tag_tview">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="headers_visible">True</property>
+		      <property name="rules_hint">False</property>
+		      <property name="reorderable">False</property>
+		      <property name="enable_search">True</property>
+		      <property name="fixed_height_mode">False</property>
+		      <property name="hover_selection">False</property>
+		      <property name="hover_expand">False</property>
+		      <signal name="button_press_event" handler="on_tag_treeview_button_press_event"/>
+		      <signal name="row_activated" handler="on_select_tag"/>
+		      <signal name="cursor_changed" handler="on_select_tag"/>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="shrink">True</property>
+	      <property name="resize">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox2">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkHBox" id="quickadd_pane">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkEntry" id="quickadd_field">
+		      <property name="visible">True</property>
+		      <property name="can_default">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="has_focus">True</property>
+		      <property name="editable">True</property>
+		      <property name="visibility">True</property>
+		      <property name="max_length">0</property>
+		      <property name="text" translatable="yes"></property>
+		      <property name="has_frame">True</property>
+		      <property name="invisible_char">●</property>
+		      <property name="activates_default">False</property>
+		      <signal name="activate" handler="on_quickadd_field_activate"/>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkButton" id="button1">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label">gtk-add</property>
+		      <property name="use_stock">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <signal name="clicked" handler="on_quickadd_button_activate"/>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">2</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkVPaned" id="vpaned1">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="position">330</property>
+
+		  <child>
+		    <widget class="GtkScrolledWindow" id="main_pane">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		      <child>
+			<widget class="GtkTreeView" id="task_tview">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="headers_visible">True</property>
+			  <property name="rules_hint">True</property>
+			  <property name="reorderable">True</property>
+			  <property name="enable_search">False</property>
+			  <property name="fixed_height_mode">False</property>
+			  <property name="hover_selection">False</property>
+			  <property name="hover_expand">False</property>
+			  <signal name="button_press_event" handler="on_task_treeview_button_press_event"/>
+			  <signal name="key_press_event" handler="on_task_treeview_key_press_event"/>
+			  <signal name="row_activated" handler="on_edit_active_task"/>
+			  <signal name="cursor_changed" handler="on_task_tview_cursor_changed"/>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="shrink">True</property>
+		      <property name="resize">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkScrolledWindow" id="closed_pane">
+		      <property name="height_request">200</property>
+		      <property name="can_focus">True</property>
+		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+		      <child>
+			<widget class="GtkTreeView" id="taskdone_tview">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="headers_visible">True</property>
+			  <property name="rules_hint">True</property>
+			  <property name="reorderable">False</property>
+			  <property name="enable_search">True</property>
+			  <property name="fixed_height_mode">False</property>
+			  <property name="hover_selection">False</property>
+			  <property name="hover_expand">False</property>
+			  <signal name="button_press_event" handler="on_closed_task_treeview_button_press_event"/>
+			  <signal name="key_press_event" handler="on_closed_task_treeview_key_press_event"/>
+			  <signal name="row_activated" handler="on_edit_done_task"/>
+			</widget>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="shrink">True</property>
+		      <property name="resize">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="shrink">True</property>
+	      <property name="resize">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkStatusbar" id="statusbar1">
+	  <property name="visible">True</property>
+	  <property name="has_resize_grip">True</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkDialog" id="confirm_delete">
+  <property name="border_width">5</property>
+  <property name="title" translatable="yes">Confirm task deletion</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">False</property>
+  <signal name="close" handler="on_delete_cancel"/>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox1">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">2</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area1">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="cancel">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">0</property>
+	      <signal name="released" handler="on_delete_cancel"/>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox1">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkImage" id="image6">
+		      <property name="visible">True</property>
+		      <property name="stock">gtk-cancel</property>
+		      <property name="icon_size">4</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label2">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Keep selected task</property>
+		      <property name="use_underline">True</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="delete">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">0</property>
+	      <signal name="activate" handler="on_delete_confirm"/>
+	      <signal name="released" handler="on_delete_confirm"/>
+
+	      <child>
+		<widget class="GtkHBox" id="hbox2">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkImage" id="image7">
+		      <property name="visible">True</property>
+		      <property name="stock">gtk-delete</property>
+		      <property name="icon_size">4</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkLabel" id="label3">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Permanently _remove task</property>
+		      <property name="use_underline">True</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHBox" id="hbox3">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkImage" id="image5">
+	      <property name="visible">True</property>
+	      <property name="stock">gtk-dialog-question</property>
+	      <property name="icon_size">6</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">16</property>
+	      <property name="expand">True</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot; size=&quot;large&quot;&gt;Are you sure you want delete this task?&lt;/span&gt;
 
 Deleting a task cannot be undone.</property>
-                <property name="use_markup">True</property>
-                <property name="wrap">True</property>
-              </widget>
-              <packing>
-                <property name="padding">16</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="padding">16</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <widget class="GtkButton" id="cancel">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="response_id">0</property>
-                <signal name="released" handler="on_delete_cancel"/>
-                <child>
-                  <widget class="GtkHBox" id="hbox1">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImage" id="image6">
-                        <property name="visible">True</property>
-                        <property name="stock">gtk-cancel</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Keep selected task</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="delete">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="response_id">0</property>
-                <signal name="activate" handler="on_delete_confirm"/>
-                <signal name="released" handler="on_delete_confirm"/>
-                <child>
-                  <widget class="GtkHBox" id="hbox2">
-                    <property name="visible">True</property>
-                    <child>
-                      <widget class="GtkImage" id="image7">
-                        <property name="visible">True</property>
-                        <property name="stock">gtk-delete</property>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Permanently _remove task</property>
-                        <property name="use_underline">True</property>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkMenu" id="ProjectContextMenu">
-    <property name="visible">True</property>
-    <child>
-      <widget class="GtkImageMenuItem" id="edit_item">
-        <property name="visible">True</property>
-        <property name="label">gtk-edit</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <signal name="activate" handler="on_edit_item_activate"/>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="delete_item">
-        <property name="visible">True</property>
-        <property name="label">gtk-delete</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <signal name="activate" handler="on_delete_item_activate"/>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkMenu" id="TagContextMenu">
-    <property name="visible">True</property>
-    <property name="no_show_all">True</property>
-    <child>
-      <widget class="GtkImageMenuItem" id="colorchooser">
-        <property name="visible">True</property>
-        <property name="label">gtk-select-color</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <signal name="activate" handler="on_colorchooser_activate"/>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkCheckMenuItem" id="nonworkviewtag">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Tag is displayed in the workview</property>
-        <property name="use_underline">True</property>
-        <property name="active">True</property>
-        <signal name="toggled" handler="on_nonworkviewtag_toggled"/>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkColorSelectionDialog" id="ColorChooser">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Choose a color</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_MENU</property>
-    <signal name="response" handler="on_color_response"/>
-    <child internal-child="color_selection">
-      <widget class="GtkColorSelection" id="colorsel-color_selection1">
-        <property name="visible">True</property>
-        <property name="border_width">5</property>
-        <property name="current_color">#ffffffffffff</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </widget>
-    </child>
-    <child internal-child="help_button">
-      <widget class="GtkButton" id="colorsel-help_button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="can_default">True</property>
-        <property name="receives_default">True</property>
-        <property name="label">gtk-help</property>
-        <property name="use_stock">True</property>
-        <property name="response_id">0</property>
-      </widget>
-    </child>
-    <child internal-child="cancel_button">
-      <widget class="GtkButton" id="colorsel-cancel_button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="can_default">True</property>
-        <property name="receives_default">True</property>
-        <property name="label">gtk-cancel</property>
-        <property name="use_stock">True</property>
-        <property name="response_id">0</property>
-      </widget>
-    </child>
-    <child internal-child="ok_button">
-      <widget class="GtkButton" id="colorsel-ok_button1">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="can_default">True</property>
-        <property name="has_default">True</property>
-        <property name="receives_default">True</property>
-        <property name="label">gtk-ok</property>
-        <property name="use_stock">True</property>
-        <property name="response_id">0</property>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkAboutDialog" id="aboutdialog1">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">About GTG!</property>
-    <property name="resizable">False</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="program_name">Getting Things Gnome!</property>
-    <property name="copyright" translatable="yes">Copyrights© 2008, 2009 Lionel Dricot, Bertrand Rousseau</property>
-    <property name="comments" translatable="yes">
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">True</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">True</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">16</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">16</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkMenu" id="ProjectContextMenu">
+  <property name="visible">True</property>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="edit_item">
+      <property name="visible">True</property>
+      <property name="label">gtk-edit</property>
+      <property name="use_stock">True</property>
+      <signal name="activate" handler="on_edit_item_activate"/>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="delete_item">
+      <property name="visible">True</property>
+      <property name="label">gtk-delete</property>
+      <property name="use_stock">True</property>
+      <signal name="activate" handler="on_delete_item_activate"/>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkMenu" id="TagContextMenu">
+  <property name="visible">True</property>
+
+  <child>
+    <widget class="GtkImageMenuItem" id="colorchooser">
+      <property name="visible">True</property>
+      <property name="label">gtk-select-color</property>
+      <property name="use_stock">True</property>
+      <signal name="activate" handler="on_colorchooser_activate"/>
+    </widget>
+  </child>
+
+  <child>
+    <widget class="GtkCheckMenuItem" id="nonworkviewtag">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">Tag is displayed in the workview</property>
+      <property name="use_underline">True</property>
+      <property name="active">True</property>
+      <signal name="toggled" handler="on_nonworkviewtag_toggled"/>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkColorSelectionDialog" id="ColorChooser">
+  <property name="border_width">5</property>
+  <property name="title" translatable="yes">Choose a color</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+  <property name="modal">False</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_MENU</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <signal name="response" handler="on_color_response"/>
+
+  <child internal-child="cancel_button">
+    <widget class="GtkButton" id="colorsel-cancel_button1">
+      <property name="visible">True</property>
+      <property name="can_default">True</property>
+      <property name="can_focus">True</property>
+      <property name="label">gtk-cancel</property>
+      <property name="use_stock">True</property>
+      <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
+    </widget>
+  </child>
+
+  <child internal-child="ok_button">
+    <widget class="GtkButton" id="colorsel-ok_button1">
+      <property name="visible">True</property>
+      <property name="can_default">True</property>
+      <property name="has_default">True</property>
+      <property name="can_focus">True</property>
+      <property name="label">gtk-ok</property>
+      <property name="use_stock">True</property>
+      <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
+    </widget>
+  </child>
+
+  <child internal-child="help_button">
+    <widget class="GtkButton" id="colorsel-help_button1">
+      <property name="visible">True</property>
+      <property name="can_default">True</property>
+      <property name="can_focus">True</property>
+      <property name="label">gtk-help</property>
+      <property name="use_stock">True</property>
+      <property name="relief">GTK_RELIEF_NORMAL</property>
+      <property name="focus_on_click">True</property>
+    </widget>
+  </child>
+
+  <child internal-child="color_selection">
+    <widget class="GtkColorSelection" id="colorsel-color_selection1">
+      <property name="border_width">5</property>
+      <property name="visible">True</property>
+      <property name="has_opacity_control">False</property>
+      <property name="has_palette">False</property>
+
+      <child>
+	<placeholder/>
+      </child>
+
+      <child>
+	<placeholder/>
+      </child>
+    </widget>
+    <packing>
+      <property name="padding">0</property>
+      <property name="expand">True</property>
+      <property name="fill">True</property>
+    </packing>
+  </child>
+</widget>
+
+<widget class="GtkAboutDialog" id="aboutdialog1">
+  <property name="border_width">5</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="name" translatable="yes">Application Name</property>
+  <property name="copyright" translatable="yes">Copyrights© 2008, 2009 Lionel Dricot, Bertrand Rousseau</property>
+  <property name="comments" translatable="yes">
 Getting Things Gnome! is an organizer for the GNOME desktop environment.</property>
-    <property name="website_label" translatable="yes">GTG website</property>
-    <property name="license" translatable="yes">Getting Things Gnome! is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+  <property name="license" translatable="yes">Getting Things Gnome! is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
 
 Getting Things Gnome! is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with Getting Things Gnome!; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</property>
-    <property name="authors">Lionel Dricot ([e-mail]),
+  <property name="wrap_license">True</property>
+  <property name="website_label" translatable="yes">GTG website</property>
+  <property name="authors">Lionel Dricot ([e-mail]),
 Bertrand Rousseau ([e-mail])</property>
-    <property name="logo_icon_name">gtg</property>
-    <property name="wrap_license">True</property>
-    <signal name="response" handler="on_about_close"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkMenu" id="TaskContextMenu">
-    <property name="visible">True</property>
-    <child>
-      <widget class="GtkImageMenuItem" id="tcm_add_subtask">
-        <property name="visible">True</property>
-        <property name="label">Add a subtask</property>
-        <signal name="activate" handler="on_add_subtask"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image5">
-            <property name="visible">True</property>
-            <property name="pixel_size">16</property>
-            <property name="icon_name">gtg-task-new</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="tcm_edit">
-        <property name="visible">True</property>
-        <property name="label">gtk-edit</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <signal name="activate" handler="on_edit_active_task"/>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkSeparatorMenuItem" id="separatormenuitem3">
-        <property name="visible">True</property>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="tcm_mark_as_done">
-        <property name="visible">True</property>
-        <property name="label">Mark as _Done</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="on_mark_as_done"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image6">
-            <property name="visible">True</property>
-            <property name="pixel_size">16</property>
-            <property name="icon_name">gtg-task-done</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="tcm_dismiss">
-        <property name="visible">True</property>
-        <property name="label">D_ismiss</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="on_dismiss_task"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image7">
-            <property name="visible">True</property>
-            <property name="pixel_size">16</property>
-            <property name="icon_name">gtg-task-dismiss</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="tcm_delete">
-        <property name="visible">True</property>
-        <property name="label">gtk-delete</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <signal name="activate" handler="on_delete_task"/>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkMenu" id="ClosedTaskContextMenu">
-    <property name="visible">True</property>
-    <child>
-      <widget class="GtkImageMenuItem" id="ctcm_edit">
-        <property name="visible">True</property>
-        <property name="label">gtk-edit</property>
-        <property name="use_underline">True</property>
-        <property name="use_stock">True</property>
-        <signal name="activate" handler="on_edit_done_task"/>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkSeparatorMenuItem" id="separatormenuitem4">
-        <property name="visible">True</property>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="ctcm_mark_as_not_done">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Mark as Not Done</property>
-        <signal name="activate" handler="on_mark_as_done"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image8">
-            <property name="visible">True</property>
-            <property name="pixel_size">16</property>
-            <property name="icon_name">gtg-task-undone</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="ctcm_undismiss">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Und_ismiss</property>
-        <property name="use_underline">True</property>
-        <signal name="activate" handler="on_dismiss_task"/>
-        <child internal-child="image">
-          <widget class="GtkImage" id="menu-item-image9">
-            <property name="visible">True</property>
-            <property name="pixel_size">16</property>
-            <property name="icon_name">gtg-task-undismiss</property>
-          </widget>
-        </child>
-      </widget>
-    </child>
-    <child>
-      <widget class="GtkImageMenuItem" id="ctcm_delete">