diff --git a/nw/config.py b/nw/config.py index a24aef0a..4ef8867b 100644 --- a/nw/config.py +++ b/nw/config.py @@ -104,6 +104,7 @@ class Config: ## Sizes self.winGeometry = [1200, 650] + self.prefGeometry = [700, 615] self.treeColWidth = [200, 50, 30] self.novelColWidth = [200, 50] self.projColWidth = [200, 60, 140] @@ -472,6 +473,9 @@ class Config: self.winGeometry = self._parseLine( cnfParse, cnfSec, "geometry", self.CNF_I_LST, self.winGeometry ) + self.prefGeometry = self._parseLine( + cnfParse, cnfSec, "preferences", self.CNF_I_LST, self.prefGeometry + ) self.treeColWidth = self._parseLine( cnfParse, cnfSec, "treecols", self.CNF_I_LST, self.treeColWidth ) @@ -701,6 +705,7 @@ class Config: cnfSec = "Sizes" cnfParse.add_section(cnfSec) cnfParse.set(cnfSec, "geometry", self._packList(self.winGeometry)) + cnfParse.set(cnfSec, "preferences", self._packList(self.prefGeometry)) cnfParse.set(cnfSec, "treecols", self._packList(self.treeColWidth)) cnfParse.set(cnfSec, "novelcols", self._packList(self.novelColWidth)) cnfParse.set(cnfSec, "projcols", self._packList(self.projColWidth)) @@ -921,6 +926,12 @@ class Config: self.confChanged = True return True + def setPreferencesSize(self, newWidth, newHeight): + self.prefGeometry[0] = int(newWidth/self.guiScale) + self.prefGeometry[1] = int(newHeight/self.guiScale) + self.confChanged = True + return True + def setTreeColWidths(self, colWidths): self.treeColWidth = [int(x/self.guiScale) for x in colWidths] self.confChanged = True @@ -984,6 +995,9 @@ class Config: def getWinSize(self): return [int(x*self.guiScale) for x in self.winGeometry] + def getPreferencesSize(self): + return [int(x*self.guiScale) for x in self.prefGeometry] + def getTreeColWidths(self): return [int(x*self.guiScale) for x in self.treeColWidth] diff --git a/tests/reference/baseConfig_novelwriter.conf b/tests/reference/baseConfig_novelwriter.conf index 4ec14a13..3f7cf6df 100644 --- a/tests/reference/baseConfig_novelwriter.conf +++ b/tests/reference/baseConfig_novelwriter.conf @@ -11,6 +11,7 @@ guilang = en-GB [Sizes] geometry = 1200, 650 +preferences = 700, 615 treecols = 200, 50, 30 novelcols = 200, 50 projcols = 200, 60, 140 diff --git a/tests/reference/guiPreferences_novelwriter.conf b/tests/reference/guiPreferences_novelwriter.conf index b7cf116c..8b8f52b4 100644 --- a/tests/reference/guiPreferences_novelwriter.conf +++ b/tests/reference/guiPreferences_novelwriter.conf @@ -11,6 +11,7 @@ guilang = en-GB [Sizes] geometry = 1200, 650 +preferences = 700, 615 treecols = 200, 50, 30 novelcols = 200, 50 projcols = 200, 60, 140 diff --git a/tests/test_gui/test_gui_projsettings.py b/tests/test_gui/test_gui_projsettings.py index 9955aac8..cb2e5b70 100644 --- a/tests/test_gui/test_gui_projsettings.py +++ b/tests/test_gui/test_gui_projsettings.py @@ -79,7 +79,7 @@ def testGuiProjSettings_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj, outDi assert projEdit.tabMain.editName.text() == "New Project" assert projEdit.tabMain.editTitle.text() == "" - assert projEdit.tabMain.editAuthors.toPlainText() == "Jane Smith\nJohn Smith\n" + assert projEdit.tabMain.editAuthors.toPlainText() == "Jane Smith\nJohn Smith" assert projEdit.tabMain.spellLang.currentData() == "en" assert projEdit.tabMain.doBackup.isChecked() is False