Moved theme class to gui folder

This commit is contained in:
Veronica K. B. Olsen
2019-11-08 15:41:24 +01:00
parent e7561cb3e3
commit 69bfb4a209
3 changed files with 9 additions and 8 deletions
+2
View File
@@ -3,6 +3,7 @@
# Main Window Elements
from nw.gui.mainmenu import GuiMainMenu
from nw.gui.statusbar import GuiMainStatus
from nw.gui.theme import GuiTheme
# Dialogs
from nw.gui.dialogs.configeditor import GuiConfigEditor
@@ -28,6 +29,7 @@ from nw.gui.tools.wordcounter import WordCounter
__all__ = [
"GuiMainMenu",
"GuiMainStatus",
"GuiTheme",
"GuiConfigEditor",
"GuiExport",
"GuiItemEditor",
+2 -2
View File
@@ -23,7 +23,7 @@ from nw.constants import nwAlert
logger = logging.getLogger(__name__)
class Theme:
class GuiTheme:
# Icons should either have a valid icon name by using Qt internal
# QIcon.fromTheme, as specified here:
@@ -353,4 +353,4 @@ class Theme:
return confParser.get(cnfSec, cnfName)
return cnfDefault
# End Class Theme
# End Class GuiTheme
+5 -6
View File
@@ -24,14 +24,13 @@ from PyQt5.QtWidgets import (
)
from nw.gui import (
GuiMainMenu, GuiMainStatus, GuiDocTree, GuiDocEditor, GuiDocViewer,
GuiDocDetails, GuiSearchBar, GuiNoticeBar, GuiDocViewDetails,
GuiConfigEditor, GuiProjectEditor, GuiExport, GuiItemEditor,
GuiTimeLineView, GuiSessionLogView
GuiMainMenu, GuiMainStatus, GuiTheme, GuiDocTree, GuiDocEditor,
GuiDocViewer, GuiDocDetails, GuiSearchBar, GuiNoticeBar,
GuiDocViewDetails, GuiConfigEditor, GuiProjectEditor, GuiExport,
GuiItemEditor, GuiTimeLineView, GuiSessionLogView
)
from nw.project import NWProject, NWDoc, NWItem, NWIndex, NWBackup
from nw.tools import countWords
from nw.theme import Theme
from nw.constants import nwFiles, nwItemType, nwAlert
logger = logging.getLogger(__name__)
@@ -44,7 +43,7 @@ class GuiMain(QMainWindow):
logger.info("Starting %s" % nw.__package__)
logger.debug("Initialising GUI ...")
self.mainConf = nw.CONFIG
self.theTheme = Theme(self)
self.theTheme = GuiTheme(self)
self.theProject = NWProject(self)
self.theIndex = NWIndex(self.theProject, self)
self.hasProject = False