Move dialog source files to their own folder

tests/test_dialogs/test_dlg_about.py

@@ -26,14 +26,14 @@ from tools import getGuiItem
 
 from PyQt5.QtWidgets import QAction, QMessageBox
 
-from nw.gui import GuiAbout
+from nw.dialogs import GuiAbout
 
 keyDelay = 2
 typeDelay = 1
 stepDelay = 20
 
 @pytest.mark.gui
-def testGuiAbout_Dialog(qtbot, monkeypatch, nwGUI):
+def testDlgAbout_Dialog(qtbot, monkeypatch, nwGUI):
     """Test the full about dialogs.
     """
     # NW About
@@ -67,4 +67,4 @@ def testGuiAbout_Dialog(qtbot, monkeypatch, nwGUI):
     # qtbot.stopForInteraction()
     msgAbout._doClose()
 
-# END Test testGuiAbout_Dialog
+# END Test testDlgAbout_Dialog

tests/test_dialogs/test_dlg_itemeditor.py

@@ -28,15 +28,16 @@ from tools import cmpFiles, getGuiItem
 
 from PyQt5.QtWidgets import QAction, QMessageBox
 
-from nw.gui import GuiItemEditor, GuiProjectTree
+from nw.gui import GuiProjectTree
 from nw.enum import nwItemLayout
+from nw.dialogs import GuiItemEditor
 
 keyDelay = 2
 typeDelay = 1
 stepDelay = 20
 
 @pytest.mark.gui
-def testGuiItemEditor_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj, refDir, outDir):
+def testDlgItemEditor_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj, refDir, outDir):
     """Test the full item editor dialog.
     """
     projFile = os.path.join(fncProj, "nwProject.nwx")
@@ -108,4 +109,4 @@ def testGuiItemEditor_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj, refDir,
 
     # qtbot.stopForInteraction()
 
-# END Test testGuiItemEditor_Dialog
+# END Test testDlgItemEditor_Dialog

tests/test_dialogs/test_dlg_mergesplit.py

@@ -28,14 +28,14 @@ from tools import cmpFiles, getGuiItem
 
 from PyQt5.QtWidgets import QAction, QMessageBox
 
-from nw.gui import GuiDocMerge, GuiDocSplit
+from nw.dialogs import GuiDocMerge, GuiDocSplit
 
 keyDelay = 2
 typeDelay = 1
 stepDelay = 20
 
 @pytest.mark.gui
-def testGuiMergeSplit_Tools(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir):
+def testDlgMergeSplit_Tools(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir):
     """Test the full merge and split tools.
     """
     # Block message box
@@ -182,4 +182,4 @@ def testGuiMergeSplit_Tools(qtbot, monkeypatch, nwGUI, nwLipsum, refDir, outDir)
 
     # qtbot.stopForInteraction()
 
-# END Test testGuiMergeSplit_Tools
+# END Test testDlgMergeSplit_Tools

tests/test_dialogs/test_dlg_preferences.py

@@ -32,9 +32,9 @@ from PyQt5.QtWidgets import (
     QDialogButtonBox, QDialog, QAction, QFileDialog, QFontDialog, QMessageBox
 )
 
-from nw.gui import GuiPreferences
 from nw.config import Config
 from nw.gui.custom import QuotesDialog
+from nw.dialogs import GuiPreferences
 from nw.constants import nwConst
 
 keyDelay = 2
@@ -42,7 +42,7 @@ typeDelay = 1
 stepDelay = 20
 
 @pytest.mark.gui
-def testGuiPreferences_Main(qtbot, monkeypatch, fncDir, outDir, refDir):
+def testDlgPreferences_Main(qtbot, monkeypatch, fncDir, outDir, refDir):
     """Test the load project wizard.
     """
     # Block message box
@@ -259,4 +259,4 @@ def testGuiPreferences_Main(qtbot, monkeypatch, fncDir, outDir, refDir):
 
     # qtbot.stopForInteraction()
 
-# END Test testGuiPreferences_Main
+# END Test testDlgPreferences_Main

tests/test_dialogs/test_dlg_projload.py

@@ -31,14 +31,14 @@ from PyQt5.QtWidgets import (
     QMessageBox
 )
 
-from nw.gui import GuiProjectLoad
+from nw.dialogs import GuiProjectLoad
 
 keyDelay = 2
 typeDelay = 1
 stepDelay = 20
 
 @pytest.mark.gui
-def testGuiLoadProject_Main(qtbot, monkeypatch, nwGUI, nwMinimal):
+def testDlgLoadProject_Main(qtbot, monkeypatch, nwGUI, nwMinimal):
     """Test the load project wizard.
     """
     # Block message box
@@ -114,4 +114,4 @@ def testGuiLoadProject_Main(qtbot, monkeypatch, nwGUI, nwMinimal):
     nwLoad.close()
     # qtbot.stopForInteraction()
 
-# END Test testGuiLoadProject_Main
+# END Test testDlgLoadProject_Main

tests/test_dialogs/test_dlg_projsettings.py

@@ -32,14 +32,14 @@ from PyQt5.QtWidgets import (
     QDialog, QAction, QMessageBox, QColorDialog, QTreeWidgetItem
 )
 
-from nw.gui import GuiProjectSettings
+from nw.dialogs import GuiProjectSettings
 
 keyDelay = 2
 typeDelay = 1
 stepDelay = 20
 
 @pytest.mark.gui
-def testGuiProjSettings_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj, outDir, refDir):
+def testDlgProjSettings_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj, outDir, refDir):
     """Test the full project settings dialog.
     """
     projFile = os.path.join(fncProj, "nwProject.nwx")
@@ -243,4 +243,4 @@ def testGuiProjSettings_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj, outDi
 
     # qtbot.stopForInteraction()
 
-# END Test testGuiProjSettings_Dialog
+# END Test testDlgProjSettings_Dialog

tests/test_dialogs/test_dlg_wordlist.py

@@ -28,14 +28,14 @@ from PyQt5.QtWidgets import QDialog, QMessageBox, QAction
 from tools import writeFile, readFile, getGuiItem
 from dummy import causeOSError
 
-from nw.gui.wordlist import GuiWordList
+from nw.dialogs import GuiWordList
 from nw.constants import nwFiles
 
 keyDelay = 2
 typeDelay = 1
 stepDelay = 20
 
-def testGuiWordList_Dialog(qtbot, monkeypatch, nwGUI, nwMinimal, tmpDir):
+def testDlgWordList_Dialog(qtbot, monkeypatch, nwGUI, nwMinimal, tmpDir):
     """test the word list editor.
     """
     monkeypatch.setattr(QMessageBox, "question", lambda *args: QMessageBox.Yes)
@@ -130,4 +130,4 @@ def testGuiWordList_Dialog(qtbot, monkeypatch, nwGUI, nwMinimal, tmpDir):
     # qtbot.stopForInteraction()
     wList._doClose()
 
-# END Test testGuiWordList_Dialog
+# END Test testDlgWordList_Dialog

tests/test_gui/test_gui_doceditor.py

@@ -30,7 +30,7 @@ from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QTextCursor
 from PyQt5.QtWidgets import QAction, QMessageBox, QDialog
 
-from nw.gui.itemeditor import GuiItemEditor
+from nw.dialogs.itemeditor import GuiItemEditor
 from nw.gui.doceditor import GuiDocEditor
 from nw.gui.projtree import GuiProjectTree
 from nw.enum import nwItemType, nwDocAction, nwWidget