Remove the "target" parameter from GrampsDisplay.help(). It was used for the old help system. We now link directly to the wiki.

svn: r10474
This commit is contained in:
Brian Matherly 2008-04-05 14:17:15 +00:00
parent ac83ce0468
commit a46e733398
46 changed files with 57 additions and 75 deletions

@ -306,8 +306,7 @@ class Bookmarks :
def help_clicked(self):
"""Display the relevant portion of GRAMPS manual."""
GrampsDisplay.help('gramps-nav', webpage=WIKI_HELP_PAGE,
section=WIKI_HELP_SEC)
GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC)
class ListBookmarks(Bookmarks):

@ -178,7 +178,7 @@ class GrampletWindow(ManagedWindow.ManagedWindow):
self.close()
elif response == gtk.RESPONSE_HELP:
# translated name:
GrampsDisplay.help('gramplet', WIKI_HELP_PAGE,
GrampsDisplay.help(WIKI_HELP_PAGE,
self.gramplet.tname.replace(" ", "_"))
def build_menu_names(self, obj):
@ -461,8 +461,7 @@ class Gramplet(object):
return True
elif link_type == 'WIKI':
if event.button == 1: # left mouse
GrampsDisplay.help('gramplet',
handle.replace(" ", "_"))
GrampsDisplay.help(handle.replace(" ", "_"))
return True
elif link_type == 'PersonList':
if event.button == 1: # left mouse

@ -263,7 +263,7 @@ class DateEditorDialog(ManagedWindow.ManagedWindow):
while True:
response = self.window.run()
if response == gtk.RESPONSE_HELP:
GrampsDisplay.help('adv-dates', webpage=WIKI_HELP_PAGE,
GrampsDisplay.help(webpage=WIKI_HELP_PAGE,
section=WIKI_HELP_SEC)
elif response == gtk.RESPONSE_DELETE_EVENT:
break

@ -133,8 +133,7 @@ class AddMediaObject(ManagedWindow.ManagedWindow):
self.cancel_button = self.glade.get_widget('button81')
self.ok_button.connect('clicked',self.save)
self.ok_button.set_sensitive(not self.dbase.readonly)
self.help_button.connect('clicked', lambda x: GrampsDisplay.help(
'gramps-edit-quick'))
self.help_button.connect('clicked', lambda x: GrampsDisplay.help())
self.cancel_button.connect('clicked', self.close)
self.show()
self.modal_call()

@ -118,7 +118,7 @@ class EditAddress(EditSecondary):
self.obj, self.db.readonly)
def _connect_signals(self):
self.define_help_button(self.top.get_widget('help'),'adv-ad')
self.define_help_button(self.top.get_widget('help'))
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_ok_button(self.top.get_widget('ok'),self.save)

@ -86,7 +86,7 @@ class EditAttribute(EditSecondary):
def _connect_signals(self):
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget('help'),'adv-at')
self.define_help_button(self.top.get_widget('help'))
self.define_ok_button(self.top.get_widget('ok'),self.save)
def _setup_fields(self):

@ -119,7 +119,7 @@ class EditChildRef(EditSecondary):
self.db.readonly)
def _connect_signals(self):
self.define_help_button(self.top.get_widget('help'), 'adv-ad')
self.define_help_button(self.top.get_widget('help'))
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_ok_button(self.ok_button, self.save)
self.edit_button.connect('button-press-event', self.edit_child)

@ -195,8 +195,7 @@ class EditEvent(EditPrimary):
def help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('adv-ev', webpage=WIKI_HELP_PAGE,
section=WIKI_HELP_SEC)
GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC)
def save(self, *obj):
self.ok_button.set_sensitive(False)
if self.object_is_empty():

@ -106,7 +106,7 @@ class EditEventRef(EditReference):
self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked)
self.define_cancel_button(self.top.get_widget('cancel'))
# FIXME: activate when help page is available
#self.define_help_button(self.top.get_widget('help'), 'tag')
#self.define_help_button(self.top.get_widget('help'))
def _setup_fields(self):

