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__) diff --git a/tests/test_core/test_core_doctools.py b/tests/test_core/test_core_doctools.py index ab55aef4..bcff60ce 100644 --- a/tests/test_core/test_core_doctools.py +++ b/tests/test_core/test_core_doctools.py @@ -27,7 +27,9 @@ from shutil import copyfile from mock import causeOSError from tools import C, buildTestProject, cmpFiles -from novelwriter.core import NWProject, DocMerger, DocSplitter, NWDoc +from novelwriter.core.project import NWProject +from novelwriter.core.doctools import DocMerger, DocSplitter +from novelwriter.core.document import NWDoc @pytest.mark.core diff --git a/tests/test_core/test_core_document.py b/tests/test_core/test_core_document.py index 2f80e45a..ecc23e9c 100644 --- a/tests/test_core/test_core_document.py +++ b/tests/test_core/test_core_document.py @@ -25,8 +25,9 @@ import pytest from mock import causeOSError from tools import readFile, writeFile -from novelwriter.core import NWProject, NWDoc from novelwriter.enum import nwItemClass, nwItemLayout +from novelwriter.core.project import NWProject +from novelwriter.core.document import NWDoc @pytest.mark.core diff --git a/tests/test_core/test_core_index.py b/tests/test_core/test_core_index.py index 14aaa9be..e2eeaa93 100644 --- a/tests/test_core/test_core_index.py +++ b/tests/test_core/test_core_index.py @@ -28,9 +28,9 @@ from shutil import copyfile from mock import causeException from tools import buildTestProject, cmpFiles, writeFile -from novelwriter.core.project import NWProject -from novelwriter.core.index import NWIndex, countWords, TagsIndex from novelwriter.enum import nwItemClass, nwItemLayout +from novelwriter.core.index import NWIndex, countWords, TagsIndex +from novelwriter.core.project import NWProject @pytest.mark.core diff --git a/tests/test_core/test_core_item.py b/tests/test_core/test_core_item.py index 3f4fe7ca..c0b92591 100644 --- a/tests/test_core/test_core_item.py +++ b/tests/test_core/test_core_item.py @@ -25,8 +25,8 @@ from lxml import etree from PyQt5.QtGui import QIcon -from novelwriter.core import NWProject from novelwriter.core.item import NWItem +from novelwriter.core.project import NWProject from novelwriter.enum import nwItemClass, nwItemType, nwItemLayout diff --git a/tests/test_core/test_core_options.py b/tests/test_core/test_core_options.py index b13d4799..0535ca71 100644 --- a/tests/test_core/test_core_options.py +++ b/tests/test_core/test_core_options.py @@ -26,8 +26,8 @@ import pytest from mock import causeOSError from tools import writeFile -from novelwriter.core import NWProject from novelwriter.core.options import OptionState +from novelwriter.core.project import NWProject from novelwriter.constants import nwFiles diff --git a/tests/test_core/test_core_tohtml.py b/tests/test_core/test_core_tohtml.py index f21d5d78..8880206c 100644 --- a/tests/test_core/test_core_tohtml.py +++ b/tests/test_core/test_core_tohtml.py @@ -24,7 +24,8 @@ import pytest from tools import readFile -from novelwriter.core import NWProject, ToHtml +from novelwriter.core.tohtml import ToHtml +from novelwriter.core.project import NWProject @pytest.mark.core diff --git a/tests/test_core/test_core_tokenizer.py b/tests/test_core/test_core_tokenizer.py index 97023201..38121268 100644 --- a/tests/test_core/test_core_tokenizer.py +++ b/tests/test_core/test_core_tokenizer.py @@ -24,7 +24,8 @@ import pytest from tools import readFile -from novelwriter.core import NWProject, NWDoc +from novelwriter.core.project import NWProject +from novelwriter.core.document import NWDoc from novelwriter.core.tokenizer import Tokenizer diff --git a/tests/test_core/test_core_tomd.py b/tests/test_core/test_core_tomd.py index 2e49d16b..3ec56a6b 100644 --- a/tests/test_core/test_core_tomd.py +++ b/tests/test_core/test_core_tomd.py @@ -24,7 +24,8 @@ import pytest from tools import readFile -from novelwriter.core import NWProject, ToMarkdown +from novelwriter.core.tomd import ToMarkdown +from novelwriter.core.project import NWProject @pytest.mark.core diff --git a/tests/test_core/test_core_toodt.py b/tests/test_core/test_core_toodt.py index c714b5f5..a564a053 100644 --- a/tests/test_core/test_core_toodt.py +++ b/tests/test_core/test_core_toodt.py @@ -28,8 +28,8 @@ from shutil import copyfile from tools import cmpFiles -from novelwriter.core import NWProject, ToOdt -from novelwriter.core.toodt import ODTParagraphStyle, ODTTextStyle, XMLParagraph, _mkTag +from novelwriter.core.toodt import ToOdt, ODTParagraphStyle, ODTTextStyle, XMLParagraph, _mkTag +from novelwriter.core.project import NWProject XML_NS = [ ' xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"', diff --git a/tests/test_core/test_core_tree.py b/tests/test_core/test_core_tree.py index 23eb7f73..cfdefe70 100644 --- a/tests/test_core/test_core_tree.py +++ b/tests/test_core/test_core_tree.py @@ -27,9 +27,11 @@ from lxml import etree from tools import readFile -from novelwriter.core.project import NWProject, NWItem, NWTree from novelwriter.enum import nwItemClass, nwItemType, nwItemLayout from novelwriter.constants import nwFiles +from novelwriter.core.item import NWItem +from novelwriter.core.tree import NWTree +from novelwriter.core.project import NWProject @pytest.fixture(scope="function") diff --git a/tests/test_dialogs/test_dlg_about.py b/tests/test_dialogs/test_dlg_about.py index a4623c1f..80a6ca06 100644 --- a/tests/test_dialogs/test_dlg_about.py +++ b/tests/test_dialogs/test_dlg_about.py @@ -25,7 +25,7 @@ from tools import getGuiItem from PyQt5.QtWidgets import QAction, QMessageBox -from novelwriter.dialogs import GuiAbout +from novelwriter.dialogs.about import GuiAbout @pytest.mark.gui diff --git a/tests/test_dialogs/test_dlg_dialogs.py b/tests/test_dialogs/test_dlg_dialogs.py index 3423beb5..9afcf410 100644 --- a/tests/test_dialogs/test_dlg_dialogs.py +++ b/tests/test_dialogs/test_dlg_dialogs.py @@ -24,7 +24,9 @@ import pytest from PyQt5.QtCore import QItemSelectionModel from PyQt5.QtWidgets import QAction, QListWidgetItem, QDialog, QMessageBox -from novelwriter.dialogs import GuiQuoteSelect, GuiUpdates, GuiEditLabel +from novelwriter.dialogs.quotes import GuiQuoteSelect +from novelwriter.dialogs.updates import GuiUpdates +from novelwriter.dialogs.editlabel import GuiEditLabel @pytest.mark.gui diff --git a/tests/test_dialogs/test_dlg_docmerge.py b/tests/test_dialogs/test_dlg_docmerge.py index 70acf961..4b86fa78 100644 --- a/tests/test_dialogs/test_dlg_docmerge.py +++ b/tests/test_dialogs/test_dlg_docmerge.py @@ -26,7 +26,7 @@ from tools import buildTestProject, C from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QMessageBox -from novelwriter.dialogs import GuiDocMerge +from novelwriter.dialogs.docmerge import GuiDocMerge @pytest.mark.gui diff --git a/tests/test_dialogs/test_dlg_docsplit.py b/tests/test_dialogs/test_dlg_docsplit.py index 84b65a51..4689f76d 100644 --- a/tests/test_dialogs/test_dlg_docsplit.py +++ b/tests/test_dialogs/test_dlg_docsplit.py @@ -25,7 +25,8 @@ from tools import C, buildTestProject from PyQt5.QtWidgets import QMessageBox -from novelwriter.dialogs import GuiDocSplit, GuiEditLabel +from novelwriter.dialogs.docsplit import GuiDocSplit +from novelwriter.dialogs.editlabel import GuiEditLabel @pytest.mark.gui diff --git a/tests/test_dialogs/test_dlg_preferences.py b/tests/test_dialogs/test_dlg_preferences.py index 1507d351..22461751 100644 --- a/tests/test_dialogs/test_dlg_preferences.py +++ b/tests/test_dialogs/test_dlg_preferences.py @@ -32,7 +32,8 @@ from PyQt5.QtWidgets import ( ) from novelwriter.config import Config -from novelwriter.dialogs import GuiPreferences, GuiQuoteSelect +from novelwriter.dialogs.quotes import GuiQuoteSelect +from novelwriter.dialogs.preferences import GuiPreferences keyDelay = 2 typeDelay = 1 diff --git a/tests/test_dialogs/test_dlg_projdetails.py b/tests/test_dialogs/test_dlg_projdetails.py index 16f73e1e..b2952ad6 100644 --- a/tests/test_dialogs/test_dlg_projdetails.py +++ b/tests/test_dialogs/test_dlg_projdetails.py @@ -25,7 +25,7 @@ from tools import getGuiItem from PyQt5.QtWidgets import QAction, QMessageBox -from novelwriter.dialogs import GuiProjectDetails +from novelwriter.dialogs.projdetails import GuiProjectDetails keyDelay = 2 typeDelay = 1 diff --git a/tests/test_dialogs/test_dlg_projload.py b/tests/test_dialogs/test_dlg_projload.py index 6edb7a0d..5916d185 100644 --- a/tests/test_dialogs/test_dlg_projload.py +++ b/tests/test_dialogs/test_dlg_projload.py @@ -30,7 +30,7 @@ from PyQt5.QtWidgets import ( QMessageBox ) -from novelwriter.dialogs import GuiProjectLoad +from novelwriter.dialogs.projload import GuiProjectLoad keyDelay = 2 typeDelay = 1 diff --git a/tests/test_dialogs/test_dlg_projsettings.py b/tests/test_dialogs/test_dlg_projsettings.py index f193194a..d194229c 100644 --- a/tests/test_dialogs/test_dlg_projsettings.py +++ b/tests/test_dialogs/test_dlg_projsettings.py @@ -29,7 +29,7 @@ from PyQt5.QtGui import QColor from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QDialog, QAction, QMessageBox, QColorDialog -from novelwriter.dialogs import GuiProjectSettings +from novelwriter.dialogs.projsettings import GuiProjectSettings keyDelay = 2 typeDelay = 1 diff --git a/tests/test_dialogs/test_dlg_wordlist.py b/tests/test_dialogs/test_dlg_wordlist.py index d9993d4d..994fb407 100644 --- a/tests/test_dialogs/test_dlg_wordlist.py +++ b/tests/test_dialogs/test_dlg_wordlist.py @@ -28,8 +28,8 @@ from PyQt5.QtWidgets import QDialog, QMessageBox, QAction from tools import writeFile, readFile, getGuiItem from mock import causeOSError -from novelwriter.dialogs import GuiWordList from novelwriter.constants import nwFiles +from novelwriter.dialogs.wordlist import GuiWordList keyDelay = 2 typeDelay = 1 diff --git a/tests/test_gui/test_gui_doceditor.py b/tests/test_gui/test_gui_doceditor.py index 572998cb..7f85ed3e 100644 --- a/tests/test_gui/test_gui_doceditor.py +++ b/tests/test_gui/test_gui_doceditor.py @@ -27,10 +27,10 @@ from PyQt5.QtCore import Qt from PyQt5.QtGui import QTextBlock, QTextCursor, QTextOption from PyQt5.QtWidgets import QAction, QMessageBox, qApp -from novelwriter.gui.doceditor import GuiDocEditor -from novelwriter.core import countWords from novelwriter.enum import nwDocAction, nwDocInsert, nwItemLayout from novelwriter.constants import nwKeyWords, nwUnicode +from novelwriter.core.index import countWords +from novelwriter.gui.doceditor import GuiDocEditor keyDelay = 2 typeDelay = 1 diff --git a/tests/test_gui/test_gui_docviewer.py b/tests/test_gui/test_gui_docviewer.py index 2226a4c3..ef76d51c 100644 --- a/tests/test_gui/test_gui_docviewer.py +++ b/tests/test_gui/test_gui_docviewer.py @@ -27,7 +27,7 @@ from PyQt5.QtWidgets import qApp, QAction, QMessageBox from mock import causeException from novelwriter.enum import nwDocAction -from novelwriter.core import ToHtml +from novelwriter.core.tohtml import ToHtml keyDelay = 2 typeDelay = 1 diff --git a/tests/test_gui/test_gui_guimain.py b/tests/test_gui/test_gui_guimain.py index 52936986..e9a03371 100644 --- a/tests/test_gui/test_gui_guimain.py +++ b/tests/test_gui/test_gui_guimain.py @@ -28,11 +28,13 @@ from shutil import copyfile from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QMessageBox, QInputDialog -from novelwriter.gui import GuiDocEditor, GuiNovelView, GuiOutlineView from novelwriter.enum import nwItemType, nwView, nwWidget from novelwriter.tools import GuiProjectWizard from novelwriter.dialogs import GuiEditLabel +from novelwriter.gui.outline import GuiOutlineView from novelwriter.gui.projtree import GuiProjectTree +from novelwriter.gui.doceditor import GuiDocEditor +from novelwriter.gui.noveltree import GuiNovelView keyDelay = 2 typeDelay = 1 diff --git a/tests/test_gui/test_gui_mainmenu.py b/tests/test_gui/test_gui_mainmenu.py index 0097b65b..8aeb6cd4 100644 --- a/tests/test_gui/test_gui_mainmenu.py +++ b/tests/test_gui/test_gui_mainmenu.py @@ -28,9 +28,9 @@ from PyQt5.QtWidgets import QAction, QFileDialog, QMessageBox from tools import C, writeFile, buildTestProject -from novelwriter.gui.doceditor import GuiDocEditor from novelwriter.enum import nwDocAction, nwDocInsert from novelwriter.constants import nwKeyWords, nwUnicode +from novelwriter.gui.doceditor import GuiDocEditor keyDelay = 2 typeDelay = 1 diff --git a/tests/test_gui/test_gui_noveltree.py b/tests/test_gui/test_gui_noveltree.py index fcbacdb2..e38d5555 100644 --- a/tests/test_gui/test_gui_noveltree.py +++ b/tests/test_gui/test_gui_noveltree.py @@ -29,8 +29,8 @@ from PyQt5.QtCore import Qt, QEvent from PyQt5.QtWidgets import QMessageBox, QToolTip from novelwriter.enum import nwWidget, nwItemType -from novelwriter.dialogs import GuiEditLabel from novelwriter.gui.noveltree import NovelTreeColumn +from novelwriter.dialogs.editlabel import GuiEditLabel @pytest.mark.gui diff --git a/tests/test_gui/test_gui_projtree.py b/tests/test_gui/test_gui_projtree.py index 82119f41..54384205 100644 --- a/tests/test_gui/test_gui_projtree.py +++ b/tests/test_gui/test_gui_projtree.py @@ -30,8 +30,10 @@ from PyQt5.QtWidgets import QMessageBox, QMenu, QTreeWidgetItem, QDialog from novelwriter.enum import nwItemLayout, nwItemType, nwItemClass from novelwriter.core import NWDoc -from novelwriter.dialogs import GuiEditLabel, GuiDocMerge, GuiDocSplit from novelwriter.gui.projtree import GuiProjectTree +from novelwriter.dialogs.docmerge import GuiDocMerge +from novelwriter.dialogs.docsplit import GuiDocSplit +from novelwriter.dialogs.editlabel import GuiEditLabel @pytest.mark.gui diff --git a/tests/test_gui/test_gui_statusbar.py b/tests/test_gui/test_gui_statusbar.py index 18f969f6..e449a3e3 100644 --- a/tests/test_gui/test_gui_statusbar.py +++ b/tests/test_gui/test_gui_statusbar.py @@ -26,8 +26,8 @@ from tools import C, buildTestProject from PyQt5.QtWidgets import QMessageBox -from novelwriter.core import NWDoc from novelwriter.enum import nwState +from novelwriter.core.document import NWDoc @pytest.mark.gui