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