Remove scaling and add slots to main config class

tests/test_base/test_base_config.py

@@ -254,52 +254,29 @@ def testBaseConfig_SettersGetters(fncPath):
 
     tstConf.setMainWinSize(70, 70)
     assert tstConf.mainWinSize == [70, 70]
-    assert tstConf._mainWinSize == [70, 70]
+    assert tstConf.mainWinSize == [70, 70]
 
     tstConf.setMainWinSize(1200, 650)
 
     # Welcome Window Size
     tstConf.setWelcomeWinSize(70, 70)
     assert tstConf.welcomeWinSize == [70, 70]
-    assert tstConf._welcomeSize == [70, 70]
+    assert tstConf.welcomeWinSize == [70, 70]
 
     tstConf.setWelcomeWinSize(800, 500)
 
     # Preferences Size
     tstConf.setPreferencesWinSize(70, 70)
-    assert tstConf.preferencesWinSize == [70, 70]
-    assert tstConf._prefsWinSize == [70, 70]
+    assert tstConf.prefsWinSize == [70, 70]
+    assert tstConf.prefsWinSize == [70, 70]
 
     tstConf.setPreferencesWinSize(700, 615)
 
-    # Main Pane Splitter
-    tstConf.setMainPanePos([200, 700])
-    assert tstConf.mainPanePos == [200, 700]
-    assert tstConf._mainPanePos == [200, 700]
-
-    tstConf.setMainPanePos([300, 800])
-
-    # View Pane Splitter
-    tstConf.setViewPanePos([400, 250])
-    assert tstConf.viewPanePos == [400, 250]
-    assert tstConf._viewPanePos == [400, 250]
-
-    tstConf.setViewPanePos([500, 150])
-
-    # Outline Pane Splitter
-    tstConf.setOutlinePanePos([400, 250])
-    assert tstConf.outlinePanePos == [400, 250]
-    assert tstConf._outlnPanePos == [400, 250]
-
-    tstConf.setOutlinePanePos([500, 150])
-
     # Getters Only
     # ============
 
     assert tstConf.getTextWidth(False) == 700
     assert tstConf.getTextWidth(True) == 800
-    assert tstConf.getTextMargin() == 40
-    assert tstConf.getTabWidth() == 40
 
 
 @pytest.mark.base

tests/test_dialogs/test_dlg_preferences.py

@@ -72,17 +72,16 @@ def testDlgPreferences_Main(qtbot, monkeypatch, nwGUI, tstPaths):
     prefs.close()
 
     # Check Fallback Values
-    with monkeypatch.context() as mp:
-        mp.setattr(CONFIG, "hasEnchant", False)
-        prefs = GuiPreferences(nwGUI)
-        prefs.show()
+    CONFIG.hasEnchant = False
+    prefs = GuiPreferences(nwGUI)
+    prefs.show()
 
-        # Check Spell Checking
-        spelling = [prefs.spellLanguage.itemData(i) for i in range(prefs.spellLanguage.count())]
-        assert len(spelling) == 1
-        assert spelling == [""]
+    # Check Spell Checking
+    spelling = [prefs.spellLanguage.itemData(i) for i in range(prefs.spellLanguage.count())]
+    assert len(spelling) == 1
+    assert spelling == [""]
 
-        prefs.close()
+    prefs.close()
 
     # qtbot.stop()
 
@@ -138,13 +137,14 @@ def testDlgPreferences_Actions(qtbot, monkeypatch, nwGUI):
 
 
 @pytest.mark.gui
-def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, tstPaths):
+def testDlgPreferences_Settings(qtbot, monkeypatch, nwGUI, fncPath, tstPaths):
     """Test the preferences dialog settings."""
     spelling = [("en", "English [en]"), ("de", "Deutch [de]")]
-    languages = [("en_GB", "British English"), ("en_US", "US English")]
-
     monkeypatch.setattr(SHARED._spelling, "listDictionaries", lambda: spelling)
-    monkeypatch.setattr(CONFIG, "listLanguages", lambda *a: languages)
+
+    (fncPath / "nw_en_US.qm").touch()
+    (fncPath / "project_en_US.json").touch()
+    CONFIG._nwLangPath = fncPath
 
     prefs = GuiPreferences(nwGUI)
     with qtbot.waitExposed(prefs):

tests/test_dialogs/test_dlg_projectsettings.py

@@ -88,7 +88,12 @@ def testDlgProjSettings_SettingsPage(qtbot, monkeypatch, nwGUI, fncPath, projPat
     """Test the settings page of the dialog."""
     languages = [("en", "English"), ("de", "German")]
     monkeypatch.setattr(SHARED._spelling, "listDictionaries", lambda *a: languages)
-    monkeypatch.setattr(CONFIG, "listLanguages", lambda *a: languages)
+
+    (fncPath / "nw_en.qm").touch()
+    (fncPath / "nw_de.qm").touch()
+    (fncPath / "project_en.json").touch()
+    (fncPath / "project_de.json").touch()
+    CONFIG._nwLangPath = fncPath
 
     # Create new project
     buildTestProject(nwGUI, projPath)