From ce1bb72219513f936c8705138ff9d7197cd9919c Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Tue, 5 Jun 2012 22:53:35 +0000 Subject: [PATCH] GEPS008: Moved GrampsDisplay module svn: r19769 --- po/POTFILES.skip | 2 +- src/Bookmarks.py | 4 ++-- src/DateEdit.py | 4 ++-- src/Makefile.am | 1 - src/ScratchPad.py | 4 ++-- src/gui/Makefile.am | 1 + src/gui/aboutdialog.py | 2 +- src/{GrampsDisplay.py => gui/display.py} | 4 ++-- src/gui/editors/addmedia.py | 4 ++-- src/gui/editors/displaytabs/webembedlist.py | 4 ++-- src/gui/editors/editevent.py | 4 ++-- src/gui/editors/editlink.py | 4 ++-- src/gui/editors/editprimary.py | 4 ++-- src/gui/editors/editreference.py | 4 ++-- src/gui/editors/editsecondary.py | 4 ++-- src/gui/editors/editurl.py | 4 ++-- src/gui/filtereditor.py | 8 ++++---- src/gui/grampsbar.py | 8 ++++---- src/gui/logger/_errorreportassistant.py | 6 +++--- src/gui/logger/_errorview.py | 4 ++-- src/gui/merge/mergecitation.py | 4 ++-- src/gui/merge/mergeevent.py | 4 ++-- src/gui/merge/mergefamily.py | 4 ++-- src/gui/merge/mergemedia.py | 4 ++-- src/gui/merge/mergenote.py | 4 ++-- src/gui/merge/mergeperson.py | 4 ++-- src/gui/merge/mergeplace.py | 4 ++-- src/gui/merge/mergerepository.py | 4 ++-- src/gui/merge/mergesource.py | 4 ++-- src/gui/plug/report/_reportdialog.py | 4 ++-- src/gui/viewmanager.py | 16 ++++++++-------- src/gui/views/tags.py | 4 ++-- src/gui/widgets/grampletpane.py | 14 +++++++------- src/gui/widgets/styledtexteditor.py | 2 +- src/gui/widgets/tageditor.py | 4 ++-- src/plugins/gramplet/EditExifMetadata.py | 4 ++-- src/plugins/lib/libmapservice.py | 4 ++-- src/plugins/tool/ChangeNames.py | 4 ++-- src/plugins/tool/Desbrowser.py | 4 ++-- src/plugins/tool/EventCmp.py | 6 +++--- src/plugins/tool/ExtractCity.py | 4 ++-- src/plugins/tool/FindDupes.py | 6 +++--- src/plugins/tool/MediaManager.py | 4 ++-- src/plugins/tool/MergeCitations.py | 4 ++-- src/plugins/tool/NotRelated.py | 4 ++-- src/plugins/tool/OwnerEditor.py | 4 ++-- src/plugins/tool/PatchNames.py | 4 ++-- src/plugins/tool/SoundGen.py | 4 ++-- src/plugins/tool/Verify.py | 4 ++-- 49 files changed, 110 insertions(+), 110 deletions(-) rename src/{GrampsDisplay.py => gui/display.py} (97%) diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 2ffd75040..ae945be19 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -7,7 +7,6 @@ src/AutoComp.py src/DdTargets.py src/Errors.py -src/GrampsDisplay.py src/ImgManip.py src/ListModel.py src/RecentFiles.py @@ -229,6 +228,7 @@ src/gen/utils/callman.py # gui - GUI code src/gui/__init__.py src/gui/dbguielement.py +src/gui/display.py src/gui/glade.py src/gui/managedwindow.py src/gui/navigator.py diff --git a/src/Bookmarks.py b/src/Bookmarks.py index 9f156c249..bf58f0068 100644 --- a/src/Bookmarks.py +++ b/src/Bookmarks.py @@ -51,7 +51,7 @@ import gtk # gramps modules # #------------------------------------------------------------------------- -import GrampsDisplay +from gui.display import display_help import ListModel import Utils import const @@ -300,7 +300,7 @@ class Bookmarks : def help_clicked(self): """Display the relevant portion of GRAMPS manual.""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) class ListBookmarks(Bookmarks): diff --git a/src/DateEdit.py b/src/DateEdit.py index 64bf8392b..aba5d5b31 100644 --- a/src/DateEdit.py +++ b/src/DateEdit.py @@ -65,7 +65,7 @@ from gen.ggettext import sgettext as _ from gen.lib.date import Date, NextYear import gen.datehandler import const -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from Errors import ValidationError from gui.glade import Glade @@ -280,7 +280,7 @@ class DateEditorDialog(ManagedWindow): while True: response = self.window.run() if response == gtk.RESPONSE_HELP: - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) elif response == gtk.RESPONSE_DELETE_EVENT: break diff --git a/src/Makefile.am b/src/Makefile.am index 5b3e1a790..8f86c6004 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,6 @@ gdir_PYTHON = \ Errors.py\ ExportAssistant.py\ ExportOptions.py\ - GrampsDisplay.py\ gramps.py\ ImgManip.py\ LdsUtils.py \ diff --git a/src/ScratchPad.py b/src/ScratchPad.py index 03717cdb2..3d1a35cf5 100644 --- a/src/ScratchPad.py +++ b/src/ScratchPad.py @@ -48,7 +48,7 @@ import const import config import gen.lib import gen.datehandler -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from gen.ggettext import sgettext as _ from TransUtils import trans_objclass @@ -1371,7 +1371,7 @@ class ScratchPadWindow(ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) def on_clear_clicked(self, obj): """Deletes the selected object from the object list""" diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 6a007cd9c..f7aa2ec62 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -26,6 +26,7 @@ pkgpython_PYTHON = \ dbguielement.py \ dbloader.py \ dbman.py \ + display.py \ displaystate.py \ filtereditor.py \ glade.py \ diff --git a/src/gui/aboutdialog.py b/src/gui/aboutdialog.py index 9af03c448..b7abe9d75 100644 --- a/src/gui/aboutdialog.py +++ b/src/gui/aboutdialog.py @@ -52,7 +52,7 @@ import gtk # #------------------------------------------------------------------------- import const -from GrampsDisplay import url as display_url +from gui.display import display_url import config if config.get('preferences.use-bsddb3'): diff --git a/src/GrampsDisplay.py b/src/gui/display.py similarity index 97% rename from src/GrampsDisplay.py rename to src/gui/display.py index 6d13d3ae4..d28e0309d 100644 --- a/src/GrampsDisplay.py +++ b/src/gui/display.py @@ -63,7 +63,7 @@ try: except KeyError: pass -def help(webpage='', section=''): +def display_help(webpage='', section=''): """ Display the specified webpage and section from the Gramps 3.0 wiki. """ @@ -75,7 +75,7 @@ def help(webpage='', section=''): link = link + '#' + section url(link) -def url(link, uistate=None): +def display_url(link, uistate=None): """ Open the specified URL in a browser. """ diff --git a/src/gui/editors/addmedia.py b/src/gui/editors/addmedia.py index f278a59b1..dae6dfffc 100644 --- a/src/gui/editors/addmedia.py +++ b/src/gui/editors/addmedia.py @@ -55,7 +55,7 @@ import config import Utils import gen.mime import ThumbNails -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from QuestionDialog import ErrorDialog, WarningDialog from gui.glade import Glade @@ -125,7 +125,7 @@ class AddMediaObject(ManagedWindow): self.cancel_button = self.glade.get_object('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()) + self.help_button.connect('clicked', lambda x: display_help()) self.cancel_button.connect('clicked', self.close) self.show() self.modal_call() diff --git a/src/gui/editors/displaytabs/webembedlist.py b/src/gui/editors/displaytabs/webembedlist.py index b89471185..f908614fb 100644 --- a/src/gui/editors/displaytabs/webembedlist.py +++ b/src/gui/editors/displaytabs/webembedlist.py @@ -118,8 +118,8 @@ class WebEmbedList(EmbeddedList): ] def jump_button_clicked(self, obj): - import GrampsDisplay + from gui.display import display_url url = self.get_selected() if url.get_path(): - GrampsDisplay.url(url.get_path()) + display_url(url.get_path()) diff --git a/src/gui/editors/editevent.py b/src/gui/editors/editevent.py index f1fcba5eb..c80862113 100644 --- a/src/gui/editors/editevent.py +++ b/src/gui/editors/editevent.py @@ -44,7 +44,7 @@ import gtk import const import gen.lib from gen.db import DbTxn -import GrampsDisplay +from gui.display import display_help from editprimary import EditPrimary from objectentries import PlaceEntry from gui.glade import Glade @@ -223,7 +223,7 @@ class EditEvent(EditPrimary): def help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) def save(self, *obj): self.ok_button.set_sensitive(False) if self.object_is_empty(): diff --git a/src/gui/editors/editlink.py b/src/gui/editors/editlink.py index 1f0028f9a..152b87238 100644 --- a/src/gui/editors/editlink.py +++ b/src/gui/editors/editlink.py @@ -35,7 +35,7 @@ import re #------------------------------------------------------------------------- from gen.ggettext import gettext as _ from gui.managedwindow import ManagedWindow -import GrampsDisplay +from gui.display import display_help from gui.glade import Glade from gen.simple import SimpleAccess @@ -233,5 +233,5 @@ class EditLink(ManagedWindow): button.connect('clicked',self.close) def define_help_button(self, button, webpage='', section=''): - button.connect('clicked', lambda x: GrampsDisplay.help(webpage, + button.connect('clicked', lambda x: display_help(webpage, section)) diff --git a/src/gui/editors/editprimary.py b/src/gui/editors/editprimary.py index bace8cdb4..a9cdba6a8 100644 --- a/src/gui/editors/editprimary.py +++ b/src/gui/editors/editprimary.py @@ -45,7 +45,7 @@ import gen.datehandler from gen.display.name import displayer as name_displayer import config import gui.utils -import GrampsDisplay +from gui.display import display_help from QuestionDialog import SaveDialog import gen.lib from gui.dbguielement import DbGUIElement @@ -173,7 +173,7 @@ class EditPrimary(ManagedWindow, DbGUIElement): button.connect('clicked', self.close) def define_help_button(self, button, webpage='', section=''): - button.connect('clicked', lambda x: GrampsDisplay.help(webpage, + button.connect('clicked', lambda x: display_help(webpage, section)) def _do_close(self, *obj): diff --git a/src/gui/editors/editreference.py b/src/gui/editors/editreference.py index 0947b1817..1d83d45ee 100644 --- a/src/gui/editors/editreference.py +++ b/src/gui/editors/editreference.py @@ -198,8 +198,8 @@ class EditReference(ManagedWindow, DbGUIElement): self.close() def define_help_button(self, button, webpage='', section=''): - import GrampsDisplay - button.connect('clicked', lambda x: GrampsDisplay.help(webpage, + from gui.display import display_help + button.connect('clicked', lambda x: display_help(webpage, section)) button.set_sensitive(True) diff --git a/src/gui/editors/editsecondary.py b/src/gui/editors/editsecondary.py index 34a7ec44a..506c99749 100644 --- a/src/gui/editors/editsecondary.py +++ b/src/gui/editors/editsecondary.py @@ -22,7 +22,7 @@ # $Id$ from gui.managedwindow import ManagedWindow -import GrampsDisplay +from gui.display import display_help import config from gui.dbguielement import DbGUIElement @@ -130,7 +130,7 @@ class EditSecondary(ManagedWindow, DbGUIElement): button.connect('clicked', self.canceledits) def define_help_button(self, button, webpage='', section=''): - button.connect('clicked', lambda x: GrampsDisplay.help(webpage, + button.connect('clicked', lambda x: display_help(webpage, section)) def canceledits(self, *obj): diff --git a/src/gui/editors/editurl.py b/src/gui/editors/editurl.py index 9217e318c..7bb83eb8c 100644 --- a/src/gui/editors/editurl.py +++ b/src/gui/editors/editurl.py @@ -68,8 +68,8 @@ class EditUrl(EditSecondary): def jump_to(self, obj): if self.obj.get_path(): - import GrampsDisplay - GrampsDisplay.url(self.obj.get_path()) + from gui.display import display_url + display_url(self.obj.get_path()) def _setup_fields(self): self.des = MonitoredEntry(self.top.get_object("url_des"), diff --git a/src/gui/filtereditor.py b/src/gui/filtereditor.py index 14f957200..778b775e5 100644 --- a/src/gui/filtereditor.py +++ b/src/gui/filtereditor.py @@ -60,7 +60,7 @@ import ListModel from gui.managedwindow import ManagedWindow from QuestionDialog import QuestionDialog import const -import GrampsDisplay +from gui.display import display_help import Errors from gen.ggettext import sgettext as _ import gen.lib @@ -666,7 +666,7 @@ class EditRule(ManagedWindow): """ Display the relevant portion of GRAMPS manual. """ - GrampsDisplay.help() + display_help() def close_window(self, obj): self.close() @@ -777,7 +777,7 @@ class EditFilter(ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE) + display_help(webpage=WIKI_HELP_PAGE) def close_window(self, obj): self.close() @@ -1034,7 +1034,7 @@ class FilterEditor(ManagedWindow): def help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help() + display_help() def filter_select_row(self, obj): store, node = self.clist.get_selected() diff --git a/src/gui/grampsbar.py b/src/gui/grampsbar.py index 321bbfa3f..949309fbc 100644 --- a/src/gui/grampsbar.py +++ b/src/gui/grampsbar.py @@ -48,7 +48,7 @@ import gtk import ConfigParser import const from gui.managedwindow import ManagedWindow -import GrampsDisplay +from gui.display import display_help, display_url from gui.widgets.grampletpane import (AVAILABLE_GRAMPLETS, GET_AVAILABLE_GRAMPLETS, GET_GRAMPLET_LIST, @@ -593,11 +593,11 @@ class DetachedWindow(ManagedWindow): # translated name: if self.gramplet.help_url: if self.gramplet.help_url.startswith("http://"): - GrampsDisplay.url(self.gramplet.help_url) + display_url(self.gramplet.help_url) else: - GrampsDisplay.help(self.gramplet.help_url) + display_help(self.gramplet.help_url) else: - GrampsDisplay.help(WIKI_HELP_PAGE, + display_help(WIKI_HELP_PAGE, self.gramplet.tname.replace(" ", "_")) def get_notebook(self): diff --git a/src/gui/logger/_errorreportassistant.py b/src/gui/logger/_errorreportassistant.py index 3b5272489..2e087a280 100644 --- a/src/gui/logger/_errorreportassistant.py +++ b/src/gui/logger/_errorreportassistant.py @@ -44,7 +44,7 @@ else: # #------------------------------------------------------------------------- import const -import GrampsDisplay +from gui.display import display_help, display_url #------------------------------------------------------------------------- # @@ -132,7 +132,7 @@ class ErrorReportAssistant(gtk.Assistant): """ Start an email client to send the report. """ - GrampsDisplay.url('mailto:gramps-bugs@lists.sourceforge.net?subject=' + display_url('mailto:gramps-bugs@lists.sourceforge.net?subject=' '"bug report"&body="%s"' \ % self._final_report_text_buffer.get_text( self._final_report_text_buffer.get_start_iter(), @@ -142,7 +142,7 @@ class ErrorReportAssistant(gtk.Assistant): """ Start a web browser to report the bug. """ - GrampsDisplay.url('http://bugs.gramps-project.org/bug_report_page.php') + display_url('http://bugs.gramps-project.org/bug_report_page.php') def _get_sys_information(self): """ diff --git a/src/gui/logger/_errorview.py b/src/gui/logger/_errorview.py index 9a2516e9a..85652a1f2 100644 --- a/src/gui/logger/_errorview.py +++ b/src/gui/logger/_errorview.py @@ -35,7 +35,7 @@ import gtk import const from gen.ggettext import sgettext as _ from _errorreportassistant import ErrorReportAssistant -import GrampsDisplay +from gui.display import display_help #------------------------------------------------------------------------- # @@ -78,7 +78,7 @@ class ErrorView(object): def help_clicked(self): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(WIKI_HELP_PAGE, WIKI_HELP_SEC) + display_help(WIKI_HELP_PAGE, WIKI_HELP_SEC) def draw_window(self): title = "%s - Gramps" % _("Error Report") diff --git a/src/gui/merge/mergecitation.py b/src/gui/merge/mergecitation.py index 38d2ab180..1ade1de54 100644 --- a/src/gui/merge/mergecitation.py +++ b/src/gui/merge/mergecitation.py @@ -32,7 +32,7 @@ Provide merge capabilities for citations. #------------------------------------------------------------------------- from gen.ggettext import sgettext as _ import const -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow import gen.datehandler from Utils import confidence @@ -137,7 +137,7 @@ class MergeCitation(ManagedWindow): def cb_help(self, obj): """Display the relevant portion of Gramps manual""" - GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) + display_help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) def cb_merge(self, obj): """ diff --git a/src/gui/merge/mergeevent.py b/src/gui/merge/mergeevent.py index 679c77a3b..1d6b676e3 100644 --- a/src/gui/merge/mergeevent.py +++ b/src/gui/merge/mergeevent.py @@ -31,7 +31,7 @@ Provide merge capabilities for events. #------------------------------------------------------------------------- from gen.ggettext import sgettext as _ import const -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow import gen.datehandler import Utils @@ -152,7 +152,7 @@ class MergeEvent(ManagedWindow): def cb_help(self, obj): """Display the relevant portion of the Gramps manual""" - GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) + display_help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) def cb_merge(self, obj): """ diff --git a/src/gui/merge/mergefamily.py b/src/gui/merge/mergefamily.py index 32a38c892..528b5f085 100644 --- a/src/gui/merge/mergefamily.py +++ b/src/gui/merge/mergefamily.py @@ -32,7 +32,7 @@ Provide merge capabilities for families. from gen.ggettext import sgettext as _ from gen.display.name import displayer as name_displayer import const -import GrampsDisplay +from gui.display import display_help from Errors import MergeError from QuestionDialog import ErrorDialog from gui.managedwindow import ManagedWindow @@ -185,7 +185,7 @@ class MergeFamily(ManagedWindow): def cb_help(self, obj): """Display the relevant portion of the Gramps manual""" - GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) + display_help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) def cb_merge(self, obj): """ diff --git a/src/gui/merge/mergemedia.py b/src/gui/merge/mergemedia.py index 685661a98..71faeddd8 100644 --- a/src/gui/merge/mergemedia.py +++ b/src/gui/merge/mergemedia.py @@ -31,7 +31,7 @@ Provide merge capabilities for media objects. #------------------------------------------------------------------------- from gen.ggettext import sgettext as _ import const -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow import gen.datehandler from gen.merge import MergeMediaQuery @@ -135,7 +135,7 @@ class MergeMedia(ManagedWindow): def cb_help(self, obj): """Display the relevant portion of the Gramps manual""" - GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) + display_help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) def cb_merge(self, obj): """ diff --git a/src/gui/merge/mergenote.py b/src/gui/merge/mergenote.py index af5b53cbb..3a077cb01 100644 --- a/src/gui/merge/mergenote.py +++ b/src/gui/merge/mergenote.py @@ -31,7 +31,7 @@ Provide merge capabilities for notes. #------------------------------------------------------------------------- from gen.ggettext import sgettext as _ import const -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from gui.widgets.styledtextbuffer import StyledTextBuffer from gen.merge import MergeNoteQuery @@ -147,7 +147,7 @@ class MergeNote(ManagedWindow): def cb_help(self, obj): """Display the relevant portion of the Gramps manual""" - GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section= WIKI_HELP_SEC) + display_help(webpage = WIKI_HELP_PAGE, section= WIKI_HELP_SEC) def cb_merge(self, obj): """ diff --git a/src/gui/merge/mergeperson.py b/src/gui/merge/mergeperson.py index 3fecc2d8e..2e65bb693 100644 --- a/src/gui/merge/mergeperson.py +++ b/src/gui/merge/mergeperson.py @@ -42,7 +42,7 @@ from gen.ggettext import sgettext as _ from gen.plug.report import utils as ReportUtils from gen.display.name import displayer as name_displayer import const -import GrampsDisplay +from gui.display import display_help import gen.datehandler from Errors import MergeError from QuestionDialog import ErrorDialog @@ -302,7 +302,7 @@ class MergePerson(ManagedWindow): def cb_help(self, obj): """Display the relevant portion of Gramps manual""" - GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) + display_help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) def cb_merge(self, obj): """ diff --git a/src/gui/merge/mergeplace.py b/src/gui/merge/mergeplace.py index 76258132c..7c5052b8c 100644 --- a/src/gui/merge/mergeplace.py +++ b/src/gui/merge/mergeplace.py @@ -39,7 +39,7 @@ import gtk #------------------------------------------------------------------------- from gen.ggettext import sgettext as _ import const -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from gen.merge import MergePlaceQuery @@ -156,7 +156,7 @@ class MergePlace(ManagedWindow): def cb_help(self, obj): """Display the relevant portion of Gramps manual""" - GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) + display_help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) def cb_merge(self, obj): """ diff --git a/src/gui/merge/mergerepository.py b/src/gui/merge/mergerepository.py index 4c431ac1a..b3969582b 100644 --- a/src/gui/merge/mergerepository.py +++ b/src/gui/merge/mergerepository.py @@ -31,7 +31,7 @@ Provide merge capabilities for repositories. #------------------------------------------------------------------------- from gen.ggettext import sgettext as _ import const -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from gen.merge import MergeRepositoryQuery @@ -123,7 +123,7 @@ class MergeRepository(ManagedWindow): def cb_help(self, obj): """Display the relevant portion of the Gramps manual""" - GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) + display_help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) def cb_merge(self, obj): """ diff --git a/src/gui/merge/mergesource.py b/src/gui/merge/mergesource.py index 19ef2646b..604a2b79c 100644 --- a/src/gui/merge/mergesource.py +++ b/src/gui/merge/mergesource.py @@ -33,7 +33,7 @@ Provide merge capabilities for sources. #------------------------------------------------------------------------- from gen.ggettext import sgettext as _ import const -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from gen.merge import MergeSourceQuery @@ -146,7 +146,7 @@ class MergeSource(ManagedWindow): def cb_help(self, obj): """Display the relevant portion of Gramps manual""" - GrampsDisplay.help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) + display_help(webpage = WIKI_HELP_PAGE, section = WIKI_HELP_SEC) def cb_merge(self, obj): """ diff --git a/src/gui/plug/report/_reportdialog.py b/src/gui/plug/report/_reportdialog.py index 11711399b..93c5f8d0a 100644 --- a/src/gui/plug/report/_reportdialog.py +++ b/src/gui/plug/report/_reportdialog.py @@ -580,8 +580,8 @@ class ReportDialog(ManagedWindow): pass def on_help_clicked(self, *obj): - import GrampsDisplay - GrampsDisplay.help(URL_REPORT_PAGE, self.report_name.replace(" ", "_")) + from gui.display import display_help + display_help(URL_REPORT_PAGE, self.report_name.replace(" ", "_")) def on_style_edit_clicked(self, *obj): """The user has clicked on the 'Edit Styles' button. Create a diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py index 0feec2931..39230f369 100644 --- a/src/gui/viewmanager.py +++ b/src/gui/viewmanager.py @@ -88,7 +88,7 @@ from gui import widgets from gui.undohistory import UndoHistory import Utils from gui.dbloader import DbLoader -import GrampsDisplay +from gui.display import display_help, display_url from gui.widgets.progressdialog import ProgressMonitor, GtkProgressDialog from gui.configure import GrampsPreferences from gen.db.backup import backup @@ -1820,43 +1820,43 @@ def key_bindings(obj): """ Display key bindings """ - GrampsDisplay.help(webpage=WIKI_HELP_PAGE_KEY) + display_help(webpage=WIKI_HELP_PAGE_KEY) def manual_activate(obj): """ Display the GRAMPS manual """ - GrampsDisplay.help(webpage=WIKI_HELP_PAGE_MAN) + display_help(webpage=WIKI_HELP_PAGE_MAN) def report_bug_activate(obj): """ Display the bug tracker web site """ - GrampsDisplay.url(const.URL_BUGTRACKER) + display_url(const.URL_BUGTRACKER) def home_page_activate(obj): """ Display the GRAMPS home page """ - GrampsDisplay.url(const.URL_HOMEPAGE) + display_url(const.URL_HOMEPAGE) def mailing_lists_activate(obj): """ Display the mailing list web page """ - GrampsDisplay.url(const.URL_MAILINGLIST) + display_url(const.URL_MAILINGLIST) def extra_plugins_activate(obj): """ Display the wiki page with extra plugins """ - GrampsDisplay.url(const.URL_WIKISTRING+const.WIKI_EXTRAPLUGINS) + display_url(const.URL_WIKISTRING+const.WIKI_EXTRAPLUGINS) def faq_activate(obj): """ Display FAQ """ - GrampsDisplay.help(webpage=WIKI_HELP_PAGE_FAQ) + display_help(webpage=WIKI_HELP_PAGE_FAQ) def by_menu_name(first, second): """ diff --git a/src/gui/views/tags.py b/src/gui/views/tags.py index f221ca6bf..4085d1af1 100644 --- a/src/gui/views/tags.py +++ b/src/gui/views/tags.py @@ -47,7 +47,7 @@ from gen.db import DbTxn from gui.dbguielement import DbGUIElement from ListModel import ListModel, NOSORT, COLOR, INTEGER import const -import GrampsDisplay +from gui.display import display_help from QuestionDialog import ErrorDialog, QuestionDialog2 import gui.widgets.progressdialog as progressdlg @@ -316,7 +316,7 @@ class OrganizeTagsDialog(object): while True: response = self.top.run() if response == gtk.RESPONSE_HELP: - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) else: break diff --git a/src/gui/widgets/grampletpane.py b/src/gui/widgets/grampletpane.py index e9237a4ce..9ad4d17d1 100644 --- a/src/gui/widgets/grampletpane.py +++ b/src/gui/widgets/grampletpane.py @@ -48,7 +48,7 @@ from gui.managedwindow import ManagedWindow import ConfigParser import gui.utils from gui.plug.quick import run_quick_report_by_name -import GrampsDisplay +from gui.display import display_help, display_url from gui.glade import Glade from gui.pluginmanager import GuiPluginManager from gui.widgets.undoablebuffer import UndoableBuffer @@ -244,11 +244,11 @@ class GrampletWindow(ManagedWindow): # translated name: if self.gramplet.help_url: if self.gramplet.help_url.startswith("http://"): - GrampsDisplay.url(self.gramplet.help_url) + display_url(self.gramplet.help_url) else: - GrampsDisplay.help(self.gramplet.help_url) + display_help(self.gramplet.help_url) else: - GrampsDisplay.help(WIKI_HELP_PAGE, + display_help(WIKI_HELP_PAGE, self.gramplet.tname.replace(" ", "_")) def build_menu_names(self, obj): @@ -638,16 +638,16 @@ class GuiGramplet(object): return True elif link_type == 'URL': if event.button == 1: # left mouse - GrampsDisplay.url(handle) + display_url(handle) return True elif link_type == 'WIKI': if event.button == 1: # left mouse handle = handle.replace(" ", "_") if "#" in handle: page, section = handle.split("#", 1) - GrampsDisplay.help(page, section) + display_help(page, section) else: - GrampsDisplay.help(handle) + display_help(handle) return True elif link_type == 'Family': family = self.dbstate.db.get_family_from_handle(handle) diff --git a/src/gui/widgets/styledtexteditor.py b/src/gui/widgets/styledtexteditor.py index c29a98282..eec2ed83c 100644 --- a/src/gui/widgets/styledtexteditor.py +++ b/src/gui/widgets/styledtexteditor.py @@ -58,7 +58,7 @@ from gui.widgets.valueaction import ValueAction from gui.widgets.toolcomboentry import ToolComboEntry from gui.widgets.springseparator import SpringSeparatorAction from Spell import Spell -from GrampsDisplay import url as display_url +from gui.display import display_url import config from constfunc import has_display diff --git a/src/gui/widgets/tageditor.py b/src/gui/widgets/tageditor.py index c32f05275..141b8fa9e 100644 --- a/src/gui/widgets/tageditor.py +++ b/src/gui/widgets/tageditor.py @@ -36,7 +36,7 @@ import gtk from gen.ggettext import sgettext as _ from gui.managedwindow import ManagedWindow import const -import GrampsDisplay +from gui.display import display_help from ListModel import ListModel, TOGGLE #------------------------------------------------------------------------- @@ -80,7 +80,7 @@ class TagEditor(ManagedWindow): while True: response = self.window.run() if response == gtk.RESPONSE_HELP: - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) elif response == gtk.RESPONSE_DELETE_EVENT: break diff --git a/src/plugins/gramplet/EditExifMetadata.py b/src/plugins/gramplet/EditExifMetadata.py index e521d4480..4ef87d59f 100644 --- a/src/plugins/gramplet/EditExifMetadata.py +++ b/src/plugins/gramplet/EditExifMetadata.py @@ -47,7 +47,7 @@ import gtk # ----------------------------------------------------------------------------- # GRAMPS modules # ----------------------------------------------------------------------------- -import GrampsDisplay +from gui.display import display_help from gen.ggettext import gettext as _ @@ -885,7 +885,7 @@ class EditExifMetadata(Gramplet): will bring up a Wiki help page. """ addonwiki = 'Edit Image Exif Metadata' - GrampsDisplay.help(webpage = addonwiki) + display_help(webpage = addonwiki) def activate_buttons(self, buttonlist): """ diff --git a/src/plugins/lib/libmapservice.py b/src/plugins/lib/libmapservice.py index eafc1003d..bb7f8804e 100644 --- a/src/plugins/lib/libmapservice.py +++ b/src/plugins/lib/libmapservice.py @@ -36,7 +36,7 @@ Base class for map services. Example: open place in openstreetmap.org # #------------------------------------------------------------------------- from PlaceUtils import conv_lat_lon -import GrampsDisplay +from gui.display import display_url class MapService(): """Generic base class for map services @@ -93,7 +93,7 @@ class MapService(): def __display(self): """Show the url in an external browser""" if self.url: - GrampsDisplay.url(self.url) + display_url(self.url) def _free(self): """Allow garbage collection to do it's work""" diff --git a/src/plugins/tool/ChangeNames.py b/src/plugins/tool/ChangeNames.py index 3c4ba73f2..8d8fe68ee 100644 --- a/src/plugins/tool/ChangeNames.py +++ b/src/plugins/tool/ChangeNames.py @@ -40,7 +40,7 @@ import gtk from gen.db import find_surname_name, DbTxn import const from gui.utils import ProgressMeter -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from QuestionDialog import OkDialog @@ -228,7 +228,7 @@ class ChangeNames(tool.BatchTool, ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC) + display_help(WIKI_HELP_PAGE , WIKI_HELP_SEC) def on_ok_clicked(self, obj): with DbTxn(_("Capitalization changes"), self.db, batch=True diff --git a/src/plugins/tool/Desbrowser.py b/src/plugins/tool/Desbrowser.py index f71d703b8..66d44a3d4 100644 --- a/src/plugins/tool/Desbrowser.py +++ b/src/plugins/tool/Desbrowser.py @@ -39,7 +39,7 @@ import gtk import const from gen.display.name import displayer as name_displayer from gui.plug import tool -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from gen.ggettext import sgettext as _ from gui.glade import Glade @@ -104,7 +104,7 @@ class DesBrowse(tool.ActivePersonTool, ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_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) diff --git a/src/plugins/tool/EventCmp.py b/src/plugins/tool/EventCmp.py index 75f54676d..69489dee5 100644 --- a/src/plugins/tool/EventCmp.py +++ b/src/plugins/tool/EventCmp.py @@ -56,7 +56,7 @@ import gen.datehandler from QuestionDialog import WarningDialog from gui.plug import tool from gen.plug.report import utils as ReportUtils -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from gen.ggettext import sgettext as _ from gui.glade import Glade @@ -162,7 +162,7 @@ class EventComparison(tool.Tool,ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) def build_menu_names(self, obj): return (_("Filter selection"),_("Event Comparison tool")) @@ -270,7 +270,7 @@ class DisplayChart(ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) def build_menu_names(self, obj): return (_("Event Comparison Results"),None) diff --git a/src/plugins/tool/ExtractCity.py b/src/plugins/tool/ExtractCity.py index 4edf52f39..e55a5f628 100644 --- a/src/plugins/tool/ExtractCity.py +++ b/src/plugins/tool/ExtractCity.py @@ -48,7 +48,7 @@ import gobject #------------------------------------------------------------------------- from gen.db import DbTxn from gui.managedwindow import ManagedWindow -import GrampsDisplay +from gui.display import display_help from gui.plug import tool from gui.utils import ProgressMeter @@ -589,7 +589,7 @@ class ExtractCity(tool.BatchTool, ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help() + display_help() def on_ok_clicked(self, obj): with DbTxn(_("Extract Place data"), self.db, batch=True) as self.trans: diff --git a/src/plugins/tool/FindDupes.py b/src/plugins/tool/FindDupes.py index eba6ee07f..539437cb3 100644 --- a/src/plugins/tool/FindDupes.py +++ b/src/plugins/tool/FindDupes.py @@ -46,7 +46,7 @@ from QuestionDialog import OkDialog import ListModel import Errors from gui.merge import MergePerson -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow from QuestionDialog import RunDatabaseRepair from gen.ggettext import sgettext as _ @@ -142,7 +142,7 @@ class Merge(tool.Tool,ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC) + display_help(WIKI_HELP_PAGE , WIKI_HELP_SEC) def ancestors_of(self, p1_id, id_list): if (not p1_id) or (p1_id in id_list): @@ -571,7 +571,7 @@ class ShowMatches(ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC) + display_help(WIKI_HELP_PAGE , WIKI_HELP_SEC) def redraw(self): list = [] for p1key, p1data in self.map.iteritems(): diff --git a/src/plugins/tool/MediaManager.py b/src/plugins/tool/MediaManager.py index 1162cbf01..16fcedc1f 100644 --- a/src/plugins/tool/MediaManager.py +++ b/src/plugins/tool/MediaManager.py @@ -50,7 +50,7 @@ import gobject # #------------------------------------------------------------------------ import const -import GrampsDisplay +from gui.display import display_help from gen.lib import MediaObject from gen.db import DbTxn from gen.updatecallback import UpdateCallback @@ -153,7 +153,7 @@ class MediaMan(tool.Tool): """ Display the relevant portion of Gramps manual. """ - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) def build_batch_ops(self): """ diff --git a/src/plugins/tool/MergeCitations.py b/src/plugins/tool/MergeCitations.py index f905ef91c..fe3575466 100644 --- a/src/plugins/tool/MergeCitations.py +++ b/src/plugins/tool/MergeCitations.py @@ -50,7 +50,7 @@ import const from gui.utils import ProgressMeter from gui.plug import tool from QuestionDialog import OkDialog -import GrampsDisplay +from gui.display import display_help import gen.datehandler from gui.managedwindow import ManagedWindow from gen.ggettext import sgettext as _ @@ -161,7 +161,7 @@ class MergeCitations(tool.BatchTool,ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC) + display_help(WIKI_HELP_PAGE , WIKI_HELP_SEC) def on_merge_ok_clicked(self, obj): """ diff --git a/src/plugins/tool/NotRelated.py b/src/plugins/tool/NotRelated.py index 50f504b7b..5a5064e8e 100644 --- a/src/plugins/tool/NotRelated.py +++ b/src/plugins/tool/NotRelated.py @@ -52,7 +52,7 @@ from gen.plug.report import utils as ReportUtils from gui.editors import EditPerson, EditFamily from gui.managedwindow import ManagedWindow from gui.utils import ProgressMeter -import GrampsDisplay +from gui.display import display_help from gen.ggettext import sgettext as _ from gui.glade import Glade from gen.lib import Tag @@ -235,7 +235,7 @@ class NotRelated(tool.ActivePersonTool, ManagedWindow) : def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC) + display_help(WIKI_HELP_PAGE , WIKI_HELP_SEC) def applyTagClicked(self, button) : diff --git a/src/plugins/tool/OwnerEditor.py b/src/plugins/tool/OwnerEditor.py index 453844d68..91a1f126c 100644 --- a/src/plugins/tool/OwnerEditor.py +++ b/src/plugins/tool/OwnerEditor.py @@ -40,7 +40,7 @@ import gtk import const import config from Utils import get_researcher -import GrampsDisplay +from gui.display import display_help from gui.widgets import MonitoredEntry from gui.managedwindow import ManagedWindow from gui.plug import tool @@ -151,7 +151,7 @@ class OwnerEditor(tool.Tool, ManagedWindow): def on_help_button_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) def on_button_press_event(self, obj, event): """Shows popup-menu for db <-> preferences copying""" diff --git a/src/plugins/tool/PatchNames.py b/src/plugins/tool/PatchNames.py index 94658f1f0..8bb8ee7a0 100644 --- a/src/plugins/tool/PatchNames.py +++ b/src/plugins/tool/PatchNames.py @@ -49,7 +49,7 @@ from gui.utils import ProgressMeter from gui.plug import tool from QuestionDialog import OkDialog from gui.managedwindow import ManagedWindow -import GrampsDisplay +from gui.display import display_help import gen.lib from gen.db import DbTxn from gen.ggettext import sgettext as _ @@ -479,7 +479,7 @@ class PatchNames(tool.BatchTool, ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) def on_ok_clicked(self, obj): with DbTxn(_("Extract information from names"), self.db, batch=True diff --git a/src/plugins/tool/SoundGen.py b/src/plugins/tool/SoundGen.py index 8784dd3c7..7dd36e57e 100644 --- a/src/plugins/tool/SoundGen.py +++ b/src/plugins/tool/SoundGen.py @@ -31,7 +31,7 @@ #------------------------------------------------------------------------ import const import soundex -import GrampsDisplay +from gui.display import display_help from gui.managedwindow import ManagedWindow import AutoComp from gen.ggettext import sgettext as _ @@ -101,7 +101,7 @@ class SoundGen(tool.Tool, ManagedWindow): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(WIKI_HELP_PAGE , WIKI_HELP_SEC) + display_help(WIKI_HELP_PAGE , WIKI_HELP_SEC) def build_menu_names(self, obj): return (self.label,None) diff --git a/src/plugins/tool/Verify.py b/src/plugins/tool/Verify.py index ef8df3176..242750155 100644 --- a/src/plugins/tool/Verify.py +++ b/src/plugins/tool/Verify.py @@ -58,7 +58,7 @@ import const import gen.lib from gui.editors import EditPerson, EditFamily import Utils -import GrampsDisplay +from gui.display import display_help from ManagedWindow from gui.managedwindow import ManagedWindow from gen.updatecallback import UpdateCallback from gui.plug import tool @@ -298,7 +298,7 @@ class Verify(tool.Tool, ManagedWindow, UpdateCallback): def on_help_clicked(self, obj): """Display the relevant portion of GRAMPS manual""" - GrampsDisplay.help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) + display_help(webpage=WIKI_HELP_PAGE, section=WIKI_HELP_SEC) def on_apply_clicked(self, obj): run_button = self.top.get_object('button4')