From 3c49ccff533071cf56c7b24e8f208f0afeadd08c Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Fri, 14 Oct 2022 19:34:37 +0200
Subject: [PATCH] Move the custom gui module to the root of the project

---
 novelwriter/{gui => }/custom.py     | 0
 novelwriter/dialogs/docmerge.py     | 2 +-
 novelwriter/dialogs/docsplit.py     | 2 +-
 novelwriter/dialogs/preferences.py  | 2 +-
 novelwriter/dialogs/projdetails.py  | 2 +-
 novelwriter/dialogs/projsettings.py | 2 +-
 novelwriter/gui/projtree.py         | 3 +--
 novelwriter/tools/build.py          | 2 +-
 novelwriter/tools/lipsum.py         | 2 +-
 novelwriter/tools/projwizard.py     | 2 +-
 novelwriter/tools/writingstats.py   | 2 +-
 11 files changed, 10 insertions(+), 11 deletions(-)
 rename novelwriter/{gui => }/custom.py (100%)

diff --git a/novelwriter/gui/custom.py b/novelwriter/custom.py
similarity index 100%
rename from novelwriter/gui/custom.py
rename to novelwriter/custom.py
diff --git a/novelwriter/dialogs/docmerge.py b/novelwriter/dialogs/docmerge.py
index 3dcf6d34..fd9fcebe 100644
--- a/novelwriter/dialogs/docmerge.py
+++ b/novelwriter/dialogs/docmerge.py
@@ -33,7 +33,7 @@ from PyQt5.QtWidgets import (
     QListWidget, QListWidgetItem, QVBoxLayout,
 )
 
-from novelwriter.gui.custom import QHelpLabel, QSwitch
+from novelwriter.custom import QHelpLabel, QSwitch
 
 logger = logging.getLogger(__name__)
 
diff --git a/novelwriter/dialogs/docsplit.py b/novelwriter/dialogs/docsplit.py
index f744f32e..aef72f32 100644
--- a/novelwriter/dialogs/docsplit.py
+++ b/novelwriter/dialogs/docsplit.py
@@ -34,7 +34,7 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter.core import NWDoc
-from novelwriter.gui.custom import QHelpLabel, QSwitch
+from novelwriter.custom import QHelpLabel, QSwitch
 
 logger = logging.getLogger(__name__)
 
diff --git a/novelwriter/dialogs/preferences.py b/novelwriter/dialogs/preferences.py
index 005b46bd..ae2df4c5 100644
--- a/novelwriter/dialogs/preferences.py
+++ b/novelwriter/dialogs/preferences.py
@@ -35,7 +35,7 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter.enum import nwAlert
-from novelwriter.gui.custom import QSwitch, QConfigLayout, PagedDialog
+from novelwriter.custom import QSwitch, QConfigLayout, PagedDialog
 from novelwriter.dialogs.quotes import GuiQuoteSelect
 
 logger = logging.getLogger(__name__)
diff --git a/novelwriter/dialogs/projdetails.py b/novelwriter/dialogs/projdetails.py
index bcd5d0f5..729f8a3b 100644
--- a/novelwriter/dialogs/projdetails.py
+++ b/novelwriter/dialogs/projdetails.py
@@ -37,8 +37,8 @@ from PyQt5.QtWidgets import (
 
 from novelwriter.enum import nwItemClass
 from novelwriter.common import numberToRoman
+from novelwriter.custom import PagedDialog, QSwitch
 from novelwriter.constants import nwLabels, nwUnicode
-from novelwriter.gui.custom import PagedDialog, QSwitch
 
 logger = logging.getLogger(__name__)
 
diff --git a/novelwriter/dialogs/projsettings.py b/novelwriter/dialogs/projsettings.py
index 87954392..ec33bc1a 100644
--- a/novelwriter/dialogs/projsettings.py
+++ b/novelwriter/dialogs/projsettings.py
@@ -36,7 +36,7 @@ from PyQt5.QtWidgets import (
 
 from novelwriter.enum import nwAlert
 from novelwriter.common import simplified
-from novelwriter.gui.custom import QSwitch, PagedDialog, QConfigLayout
+from novelwriter.custom import QSwitch, PagedDialog, QConfigLayout
 
 logger = logging.getLogger(__name__)
 
diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py
index 181b8b55..15bc7cbf 100644
--- a/novelwriter/gui/projtree.py
+++ b/novelwriter/gui/projtree.py
@@ -39,8 +39,7 @@ from PyQt5.QtWidgets import (
     QVBoxLayout, QWidget
 )
 
-from novelwriter.core import DocMerger
-from novelwriter.core.doctools import DocSplitter
+from novelwriter.core import DocMerger, DocSplitter
 from novelwriter.enum import nwDocMode, nwItemType, nwItemClass, nwItemLayout, nwAlert
 from novelwriter.dialogs import GuiDocMerge, GuiDocSplit, GuiEditLabel
 from novelwriter.constants import nwHeaders, trConst, nwLabels
diff --git a/novelwriter/tools/build.py b/novelwriter/tools/build.py
index 2915818c..b99f7828 100644
--- a/novelwriter/tools/build.py
+++ b/novelwriter/tools/build.py
@@ -47,8 +47,8 @@ from novelwriter.core import ToHtml, ToOdt, ToMarkdown
 from novelwriter.enum import nwAlert, nwItemType, nwItemLayout, nwItemClass
 from novelwriter.error import formatException, logException
 from novelwriter.common import fuzzyTime, makeFileNameSafe
+from novelwriter.custom import QSwitch
 from novelwriter.constants import nwConst, nwFiles
-from novelwriter.gui.custom import QSwitch
 
 logger = logging.getLogger(__name__)
 
diff --git a/novelwriter/tools/lipsum.py b/novelwriter/tools/lipsum.py
index 64069e6f..976732dd 100644
--- a/novelwriter/tools/lipsum.py
+++ b/novelwriter/tools/lipsum.py
@@ -34,8 +34,8 @@ from PyQt5.QtWidgets import (
     QSpinBox
 )
 
-from novelwriter.gui.custom import QSwitch
 from novelwriter.common import readTextFile
+from novelwriter.custom import QSwitch
 
 logger = logging.getLogger(__name__)
 
diff --git a/novelwriter/tools/projwizard.py b/novelwriter/tools/projwizard.py
index d2602a4c..389e8946 100644
--- a/novelwriter/tools/projwizard.py
+++ b/novelwriter/tools/projwizard.py
@@ -35,7 +35,7 @@ from PyQt5.QtWidgets import (
 )
 
 from novelwriter.common import makeFileNameSafe
-from novelwriter.gui.custom import QSwitch
+from novelwriter.custom import QSwitch
 
 logger = logging.getLogger(__name__)
 
diff --git a/novelwriter/tools/writingstats.py b/novelwriter/tools/writingstats.py
index 7033aadc..8d372641 100644
--- a/novelwriter/tools/writingstats.py
+++ b/novelwriter/tools/writingstats.py
@@ -40,8 +40,8 @@ from PyQt5.QtWidgets import (
 from novelwriter.enum import nwAlert
 from novelwriter.error import formatException
 from novelwriter.common import formatTime, checkInt, checkIntRange, checkIntTuple
+from novelwriter.custom import QSwitch
 from novelwriter.constants import nwConst, nwFiles
-from novelwriter.gui.custom import QSwitch
 
 logger = logging.getLogger(__name__)