Merge lp:~gtg-contributors/gtg/integrate-mallard-doc into lp:~gtg/gtg/old-trunk

[Bertrand Rousseau]

This patch integrates the user documentation written by Radina:

 - the mallard pages have been put in doc/userdoc/C
 - setup.py has been modified to install those pages in $PREFIX/share/help/$LANG/gtg (currently, there is only C)
 - the browser code has been modified to open help:gtg when pressing F1

One remark:

 - Should we care about accessing the documentation through while developing? Right now one can only browse the documentation via GTG when it's installed in the dedicated system folder (if not, the URI help:gtg cannot be resolved correctly). I'm not sure we should, but if we want it so, I don't know how to do it.

I might have overlooked some things while doing this, since I'm really not familiar with mallard and user documentation in GNOME/python project in general.

[lp:~gtg-contributors/gtg/integrate-mallard-doc]

1205. By Bertrand Rousseau on 2012-07-11

Update help menu item tooltip, make Getting Things GNOME! translatable again, remove DOCUMENTATION_URL

[Izidor Matušov (izidor)]

It looks good to me. Could you add a help button to synchronization services dialog which opens help page for sync. services? Something like the hidden button in preferences dialog.

review: Needs Fixing (code)

[lp:~gtg-contributors/gtg/integrate-mallard-doc]

1206. By Bertrand Rousseau on 2012-07-13

Add a Help button to the Synchronization Service configuration dialog, also fixes most pylint errors and some pep8-related errors

[Bertrand Rousseau (bertrand-rousseau)]

I've added the button. I also fixed some pylint and pep8 errors.

[Izidor Matušov (izidor)]

Awesome work, I'm going to merge it :)

review: Approve (code, running)

=== modified file 'GTG/gtk/backends_dialog.glade'
--- GTG/gtk/backends_dialog.glade	2012-06-07 15:25:05 +0000
+++ GTG/gtk/backends_dialog.glade	2012-07-13 10:57:18 +0000
@@ -1,13 +1,21 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <!-- interface-naming-policy project-wide -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
   <object class="GtkWindow" id="backends_dialog">
+    <property name="can_focus">False</property>
     <property name="window_position">mouse</property>
-    <signal name="delete_event" handler="on_BackendsDialog_delete_event"/>
+    <signal name="delete-event" handler="on_BackendsDialog_delete_event" swapped="no"/>
     <child>
       <object class="GtkAlignment" id="alignment1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="top_padding">10</property>
         <property name="bottom_padding">10</property>
         <property name="left_padding">10</property>
@@ -15,23 +23,29 @@
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">10</property>
             <child>
               <object class="GtkHBox" id="big_central_hbox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="spacing">10</property>
                 <child>
                   <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkViewport" id="treeview_window">
                         <property name="height_request">400</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <placeholder/>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
@@ -39,6 +53,7 @@
                       <object class="GtkAlignment" id="alignment2">
                         <property name="height_request">30</property>
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="yalign">1</property>
                         <property name="top_padding">20</property>
                         <property name="bottom_padding">10</property>
@@ -47,6 +62,7 @@
                         <child>
                           <object class="GtkHButtonBox" id="hbuttonbox3">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">10</property>
                             <property name="homogeneous">True</property>
                             <child>
@@ -55,8 +71,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_stock">True</property>
-                                <signal name="clicked" handler="on_add_button_clicked"/>
+                                <signal name="clicked" handler="on_add_button_clicked" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -70,8 +87,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="use_stock">True</property>
-                                <signal name="clicked" handler="on_remove_button_clicked"/>
+                                <signal name="clicked" handler="on_remove_button_clicked" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -90,6 +108,8 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -104,10 +124,12 @@
                     <child>
                       <object class="GtkViewport" id="central_pane1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="resize_mode">queue</property>
                         <child>
                           <object class="GtkAlignment" id="central_pane">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="left_padding">10</property>
                             <property name="right_padding">10</property>
                             <child>
@@ -119,36 +141,59 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkHButtonBox" id="hbuttonbox2">
                 <property name="visible">True</property>
-                <property name="layout_style">end</property>
+                <property name="can_focus">False</property>
+                <property name="layout_style">edge</property>
+                <child>
+                  <object class="GtkButton" id="button1">
+                    <property name="label">gtk-help</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" handler="on_help_button_clicked" swapped="no"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkButton" id="close_button">
                     <property name="label">gtk-close</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
                     <property name="use_stock">True</property>
-                    <signal name="clicked" handler="on_close_button_clicked"/>
+                    <signal name="clicked" handler="on_close_button_clicked" swapped="no"/>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">0</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -157,10 +202,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
 </interface>
 
=== modified file 'GTG/gtk/backends_dialog/__init__.py'
--- GTG/gtk/backends_dialog/__init__.py	2012-06-07 15:25:05 +0000
+++ GTG/gtk/backends_dialog/__init__.py	2012-07-13 10:57:18 +0000
@@ -28,6 +28,8 @@
 
 import gtk
 
+from webbrowser import open as openurl
+
 from GTG.gtk                                import ViewConfig
 from GTG.core                               import CoreConfig
 from GTG.gtk.backends_dialog.backendstree   import BackendsTree
@@ -42,7 +44,8 @@
 
 class BackendsDialog(object):
     '''
-    BackendsDialog manages a window that lets you manage and configure synchronization service.
+    BackendsDialog manages a window that lets you manage and configure
+    synchronization service.
     It can display two "views", or "panels":
         - the backend configuration view
         - the backend adding view
@@ -54,14 +57,26 @@
         @param req: a Requester object
         '''
         self.req = req
+        self.icon_theme = None
         self._configure_icon_theme()
-        builder = gtk.Builder() 
+        # Declare subsequently loaded widget
+        self.dialog = None
+        self.treeview_window = None
+        self.central_pane = None
+        self.add_button = None
+        self.remove_button = None
+        self.backends_tv = None
+        self.config_panel = None
+        self.add_panel = None
+        # Load from Glade
+        builder = gtk.Builder()
         self._load_widgets_from_glade(builder)
+        # Load and setup other widgets
         self.dialog.set_title(_("Synchronization Services - %s" % info.NAME))
         self._create_widgets_for_add_panel()
-        self._create_widgets_for_configure_panel()
+        self._create_widgets_for_conf_panel()
         self._setup_signal_connections(builder)
-        self._create_widgets_for_backends_tree()
+        self._create_widgets_for_treeview()
 
 ########################################
 ### INTERFACE WITH THE VIEWMANAGER #####
@@ -74,10 +89,10 @@
         self.backends_tv.select_backend()
         self.dialog.present()
 
-    def on_close(self, widget, data = None):
+    def on_close(self, widget, data = None): # pylint: disable-msg=W0613
         '''
         Hides this window, saving the backends configuration.
-        
+
         @param widget: not used, here only for using this as signal callback
         @param data: same as widget, disregard the content
         '''
@@ -109,13 +124,13 @@
         @returns gtk.gdk.Pixbuf: a pixbuf containing the wanted icon, or None
         (if the icon is not present)
         '''
-        #NOTE: loading icons directly from the theme and scaling them results in
-        #      blurry icons. So, instead of doing that, I'm loading them
+        #NOTE: loading icons directly from the theme and scaling them results
+        #      in blurry icons. So, instead of doing that, I'm loading them
         #      directly from file. 
         icon_info = self.icon_theme.lookup_icon(name, gtk.ICON_SIZE_MENU, 0)
         if icon_info == None:
             return None
-        pixbuf =  gtk.gdk.pixbuf_new_from_file(icon_info.get_filename())
+        pixbuf = gtk.gdk.pixbuf_new_from_file(icon_info.get_filename())
         return pixbuf.scale_simple(width, height, gtk.gdk.INTERP_BILINEAR)
 
     def _show_panel(self, panel_name):
@@ -166,11 +181,11 @@
         '''
         builder.add_from_file(ViewConfig.BACKENDS_GLADE_FILE)
         widgets = {
-          'dialog'        : 'backends_dialog',
-          'treeview_window'   : 'treeview_window',
-          'central_pane'  : 'central_pane',
-          'add_button'    : 'add_button',
-          'remove_button' : 'remove_button',
+          'dialog'          : 'backends_dialog',
+          'treeview_window' : 'treeview_window',
+          'central_pane'    : 'central_pane',
+          'add_button'      : 'add_button',
+          'remove_button'   : 'remove_button',
           }
         for attr, widget in widgets.iteritems():
             setattr(self, attr, builder.get_object(widget))
