2008-01-12 Benny Malengier <benny.malengier@gramps-project.org>

* src/const.py.in: new manual constant keys
	* src/GrampsDisplay.py: show wiki manual, allow webpage and 
		section to be passed
	RERUN ./autogen.sh


svn: r9785
This commit is contained in:
Benny Malengier 2008-01-12 15:24:19 +00:00
parent 895e0bb633
commit afaca66068
3 changed files with 22 additions and 7 deletions

View File

@ -1,3 +1,8 @@
2008-01-12 Benny Malengier <benny.malengier@gramps-project.org>
* src/const.py.in: new manual constant keys
* src/GrampsDisplay.py: show wiki manual, allow webpage and
section to be passed
RERUN ./autogen.sh
2008-01-12 Peter Landgren <peter.talken@telia.com>
* src/ViewManager.py: partial fix for #1580. Work in DisplayState.py remains.

View File

@ -22,16 +22,25 @@
import const
def help(target):
def help(target, webpage='', section=''):
"""
Display the specified target in a help window. If this fails,
open the manual on the web site.
"""
try:
import gnome
gnome.help_display('gramps',target)
except:
url(const.URL_MANUAL+'en/')
#try:
# import gnome
# gnome.help_display('gramps',target)
#except:
# url(const.URL_MANUAL+'en/')
# 3.0 Beta, direct to the wiki 3.0 Manual
if not webpage:
link = const.URL_WIKISTRING + const.URL_MANUAL_PAGE
else:
link = const.URL_WIKISTRING + webpage
if section:
link + '#' + section
url(link)
def url(target):
"""

View File

@ -41,7 +41,8 @@ from gettext import gettext as _
URL_HOMEPAGE = "http://gramps-project.org/"
URL_MAILINGLIST = "http://sourceforge.net/mail/?group_id=25770"
URL_BUGTRACKER = "http://bugs.gramps-project.org/bug_report_advanced_page.php"
URL_MANUAL = "http://gramps-project.org/gramps-manual/2.2/"
URL_WIKISTRING = "http://gramps-project.org/wiki/index.php?title="
URL_MANUAL_PAGE = "Gramps_3.0_Wiki_Manual"
#-------------------------------------------------------------------------
#