From 894bc41f510249c6f94b57d247a31878f81cc143 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Fri, 8 May 2020 21:32:38 +0200
Subject: [PATCH] Moved the additions folder into the gui folder as it only
 contains gui elements

---
 nw/additions/__init__.py                | 8 --------
 nw/gui/__init__.py                      | 6 ++++++
 nw/gui/additions/__init__.py            | 8 ++++++++
 nw/{ => gui}/additions/qconfiglayout.py | 0
 nw/{ => gui}/additions/qswitch.py       | 0
 nw/gui/dialogs/configeditor.py          | 2 +-
 6 files changed, 15 insertions(+), 9 deletions(-)
 delete mode 100644 nw/additions/__init__.py
 create mode 100644 nw/gui/additions/__init__.py
 rename nw/{ => gui}/additions/qconfiglayout.py (100%)
 rename nw/{ => gui}/additions/qswitch.py (100%)

diff --git a/nw/additions/__init__.py b/nw/additions/__init__.py
deleted file mode 100644
index 213df1b1..00000000
--- a/nw/additions/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-from nw.additions.qconfiglayout import QConfigLayout
-from nw.additions.qswitch import QSwitch
-
-__all__ = [
-    "QConfigLayout",
-    "QSwitch",
-]
diff --git a/nw/gui/__init__.py b/nw/gui/__init__.py
index a39d93ad..c59bfed9 100644
--- a/nw/gui/__init__.py
+++ b/nw/gui/__init__.py
@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
 
+# Qt Additions
+from nw.gui.additions.qconfiglayout import QConfigLayout
+from nw.gui.additions.qswitch import QSwitch
+
 # Main Window Elements
 from nw.gui.icons import GuiIcons
 from nw.gui.mainmenu import GuiMainMenu
@@ -33,6 +37,8 @@ from nw.gui.tools.optionstate import OptionState
 from nw.gui.tools.wordcounter import WordCounter
 
 __all__ = [
+    "QConfigLayout",
+    "QSwitch",
     "GuiIcons",
     "GuiMainMenu",
     "GuiMainStatus",
diff --git a/nw/gui/additions/__init__.py b/nw/gui/additions/__init__.py
new file mode 100644
index 00000000..04f5e25a
--- /dev/null
+++ b/nw/gui/additions/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+from nw.gui.additions.qconfiglayout import QConfigLayout
+from nw.gui.additions.qswitch import QSwitch
+
+__all__ = [
+    "QConfigLayout",
+    "QSwitch",
+]
diff --git a/nw/additions/qconfiglayout.py b/nw/gui/additions/qconfiglayout.py
similarity index 100%
rename from nw/additions/qconfiglayout.py
rename to nw/gui/additions/qconfiglayout.py
diff --git a/nw/additions/qswitch.py b/nw/gui/additions/qswitch.py
similarity index 100%
rename from nw/additions/qswitch.py
rename to nw/gui/additions/qswitch.py
diff --git a/nw/gui/dialogs/configeditor.py b/nw/gui/dialogs/configeditor.py
index 7a6f167b..581d7307 100644
--- a/nw/gui/dialogs/configeditor.py
+++ b/nw/gui/dialogs/configeditor.py
@@ -38,7 +38,7 @@ from PyQt5.QtWidgets import (
     QFileDialog
 )
 
-from nw.additions import QSwitch, QConfigLayout
+from nw.gui.additions import QSwitch, QConfigLayout
 from nw.core import NWSpellCheck, NWSpellSimple, NWSpellEnchant
 from nw.constants import nwAlert, nwQuotes