@ -155,7 +155,7 @@ class EditLdsOrd(EditSecondary):
def _connect_signals(self):
self.parents_select.connect('clicked',self.select_parents_clicked)
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget('help'),'adv-at')
self.define_help_button(self.top.get_widget('help'))
self.define_ok_button(self.top.get_widget('ok'),self.save)
def _get_types(self):
@ -340,7 +340,7 @@ class EditFamilyLdsOrd(EditSecondary):
def _connect_signals(self):
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget('help'),'adv-at')
self.define_help_button(self.top.get_widget('help'))
self.define_ok_button(self.top.get_widget('ok'),self.save)
def _get_types(self):

@ -110,7 +110,7 @@ class EditLocation(EditSecondary):
def _connect_signals(self):
self.define_cancel_button(self.top.get_widget('button119'))
self.define_ok_button(self.top.get_widget('button118'),self.save)
self.define_help_button(self.top.get_widget('button128'),'gramps-edit-complete')
self.define_help_button(self.top.get_widget('button128'))
def save(self,*obj):
if self.callback:

@ -100,8 +100,7 @@ class EditMedia(EditPrimary):
def _connect_signals(self):
self.define_cancel_button(self.glade.get_widget('button91'))
self.define_ok_button(self.glade.get_widget('ok'), self.save)
self.define_help_button(self.glade.get_widget('button102'),
'adv-media')
self.define_help_button(self.glade.get_widget('button102'))
def _setup_fields(self):
self.date_field = MonitoredDate(self.glade.get_widget("date_entry"),

@ -141,7 +141,7 @@ class EditName(EditSecondary):
def _connect_signals(self):
self.define_cancel_button(self.top.get_widget('button119'))
self.define_help_button(self.top.get_widget('button131'),'adv-an')
self.define_help_button(self.top.get_widget('button131'))
self.define_ok_button(self.top.get_widget('button118'),self.save)
def _setup_fields(self):

@ -223,7 +223,7 @@ class EditNote(EditPrimary):
"""
self.define_ok_button(self.top.get_widget('ok'), self.save)
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget('help'), '')
self.define_help_button(self.top.get_widget('help'))
def _create_tabbed_pages(self):
"""Create the notebook tabs and inserts them into the main window."""

@ -174,7 +174,7 @@ class EditPerson(EditPrimary):
"""
self.define_cancel_button(self.top.get_widget("button15"))
self.define_ok_button(self.top.get_widget("ok"), self.save)
self.define_help_button(self.top.get_widget("button134"), 'adv-pers')
self.define_help_button(self.top.get_widget("button134"))
self.given.connect("focus_out_event", self._given_focus_out_event)
self.top.get_widget("button177").connect("clicked",

@ -100,7 +100,7 @@ class EditPersonRef(EditSecondary):
self.db.readonly)
def _connect_signals(self):
#self.define_help_button(self.top.get_widget('help'),'adv-ad')
#self.define_help_button(self.top.get_widget('help'))
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_ok_button(self.top.get_widget('ok'),self.save)
self.top.get_widget('select').connect('clicked',self._select_person)

@ -138,7 +138,7 @@ class EditPlace(EditPrimary):
def _connect_signals(self):
self.define_ok_button(self.top.get_widget('ok'), self.save)
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget('help'),'adv-plc')
self.define_help_button(self.top.get_widget('help'))
def _setup_fields(self):
mloc = self.obj.get_main_location()