@@ -186,6 +201,7 @@
          'on_BackendsDialog_delete_event': self.on_close,
          'on_close_button_clicked': self.on_close,
          'on_remove_button_clicked': self.on_remove_button,
+         'on_help_button_clicked': lambda w: openurl("help:gtg/gtg-add-sync"),
         }
         builder.connect_signals(signals)
 
@@ -198,7 +214,7 @@
         for directory in CoreConfig().get_icons_directories():
             self.icon_theme.prepend_search_path(directory)
 
-    def _create_widgets_for_backends_tree(self):
+    def _create_widgets_for_treeview(self):
         '''
         Creates the widgets for the lateral treeview displaying the 
         backends the user has added
@@ -206,7 +222,7 @@
         self.backends_tv = BackendsTree(self)
         self.treeview_window.add(self.backends_tv)
 
-    def _create_widgets_for_configure_panel(self):
+    def _create_widgets_for_conf_panel(self):
         '''simply creates the panel to configure backends'''
         self.config_panel = ConfigurePanel(self)
 
@@ -231,6 +247,7 @@
             backend = self.req.get_backend(backend_id)
             self.remove_button.set_sensitive(not backend.is_default())
 
+    # pylint: disable-msg=W0613
     def on_add_button(self, widget = None, data = None):
         '''
         When the add button is pressed, the add panel is shown
@@ -249,11 +266,9 @@
         @param backend_name: the name of the type of the backend to add
                              (identified as BACKEND_NAME in the Backend class)
         '''
-        backend_id = None
         #Create Backend
         backend_dic = BackendFactory().get_new_backend_dict(backend_name)
         if backend_dic:
-            backend_id = backend_dic["backend"].get_id()
             backend_dic[GenericBackend.KEY_ENABLED] = False
             self.req.register_backend(backend_dic)
         #Restore UI
@@ -267,6 +282,7 @@
         '''
         self.backends_tv.select_backend(backend_id)
 
