From 91ad4bb07dc67a6880312d69510df0ef3692910f Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Tue, 2 Jun 2020 11:54:59 +0200 Subject: [PATCH] Renamed docdetails file to itemdetails --- nw/__init__.py | 6 +++--- nw/gui/__init__.py | 4 ++-- nw/gui/{docdetails.py => itemdetails.py} | 8 ++++---- nw/guimain.py | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) rename nw/gui/{docdetails.py => itemdetails.py} (98%) diff --git a/nw/__init__.py b/nw/__init__.py index 61aa56bb..ce005764 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -172,7 +172,7 @@ def main(sysArgs=None): debugLevel = logging.INFO elif inOpt == "--debug": debugLevel = logging.DEBUG - logFormat = "[{asctime:}] {name:>30}:{lineno:<4d} {levelname:8} {message:}" + logFormat = "[{asctime:}] {name:>22}:{lineno:<4d} {levelname:8} {message:}" elif inOpt == "--logfile": logFile = inArg toFile = True @@ -180,7 +180,7 @@ def main(sysArgs=None): toStd = False elif inOpt == "--verbose": debugLevel = VERBOSE - logFormat = "[{asctime:}] {name:>30}:{lineno:<4d} {levelname:8} {message:}" + logFormat = "[{asctime:}] {name:>22}:{lineno:<4d} {levelname:8} {message:}" elif inOpt == "--style": qtStyle = inArg elif inOpt == "--config": @@ -196,7 +196,7 @@ def main(sysArgs=None): CONFIG.cmdOpen = cmdOpen # Set Logging - logFmt = logging.Formatter(fmt=logFormat,datefmt="%Y-%m-%d %H:%M:%S",style="{") + logFmt = logging.Formatter(fmt=logFormat, datefmt="%Y-%m-%d %H:%M:%S", style="{") if not logFile == "" and toFile: if path.isfile(logFile+".bak"): diff --git a/nw/gui/__init__.py b/nw/gui/__init__.py index 28a7a654..1156abc0 100644 --- a/nw/gui/__init__.py +++ b/nw/gui/__init__.py @@ -5,12 +5,12 @@ from nw.gui.build import GuiBuildNovel from nw.gui.docbars import GuiDocTitleBar from nw.gui.docbars import GuiNoticeBar from nw.gui.docbars import GuiSearchBar -from nw.gui.docdetails import GuiDocDetails 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 from nw.gui.mainmenu import GuiMainMenu from nw.gui.outline import GuiProjectOutline @@ -29,12 +29,12 @@ __all__ = [ "GuiDocTitleBar", "GuiNoticeBar", "GuiSearchBar", - "GuiDocDetails", "GuiDocEditor", "GuiDocMerge", "GuiDocSplit", "GuiDocTree", "GuiDocViewer", + "GuiItemDetails", "GuiItemEditor", "GuiMainMenu", "GuiProjectOutline", diff --git a/nw/gui/docdetails.py b/nw/gui/itemdetails.py similarity index 98% rename from nw/gui/docdetails.py rename to nw/gui/itemdetails.py index 39bc6fe6..93ffb788 100644 --- a/nw/gui/docdetails.py +++ b/nw/gui/itemdetails.py @@ -38,12 +38,12 @@ from nw.constants import ( logger = logging.getLogger(__name__) -class GuiDocDetails(QFrame): +class GuiItemDetails(QFrame): def __init__(self, theParent, theProject): QFrame.__init__(self, theParent) - logger.debug("Initialising DocDetails ...") + logger.debug("Initialising GuiItemDetails ...") self.mainConf = nw.CONFIG self.theParent = theParent self.theProject = theProject @@ -182,7 +182,7 @@ class GuiDocDetails(QFrame): self.mainBox.setColumnMinimumWidth(1, flagWidth) self.mainBox.setColumnMinimumWidth(4, countWidth) - logger.debug("DocDetails initialisation complete") + logger.debug("GuiItemDetails initialisation complete") return @@ -262,4 +262,4 @@ class GuiDocDetails(QFrame): return -# END Class GuiDocDetails +# END Class GuiItemDetails diff --git a/nw/guimain.py b/nw/guimain.py index ec00ea5c..6c547a9b 100644 --- a/nw/guimain.py +++ b/nw/guimain.py @@ -41,7 +41,7 @@ from PyQt5.QtWidgets import ( from nw.gui import ( GuiMainMenu, GuiMainStatus, GuiTheme, GuiDocTree, GuiDocEditor, - GuiDocViewer, GuiDocDetails, GuiSearchBar, GuiNoticeBar, GuiDocViewDetails, + GuiDocViewer, GuiItemDetails, GuiSearchBar, GuiNoticeBar, GuiDocViewDetails, GuiPreferences, GuiProjectSettings, GuiItemEditor, GuiProjectOutline, GuiSessionLogView, GuiDocMerge, GuiDocSplit, GuiProjectLoad, GuiBuildNovel ) @@ -96,7 +96,7 @@ class GuiMain(QMainWindow): self.docViewer = GuiDocViewer(self, self.theProject) self.viewMeta = GuiDocViewDetails(self, self.theProject) self.searchBar = GuiSearchBar(self) - self.treeMeta = GuiDocDetails(self, self.theProject) + self.treeMeta = GuiItemDetails(self, self.theProject) self.projView = GuiProjectOutline(self, self.theProject) self.mainMenu = GuiMainMenu(self, self.theProject)