From 635a52fd31708b47bf005d1646154a30a0841c21 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sat, 26 Sep 2020 13:08:48 +0200
Subject: [PATCH] More import and file cleanup

---
 nw/constants/__init__.py           | 18 +++++++++---------
 nw/core/__init__.py                |  6 +++---
 nw/gui/__init__.py                 | 13 ++++++-------
 nw/gui/{buildnovel.py => build.py} |  0
 4 files changed, 18 insertions(+), 19 deletions(-)
 rename nw/gui/{buildnovel.py => build.py} (100%)

diff --git a/nw/constants/__init__.py b/nw/constants/__init__.py
index 7c43df61..1ffe2540 100644
--- a/nw/constants/__init__.py
+++ b/nw/constants/__init__.py
@@ -9,20 +9,20 @@ from nw.constants.enum import (
 )
 
 __all__ = [
-    "isoLanguage",
     "isoCountry",
-    "nwConst",
-    "nwRegEx",
-    "nwFiles",
-    "nwKeyWords",
-    "nwLabels",
-    "nwQuotes",
-    "nwUnicode",
+    "isoLanguage",
     "nwAlert",
+    "nwConst",
     "nwDocAction",
+    "nwDocInsert",
+    "nwFiles",
     "nwItemClass",
     "nwItemLayout",
     "nwItemType",
+    "nwKeyWords",
+    "nwLabels",
     "nwOutline",
-    "nwDocInsert",
+    "nwQuotes",
+    "nwRegEx",
+    "nwUnicode",
 ]
diff --git a/nw/core/__init__.py b/nw/core/__init__.py
index ede01b73..f5140ebc 100644
--- a/nw/core/__init__.py
+++ b/nw/core/__init__.py
@@ -8,6 +8,9 @@ from nw.core.tohtml import ToHtml
 from nw.core.tools import countWords, numberToRoman, numberToWord
 
 __all__ = [
+    "countWords",
+    "numberToRoman",
+    "numberToWord",
     "NWDoc",
     "NWIndex",
     "NWProject",
@@ -15,7 +18,4 @@ __all__ = [
     "NWSpellEnchant",
     "NWSpellSimple",
     "ToHtml",
-    "countWords",
-    "numberToRoman",
-    "numberToWord",
 ]
diff --git a/nw/gui/__init__.py b/nw/gui/__init__.py
index 8d413f61..d40d84fc 100644
--- a/nw/gui/__init__.py
+++ b/nw/gui/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from nw.gui.about import GuiAbout
-from nw.gui.buildnovel import GuiBuildNovel
+from nw.gui.build import GuiBuildNovel
 from nw.gui.doceditor import GuiDocEditor
 from nw.gui.docmerge import GuiDocMerge
 from nw.gui.docsplit import GuiDocSplit
@@ -16,9 +16,9 @@ from nw.gui.projload import GuiProjectLoad
 from nw.gui.projsettings import GuiProjectSettings
 from nw.gui.projtree import GuiProjectTree
 from nw.gui.projwizard import GuiProjectWizard
-from nw.gui.writingstats import GuiWritingStats
 from nw.gui.statusbar import GuiMainStatus
-from nw.gui.theme import GuiIcons, GuiTheme
+from nw.gui.theme import GuiTheme
+from nw.gui.writingstats import GuiWritingStats
 
 __all__ = [
     "GuiAbout",
@@ -26,11 +26,12 @@ __all__ = [
     "GuiDocEditor",
     "GuiDocMerge",
     "GuiDocSplit",
-    "GuiDocViewer",
     "GuiDocViewDetails",
+    "GuiDocViewer",
     "GuiItemDetails",
     "GuiItemEditor",
     "GuiMainMenu",
+    "GuiMainStatus",
     "GuiOutline",
     "GuiOutlineDetails",
     "GuiPreferences",
@@ -38,8 +39,6 @@ __all__ = [
     "GuiProjectSettings",
     "GuiProjectTree",
     "GuiProjectWizard",
-    "GuiWritingStats",
-    "GuiMainStatus",
-    "GuiIcons",
     "GuiTheme",
+    "GuiWritingStats",
 ]
diff --git a/nw/gui/buildnovel.py b/nw/gui/build.py
similarity index 100%
rename from nw/gui/buildnovel.py
rename to nw/gui/build.py