Git commit 07309020e446cedff2341f8d07d8a974a24af534 by Friedrich W. H. Kossebau. Committed on 31/03/2017 at 15:49. Pushed by kossebau into branch 'frameworks'.
Consistenly use current official letter cases for "Graphviz", "DOT" M +2 -2 CMakeLists.txt M +2 -2 README R +0 -0 cmake/FindGraphviz.cmake [from: cmake/FindGraphViz.cmake - 100% similarity] M +1 -1 doc/en_US/index.docbook M +1 -1 src/kgrapheditormain.cpp M +1 -1 src/kgraphviewer.cpp M +1 -1 src/main.cpp M +1 -1 src/org.kde.kgrapheditor.desktop M +2 -2 src/org.kde.kgraphviewer.appdata.xml M +1 -1 src/org.kde.kgraphviewer.desktop M +1 -1 src/part/canvasedge.cpp M +4 -4 src/part/dot2qtconsts.cpp M +1 -1 src/part/dotgrammar.h M +2 -2 src/part/dotgraph.h M +3 -3 src/part/dotgraphview.cpp M +1 -1 src/part/graphelement.h M +1 -1 src/part/graphnode.h M +1 -1 src/part/graphsubgraph.h M +1 -1 src/part/kgraphviewer_part.cpp M +1 -1 src/part/org.kde.libkgraphviewer.metainfo.xml.in https://commits.kde.org/kgraphviewer/07309020e446cedff2341f8d07d8a974a24af534 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d12715..15a3117 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ include(ECMPackageConfigHelpers) find_package(Qt5 CONFIG REQUIRED Core DBus Widgets Svg PrintSupport) find_package(Boost 1.36 REQUIRED) -find_package(GraphViz REQUIRED) +find_package(Graphviz REQUIRED) set(KF5_DEP_VERSION "5.16.0") find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS @@ -30,7 +30,7 @@ find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS ) if(NOT DOT) - MESSAGE(STATUS "dot executable from GraphViz not found. You will need it at runtime") + MESSAGE(STATUS "dot executable from Graphviz not found. You will need it at runtime") endif(NOT DOT) option(BUILD_GRAPHEDITOR "Build the graph editor app (WIP, not yet functional). [default=OFF]" OFF) diff --git a/README b/README index 4c88e07..84a8da0 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -KGraphViewer is a Graphviz dot graph file viewer by KDE. +KGraphViewer is a Graphviz DOT graph file viewer by KDE. http://extragear.kde.org/apps/kgraphviewer/ Copyright (C) 2005-2007 Gaël de Chalendar <kl...@free.fr> @@ -21,7 +21,7 @@ KGraphViewer is a tool to display graphviz .dot graphs. It is more generally a KPart able to display any graph data that graphviz can handle. This part is commanded through the signals/slots mechanism. It is used -in an experimental dot graphs editor called kgrapheditor released with in this +in an experimental DOT graphs editor called kgrapheditor released with in this package. I used, in this program, code from the profiling tool kcachegrind diff --git a/cmake/FindGraphViz.cmake b/cmake/FindGraphviz.cmake similarity index 100% rename from cmake/FindGraphViz.cmake rename to cmake/FindGraphviz.cmake diff --git a/doc/en_US/index.docbook b/doc/en_US/index.docbook index 5a768f8..b082694 100644 --- a/doc/en_US/index.docbook +++ b/doc/en_US/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kgraphviewer "<application>KGraphViewer</application>"> - <!ENTITY graphviz "<application><ulink url="http://www.graphviz.org">GraphViz</ulink></application>"> + <!ENTITY graphviz "<application><ulink url="http://www.graphviz.org">Graphviz</ulink></application>"> <!ENTITY boost "<ulink url="http://www.boost.org">Boost</ulink>"> <!ENTITY GUI "<acronym>GUI</acronym>"> <!ENTITY tcltk "<application>Tcl/Tk</application>"> diff --git a/src/kgrapheditormain.cpp b/src/kgrapheditormain.cpp index 0ac120e..533866e 100644 --- a/src/kgrapheditormain.cpp +++ b/src/kgrapheditormain.cpp @@ -47,7 +47,7 @@ int main(int argc, char **argv) KAboutData about(QStringLiteral("kgrapheditor"), i18n("KGraphEditor"), KGRAPHVIEWER_VERSION_STRING, - i18n("A Graphviz dot graph editor by KDE"), + i18n("A Graphviz DOT graph editor by KDE"), KAboutLicense::GPL, i18n("(C) 2005-2010 Gaël de Chalendar")); diff --git a/src/kgraphviewer.cpp b/src/kgraphviewer.cpp index 17ba5ec..5574ba5 100644 --- a/src/kgraphviewer.cpp +++ b/src/kgraphviewer.cpp @@ -219,7 +219,7 @@ void KGraphViewerWindow::setupActions() newAction->setWhatsThis(i18n("Opens a new empty KGraphViewer window.")); QAction* openAction = actionCollection()->addAction( KStandardAction::Open, "file_open", this, SLOT(fileOpen()) ); - openAction->setWhatsThis(i18n("Shows the file open dialog to choose a GraphViz dot file to open.")); + openAction->setWhatsThis(i18n("Shows the file open dialog to choose a Graphviz DOT file to open.")); m_rfa = KStandardAction::openRecent(this, SLOT(slotURLSelected(QUrl)), this); actionCollection()->addAction(m_rfa->objectName(),m_rfa); diff --git a/src/main.cpp b/src/main.cpp index 2d52fa7..955ed1d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -44,7 +44,7 @@ int main(int argc, char **argv) KAboutData about(QStringLiteral("kgraphviewer"), i18n("KGraphViewer"), KGRAPHVIEWER_VERSION_STRING, - i18n("A Graphviz dot graph viewer by KDE"), + i18n("A Graphviz DOT graph viewer by KDE"), KAboutLicense::GPL, i18n("(C) 2005-2010 Gaël de Chalendar")); about.addAuthor( i18n("Gaël de Chalendar"), i18n("Original Author and current maintainer"), "kl...@free.fr" ); diff --git a/src/org.kde.kgrapheditor.desktop b/src/org.kde.kgrapheditor.desktop index 6760826..cb7369b 100644 --- a/src/org.kde.kgrapheditor.desktop +++ b/src/org.kde.kgrapheditor.desktop @@ -44,7 +44,7 @@ Type=Application Categories=Qt;KDE;Graphics;2DGraphics;DataVisualization; InitialPreference=9 X-DocPath=kgrapheditor/kgrapheditor.html -Comment=A Graphviz dot graph editor by KDE +Comment=A Graphviz DOT graph editor by KDE Comment[bg]=Редактиране на Graphviz-графики в KDE Comment[bs]=Graphviz tačkasti grafički editor za KDE Comment[ca]=Un editor de gràfics DOT de Graphviz pel KDE diff --git a/src/org.kde.kgraphviewer.appdata.xml b/src/org.kde.kgraphviewer.appdata.xml index 8685c9a..0054f10 100644 --- a/src/org.kde.kgraphviewer.appdata.xml +++ b/src/org.kde.kgraphviewer.appdata.xml @@ -29,7 +29,7 @@ <name xml:lang="tr">KGraphViewer</name> <name xml:lang="uk">KGraphViewer</name> <name xml:lang="x-test">xxKGraphViewerxx</name> - <summary>A Graphviz dot graph viewer by KDE</summary> + <summary>A Graphviz DOT graph viewer by KDE</summary> <summary xml:lang="bs">Graphviz tačkasti grafički preglednik za KDE</summary> <summary xml:lang="ca">Un visor de gràfics DOT de Graphviz pel KDE</summary> <summary xml:lang="ca-valencia">Un visor de gràfics DOT de Graphviz pel KDE</summary> @@ -57,7 +57,7 @@ <summary xml:lang="x-test">xxA Graphviz dot graph viewer for KDExx</summary> <description> <p> - KGraphViewer is a Graphviz dot graph file viewer, aimed to replace the other outdated GraphViz tools. + KGraphViewer is a Graphviz DOT graph file viewer, aimed to replace the other outdated Graphviz tools. Graphs are commonly used in scientific domains and particularly in computer science. </p> <p xml:lang="bs">Graphviz tačkasti grafički preglednik za fajlove, namijenjen da zamijeni druge zastarijele GraphViz alate. Grafovi su često korišteni u znanstvenim oblastima, i djelomično u kompjuterskoj nauci.</p> diff --git a/src/org.kde.kgraphviewer.desktop b/src/org.kde.kgraphviewer.desktop index 3c35c67..dec6295 100644 --- a/src/org.kde.kgraphviewer.desktop +++ b/src/org.kde.kgraphviewer.desktop @@ -42,7 +42,7 @@ Type=Application Categories=Qt;KDE;Graphics;Viewer;2DGraphics;DataVisualization; X-DocPath=kgraphviewer/index.html InitialPreference=10 -Comment=A Graphviz dot graph viewer by KDE +Comment=A Graphviz DOT graph viewer by KDE Comment[bg]=Преглед на Graphviz-графики в KDE Comment[bs]=Graphviz tačkasti grafički editor za KDE Comment[ca]=Un visor de gràfics DOT de Graphviz pel KDE diff --git a/src/part/canvasedge.cpp b/src/part/canvasedge.cpp index 7199acc..ca4a534 100644 --- a/src/part/canvasedge.cpp +++ b/src/part/canvasedge.cpp @@ -138,7 +138,7 @@ QPainterPath CanvasEdge::pathForSpline(int splineNum, const DotRenderOp& dro) co for (int i = 0; i < dro.integers[0]; i++) { // computing of diffX and diffY to draw parallel edges - // when asked through the corresponding GraphViz feature + // when asked through the corresponding Graphviz feature qreal nom = (dro.integers[2*dro.integers[0]]-dro.integers[2]); qreal denom = (dro.integers[2*dro.integers[0]-1]-dro.integers[1]); qreal diffX, diffY; diff --git a/src/part/dot2qtconsts.cpp b/src/part/dot2qtconsts.cpp index c690540..2a2ac39 100644 --- a/src/part/dot2qtconsts.cpp +++ b/src/part/dot2qtconsts.cpp @@ -900,13 +900,13 @@ QColor Dot2QtConsts::qtColor(const QString& dotColor) const } else { - qWarning() << "Unknown stored dot color '" << dotColor << "'. returning Qt black"; + qWarning() << "Unknown stored DOT color '" << dotColor << "'. returning Qt black"; return Qt::black; } } else { -// kWarning() << "Unknown dot color '" << dotColor << "'. returning Qt black"; +// kWarning() << "Unknown DOT color '" << dotColor << "'. returning Qt black"; return Qt::black; } } @@ -921,7 +921,7 @@ Qt::PenStyle Dot2QtConsts::qtPenStyle(const QString& dotLineStyle) const { if (!dotLineStyle.left(12).isEmpty() && dotLineStyle.left(12) != "setlinewidth") - qWarning() << "Unknown dot line style '" << dotLineStyle << "'. returning Qt solid line"; + qWarning() << "Unknown DOT line style '" << dotLineStyle << "'. returning Qt solid line"; return Qt::SolidLine; } } @@ -932,7 +932,7 @@ QFont Dot2QtConsts::qtFont(const QString& dotFont) const return (*(m_psFonts.find(dotFont))); else { - qWarning() << "Unknown dot font '" << dotFont << "'. returning Qt default."; + qWarning() << "Unknown DOT font '" << dotFont << "'. returning Qt default."; return QFont(QFont::substitute(dotFont)); } } diff --git a/src/part/dotgrammar.h b/src/part/dotgrammar.h index 48752cc..4f7c47f 100644 --- a/src/part/dotgrammar.h +++ b/src/part/dotgrammar.h @@ -17,7 +17,7 @@ */ /* - * GraphViz dot Graph parsing grammar implemented with boost Spirit + * Graphviz DOT graph parsing grammar implemented with boost Spirit */ #ifndef DOT_GRAMMAR_H diff --git a/src/part/dotgraph.h b/src/part/dotgraph.h index 0f61037..db826b6 100644 --- a/src/part/dotgraph.h +++ b/src/part/dotgraph.h @@ -17,7 +17,7 @@ */ /* - * GraphViz dot Graph model + * Graphviz DOT graph model */ #ifndef DOT_GRAPH_H @@ -42,7 +42,7 @@ namespace KGraphViewer { /** - * A class representing the model of a GraphViz dot graph + * A class representing the model of a Graphviz DOT graph */ class DotGraph : public GraphElement { diff --git a/src/part/dotgraphview.cpp b/src/part/dotgraphview.cpp index e5c8934..f2dfb4e 100644 --- a/src/part/dotgraphview.cpp +++ b/src/part/dotgraphview.cpp @@ -452,9 +452,9 @@ void DotGraphViewPrivate::setupPopup() m_layoutAlgoSelectAction->setCurrentAction(lda); m_layoutAlgoSelectAction->setEditable(true); - m_layoutAlgoSelectAction->setToolTip(i18n("Choose a GraphViz layout algorithm or edit your own one.")); + m_layoutAlgoSelectAction->setToolTip(i18n("Choose a Graphviz layout algorithm or edit your own one.")); m_layoutAlgoSelectAction->setWhatsThis(i18n( - "Choose a GraphViz layout algorithm or type in your own command that will " + "Choose a Graphviz layout algorithm or type in your own command that will " "generate a graph in the xdot format on its standard output. For example, to " "manually specify the <tt>G</tt> option to the dot command, type in: " "<tt>dot -Gname=MyGraphName -Txdot </tt>")); @@ -654,7 +654,7 @@ DotGraphView::DotGraphView(KActionCollection* actions, QWidget* parent) : this, &DotGraphView::zoomRectMoveFinished); setWhatsThis( i18n( - "<h1>GraphViz dot format graph visualization</h1>" + "<h1>Graphviz DOT format graph visualization</h1>" "<p>If the graph is larger than the widget area, an overview " "panner is shown in one edge. Choose through the context menu " "if the optimal position of this overview should be automatically " diff --git a/src/part/graphelement.h b/src/part/graphelement.h index c51343a..8c37d1b 100644 --- a/src/part/graphelement.h +++ b/src/part/graphelement.h @@ -32,7 +32,7 @@ namespace KGraphViewer class CanvasElement; /** - * The base of all GraphViz dot graph elements (nodes, edges, subgraphs, + * The base of all Graphviz DOT graph elements (nodes, edges, subgraphs, * graphs). It is used to store the element attributes */ class GraphElement: public QObject diff --git a/src/part/graphnode.h b/src/part/graphnode.h index d9c8a7f..82acaaa 100644 --- a/src/part/graphnode.h +++ b/src/part/graphnode.h @@ -51,7 +51,7 @@ namespace KGraphViewer class CanvasNode; /** - * Colors and styles are dot names + * Colors and styles are DOT names */ class GraphNode : public GraphElement { diff --git a/src/part/graphsubgraph.h b/src/part/graphsubgraph.h index 85f9cae..6d53e6e 100644 --- a/src/part/graphsubgraph.h +++ b/src/part/graphsubgraph.h @@ -43,7 +43,7 @@ typedef QMap<QString, GraphSubgraph*> GraphSubgraphMap; /** - * Colors and styles are dot names + * Colors and styles are DOT names */ class GraphSubgraph : public GraphElement { diff --git a/src/part/kgraphviewer_part.cpp b/src/part/kgraphviewer_part.cpp index 3020829..2b7d1bd 100644 --- a/src/part/kgraphviewer_part.cpp +++ b/src/part/kgraphviewer_part.cpp @@ -81,7 +81,7 @@ KGraphViewerPart::KGraphViewerPart( QWidget *parentWidget, QObject *parent, cons QStringLiteral("kgraphviewer"), i18n("KGraphViewerPart"), KGRAPHVIEWER_VERSION_STRING, - i18n( "GraphViz dot files viewer" ), + i18n("Graphviz DOT files viewer"), KAboutLicense::GPL, i18n("(c) 2005-2006, Gaël de Chalendar <kl...@free.fr>") ); diff --git a/src/part/org.kde.libkgraphviewer.metainfo.xml.in b/src/part/org.kde.libkgraphviewer.metainfo.xml.in index 108132f..911d763 100644 --- a/src/part/org.kde.libkgraphviewer.metainfo.xml.in +++ b/src/part/org.kde.libkgraphviewer.metainfo.xml.in @@ -32,7 +32,7 @@ <name xml:lang="tr">KGraphViewer Kitaplığı</name> <name xml:lang="uk">Бібліотека KGraphViewer</name> <name xml:lang="x-test">xxKGraphViewer Libraryxx</name> - <summary>A Graphviz dot graph viewer by KDE (shared library)</summary> + <summary>A Graphviz DOT graph viewer by KDE (shared library)</summary> <summary xml:lang="bs">Graphviz pregledač tačkaste grafike za KDE (dijeljena biblioteka)</summary> <summary xml:lang="ca">Un visor de gràfics DOT de Graphviz pel KDE (biblioteca compartida)</summary> <summary xml:lang="ca-valencia">Un visor de gràfics DOT de Graphviz pel KDE (biblioteca compartida)</summary>