From 61831d9c0e3ff80adbedef4f02e9b597a05a1347 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Mon, 1 Jun 2020 23:13:08 +0200
Subject: [PATCH] Moved the custom widgets classes to the root gui folder

---
 nw/gui/additions/__init__.py                     | 12 ------------
 nw/gui/build.py                                  |  2 +-
 nw/gui/{additions/qconfiglayout.py => custom.py} |  0
 nw/gui/dialogs/docmerge.py                       |  2 +-
 nw/gui/dialogs/docsplit.py                       |  2 +-
 nw/gui/dialogs/itemeditor.py                     |  2 +-
 nw/gui/dialogs/preferences.py                    |  2 +-
 nw/gui/dialogs/projectsettings.py                |  2 +-
 8 files changed, 6 insertions(+), 18 deletions(-)
 delete mode 100644 nw/gui/additions/__init__.py
 rename nw/gui/{additions/qconfiglayout.py => custom.py} (100%)

diff --git a/nw/gui/additions/__init__.py b/nw/gui/additions/__init__.py
deleted file mode 100644
index 83c73cdc..00000000
--- a/nw/gui/additions/__init__.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-from nw.gui.additions.qconfiglayout import PagedDialog
-from nw.gui.additions.qconfiglayout import QConfigLayout
-from nw.gui.additions.qconfiglayout import QHelpLabel
-from nw.gui.additions.qconfiglayout import QSwitch
-
-__all__ = [
-    "PagedDialog",
-    "QConfigLayout",
-    "QHelpLabel",
-    "QSwitch",
-]
diff --git a/nw/gui/build.py b/nw/gui/build.py
index 639f504d..791dff67 100644
--- a/nw/gui/build.py
+++ b/nw/gui/build.py
@@ -43,7 +43,7 @@ from PyQt5.QtWidgets import (
     QFileDialog, QFontDialog, QSpinBox
 )
 
-from nw.gui.additions import QSwitch
+from nw.gui.custom import QSwitch
 from nw.core import ToHtml
 from nw.constants import (
     nwAlert, nwFiles, nwItemType, nwItemLayout, nwItemClass
diff --git a/nw/gui/additions/qconfiglayout.py b/nw/gui/custom.py
similarity index 100%
rename from nw/gui/additions/qconfiglayout.py
rename to nw/gui/custom.py
diff --git a/nw/gui/dialogs/docmerge.py b/nw/gui/dialogs/docmerge.py
index 1fc225a9..73b15a6a 100644
--- a/nw/gui/dialogs/docmerge.py
+++ b/nw/gui/dialogs/docmerge.py
@@ -35,7 +35,7 @@ from PyQt5.QtWidgets import (
 )
 
 from nw.constants import nwAlert, nwItemType
-from nw.gui.additions import QHelpLabel
+from nw.gui.custom import QHelpLabel
 from nw.core import NWDoc
 
 logger = logging.getLogger(__name__)
diff --git a/nw/gui/dialogs/docsplit.py b/nw/gui/dialogs/docsplit.py
index e029a49b..702e8f17 100644
--- a/nw/gui/dialogs/docsplit.py
+++ b/nw/gui/dialogs/docsplit.py
@@ -34,7 +34,7 @@ from PyQt5.QtWidgets import (
     QListWidgetItem, QDialogButtonBox, QLabel
 )
 from nw.constants import nwAlert, nwItemType, nwItemClass, nwItemLayout
-from nw.gui.additions import QHelpLabel
+from nw.gui.custom import QHelpLabel
 from nw.core import NWDoc
 
 logger = logging.getLogger(__name__)
diff --git a/nw/gui/dialogs/itemeditor.py b/nw/gui/dialogs/itemeditor.py
index ce1fac67..7eb54b14 100644
--- a/nw/gui/dialogs/itemeditor.py
+++ b/nw/gui/dialogs/itemeditor.py
@@ -34,7 +34,7 @@ from PyQt5.QtWidgets import (
     QDialogButtonBox
 )
 
-from nw.gui.additions import QSwitch
+from nw.gui.custom import QSwitch
 from nw.constants import nwLabels, nwItemLayout, nwItemClass, nwItemType
 
 logger = logging.getLogger(__name__)
diff --git a/nw/gui/dialogs/preferences.py b/nw/gui/dialogs/preferences.py
index 280993f5..a05e5eb0 100644
--- a/nw/gui/dialogs/preferences.py
+++ b/nw/gui/dialogs/preferences.py
@@ -37,7 +37,7 @@ from PyQt5.QtWidgets import (
     QDialogButtonBox, QFileDialog, QFontDialog
 )
 
-from nw.gui.additions import QSwitch, QConfigLayout, PagedDialog
+from nw.gui.custom import QSwitch, QConfigLayout, PagedDialog
 from nw.core import NWSpellCheck, NWSpellSimple, NWSpellEnchant
 from nw.constants import nwAlert, nwQuotes
 
diff --git a/nw/gui/dialogs/projectsettings.py b/nw/gui/dialogs/projectsettings.py
index 66af994a..a1c28ca4 100644
--- a/nw/gui/dialogs/projectsettings.py
+++ b/nw/gui/dialogs/projectsettings.py
@@ -38,7 +38,7 @@ from PyQt5.QtWidgets import (
 )
 
 from nw.constants import nwAlert
-from nw.gui.additions import QSwitch, PagedDialog, QConfigLayout
+from nw.gui.custom import QSwitch, PagedDialog, QConfigLayout
 
 logger = logging.getLogger(__name__)