From d3b7efa0a6c566f855771a0fefa52f1241c1c343 Mon Sep 17 00:00:00 2001 From: Sam Manzi Date: Sun, 19 Jul 2015 14:24:33 +1000 Subject: [PATCH] 7553 Change GraphViz to Graphviz --- FAQ | 2 +- NEWS | 4 ++-- README | 2 +- gramps/cli/plug/__init__.py | 2 +- gramps/gen/plug/docgen/graphdoc.py | 14 +++++++------- gramps/plugins/graph/graphplugins.gpr.py | 2 +- gramps/plugins/graph/gvfamilylines.py | 2 +- gramps/plugins/graph/gvhourglass.py | 2 +- gramps/plugins/graph/gvrelgraph.py | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/FAQ b/FAQ index 68af96015..f6ad93cd6 100644 --- a/FAQ +++ b/FAQ @@ -212,7 +212,7 @@ their own plugins which could be new reports, charts, or research tools. 18. In what formats can Gramps output its reports? -Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and GraphViz formats. +Text reports are available in HTML, PDF, ODT, LaTeX, and RTF formats. Graphical reports (charts and diagrams) are available in PostScript, PDF, SVG, ODS, and Graphviz formats. 19. How can I change the default language in reports? diff --git a/NEWS b/NEWS index 792644ab4..afea35d81 100644 --- a/NEWS +++ b/NEWS @@ -360,8 +360,8 @@ Version 3.4.3 of Gramps! "Whenever life gets you down, Mrs. Brown", a maintenanc * GEDCOM Repositories not imported correctly from FTM for Windows and Heredis. * Fixes to a number of errors in filtering notes. * Fix some errors in determining whether someone is alive (e.g. for filtering out alive people). -* Make availability of GraphViz settings depend on output format -* Improve the descriptions and tooltip for GraphViz aspect ratio option +* Make availability of Graphviz settings depend on output format +* Improve the descriptions and tooltip for Graphviz aspect ratio option * Fixed update problems with citation bottombar gramplet (bug #6336) * Fixed Open Document Text output in Book report (bug #6457) * A number of changes to Narrative Web: diff --git a/README b/README index 6aca0fdfb..c370380a0 100644 --- a/README +++ b/README @@ -30,7 +30,7 @@ The following packages are *STRONGLY RECOMMENDED* to be installed: Without this the GeoView will not be active, see http://gramps-project.org/wiki/index.php?title=Gramps_4.1_Wiki_Manual_-_Main_Window#Geography_Category - GraphViz Enable creation of graphs using GraphViz engine. + Graphviz Enable creation of graphs using Graphviz engine. Without this, three reports cannot be run. Obtain it from: http://www.graphviz.org diff --git a/gramps/cli/plug/__init__.py b/gramps/cli/plug/__init__.py index fcee1885f..97c389103 100644 --- a/gramps/cli/plug/__init__.py +++ b/gramps/cli/plug/__init__.py @@ -225,7 +225,7 @@ class CommandLineReport(object): self.raw_name = name self.option_class = option_class(name, database) if category == CATEGORY_GRAPHVIZ: - # Need to include GraphViz options + # Need to include Graphviz options self.__gvoptions = graphdoc.GVOptions() menu = self.option_class.menu self.__gvoptions.add_menu_options(menu) diff --git a/gramps/gen/plug/docgen/graphdoc.py b/gramps/gen/plug/docgen/graphdoc.py index 5e93896a6..09f143203 100644 --- a/gramps/gen/plug/docgen/graphdoc.py +++ b/gramps/gen/plug/docgen/graphdoc.py @@ -128,7 +128,7 @@ class GVOptions(): :return: nothing """ ################################ - category = _("GraphViz Layout") + category = _("Graphviz Layout") ################################ font_family = EnumeratedListOption(_("Font family"), "") for item in _FONTS: @@ -151,7 +151,7 @@ class GVOptions(): menu.add_option(category, "rank_dir", rank_dir) h_pages = NumberOption(_("Number of Horizontal Pages"), 1, 1, 25) - h_pages.set_help(_("GraphViz can create very large graphs by " + h_pages.set_help(_("Graphviz can create very large graphs by " "spreading the graph across a rectangular " "array of pages. This controls the number " "pages in the array horizontally. " @@ -159,7 +159,7 @@ class GVOptions(): menu.add_option(category, "h_pages", h_pages) v_pages = NumberOption(_("Number of Vertical Pages"), 1, 1, 25) - v_pages.set_help(_("GraphViz can create very large graphs by " + v_pages.set_help(_("Graphviz can create very large graphs by " "spreading the graph across a rectangular " "array of pages. This controls the number " "pages in the array vertically. " @@ -187,7 +187,7 @@ class GVOptions(): self.v_pages.connect('value-changed', self.pages_changed) ################################ - category = _("GraphViz Options") + category = _("Graphviz Options") ################################ aspect_ratio = EnumeratedListOption(_("Aspect ratio"), "fill") @@ -234,7 +234,7 @@ class GVOptions(): menu.add_option(category, "ranksep", ranksep) use_subgraphs = BooleanOption(_('Use subgraphs'), True) - use_subgraphs.set_help(_("Subgraphs can help GraphViz position " + use_subgraphs.set_help(_("Subgraphs can help Graphviz position " "spouses together, but with non-trivial " "graphs will result in longer lines and " "larger graphs.")) @@ -510,7 +510,7 @@ class GVDocBase(BaseDoc, GVDoc): text += ' style="%s"' % style # note that we always output a label -- even if an empty string -- - # otherwise GraphViz uses the node ID as the label which is unlikely + # otherwise Graphviz uses the node ID as the label which is unlikely # to be what the user wants to see in the graph if label.startswith("<") or htmloutput: text += ' label=<%s>' % label @@ -645,7 +645,7 @@ class GVPsDoc(GVDocBase): # Generate the PS file. # Reason for using -Tps:cairo. Needed for Non Latin-1 letters # Some testing with Tps:cairo. Non Latin-1 letters are OK i all cases: - # Output format: ps PDF-GostScript PDF-GraphViz + # Output format: ps PDF-GostScript PDF-Graphviz # Single page OK OK OK # Multip page 1 page, OK 1 page, # corrupted set by gramps diff --git a/gramps/plugins/graph/graphplugins.gpr.py b/gramps/plugins/graph/graphplugins.gpr.py index 3ed9e0e4c..df62cab02 100644 --- a/gramps/plugins/graph/graphplugins.gpr.py +++ b/gramps/plugins/graph/graphplugins.gpr.py @@ -29,7 +29,7 @@ MODULE_VERSION="5.0" plg = newplugin() plg.id = 'familylines_graph' plg.name = _("Family Lines Graph") -plg.description = _("Produces family line graphs using GraphViz.") +plg.description = _("Produces family line graphs using Graphviz.") plg.version = '1.0' plg.gramps_target_version = MODULE_VERSION plg.status = STABLE diff --git a/gramps/plugins/graph/gvfamilylines.py b/gramps/plugins/graph/gvfamilylines.py index c8fb96e0d..e667ee272 100644 --- a/gramps/plugins/graph/gvfamilylines.py +++ b/gramps/plugins/graph/gvfamilylines.py @@ -24,7 +24,7 @@ # """ -Family Lines, a GraphViz-based plugin for Gramps. +Family Lines, a Graphviz-based plugin for Gramps. """ #------------------------------------------------------------------------ diff --git a/gramps/plugins/graph/gvhourglass.py b/gramps/plugins/graph/gvhourglass.py index 1552ede44..c3cca64ab 100644 --- a/gramps/plugins/graph/gvhourglass.py +++ b/gramps/plugins/graph/gvhourglass.py @@ -23,7 +23,7 @@ # """ -Generate an hourglass graph using the GraphViz generator. +Generate an hourglass graph using the Graphviz generator. """ #------------------------------------------------------------------------ # diff --git a/gramps/plugins/graph/gvrelgraph.py b/gramps/plugins/graph/gvrelgraph.py index 3009f4b04..f3db713f9 100644 --- a/gramps/plugins/graph/gvrelgraph.py +++ b/gramps/plugins/graph/gvrelgraph.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Adapted from GraphViz.py (now deprecated) +# Adapted from Graphviz.py (now deprecated) # Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2005-2006 Eero Tamminen # Copyright (C) 2007-2008 Brian G. Matherly @@ -186,7 +186,7 @@ class RelGraphReport(Report): def add_child_links_to_families(self): """ - returns string of GraphViz edges linking parents to families or + returns string of Graphviz edges linking parents to families or children """ # Hash people in a dictionary for faster inclusion checking