Merge lp://qastaging/~sara.ribeiro/gtg/userdoc into lp://qastaging/~gtg/gtg/old-trunk
Proposed by
Sara Ribeiro
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 1364 | ||||
Proposed branch: | lp://qastaging/~sara.ribeiro/gtg/userdoc | ||||
Merge into: | lp://qastaging/~gtg/gtg/old-trunk | ||||
Diff against target: |
240 lines (+79/-10) 8 files modified
CHANGELOG (+1/-0) GTG/gtk/backends_dialog.ui (+1/-1) GTG/gtk/backends_dialog/__init__.py (+8/-4) GTG/gtk/editor/editor.py (+4/-0) GTG/gtk/help.py (+53/-0) GTG/gtk/plugins.py (+5/-1) GTG/gtk/plugins.ui (+3/-3) GTG/gtk/preferences.py (+4/-1) |
||||
To merge this branch: | bzr merge lp://qastaging/~sara.ribeiro/gtg/userdoc | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Izidor Matušov | Needs Fixing | ||
Nimit Shah | Needs Fixing | ||
Review via email: mp+210071@code.qastaging.launchpad.net |
Description of the change
Fix for bug #1027604: Deeper integeration of userdoc
To post a comment you must log in.
Hi Sara,
You need to make some small fixes:
=== modified file 'CHANGELOG'
> --- CHANGELOG 2014-03-05 19:25:18 +0000 backends_ dialog. ui' backends_ dialog. ui 2013-09-04 17:48:19 +0000 backends_ dialog. ui 2014-03-09 03:03:28 +0000 focus"> False</ property> style"> edge</property> >gtk-help< /property> >True</ property> focus"> True</property> backends_ dialog/ __init_ _.py' backends_ dialog/ __init_ _.py 2013-11-25 02:37:46 +0000 backends_ dialog/ __init_ _.py 2014-03-09 03:03:28 +0000 widgets_ from_builder( builder) set_title( _("Synchronizat ion Services - %s" %
> +++ 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/
> --- GTG/gtk/
> +++ GTG/gtk/
> @@ -151,7 +151,7 @@
> <property name="can_
> <property name="layout_
> <child>
> - <object class="GtkButton" id="button1">
> + <object class="GtkButton" id="sync_help">
> <property name="label"
> <property name="visible"
> <property name="can_
>
> === modified file 'GTG/gtk/
> --- GTG/gtk/
> +++ GTG/gtk/
> @@ -72,6 +72,7 @@
> self._load_
> # Load and setup other widgets
> self.dialog.
> info.NAME))
> +
>
Remove this extra line
> self._create_ widgets_ for_add_ panel() widgets_ for_conf_ panel() signal_ connections( builder) connect_ signals( signals) add_accel_ group(agr) get_object( "sync_help" ) _parse( 'F1') add_accelerator ("activate" , agr, key, modifier, VISIBLE) icon_theme( self): editor/ editor. py' editor/ editor. py 2014-03-05 19:25:18 +0000 editor/ editor. py 2014-03-09 03:03:28 +0000 editor. taskview import TaskView plugins. engine import PluginEngine _parse( '<Control> w') VISIBLE, self.close)
> self._create_
> self._setup_
> @@ -199,6 +200,13 @@
> }
> builder.
>
> + # adding F1 as a shortcut for Help
> + agr = Gtk.AccelGroup()
> + self.dialog.
> + widget = builder.
> + key, modifier = Gtk.accelerator
> + widget.
> Gtk.AccelFlags.
> +
> def _configure_
> '''
> Inform gtk on the location of the backends icons (which is in
>
> === modified file 'GTG/gtk/
> --- GTG/gtk/
> +++ GTG/gtk/
> @@ -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.
> from GTG.core.
> @@ -201,6 +203,10 @@
> key, modifier = Gtk.accelerator
> agr.connect(key, modifier, Gtk.AccelFlags.
>
> + # F...