From 807937caa9a32fb6937e40371e2bb2a117a87e23 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 2 Jun 2020 12:02:36 +0200 Subject: [PATCH] And renamed doctree to projecttree --- nw/gui/__init__.py | 4 ++-- nw/gui/{doctree.py => projtree.py} | 8 ++++---- nw/guimain.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename nw/gui/{doctree.py => projtree.py} (99%) diff --git a/nw/gui/__init__.py b/nw/gui/__init__.py index 6079c676..4df869b5 100644 --- a/nw/gui/__init__.py +++ b/nw/gui/__init__.py @@ -9,7 +9,6 @@ from nw.gui.docdetails import GuiDocViewDetails from nw.gui.doceditor import GuiDocEditor from nw.gui.docmerge import GuiDocMerge from nw.gui.docsplit import GuiDocSplit -from nw.gui.doctree import GuiDocTree from nw.gui.docviewer import GuiDocViewer from nw.gui.itemdetails import GuiItemDetails from nw.gui.itemeditor import GuiItemEditor @@ -18,6 +17,7 @@ from nw.gui.outline import GuiProjectOutline from nw.gui.preferences import GuiPreferences from nw.gui.projload import GuiProjectLoad from nw.gui.projsettings import GuiProjectSettings +from nw.gui.projtree import GuiProjectTree from nw.gui.sessionlog import GuiSessionLogView from nw.gui.statusbar import GuiMainStatus from nw.gui.theme import GuiIcons @@ -33,7 +33,6 @@ __all__ = [ "GuiDocEditor", "GuiDocMerge", "GuiDocSplit", - "GuiDocTree", "GuiDocViewer", "GuiItemDetails", "GuiItemEditor", @@ -42,6 +41,7 @@ __all__ = [ "GuiPreferences", "GuiProjectLoad", "GuiProjectSettings", + "GuiProjectTree", "GuiSessionLogView", "GuiMainStatus", "GuiIcons", diff --git a/nw/gui/doctree.py b/nw/gui/projtree.py similarity index 99% rename from nw/gui/doctree.py rename to nw/gui/projtree.py index 7449d5c3..72246c3a 100644 --- a/nw/gui/doctree.py +++ b/nw/gui/projtree.py @@ -42,7 +42,7 @@ from nw.constants import ( logger = logging.getLogger(__name__) -class GuiDocTree(QTreeWidget): +class GuiProjectTree(QTreeWidget): C_NAME = 0 C_COUNT = 1 @@ -52,7 +52,7 @@ class GuiDocTree(QTreeWidget): def __init__(self, theParent, theProject): QTreeWidget.__init__(self, theParent) - logger.debug("Initialising GuiDocTree ...") + logger.debug("Initialising GuiProjectTree ...") self.mainConf = nw.CONFIG self.theParent = theParent self.theTheme = theParent.theTheme @@ -115,7 +115,7 @@ class GuiDocTree(QTreeWidget): # The last column should just auto-scale self.resizeColumnToContents(self.C_FLAGS) - logger.debug("GuiDocTree initialisation complete") + logger.debug("GuiProjectTree initialisation complete") # Internal Mapping self.makeAlert = self.theParent.makeAlert @@ -782,4 +782,4 @@ class GuiDocTree(QTreeWidget): return -# END Class GuiDocTree +# END Class GuiProjectTree diff --git a/nw/guimain.py b/nw/guimain.py index 6c547a9b..ea6c050e 100644 --- a/nw/guimain.py +++ b/nw/guimain.py @@ -40,7 +40,7 @@ from PyQt5.QtWidgets import ( ) from nw.gui import ( - GuiMainMenu, GuiMainStatus, GuiTheme, GuiDocTree, GuiDocEditor, + GuiMainMenu, GuiMainStatus, GuiTheme, GuiProjectTree, GuiDocEditor, GuiDocViewer, GuiItemDetails, GuiSearchBar, GuiNoticeBar, GuiDocViewDetails, GuiPreferences, GuiProjectSettings, GuiItemEditor, GuiProjectOutline, GuiSessionLogView, GuiDocMerge, GuiDocSplit, GuiProjectLoad, GuiBuildNovel @@ -91,7 +91,7 @@ class GuiMain(QMainWindow): # Main GUI Elements self.statusBar = GuiMainStatus(self) self.noticeBar = GuiNoticeBar(self) - self.treeView = GuiDocTree(self, self.theProject) + self.treeView = GuiProjectTree(self, self.theProject) self.docEditor = GuiDocEditor(self, self.theProject) self.docViewer = GuiDocViewer(self, self.theProject) self.viewMeta = GuiDocViewDetails(self, self.theProject)