@ -145,8 +145,8 @@ class EditPrimary(ManagedWindow.ManagedWindow):
def define_cancel_button(self, button):
button.connect('clicked', self.close)
def define_help_button(self, button, tag, webpage='', section=''):
button.connect('clicked', lambda x: GrampsDisplay.help(tag, webpage,
def define_help_button(self, button, webpage='', section=''):
button.connect('clicked', lambda x: GrampsDisplay.help(webpage,
section))
def _do_close(self, *obj):

@ -198,9 +198,9 @@ class EditReference(ManagedWindow.ManagedWindow):
self._cleanup_on_exit()
self.close(obj)
def define_help_button(self, button, tag, webpage='', section=''):
def define_help_button(self, button, webpage='', section=''):
import GrampsDisplay
button.connect('clicked', lambda x: GrampsDisplay.help(tag, webpage,
button.connect('clicked', lambda x: GrampsDisplay.help(webpage,
section))
button.set_sensitive(True)

@ -134,7 +134,7 @@ class EditRepository(EditPrimary):
self.glade.get_widget("vbox").pack_start(notebook, True, True)
def _connect_signals(self):
self.define_help_button(self.glade.get_widget('help'),'adv-src')
self.define_help_button(self.glade.get_widget('help'))
self.define_cancel_button(self.glade.get_widget('cancel'))
self.define_ok_button(self.glade.get_widget('ok'), self.save)

@ -124,8 +124,8 @@ class EditSecondary(ManagedWindow.ManagedWindow):
def define_cancel_button(self,button):
button.connect('clicked',self.close)
def define_help_button(self, button, tag, webpage='', section=''):
button.connect('clicked', lambda x: GrampsDisplay.help(tag, webpage,
def define_help_button(self, button, webpage='', section=''):
button.connect('clicked', lambda x: GrampsDisplay.help(webpage,
section))
def close(self,*obj):

@ -91,7 +91,7 @@ class EditSource(EditPrimary):
def _connect_signals(self):
self.define_ok_button(self.glade.get_widget('ok'),self.save)
self.define_cancel_button(self.glade.get_widget('cancel'))
self.define_help_button(self.glade.get_widget('help'),'adv-src')
self.define_help_button(self.glade.get_widget('help'))
def _setup_fields(self):
self.author = MonitoredEntry(self.glade.get_widget("author"),

@ -86,7 +86,7 @@ class EditSourceRef(EditReference):
def _connect_signals(self):
self.define_ok_button(self.top.get_widget('ok'),self.ok_clicked)
self.define_cancel_button(self.top.get_widget('cancel'))
self.define_help_button(self.top.get_widget("help"), 'adv-si')
self.define_help_button(self.top.get_widget("help"))
def _setup_fields(self):
self.ref_privacy = PrivacyButton(

@ -71,7 +71,7 @@ class EditUrl(EditSecondary):
self.jump.connect('clicked', self.jump_to)
self.define_cancel_button(self.top.get_widget('button125'))
self.define_ok_button(self.top.get_widget('button124'), self.save)
self.define_help_button(self.top.get_widget('button130'), 'gramps-edit_complete')
self.define_help_button(self.top.get_widget('button130'))
def jump_to(self, obj):
if self.obj.get_path():

@ -118,7 +118,7 @@ class EditFilter(ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-util-cfe')
GrampsDisplay.help()
def close_window(self, obj):
self.close()

@ -579,7 +579,7 @@ class EditRule(ManagedWindow.ManagedWindow):
"""
Display the relevant portion of GRAMPS manual.
"""
GrampsDisplay.help('append-filtref')
GrampsDisplay.help()
def close_window(self, obj):
self.close()

@ -122,7 +122,7 @@ class FilterEditor(ManagedWindow.ManagedWindow):
def help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-util-cfe')
GrampsDisplay.help()
def filter_select_row(self, obj):
store, node = self.clist.get_selected()

@ -55,19 +55,10 @@ try:
except KeyError:
pass
def help(target, webpage='', section=''):
def help(webpage='', section=''):
"""
Display the specified target in a help window. If this fails,
open the manual on the web site.
Display the specified webpage and section from the Gramps 3.0 wiki.
"""
#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 + EXTENSION
else:

@ -52,7 +52,7 @@ class ErrorView(object):
def help_clicked(self):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('faq', WIKI_HELP_PAGE, WIKI_HELP_SEC)
GrampsDisplay.help(WIKI_HELP_PAGE, WIKI_HELP_SEC)
def draw_window(self):
title = "%s - GRAMPS" % _("Error Report")

@ -89,7 +89,7 @@ class PersonCompare(ManagedWindow.ManagedWindow):
def help(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('adv-merge-people', webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
def merge(self, obj):
if check_for_spouse(self.p1, self.p2):
@ -333,7 +333,7 @@ class MergePeopleUI(ManagedWindow.ManagedWindow):
def help(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('adv-merge-people', webpage=WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
def name_of(p):

@ -98,7 +98,7 @@ class MergePlaces(ManagedWindow.ManagedWindow):
def help(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('adv-merge-places', webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
def merge(self, obj):
"""

@ -112,7 +112,7 @@ class MergeSources(ManagedWindow.ManagedWindow):
def help(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('adv-merge-sources', webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC)
def merge(self, obj):
"""

@ -454,9 +454,7 @@ class BareReportDialog(ManagedWindow.ManagedWindow):
def on_help_clicked(self, *obj):
import GrampsDisplay
GrampsDisplay.help(None,
URL_REPORT_PAGE,
self.report_name.replace(" ", "_") )
GrampsDisplay.help(URL_REPORT_PAGE, self.report_name.replace(" ", "_"))
def on_ok_clicked(self, obj):
"""The user is satisfied with the dialog choices. Parse all options

@ -1245,7 +1245,7 @@ class ScratchPadWindow(ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-util-scratch-pad')
GrampsDisplay.help()
def on_clear_clicked(self, obj):
"""Deletes the selected object from the object list"""

@ -1459,13 +1459,13 @@ def key_bindings(obj):
"""
Display key bindings
"""
GrampsDisplay.help('keybind-lists', const.WIKI_KEYBINDINGS)
GrampsDisplay.help(const.WIKI_KEYBINDINGS)
def manual_activate(obj):
"""
Display the GRAMPS manual
"""
GrampsDisplay.help('index')
GrampsDisplay.help()
def report_bug_activate(obj):
"""
@ -1495,7 +1495,7 @@ def faq_activate(obj):
"""
Display FAQ
"""
GrampsDisplay.help("faq", webpage=const.WIKI_FAQ)
GrampsDisplay.help(webpage=const.WIKI_FAQ)
def by_menu_name(first, second):
"""

@ -231,7 +231,7 @@ class ChangeNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-db', WIKI_HELP_PAGE , WIKI_HELP_SEC)
GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC)
def on_ok_clicked(self, obj):
self.trans = self.db.transaction_begin("",batch=True)

@ -109,8 +109,7 @@ class DesBrowse(Tool.ActivePersonTool, ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-ae',webpage=WIKI_HELP_PAGE,
section=WIKI_HELP_SEC)
GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC)
def add_to_tree(self, parent_id, sib_id, person_handle):
item_id = self.model.insert_after(parent_id, sib_id)

@ -148,7 +148,7 @@ class EventComparison(Tool.Tool,ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
help('tools-util')
help()
def build_menu_names(self, obj):
return (_("Filter selection"),_("Event Comparison tool"))
@ -247,7 +247,7 @@ class DisplayChart(ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
help('tools-ae')
help()
def build_menu_names(self, obj):
return (_("Event Comparison Results"),None)

@ -576,7 +576,7 @@ class ExtractCity(Tool.BatchTool, ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-db')
GrampsDisplay.help()
def on_ok_clicked(self, obj):
self.trans = self.db.transaction_begin("", batch=True)

@ -146,7 +146,7 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-db')
GrampsDisplay.help()
def ancestors_of(self,p1_id,id_list):
if (not p1_id) or (p1_id in id_list):
@ -583,7 +583,7 @@ class ShowMatches(ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-db')
GrampsDisplay.help()
def redraw(self):
list = []

@ -152,7 +152,7 @@ class MediaMan(Tool.Tool):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-util-other')
GrampsDisplay.help()
def build_batch_ops(self):
self.batch_ops = []

@ -214,7 +214,7 @@ class NotRelated(Tool.Tool, ManagedWindow.ManagedWindow) :
#
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-util-other', WIKI_HELP_PAGE , WIKI_HELP_SEC)
GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC)
def applyMarkerClicked(self, button) :

@ -145,7 +145,7 @@ class OwnerEditor(Tool.Tool, ManagedWindow.ManagedWindow):
def on_help_button_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-db')
GrampsDisplay.help()
def on_button_press_event(self, obj, event):
"""Shows popup-menu for db <-> preferences copying"""

@ -276,7 +276,7 @@ class PatchNames(Tool.BatchTool, ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-db')
GrampsDisplay.help()
def on_ok_clicked(self, obj):
self.trans = self.db.transaction_begin("",batch=True)

@ -112,7 +112,7 @@ class SoundGen(Tool.Tool, ManagedWindow.ManagedWindow):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-util-other', WIKI_HELP_PAGE , WIKI_HELP_SEC)
GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC)
def build_menu_names(self, obj):
return (self.label,None)

@ -294,8 +294,7 @@ class Verify(Tool.Tool, ManagedWindow, UpdateCallback):
def on_help_clicked(self, obj):
"""Display the relevant portion of GRAMPS manual"""
GrampsDisplay.help('tools-util-other', webpage=WIKI_HELP_PAGE,
section=WIKI_HELP_SEC)
GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC)
def on_apply_clicked(self, obj):
self.options.handler.options_dict['oldage'] = self.top.get_widget(