+    # pylint: disable-msg=W0613
     def on_remove_button(self, widget = None, data = None):
         '''
         When the remove button is pressed, a confirmation dialog is shown, 
@@ -283,7 +299,8 @@
                     type = gtk.MESSAGE_QUESTION,
                     buttons = gtk.BUTTONS_YES_NO,
                     message_format = \
-                     _("Do you really want to remove the '%s' synchronization service?") % \
+                     _("Do you really want to remove the '%s' "
+                       "synchronization service?") % \
                             backend.get_human_name())
         response = dialog.run() 
         dialog.destroy()
 
=== modified file 'GTG/gtk/browser/browser.py'
--- GTG/gtk/browser/browser.py	2012-06-21 09:51:32 +0000
+++ GTG/gtk/browser/browser.py	2012-07-13 10:57:18 +0000
@@ -332,7 +332,7 @@
             "on_about_close":
                 self.on_about_close,
             "on_documentation_clicked":
-                lambda w: openurl(info.DOCUMENTATION_URL),
+                lambda w: openurl(info.HELP_URI),
             "on_translate_clicked":
                 lambda w: openurl(info.TRANSLATE_URL),
             "on_report_bug_clicked":
@@ -395,7 +395,7 @@
         self._add_accelerator_for_widget(agr, "dismiss_mi", "<Control>i")
         self._add_accelerator_for_widget(agr, "tcm_modifytags", "<Control>t")
         self._add_accelerator_for_widget(agr, "view_closed", "<Control>F9")
-        self._add_accelerator_for_widget(agr, "online_help", "F1")
+        self._add_accelerator_for_widget(agr, "help_contents", "F1")
 
         quickadd_field = self.builder.get_object("quickadd_field")
         key, mod = gtk.accelerator_parse("<Control>l")
 
=== modified file 'GTG/gtk/browser/taskbrowser.glade'
--- GTG/gtk/browser/taskbrowser.glade	2012-06-08 13:24:35 +0000
+++ GTG/gtk/browser/taskbrowser.glade	2012-07-13 10:57:18 +0000
@@ -313,14 +313,14 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem" id="online_help">
-                        <property name="label">Get _Help Online</property>
+                      <object class="GtkImageMenuItem" id="help_contents">
+                        <property name="label">Contents</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="tooltip_text" translatable="yes">Open GTG documentation in your web browser</property>
+                        <property name="tooltip_text" translatable="yes">Open GTG help</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
+                        <property name="image">image7</property>
+                        <property name="use_stock">False</property>
                         <property name="accel_group">accelgroup1</property>
                         <signal name="activate" handler="on_documentation_clicked" swapped="no"/>
                       </object>
@@ -955,6 +955,11 @@
     <property name="stock">gtk-edit</property>
     <property name="icon-size">1</property>
   </object>
+  <object class="GtkImage" id="image7">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-help</property>
+  </object>
   <object class="GtkEntryCompletion" id="quickadd_entrycompletion">
     <property name="popup_set_width">False</property>
     <signal name="action-activated" handler="on_quickadd_entrycompletion_action_activated" swapped="no"/>
 
=== modified file 'GTG/info.py'
--- GTG/info.py	2012-06-08 13:24:35 +0000
+++ GTG/info.py	2012-07-13 10:57:18 +0000
@@ -24,7 +24,7 @@
 
 NAME = "Getting Things GNOME!"
 URL = "http://gtg.fritalk.com"
-DOCUMENTATION_URL = "http://live.gnome.org/gtg/documentation"
+HELP_URI = "help:gtg"
 TRANSLATE_URL = "https://translations.launchpad.net/gtg"
 REPORT_BUG_URL = "https://bugs.launchpad.net/gtg/+filebug"
 EMAIL = "[e-mail]"
 
=== added directory 'doc/userdoc'
=== added directory 'doc/userdoc/C'
=== added directory 'doc/userdoc/C/figures'
=== added file 'doc/userdoc/C/figures/Understand-GTG-main-window.png'
 Binary files doc/userdoc/C/figures/Understand-GTG-main-window.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/Understand-GTG-main-window.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/configure-sync.png'
 Binary files doc/userdoc/C/figures/configure-sync.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/configure-sync.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/edit_tag.png'
 Binary files doc/userdoc/C/figures/edit_tag.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/edit_tag.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/edit_task.png'
 Binary files doc/userdoc/C/figures/edit_task.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/edit_task.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/get_started.png'
 Binary files doc/userdoc/C/figures/get_started.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/get_started.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/gtg-icon.png'
 Binary files doc/userdoc/C/figures/gtg-icon.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/gtg-icon.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/gtg-screenshot.png'
 Binary files doc/userdoc/C/figures/gtg-screenshot.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/gtg-screenshot.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/modify-tag.png'
 Binary files doc/userdoc/C/figures/modify-tag.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/modify-tag.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/mover1.png'
 Binary files doc/userdoc/C/figures/mover1.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/mover1.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/mover2.png'
 Binary files doc/userdoc/C/figures/mover2.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/mover2.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/mover3.png'
 Binary files doc/userdoc/C/figures/mover3.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/mover3.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/mover4.png'
 Binary files doc/userdoc/C/figures/mover4.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/mover4.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/plugins.png'
 Binary files doc/userdoc/C/figures/plugins.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/plugins.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/quick_tag_entry.png'
 Binary files doc/userdoc/C/figures/quick_tag_entry.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/quick_tag_entry.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/select-sync.png'
 Binary files doc/userdoc/C/figures/select-sync.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/select-sync.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/select_sync_service.png'
 Binary files doc/userdoc/C/figures/select_sync_service.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/select_sync_service.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/set_date_task_browser.png'
 Binary files doc/userdoc/C/figures/set_date_task_browser.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/set_date_task_browser.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/set_date_task_open.png'
 Binary files doc/userdoc/C/figures/set_date_task_open.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/set_date_task_open.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/subtasks.png'
 Binary files doc/userdoc/C/figures/subtasks.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/subtasks.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/subtasks2.png'
 Binary files doc/userdoc/C/figures/subtasks2.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/subtasks2.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/tag.png'
 Binary files doc/userdoc/C/figures/tag.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/tag.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/task-management.png'
 Binary files doc/userdoc/C/figures/task-management.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/task-management.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/tasks.png'
 Binary files doc/userdoc/C/figures/tasks.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/tasks.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/figures/workview.png'
 Binary files doc/userdoc/C/figures/workview.png	1970-01-01 00:00:00 +0000 and doc/userdoc/C/figures/workview.png	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/gtg-add-sync.page'
--- doc/userdoc/C/gtg-add-sync.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-add-sync.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,38 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-add-sync">
+
+  <info>
+    <link type="guide" xref="index#gtg-sync"/>
+     <link type="seealso" xref="gtg-sync"/>
+      <link type="seealso" xref="gtg-remove-sync"/>
+
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Enable/Disable Sync Service</title>
+
+<p>To enable or disable Sync Services in the GTG main menu go to <guiseq><gui>Edit</gui><gui>Setup Sync Services</gui></guiseq>. Press the button <gui>Add</gui> and choose the desired sync service from the drop down menu on the right.</p>
+
+<figure>
+  <title>Enable Sync Service</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/select-sync.png"/>
+</figure>
+
+<p>For each sync service that you wish to enable you will have to set certain parameters, provide the user name and password if necessary and press the <gui>Enable syncing</gui> button.</p>
+
+<p>To disable a sync service press the <gui>Disable syncing</gui> button.</p>
+
+<figure>
+  <title>Configure Sync Service</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/configure-sync.png"/>
+</figure>
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-add-tag.page'
--- doc/userdoc/C/gtg-add-tag.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-add-tag.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-add-tag">
+
+  <info>
+    <link type="guide" xref="gtg-tags" group="third"/>
+    <link type="seealso" xref="gtg-tag-color"/>
+    <link type="seealso" xref="gtg-add-subtag"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Add or Modify Tags</title>
+
+    <p>To add a new tag or modify those already assigned to a selected task in the main <app>GTG</app> window, you can:</p>
+  
+  <list>
+      <item><p>Use the <keyseq><key>Ctrl</key><key>T</key></keyseq> keyboard shortcut.</p></item>
+      <item><p>Right-click the task and select <gui>Modify Tag...</gui> from the contextual menu.</p></item>
+  </list> 
+
+<p>Pop-up window will appear and allow you to add new tags separated by space. To remove an already assigned tag place the “!” sign in front of it.</p>
+
+<figure>
+  <title>Modify Tags</title>
+ <media type="image" mime="image/png" src="figures/modify-tag.png"/>
+</figure>
+  
+   <p>To add a new tag to an open <app>GTG</app> task, click the <gui>Add Tag</gui> button in the task toolbar.  This will insert a "@" sign into the task after which you can write the name of the new tag. As soon as you start writing after the "@", the new tag will be highlighted yellow and appear on the list of tags in the <app>GTG</app> sidebar.</p>
+
+   <p>To add an already existing tag to an open <app>GTG</app> task, click the downward arrow beside the <gui>Add Tag</gui> button in the task toolbar. This will open a dropdown list with all the available tags that you can add to the task.</p>
+
+</page>
 
=== added file 'doc/userdoc/C/gtg-create-new-task.page'
--- doc/userdoc/C/gtg-create-new-task.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-create-new-task.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-create-new-task">
+
+  <info>
+    <link type="guide" xref="gtg-tasks" group="first"/>
+    <link type="seealso" xref="gtg-edit-task"/>
+    <link type="seealso" xref="gtg-dismiss-task"/>
+    <link type="seealso" xref="gtg-delete-task"/>
+    <link type="seealso" xref="gtg-set-task-date"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Create a New Task</title>
+
+  <p>There are three ways to create a new task in <app>GTG</app>:</p>
+
+<list>
+  <item><p>Go to <guiseq><gui>Tasks</gui><gui>New Task</gui></guiseq> in the main menu.</p></item>
+  <item><p>Click the <gui>New Task</gui> button in the toolbar.</p></item>
+  <item><p>Use the <keyseq><key>Ctrl</key><key>N</key></keyseq> shortcut.</p></item>
+</list>
+
+  <!-- Insert Image Here -->
+
+  <p>The new task will open on top of the <app>GTG</app> main window, or any other tasks that you may have opened.</p>
+
+</page>
+
+
+
+
 
=== added file 'doc/userdoc/C/gtg-create-plugin.page'
--- doc/userdoc/C/gtg-create-plugin.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-create-plugin.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-create-plugin">
+
+  <info>
+    <link type="guide" xref="index#gtg-advanced"/>
+    <link type="seealso" xref="gtg-ppa"/>
+    <link type="seealso" xref="gtg-create-sync"/>
+    <link type="seealso" xref="gtg-join-developers"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Create your own Plugin</title>
+
+<p>Here are some resources in case you are interested in making your own plugin for <app>GTG</app>:</p>
+
+<p><link href="https://live.gnome.org/gtg/pluginHowTo">How do plugins work and how can you build a plugin for <app>GTG</app></link></p>
+
+<p><link href="https://live.gnome.org/gtg/plugins">Plugin examples</link></p>
+
+
+
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-create-sync.page'
--- doc/userdoc/C/gtg-create-sync.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-create-sync.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,27 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-create-sync">
+
+  <info>
+    <link type="guide" xref="index#gtg-advanced"/>
+    <link type="seealso" xref="gtg-ppa"/>
+    <link type="seealso" xref="gtg-create-plugin"/>
+    <link type="seealso" xref="gtg-join-developers"/>
+
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+ 
+  <title>Create your own Sync Service</title>
+
+<p>Here are some resources in case you are interested in making your own Sync Service for <app>GTG</app>:</p>
+
+<p><link href="https://live.gnome.org/gtg/Backends">Sync Services (Backends)</link></p>
+
+<p><link href="https://live.gnome.org/gtg/dbus">DBus</link></p>
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-credits-design.page'
--- doc/userdoc/C/gtg-credits-design.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-credits-design.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-credits-design">
+
+  <info>
+    <link type="guide" xref="index#gtg-credits"/>
+    <link type="seealso" xref="gtg-credits-dev"/>
+    <link type="seealso" xref="gtg-credits-trans"/>
+    <link type="seealso" xref="gtg-credits-collab"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>GTG Design</title>
+
+<p>Bertrand Rousseau - <email>[e-mail]</email></p>
+<p>Kalle Persson - <email>[e-mail]</email></p>
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-credits-dev.page'
--- doc/userdoc/C/gtg-credits-dev.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-credits-dev.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,29 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-credits-dev">
+
+  <info>
+    <link type="guide" xref="index#gtg-credits"/>
+    <link type="seealso" xref="gtg-credits-design"/>
+    <link type="seealso" xref="gtg-credits-trans"/>
+    <link type="seealso" xref="gtg-credits-collab"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>GTG Developers</title>
+
+<p>Lionel Dricot - <email>[e-mail]</email></p>
+<p>Bertrand Rousseau - <email>[e-mail]</email></p>
+<p>Paulo Cabido - <email>[e-mail]</email></p>
+<p>Luca Invernizzi - <email>[e-mail]</email></p>
+<p>Kevin Mehall - <email>[e-mail]</email></p>
+<p>Luca Falavigna - <email>[e-mail]</email></p>
+<p>Izidor Matušov - <email>[e-mail]</email></p>
+
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-credits-trans.page'
--- doc/userdoc/C/gtg-credits-trans.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-credits-trans.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-credits-trans">
+
+  <info>
+    <link type="guide" xref="index#gtg-credits"/>
+    <link type="seealso" xref="gtg-credits-dev"/>
+    <link type="seealso" xref="gtg-credits-design"/>
+    <link type="seealso" xref="gtg-credits-collab"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>GTG Translators</title>
+
+<p>Afrikaans: Walter Leibbrandt</p>
+<p>Belarusian: Egor Kuryanovich, Iryna Nikanchuk</p>
+<p>Catalan: Siegfried Gevatter, Radina Matic</p>
+<p>Czech: Hýroumen, Ladislav Prskavec</p>
+<p>Danish: Peter Skov</p>
+<p>Dutch: puccha</p>
+<p>Finnish: Mika Tapojärvi</p>
+<p>French: Lionel Dricot, Rafik Ouerchefani, Bertrand Rousseau, Pititjo</p>
+<p>German: Philip Stewart, Thomas Pitlik</p>
+<p>Italian: Luca Falavigna, Luca Invernizzi, Radina Matic</p>
+<p>Malay: melayubuntu</p>
+<p>Polish: Tomasz Maciejewski</p>
+<p>Portuguese: Paulo Cabido</p>
+<p>Russian: Alexey Kostyuk, Alexey Nedilko, a220, mrk, wiz</p>
+<p>Simplified Chinese: Harold.luo</p>
+<p>Slovak: Slavko (linux-slavino)</p>
+<p>Spanish: David Prieto, DiegoJ, Pititjo, Radina Matic</p>
+<p>Swedish: Christian Widell, Daniel Holm, Kalle Persson, Petri Rosenström</p>
+<p>Traditional Chinese: Rex Tsai</p>
+<p>Turkish: Murat Güneş</p>
+
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-delete-task.page'
--- doc/userdoc/C/gtg-delete-task.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-delete-task.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-delete-task">
+
+  <info>
+    <link type="guide" xref="gtg-tasks" group="second"/>
+    <link type="seealso" xref="gtg-create-new-task"/>
+    <link type="seealso" xref="gtg-edit-task"/>
+    <link type="seealso" xref="gtg-dismiss-task"/>
+    <link type="seealso" xref="gtg-set-task-date"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Delete Task</title>
+
+  <p>To delete a selected task from the main <app>GTG</app> window, you can:</p>
+  
+  <list>
+      <item><p>Go to <guiseq><gui>Tasks</gui><gui>Delete</gui></guiseq> in the main menu.</p></item>
+      <item><p>Press the <keyseq><key>Del</key></keyseq> key on your keyboard.</p></item>
+      <item><p>Right-click the task and select <gui>Delete Task</gui> from the contextual menu.</p></item>
+</list> 
+  
+   <p>To delete an open <app>GTG</app> task click the <gui>Delete Task</gui> button in the task toolbar.</p>
+    <p>Since deleting tasks cannot be undone, in each case you will be asked to confirm the deletion. </p> 
+ 
+ 
+</page>
 
=== added file 'doc/userdoc/C/gtg-dismiss-task.page'
--- doc/userdoc/C/gtg-dismiss-task.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-dismiss-task.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-dismiss-task">
+
+  <info>
+    <link type="guide" xref="gtg-tasks" group="second"/>
+    <link type="seealso" xref="gtg-create-new-task"/>
+    <link type="seealso" xref="gtg-edit-task"/>
+    <link type="seealso" xref="gtg-delete-task"/>
+    <link type="seealso" xref="gtg-set-task-date"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Dismiss Task</title>
+
+  <p>When you decide that a certain task is not valid anymore (does not need to be accomplished), you can dismiss it. To dismiss a selected task from the main <app>GTG</app> window, you can:</p>
+  
+  <list>
+      <item><p>Go to <guiseq><gui>Tasks</gui><gui>Dismiss</gui></guiseq> in the main menu.</p></item>
+      <item><p>Click the <gui>Dismiss Task</gui> button in the <app>GTG</app> toolbar.</p></item>
+      <item><p>Use the <keyseq><key>Ctrl</key><key>I</key></keyseq> keyboard shortcut.</p></item>
+      <item><p>Right-click the task and select <gui>Dismiss</gui> from the contextual menu.</p></item>
+</list> 
+  
+   <p>To dismiss an open <app>GTG</app> task click the <gui>Dismiss Task</gui> button in the task toolbar.</p>
+    <p>You can view all the tasks marked as dismissed and closed in the <gui>Closed Task Pane</gui>. To show and hide the <gui>Closed Task Pane</gui>, go to <guiseq><gui>View</gui><gui>Closed Task Pane</gui></guiseq> in the main <app>GTG</app> menu.</p> 
+
+</page>
 
=== added file 'doc/userdoc/C/gtg-edit-task.page'
--- doc/userdoc/C/gtg-edit-task.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-edit-task.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,33 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-edit-task">
+
+  <info>
+    <link type="guide" xref="gtg-tasks" group="second"/>
+    <link type="seealso" xref="gtg-create-new-task"/>
+    <link type="seealso" xref="gtg-dismiss-task"/>
+    <link type="seealso" xref="gtg-delete-task"/>
+    <link type="seealso" xref="gtg-set-task-date"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Edit Task</title>
+
+<p>To open and edit an already created task:</p>
+
+ <list>
+      <item><p>Select the task in the task browser and double-click it or press <gui>ENTER</gui>.</p></item>
+      <item><p>Go to <guiseq><gui>Tasks</gui><gui>Edit</gui></guiseq> in the main menu.</p></item>
+      <item><p> Right-click the task and select <gui>Edit</gui> from the contextual menu.</p></item>  
+</list>
+
+<p>Write the desired task content in the task editor window. You can paste links, add tags (start with the sign “@”) and subtasks (start with “-”) inside the task editor. See the <link xref="gtg-subtasks">Subtasks</link> and <link xref="gtg-tags">Tags</link> sections for more details about the syntax.</p>
+
+
+<p>Remember that you do not need to save the changes to the task as GTG does that automatically while you write.</p>
+
+</page>
 
=== added file 'doc/userdoc/C/gtg-faq.page'
--- doc/userdoc/C/gtg-faq.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-faq.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-faq">
+
+  <info>
+    <link type="guide" xref="index#gtg-faq"/>
+
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Frequently Asked Questions</title>
+
+
+<list type="numbered">
+
+<item><p><em>How do I save the changes to the task that I just edited?</em></p>
+<p>You do not need to save the changes to the task as <app>GTG</app> does that automatically while you write.</p>
+</item> 
+
+<item><p><em>I cannot activate some of the GTG plugins.</em></p>
+<p>Sometimes there are missing dependencies that impede the activation of the plugin. <app>GTG</app> will try to identify and list all the missing dependencies in bold below the deactivated plugin description, so you can install them.</p>
+</item> 
+
+<item><p><em>Is there a way to setup a "waiting task" (in cases I am waiting for somebody/something else to happen before I can proceed with the task?</em></p>
+<p>Here is a possible workflow:</p>
+<list>
+      <item><p>Set the <gui>start date</gui> in the future taking in consideration how long do you want to wait.</p></item>
+      <item><p>Create a special tag like @wait, @delegate and edit the properties of this tag so the tasks with it do not appear in the <gui>Work View</gui>.</p></item> 
+      <item><p>Set the <gui>due date</gui> to <gui>sometimes</gui>.</p></item>
+</list>
+
+</item> 
+
+
+<item><p><em>Can I make a backup of my tasks in case of the computer crash?</em></p>
+
+<p>GTG makes an automatic backup of yours tasks and in the latest release it even detects a faulty tasks database and automatically restores the latest version from backup. For the manual procedure check this wiki page:</p>
+<p><link href="https://live.gnome.org/gtg/FAQ">Backup your GTG Tasks</link></p>
+</item> 
+
+</list>
+
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-join-developers.page'
--- doc/userdoc/C/gtg-join-developers.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-join-developers.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,28 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-join-developers">
+
+  <info>
+    <link type="guide" xref="index#gtg-advanced" group="second"/>
+    <link type="seealso" xref="gtg-ppa"/>
+    <link type="seealso" xref="gtg-create-sync"/>
+    <link type="seealso" xref="gtg-create-plugin"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Join the GTG Developer Team</title>
+
+<p>Are you up for an interesting adventure? Want to join the developer team? Start here:</p>
+
+
+<p><link href="https://live.gnome.org/gtg/contributing/">Contributing to GTG</link></p>
+
+<p><link href="https://live.gnome.org/gtg/becoming%20a%20gtg%20developer/">Becoming a GTG developer</link></p>
+
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-join-users.page'
--- doc/userdoc/C/gtg-join-users.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-join-users.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-join-users">
+
+  <info>
+    <link type="guide" xref="index#gtg-get-involved"/>
+    <link type="seealso" xref="gtg-report-problem"/>
+    <link type="seealso" xref="gtg-translate"/>
+
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Join the GTG Users Group</title>
+
+<p>To join our user group go to <link href="https://launchpad.net/~gtg-user/+join">GTG User Group on Launchpad</link>. You will also have the possibility to subscribe to the user's mailing list.</p>
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-main-window.page'
--- doc/userdoc/C/gtg-main-window.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-main-window.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,67 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-main-window">
+
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="seealso" xref="gtg-shortcut-keys"/>
+    <link type="seealso" xref="gtg-quickstart"/>
+    
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Understand GTG Main Window</title>
+
+
+  <p>Watch the video to become more familiar with various parts of the <app>GTG</app> main window.</p>
+
+<media type="video" src="videos/GetStarted.ogg">
+ <tt:tt xmlns:tt="http://www.w3.org/ns/ttml">
+        <tt:body>
+          <tt:div begin="1s" end="16s">
+            <tt:p>
+              The GTG Main Menu has the following items: Tasks, Edit, View, Plugins and Help.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="16s" end="23s">
+            <tt:p>
+              Bellow the menu there is the <em style="strong">Toolbar</em>.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="23s" end="36s">
+            <tt:p>
+               <em style="strong">Tag Sidebar</em> is on the right side of the window.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="36s" end="53s">
+            <tt:p>
+             Use the <em style="strong">Quick Add Entry</em> as the fastest way to create a new task.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="53s" end="61s">
+            <tt:p>
+              All the tasks are listed in the <em style="strong">GTG Task Browser</em>.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="61s" end="77s">
+            <tt:p>
+          You can show and hide the <em style="strong">Closed Task Pane</em> from the View menu.
+            </tt:p>
+          </tt:div>
+        </tt:body>
+      </tt:tt>
+
+<figure>
+  <title>GTG Main Window</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/Understand-GTG-main-window.png"/>
+</figure>
+
+</media>
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-plugins.page'
--- doc/userdoc/C/gtg-plugins.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-plugins.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,60 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-plugins">
+
+  <info>
+    <link type="guide" xref="index#gtg-plugins"/>
+     <link type="seealso" xref="gtg-add-plugin"/>
+      <link type="seealso" xref="gtg-remove-plugin"/>
+
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Understand Plugins</title>
+
+<p><app>GTG</app> plugins offer the possibility to extend the basic functionality of the program. Plugins allow you to add new features and change the way <app>GTG</app> works.</p>
+
+<p>To activate or deactivate GTG plugins in the main menu go to <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Plugins</gui></guiseq> tab and use the corresponding check box.</p>
+
+<note style="tip">
+<p>Sometimes there are missing dependencies that impede the activation of the plugins. <app>GTG</app> will try to identify and list in bold letters all the missing dependencies below the description of the deactivated plugin.</p>
+</note>
+
+<p>List of available plugins in <app>GTG</app>:</p>
+
+<p><em>Tomboy/Gnote</em></p>
+<p>This plugin allows you to add a link to Tomboy or Gnote notes in your tasks, or create a new one.</p>
+
+<p><em>Notification area</em></p>
+<p>Adds a GTG icon to the notification area that displays the list of the currently workable tasks.</p>
+
+<p><em>Remove Closed Tasks</em></p>
+<p>This plugin deletes the tasks that have been closed more than a specified number of days ago.</p>
+
+<p><em>Send Tasks via Email</em></p>
+<p>Adds a button on the toolbar which allows to easily send a task (with its status, due dates, tags and subtasks) via email.</p>
+
+<p><em>Bugzilla</em></p>
+<p>Allows to link a task with a Bugzilla ticket. At the moment the only bugzillas that are supported are GNOME, Mozilla and Freedesktop.org.</p>
+
+<p><em>Export and Print</em></p>
+<p>Exports the tasks in the current view into a variety of formats.</p>
+
+<p><em>Hamster Time Tracker Integration</em></p>
+<p>Adds the ability to send a task to the Hamster time tracking applet.</p>
+
+<p><em>Urgency Color</em></p>
+<p>Color-code the tasks according to start and due dates.</p>
+
+<figure>
+  <title>GTG Plugins</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/plugins.png"/>
+</figure>
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-ppa.page'
--- doc/userdoc/C/gtg-ppa.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-ppa.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,42 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-ppa">
+
+  <info>
+    <link type="guide" xref="index#gtg-advanced" group="first"/>
+   <link type="seealso" xref="gtg-create-sync"/>
+    <link type="seealso" xref="gtg-create-plugin"/>
+  <link type="seealso" xref="gtg-join-developers"/>
+
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+ 
+  <title>Install GTG Daily PPA</title>
+
+<p>If you want to work with the development version of <app>Getting things GNOME!</app> you can install the daily Personal Package Archive (PPA) from the development repository.</p> 
+
+<p><app>GTG</app> Development Team is trying to keep it stable for daily usage (they also use this repository), but you will be the first to encounter bugs. Please report any bugs you find on <link href="https://bugs.launchpad.net/gtg/+filebug">GTG Launchpad bugtracker</link>.</p> 
+
+<p>To add this PPA in Ubuntu, use the command line:</p>
+  <p><cmd>sudo add-apt-repository ppa:gtg/gtg-daily</cmd></p>
+
+<p>If you're more comfortable with the mouse, in Ubuntu Oneiric (11.10) go to 
+	   <guiseq>
+		<gui>Main Ubuntu Menu</gui>
+		<gui>System</gui>
+		<gui>Administration</gui>
+		<gui>Software Sources</gui>:
+	   </guiseq>.
+	</p>
+    <steps>
+    <item><p>Open the tab <gui>Other software</gui>. </p></item>
+    <item><p>Press the <gui>Add</gui> button. </p></item>
+    <item><p>Paste the "ppa:gtg/gtg-daily" and close both windows to confirm the change. </p></item>
+    <item><p>When the <gui>Software Sources</gui> window reloads you will see the GTG PPA available for download.</p></item>
+</steps>
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-quickadd-dates.page'
--- doc/userdoc/C/gtg-quickadd-dates.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-quickadd-dates.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,86 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-quickadd-dates">
+
+  <info>
+    <link type="guide" xref="gtg-quickadd" group="fourth"/>
+    <link type="seealso" xref="gtg-quickadd-new-task"/>
+    <link type="seealso" xref="gtg-quickadd-tags"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Add Dates and Tags to Tasks using the Quick Add Entry</title>
+
+    <p>You can also create a task in the Quick Add Entry and at the same time specify its tags, due and defer date. Follow these format rules:</p>
+
+    <p><em style="strong">tags:tag1,tag2,tag3</em></p>
+
+<list>
+      <item><p>This way you can apply as many tags as you wish using comma as a separator.</p></item>
+      <item><p>Any word that begins with “@” sign will be interpreted as a tag.</p></item> 
+</list>
+
+
+    <p><em style="strong">due:date</em></p>
+
+    <p><em style="strong">defer:date</em></p>
+
+ <p>This way you can apply a due date or a defer date. Dates can be formatted as yyyy-mm-dd (for example 2012-04-01) or yyyymmdd (20120401) or mmdd (0401 - the year being implicitly the current one) or today, tomorrow or a weekday name (due:monday means due next Monday). Dates which are added in this way will not appear in the task title.</p>
+
+    <p>Examples</p>
+
+    <p><em style="strong">buy stationary tags:purchases,office due:20120330 defer:tuesday</em></p>
+
+    <p>The above example tells GTG to create a new task with the title "buy stationary", under the tags "purchases" and "office", with the due date March 30, 2012 and the start date next Tuesday.</p>
+
+    <p><em style="strong">call mum tags:family,calls due:sunday defer:tomorrow</em></p>
+
+    <p>The above example tells GTG to create a new task with the title "call mum", under the tags "family" and "calls", with the due date next Sunday and the start date tomorrow.</p>
+
+<p>Watch this short video tutorial to understand better how the Quick Add Entry works:</p>
+
+<media type="video" src="videos/quick-add2.webm" title="Add Dates and Tags to Tasks using the Quick Add Entry">
+
+<tt:tt xmlns:tt="http://www.w3.org/ns/ttml">
+        <tt:body>
+          <tt:div begin="1s" end="11s">
+            <tt:p>
+              Let's see an example how to use the <em style="strong">Quick Add Entry</em> to set up a new task.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="11s" end="25s">
+            <tt:p>
+              We are going to copy an already prepared line with parameters and explain them one by one.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="25s" end="36s">
+            <tt:p>
+               Once you press the <gui>Enter</gui> key, the new task will appear in the task browser.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="36s" end="53s">
+            <tt:p>
+             The first part ("call mum") is the task title.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="53s" end="65s">
+            <tt:p>
+              When GTG sees "tags:calls,family" it will add the tags <gui>@calls</gui> and <gui>@family</gui> highligthed in yellow under the task name.
+            </tt:p>
+          </tt:div>
+          <tt:div begin="65s" end="104s">
+            <tt:p>
+          Setting the dates is easy: "due:sunday" and "defer:tomorrow" will be recorded correctly as the due and start date of the task.
+            </tt:p>
+          </tt:div>
+        </tt:body>
+      </tt:tt>
+
+</media>
+
+
+</page>
 
=== added file 'doc/userdoc/C/gtg-quickadd-new-task.page'
--- doc/userdoc/C/gtg-quickadd-new-task.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-quickadd-new-task.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-quickadd-new-task">
+
+  <info>
+    <link type="guide" xref="gtg-quickadd" group="fourth"/>
+    <link type="seealso" xref="gtg-quickadd-tags"/>
+    <link type="seealso" xref="gtg-quickadd-dates"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Create a New Task using the Quick Add Entry</title>
+
+    <p>To add a task simply type its title in the entry and press <gui>Enter</gui>. The task will be created and selected in the task browser. If a tag is selected in the <gui>Tags Sidebar</gui>, it will be applied to the task you created. </p>
+
+<figure>
+  <title>Quick Add Entry</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/quick_tag_entry.png"/>
+</figure> 
+
+</page>
 
=== added file 'doc/userdoc/C/gtg-quickadd.page'
--- doc/userdoc/C/gtg-quickadd.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-quickadd.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,19 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task 2column"
+      id="gtg-quickadd">
+
+  <info>
+    <link type="guide" xref="index#gtg-task-management" group="fourth"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Quick Add Entry</title>
+
+  <p>The Quick Add Entry is the fastest way to create a new task. To enable and disable the entry field in the main <app>GTG</app> menu go to <guiseq><gui>View</gui><gui>Quick Add Entry</gui></guiseq>.</p> 
+  
+  <links type="topic" groups="first second third fourth fifth sixth" style="2column"/>
+</page>
 
=== added file 'doc/userdoc/C/gtg-quickstart.page'
--- doc/userdoc/C/gtg-quickstart.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-quickstart.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-quickstart">
+
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="seealso" xref="gtg-shortcut-keys"/>
+    <link type="seealso" xref="gtg-workflows"/>
+    <link type="seealso" xref="gtg-main-window"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Get started with GTG</title>
+
+  <p>Welcome to <app>Getting Things GNOME!</app>. In <app>GTG</app>, everything is a task: from building a bridge over the Pacific Ocean to changing a light bulb or organizing a party.</p>
+
+<figure>
+  <title>GTG Main Window</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/get_started.png"/>
+</figure>
+
+<p>To start a new task just click the <gui>New Task</gui> button and start writing. You do not need to save the task yourself – GTG does that for you automatically while you write! Once you have completed the task, just click the <gui>Mark as Done</gui> button and the task will disappear from the GTG main window (you can still see it if you activate the <gui>Closed Task Pane</gui>). If the task is not relevant any more, simply click the <gui>Dismiss</gui> button to archive it.</p>
+
+<p>You can learn all about various <app>GTG</app> features by exploring <link xref="index">the main page</link> of this <app>GTG</app> user manual.</p>
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-report-problem.page'
--- doc/userdoc/C/gtg-report-problem.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-report-problem.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,25 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-report-problem">
+
+  <info>
+    <link type="guide" xref="index#gtg-get-involved" group="first"/>
+    <link type="seealso" xref="gtg-join-users"/>
+    <link type="seealso" xref="gtg-translate"/>
+
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Report a Problem</title>
+
+<p>Help us make <app>GTG</app> better! In case you find a bug, report it here:</p>
+
+
+<p><link href="https://bugs.launchpad.net/gtg/+filebug">GTG Lauchpad bug tracker</link></p>
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-set-task-date.page'
--- doc/userdoc/C/gtg-set-task-date.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-set-task-date.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,38 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-set-task-date">
+
+  <info>
+    <link type="guide" xref="gtg-tasks" group="second"/>
+    <link type="seealso" xref="gtg-create-new-task"/>
+    <link type="seealso" xref="gtg-edit-task"/>
+    <link type="seealso" xref="gtg-delete-task"/>
+    <link type="seealso" xref="gtg-dismiss-task"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Set Task Start and Due Date</title>
+
+<p>To set the start and due date for the task from the task browser in the GTG main window, right-click the task and select the desired days from the <gui>Set start date</gui> or <gui>Set due date</gui> options in the contextual menu.</p>
+
+<figure>
+  <title>Set Dates Task Browser</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/set_date_task_browser.png"/>
+</figure>
+
+<p>To set the start and due date for the task that is already opened, press the upward arrowhead icon in the status bar to open the calendar widget and set the dates.</p>
+
+<figure>
+  <title>Set Dates Open Task</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/set_date_task_open.png"/>
+</figure>
+
+
+
+</page>
 
=== added file 'doc/userdoc/C/gtg-shortcut-keys.page'
--- doc/userdoc/C/gtg-shortcut-keys.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-shortcut-keys.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,108 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      xmlns:ui="http://projectmallard.org/experimental/ui/"
+      type="guide" style="tip"
+      id="gtg-shortcut-keys">
+
+  <info>
+    <link type="guide" xref="index"/>
+    <link type="seealso" xref="gtg-quickstart"/>
+    <link type="seealso" xref="gtg-main-window"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Shortcut keys</title>
+
+  <p>Use keyboard <gui>shortcut keys</gui> to perform common tasks faster than
+  with the mouse and menus. The following table lists all of <app>GTG's</app> shortcut keys.</p>
+<br />
+
+ <table rules="rows" frame="top bottom" ui:expanded="yes">
+    <title>GTG window related shortcuts</title>
+      <thead>
+        <tr>
+          <td><p><em style="strong">To Do This</em></p></td>  <td><p><em style="strong">Press This</em></p></td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><p>Show Task Editor Window</p></td>  <td><p>ENTER</p></td>
+        </tr>
+        <tr>
+          <td><p>Hide Task Editor Window</p></td>  <td><p>ESC</p></td>
+        </tr>
+	<tr>
+          <td><p>Move one Task Up in Task List</p></td>  <td><p>Up Arrow</p></td>
+        </tr>
+	<tr>
+          <td><p>Move one Task Down in Task List</p></td>  <td><p>Down Arrow</p></td>
+        </tr>
+        <tr>
+          <td><p>Place Focus on QuickAdd Entry Field</p></td>  <td><p>Ctrl + L</p></td>
+        </tr>
+        <tr>
+          <td><p>Toggle Sidebar</p></td> <td><p>F9</p></td>
+        </tr>
+        <tr>
+          <td><p>Toggle Closed Tasks Pane</p></td>  <td><p>Ctrl + F9</p></td>
+        </tr>
+        <tr>
+          <td><p>Redo</p></td>  <td><p>Ctrl + Y</p></td>
+        </tr>
+        <tr>
+          <td><p>Undo</p></td>  <td><p>Ctrl + Z</p></td>
+        </tr>
+        <tr>
+          <td><p>Quit</p></td>  <td><p>Ctrl + Q</p></td>
+        </tr>
+      </tbody>
+    </table>
+
+<br/><br/>
+    <table rules="rows" frame="top bottom" ui:expanded="yes">
+    <title>Task related shortcuts</title>
+      <thead>
+        <tr>
+          <td><p><em style="strong">To Do This</em></p></td>  <td><p><em style="strong">Press This</em></p></td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><p>New Task</p></td> <td><p>Ctrl + N</p></td>
+        </tr>
+        <tr>
+          <td><p>Mark Task as Done</p></td>  <td><p>Ctrl + D</p></td>
+        </tr>
+        <tr>
+          <td><p>Dismiss Task</p></td>  <td><p>Ctrl + I</p></td>
+        </tr>
+        <tr>
+          <td><p>Delete Task</p></td>  <td><p>DEL</p></td>
+        </tr>
+        <tr>
+          <td><p>New Subtask</p></td>  <td><p>Ctrl+Shift+N</p></td>
+        </tr>
+      </tbody>
+    </table>
+
+<p>       </p><p>       </p>
+
+    <table rules="rows" frame="top bottom"  ui:expanded="yes">
+    <title>Tag related shortcuts</title>
+      <thead>
+        <tr>
+          <td><p><em style="strong">To Do This</em></p></td>  <td><p><em style="strong">Press This</em></p></td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td><p>Add/Modify Tag</p></td>  <td><p>Ctrl + T</p></td>
+        </tr>
+      </tbody>
+    </table>
+
+   
+</page>
 
=== added file 'doc/userdoc/C/gtg-subtasks.page'
--- doc/userdoc/C/gtg-subtasks.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-subtasks.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,46 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task 2column"
+      id="gtg-subtasks">
+
+  <info>
+    <link type="guide" xref="index#gtg-task-management" group="second"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Insert Subtasks</title>
+  
+<p>Even the biggest project is only a simple list of tasks. Often, in order to accomplish a certain task, you first need to accomplish another, separate task. GTG calls this <em>prerequisite</em> task a <em style="strong">Subtask</em>. You can insert as many subtasks as you need for each task.</p>
+
+ <section id="gtg-create-new-subtask">
+ <title>Create a New Subtask</title>
+
+  <p>To create a subtask for the task that is currently opened, you can:</p>
+
+ <list>
+      <item><p>Start a new line with "-" and write the subtask title.</p></item>
+      <item><p>Click the <gui>Insert the subtask in this task</gui> button in the task editor toolbar.</p></item>
+      <item><p>Use the <keyseq><key>Ctrl</key><key>Shift</key><key>N</key></keyseq> keyboard shortcut.</p></item>  
+</list>
+
+<p>Subtask title will appear with an arrow bullet and underlined as a link: if you click the link it will open the subtask in a separate task editor window.</p>
+  
+<figure>
+  <title>Insert Subtasks</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/subtasks2.png"/>
+</figure>
+
+<p>You can reorganize tasks and subtasks by drag-n-drop in the tasks browser to achieve the hierarchy and order that you require. However, keep in mind that subtasks obey to certain rules. For example, a subtask's due date can never be after its parent's due date, and when you mark a parent task as done, its subtasks will also be marked as done.</p>
+
+</section>
+ 
+  <section id="gtg-edit-delete-subtask">
+   <title>Edit, Dismiss and Delete Subtasks</title>
+
+  <p>Follow the same steps as for Tasks.</p>
+    </section>
+</page>
 
=== added file 'doc/userdoc/C/gtg-sync.page'
--- doc/userdoc/C/gtg-sync.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-sync.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,49 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-sync">
+
+  <info>
+    <link type="guide" xref="index#gtg-sync"/>
+     <link type="seealso" xref="gtg-add-sync"/>
+      <link type="seealso" xref="gtg-remove-sync"/>
+
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Understand Sync Services</title>
+
+<p>Sync Services allow GTG to synchronize (meaning to have access or to import) tasks, notes or bugs from other sites or services like <em>Launchpad</em>, <em>Remember the Milk</em>, <em>Tomboy</em>, <em>GNote</em>...</p> 
+
+<p>There are different types of synchronization:</p>
+<list>
+      <item><p><em>Read-only synchronization</em>: The primary goal is to track things, for example the bugs assigned to you on a bug tracking system. You cannot directly mark the task as resolved in GTG, but when you mark the associated bug as fixed on the bug tracking system, it will show up as such in GTG.  Read-only also means that if you open one of the imported tasks and change the title, description or tags, those changes are visible only to you and will be lost when the associated task is modified on the originating service. You are free to set any other field (start/due dates, subtasks...) as for those field your changes will be preserved. This is useful to add personal annotations to imported tasks.</p></item>
+      <item><p><em>Import synchronization</em>: This is similar to read-only synchronization but you are free to change any field you want. However, keep in mind that all the changes you make will be visible only on your computer. GTG will also make sure that no task is imported twice</p></item> 
+      <item><p><em>Full synchronization</em>:</p></item>
+</list>
+
+<p>List of available sync services in GTG:</p>
+
+<p><em style="strong">Evolution tasks</em></p>
+<p>Allows you to synchronize your GTG tasks with Evolution tasks (full synchronization). <em>This sync service is currently disabled because of a bug between PyGTK and python-evolution.</em></p>
+
+<p><em style="strong">Identi.ca</em></p>
+<p>Imports your Identi.ca messages into your GTG (import synchronization).</p>
+
+<p><em style="strong">Tomboy</em></p>
+<p>Synchronizes all or part of your Tomboy notes in GTG (full synchronization).</p>
+
+<p><em style="strong">Gnote</em></p>
+<p>Synchronizes all or part of your Gnote notes in GTG (full synchronization).</p>
+
+<p><em style="strong">Launchpad</em></p>
+<p>Allows you to import any Launchpad bugs assigned to you (or someone else) in your GTG (read-only synchronization).</p> 
+
+<p><em style="strong">Remember the Milk</em></p>
+<p>Synchronize your tasks with the web service RememberTheMilk (full synchronization).</p>
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-tag-color.page'
--- doc/userdoc/C/gtg-tag-color.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-tag-color.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-tag-color">
+
+  <info>
+    <link type="guide" xref="gtg-tags" group="third"/>
+    <link type="seealso" xref="gtg-add-tag"/>
+    <link type="seealso" xref="gtg-add-subtag"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Edit Tag Properties</title>
+
+<p>You can easily edit tag name, color, or set a specific tag icon, by right-clicking the tag in the tags sidebar and selecting <gui>Edit Tag</gui> from the contextual menu:</p>
+
+<list>
+      <item><p>To change the tag name edit the field <gui>Name</gui>.</p></item>
+      <item><p>Choose one of the predefined colors or press the <gui>Add custom color</gui> button. Select the desired color in the <gui>Choose color</gui> window and press the <gui>OK</gui> button to confirm.</p></item>
+      <item><p>Press the <gui>Click to set icon</gui> button and choose the icon you wish to use as a tag icon.</p></item>  
+</list>
+
+<figure>
+  <title>Edit Tag</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/edit_tag.png"/>
+</figure>  
+ 
+</page>
 
=== added file 'doc/userdoc/C/gtg-tags.page'
--- doc/userdoc/C/gtg-tags.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-tags.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task 2column"
+      id="gtg-tags">
+
+  <info>
+    <link type="guide" xref="index#gtg-task-management" group="third"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Tag your Tasks</title>
+
+  <p>Tag is a simple word that begins with the sign &quot;@&quot;.</p>
+  
+  <p>When you type a word beginning with @, it will appear higlighted yellow which is the indicator that <app>GTG</app> considers the word to be a tag.</p>
+
+<figure>
+  <title>GTG Tag</title>
+ <media type="image" mime="image/png" src="figures/tag.png"/>
+</figure>
+
+  <p>Tags are useful to sort your tasks. In the <gui>View</gui> menu, you can enable the <gui>Tags Sidebar</gui> which displays all the tags you have used, in a way that you can easily see and select only the tasks with a given tag by clicking on it. There's no limit to the number of tags a task can have.</p>
+
+  <p>You can drag-n-drop a tag onto another to create "subtags". As an example, if you drag the tag @to_pay onto the tag @money, every task tagged with @to_pay will also appear in the view of @money (but the @money tag is not added to the task).</p>
+
+  <p>New tag is only added to the current task - there's no recursion and the tag is not applied to subtasks. However, when you create a new subtask, it will inherit the tags of its parents, but you can modify at any time the tags of a subtask to make it different from its parents if required.</p>
+  
+  <links type="topic" groups="first second third fourth fifth sixth" style="2column"/>
+</page>
 
=== added file 'doc/userdoc/C/gtg-tasks.page'
--- doc/userdoc/C/gtg-tasks.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-tasks.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,20 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task 2column"
+      id="gtg-tasks">
+
+  <info>
+    <link type="guide" xref="index#gtg-task-management" group="first"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Working with Tasks</title>
+
+<media type="image" mime="image/png" src="figures/task-management.png"/>
+
+  <p>In <app>GTG</app>, everything is a task. From building a bridge over the Pacific Ocean to changing a light bulb or organizing a party.</p>
+  <links type="topic" groups="first second third fourth fifth sixth" style="2column"/>
+</page>
 
=== added file 'doc/userdoc/C/gtg-translate.page'
--- doc/userdoc/C/gtg-translate.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-translate.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,26 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" style="task"
+      id="gtg-translate">
+
+  <info>
+    <link type="guide" xref="index#gtg-get-involved"/>
+    <link type="seealso" xref="gtg-report-problem"/>
+    <link type="seealso" xref="gtg-join-users"/>
+
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Translate GTG into your Language</title>
+
+<p>Even if you are not a programmer, you can contribute by translating <app>GTG</app> to your language. Go to:</p>
+
+<p><link href="https://translations.launchpad.net/gtg">Translate GTG</link></p>
+
+<p>You will have to register at Launchpad platform and join the team of translators for your target language. You will be credited for your translation inside the program, on our website and in this user manual. Thank you!!!</p>
+
+</page>
+
 
=== added file 'doc/userdoc/C/gtg-workview.page'
--- doc/userdoc/C/gtg-workview.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/gtg-workview.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,39 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide" style="task 2column"
+      id="gtg-workview">
+
+  <info>
+    <link type="guide" xref="index#gtg-task-management"/>
+    <revision pkgversion="0.1" version="0.1" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+      <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+  </info>
+
+  <title>Understand Work View</title>
+  
+    <p> If you press the <gui>Work View</gui> button, only actionable tasks will be displayed.</p> 
+
+
+<figure>
+  <title>Work View</title>
+  <desc> </desc>
+ <media type="image" mime="image/png" src="figures/workview.png"/>
+</figure>
+  
+ <p>What is an actionable task? Actionable tasks are the ones that you can do directly, right now, and it has to meet two conditions:</p>
+
+<list>
+      <item><p>Be "start-able", meaning that the start date has already arrived or passed.</p></item>
+      <item><p>Not have any open subtasks, meaning that all its “prerequisites” are met and you can do the task itself directly.</p></item> 
+</list>
+
+<p>This way the <gui>Work View</gui> will only show you the tasks you can do right now.</p>
+
+<p>If you use tags, you can right click on a tag in the sidebar and choose to hide tasks tagged with it in the <gui>Work View</gui>. This option is very useful if you have a tag like "someday" that you use for tasks you would like to do but are not particularly urgent.</p>
+ 
+ 
+  
+  <links type="topic" groups="first second third fourth fifth sixth" style="2column"/>
+</page>
 
=== added file 'doc/userdoc/C/index.page'
--- doc/userdoc/C/index.page	1970-01-01 00:00:00 +0000
+++ doc/userdoc/C/index.page	2012-07-13 10:57:18 +0000
@@ -0,0 +1,74 @@
+<page xmlns="http://projectmallard.org/1.0/"
+     xmlns:e="http://projectmallard.org/experimental/"
+     type="guide" style="2column"
+     id="index">
+
+ <info>
+	<title type="link">Getting Things GNOME! task management</title>
+    	<title type="text">Getting Things GNOME! task management</title>
+
+    	<revision pkgversion="0.1" version="0.2" date="2012-07-03" status="candidate"/>
+    <credit type="author">
+     <name>Radina Matic</name>
+     <email>[e-mail]</email>
+    </credit>
+
+  
+<!--  
+  <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+-->
+ </info>  
+
+ <title>
+    <media type="image" mime="image/png" src="figures/gtg-icon.png">
+     gtg logo
+    </media>
+    Getting Things GNOME!
+ </title>
+
+<p>Welcome to the <app>Getting Things GNOME!</app> user documentation.</p> <p><app>Getting Things GNOME! (GTG)</app> is the task manager and organizer for the GNOME desktop environment – it focuses on usability and simplicity. Main GTG objective is to provide a simple and yet flexible organization tool for life and work.</p>
+
+<links type="topic" style="mouseovers">
+  <e:mouseover src="figures/mover1.png"/>
+  <e:mouseover match="gtg-quickstart" src="figures/mover2.png"/>
+  <e:mouseover match="gtg-shortcut-keys" src="figures/mover3.png"/>
+  <e:mouseover match="gtg-main-window" src="figures/mover4.png"/>
+</links>
+
+  <p>For a quick introduction into both <app>GTG's</app> most basic features, as well as some advanced keyboard shortcuts, see the <link xref="gtg-quickstart">Get started</link> and <link xref="gtg-shortcut-keys">Shortcut keys</link> pages. For details about the <app>GTG's</app> interface check the <link xref="gtg-main-window">Understand GTG Main Window</link>.</p>
+
+ <p>Other help topics are grouped together into sections below. Enjoy using <app>Getting Things GNOME!</app></p>
+
+ <section id="gtg-task-management" style="2column">
+    <title>Task Management</title>
+ </section>
+
+ <section id="gtg-sync" style="2column">
+    <title>Sync Services</title>
+ </section>
+
+ <section id="gtg-plugins" style="2column">
+    <title>Plugins</title>
+ </section>
+
+ <section id="gtg-faq" style="2column">
+    <title>FAQ</title>
+ </section>
+
+ <section id="gtg-get-involved" style="2column">
+    <title>Get Involved</title>
+ </section>
+ 
+ <section id="gtg-advanced" style="2column">
+    <title>Advanced Topics</title>
+    
+    <p>If you are willing to dive even deeper into the  <app>GTG</app> world, here are some topics to get you started:</p>
+    
+ </section>
+
+  <section id="gtg-credits" style="2column">
+    <title>Credits</title>
+    <p>These are the people that made <app>GTG</app> possible over the years:</p>
+ </section>
+
+</page>
 
=== added directory 'doc/userdoc/C/videos'
=== added file 'doc/userdoc/C/videos/GetStarted.ogg'
 Binary files doc/userdoc/C/videos/GetStarted.ogg	1970-01-01 00:00:00 +0000 and doc/userdoc/C/videos/GetStarted.ogg	2012-07-13 10:57:18 +0000 differ
=== added file 'doc/userdoc/C/videos/quick-add2.webm'
 Binary files doc/userdoc/C/videos/quick-add2.webm	1970-01-01 00:00:00 +0000 and doc/userdoc/C/videos/quick-add2.webm	2012-07-13 10:57:18 +0000 differ
=== modified file 'setup.py'
--- setup.py	2012-06-07 19:45:16 +0000
+++ setup.py	2012-07-13 10:57:18 +0000
@@ -30,6 +30,7 @@
 ### CONSTANTS ################################################################
 
 DATA_DIR        = "share/gtg"
+HELP_DIR        = "share/help"
 GLOBAL_ICON_DIR = "share/icons/hicolor"
 
 ### TOOLS ####################################################################
@@ -47,6 +48,23 @@
             fileList.append((os.path.join(DATA_DIR, newroot), dirList))
     return fileList
 
+def create_userdoc_list():
+    fileList = []
+    rootdir  = "doc/userdoc"
+    for root, subFolders, files in os.walk(rootdir):
+        dirList = []
+        for file in files:
+            dirList.append(os.path.join(root, file))
+        if len(dirList)!=0:
+            comps = root.split(os.sep)
+            prefix = os.path.join(comps[0], comps[1], comps[2])+os.sep
+            if root != prefix[:-1]:
+                newroot = root.replace(prefix, "")
+            else:
+                newroot = ""
+            newroot = os.path.join( HELP_DIR, comps[2], "gtg", newroot)
+            fileList.append((newroot, dirList))
+    return fileList
 
 def create_data_files():
     data_files = []
@@ -64,6 +82,9 @@
                        ['data/icons/hicolor/32x32/apps/gtg.png']))
     data_files.append(('share/icons/hicolor/scalable/apps', \
                        ['data/icons/hicolor/scalable/apps/gtg.svg']))
+    # documentation
+    helpfiles = create_userdoc_list()
+    data_files.extend(helpfiles)
     # misc
     data_files.append(('share/applications', ['gtg.desktop']))
     data_files.append(('share/dbus-1/services', ['org.gnome.GTG.service']))