Merge lp://qastaging/~sara.ribeiro/gtg/userdoc into lp://qastaging/~gtg/gtg/old-trunk

Hi Sara,
You need to make some small fixes:

=== modified file 'CHANGELOG'

> --- CHANGELOG 2014-03-05 19:25:18 +0000
> +++ CHANGELOG 2014-03-09 03:03:28 +0000
> @@ -19,6 +19,7 @@
> * Fix for bug #1286493 : GTG cannot connect to RTM, by Pawan Hegde
> * Fix for bug #1288011 : More intuitive title label for tasks, by
> Sara Ribeiro
> * Fix for bug #316922 : Have a link to the parent(s) in the task
> editor, by Parth Panchal
> + * Fix for bug #1027604: Deeper integeration of userdoc, by Sara
> Ribeiro
>
> 2013-11-24 Getting Things GNOME! 0.3.1
> * Fix for bug #1024473: Have 'Show Main Window' in notification area,
> by Antonio Roquentin
>
> === modified file 'GTG/gtk/backends_dialog.ui'
> --- GTG/gtk/backends_dialog.ui 2013-09-04 17:48:19 +0000
> +++ GTG/gtk/backends_dialog.ui 2014-03-09 03:03:28 +0000
> @@ -151,7 +151,7 @@
> <property name="can_focus">False</property>
> <property name="layout_style">edge</property>
> <child>
> - <object class="GtkButton" id="button1">
> + <object class="GtkButton" id="sync_help">
> <property name="label">gtk-help</property>
> <property name="visible">True</property>
> <property name="can_focus">True</property>
>
> === modified file 'GTG/gtk/backends_dialog/__init__.py'
> --- GTG/gtk/backends_dialog/__init__.py 2013-11-25 02:37:46 +0000
> +++ GTG/gtk/backends_dialog/__init__.py 2014-03-09 03:03:28 +0000
> @@ -72,6 +72,7 @@
> self._load_widgets_from_builder(builder)
> # Load and setup other widgets
> self.dialog.set_title(_("Synchronization Services - %s" %
> info.NAME))
> +
>
Remove this extra line

> self._create_widgets_for_add_panel()
> self._create_widgets_for_conf_panel()
> self._setup_signal_connections(builder)
> @@ -199,6 +200,13 @@
> }
> builder.connect_signals(signals)
>
> + # adding F1 as a shortcut for Help
> + agr = Gtk.AccelGroup()
> + self.dialog.add_accel_group(agr)
> + widget = builder.get_object("sync_help")
> + key, modifier = Gtk.accelerator_parse('F1')
> + widget.add_accelerator("activate", agr, key, modifier,
> Gtk.AccelFlags.VISIBLE)
> +
> def _configure_icon_theme(self):
> '''
> Inform gtk on the location of the backends icons (which is in
>
> === modified file 'GTG/gtk/editor/editor.py'
> --- GTG/gtk/editor/editor.py 2014-03-05 19:25:18 +0000
> +++ GTG/gtk/editor/editor.py 2014-03-09 03:03:28 +0000
> @@ -24,10 +24,12 @@
> The rest is the logic of the widget: date changing widgets, buttons, ...
> """
> import time
> +from webbrowser import open as openurl
>
> from gi.repository import Gtk, Gdk, Pango
>
> from GTG import _, ngettext
> +from GTG import info
> from GTG.gtk.editor import GnomeConfig
> from GTG.gtk.editor.taskview import TaskView
> from GTG.core.plugins.engine import PluginEngine
> @@ -201,6 +203,10 @@
> key, modifier = Gtk.accelerator_parse('<Control>w')
> agr.connect(key, modifier, Gtk.AccelFlags.VISIBLE, self.close)
>
> + # F...

Hi Sara,
Please check my mail for the small readability related issues that you need to rectify.

I like the change and have a proposal to make it even better! What about extracting the code you added into a separate module, something like GTG.gtk.help?

Why?

 - less duplicated code
 - add more abstraction: I want the documentation for this dialog be this URI
 - it would be easy to modify way how to open/display help

The use can be as easy as this:

<code>
from GTG.gtk.help import register_help
register_help(self.dialog, 'preferences')
</code>

Implementation will be the code you copy pasted (pseudo code):

<code>
def show_help(help_url, *args):
   openurl(help_url)
   return True

def register_help(widget, help_addr):
   full_help_addr = construct_help_addr(help_addr)

   # Code for adding accel group here
</code>

I made the modifications you guys suggested. Can you please review again? Thanks!