Cleaned up the source files in the gui folder a bit.

nw/gui/elements/doceditor.py

@@ -13,18 +13,20 @@
 import logging
 import nw
 
-from time                import time
+from time import time
 
-from PyQt5.QtCore        import Qt, QTimer, QSizeF
+from PyQt5.QtCore    import Qt, QTimer, QSizeF
-from PyQt5.QtWidgets     import qApp, QTextEdit, QAction, QMenu, QShortcut
+from PyQt5.QtWidgets import qApp, QTextEdit, QAction, QMenu, QShortcut
-from PyQt5.QtGui         import QTextCursor, QTextOption, QIcon, QKeySequence, QFont, QColor, QPalette, QTextDocument
+from PyQt5.QtGui     import (
+    QTextCursor, QTextOption, QIcon, QKeySequence, QFont, QColor, QPalette, QTextDocument
+)
 
-from nw.project.document import NWDoc
+from nw.project.document       import NWDoc
-from nw.gui.dochighlight import GuiDocHighlighter
+from nw.gui.tools.dochighlight import GuiDocHighlighter
-from nw.gui.wordcounter  import WordCounter
+from nw.gui.tools.wordcounter  import WordCounter
-from nw.tools.spellcheck import NWSpellCheck
+from nw.tools.spellcheck       import NWSpellCheck
-from nw.constants        import nwFiles, nwUnicode
+from nw.constants              import nwFiles, nwUnicode
-from nw.enum             import nwDocAction, nwAlert
+from nw.enum                   import nwDocAction, nwAlert
 
 logger = logging.getLogger(__name__)
 

nw/gui/winmain.py

@@ -14,36 +14,37 @@ import logging
 import time
 import nw
 
-from os                   import path
+from os import path
-from PyQt5.QtCore         import Qt, QTimer
+
-from PyQt5.QtGui          import QIcon, QPixmap, QColor
+from PyQt5.QtCore    import Qt, QTimer
-from PyQt5.QtWidgets      import (
+from PyQt5.QtGui     import QIcon, QPixmap, QColor
+from PyQt5.QtWidgets import (
     qApp, QWidget, QMainWindow, QVBoxLayout, QFrame, QSplitter, QFileDialog,
     QShortcut, QMessageBox, QProgressDialog, QDialog
 )
 
-from nw.gui.doctree       import GuiDocTree
+from nw.gui.mainmenu              import GuiMainMenu
-from nw.gui.doceditor     import GuiDocEditor
+from nw.gui.statusbar             import GuiMainStatus
-from nw.gui.docviewer     import GuiDocViewer
+from nw.gui.elements.doctree      import GuiDocTree
-from nw.gui.docdetails    import GuiDocDetails
+from nw.gui.elements.doceditor    import GuiDocEditor
-from nw.gui.searchbar     import GuiSearchBar
+from nw.gui.elements.docviewer    import GuiDocViewer
-from nw.gui.mainmenu      import GuiMainMenu
+from nw.gui.elements.docdetails   import GuiDocDetails
-from nw.gui.configeditor  import GuiConfigEditor
+from nw.gui.elements.searchbar    import GuiSearchBar
-from nw.gui.projecteditor import GuiProjectEditor
+from nw.gui.dialogs.configeditor  import GuiConfigEditor
-from nw.gui.export        import GuiExport
+from nw.gui.dialogs.projecteditor import GuiProjectEditor
-from nw.gui.itemeditor    import GuiItemEditor
+from nw.gui.dialogs.export        import GuiExport
-from nw.gui.statusbar     import GuiMainStatus
+from nw.gui.dialogs.itemeditor    import GuiItemEditor
-from nw.gui.timelineview  import GuiTimeLineView
+from nw.gui.dialogs.timelineview  import GuiTimeLineView
-from nw.gui.sessionlog    import GuiSessionLogView
+from nw.gui.dialogs.sessionlog    import GuiSessionLogView
-from nw.project.project   import NWProject
+from nw.project.project           import NWProject
-from nw.project.document  import NWDoc
+from nw.project.document          import NWDoc
-from nw.project.item      import NWItem
+from nw.project.item              import NWItem
-from nw.project.index     import NWIndex
+from nw.project.index             import NWIndex
-from nw.project.backup    import NWBackup
+from nw.project.backup            import NWBackup
-from nw.tools.wordcount   import countWords
+from nw.tools.wordcount           import countWords
-from nw.theme             import Theme
+from nw.theme                     import Theme
-from nw.enum              import nwItemType, nwAlert
+from nw.enum                      import nwItemType, nwAlert
-from nw.constants         import nwFiles
+from nw.constants                 import nwFiles
 
 logger = logging.getLogger(__name__)
 

sample/sampleNovel/nwProject.nwx

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="0.3.2" fileVersion="1.0" timeStamp="2019-10-31 13:36:33">
+<novelWriterXML appVersion="0.3.2" fileVersion="1.0" timeStamp="2019-10-31 13:54:16">
   <project>
     <name>Sample Project</name>
     <title>Sample Project</title>

tests/test_gui.py

@@ -8,10 +8,11 @@ from nwtools import *
 from os import path, unlink
 from PyQt5.QtCore import Qt
 
-from nw.gui.projecteditor import GuiProjectEditor
+from nw.gui.dialogs.projecteditor import GuiProjectEditor
-from nw.gui.timelineview  import GuiTimeLineView
+from nw.gui.dialogs.timelineview  import GuiTimeLineView
-from nw.gui.itemeditor    import GuiItemEditor
+from nw.gui.dialogs.itemeditor    import GuiItemEditor
-from nw.enum              import *
+
+from nw.enum import *
 
 keyDelay  = 10
 stepDelay = 50