From 42700a23251ca6deaea766a3c0b51c693bd92b1c Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Sun, 25 Oct 2020 14:31:23 +0100 Subject: [PATCH] More sensible default values for tree column widths --- nw/config.py | 6 +++--- tests/reference/novelwriter.conf | 6 +++--- tests/test_config.py | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/nw/config.py b/nw/config.py index a82c133b..8fc681e0 100644 --- a/nw/config.py +++ b/nw/config.py @@ -93,9 +93,9 @@ class Config: self.guiScale = 1.0 # Set automatically by Theme class ## Sizes - self.winGeometry = [1100, 650] - self.treeColWidth = [120, 30, 50] - self.projColWidth = [140, 55, 140] + self.winGeometry = [1200, 650] + self.treeColWidth = [200, 50, 30] + self.projColWidth = [200, 60, 140] self.mainPanePos = [300, 800] self.docPanePos = [400, 400] self.viewPanePos = [500, 150] diff --git a/tests/reference/novelwriter.conf b/tests/reference/novelwriter.conf index aef7459f..99b01f75 100644 --- a/tests/reference/novelwriter.conf +++ b/tests/reference/novelwriter.conf @@ -8,9 +8,9 @@ guifont = guifontsize = 11 [Sizes] -geometry = 1100, 650 -treecols = 120, 30, 50 -projcols = 140, 55, 140 +geometry = 1200, 650 +treecols = 200, 50, 30 +projcols = 200, 60, 140 mainpane = 300, 800 docpane = 400, 400 viewpane = 500, 150 diff --git a/tests/test_config.py b/tests/test_config.py index 8911a69d..f9ce767b 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -44,11 +44,11 @@ def testConfigSetWinSize(tmpConf, nwTemp, nwRef): tmpConf.guiScale = 1.0 assert tmpConf.confPath == nwTemp - assert tmpConf.setWinSize(1105, 655) + assert tmpConf.setWinSize(1205, 655) assert not tmpConf.confChanged assert tmpConf.setWinSize(70, 70) assert tmpConf.confChanged - assert tmpConf.setWinSize(1100, 650) + assert tmpConf.setWinSize(1200, 650) assert tmpConf.saveConfig() assert cmpFiles(testConf, refConf, [2]) @@ -62,13 +62,13 @@ def testConfigSetTreeColWidths(tmpConf, nwTemp, nwRef): assert tmpConf.confPath == nwTemp tmpConf.guiScale = 1.0 - assert tmpConf.setTreeColWidths([10, 20, 30]) - assert tmpConf.treeColWidth == [10, 20, 30] - assert tmpConf.setTreeColWidths([120, 30, 50]) + assert tmpConf.setTreeColWidths([10, 20, 25]) + assert tmpConf.treeColWidth == [10, 20, 25] + assert tmpConf.setTreeColWidths([200, 50, 30]) assert tmpConf.setProjColWidths([10, 20, 30]) assert tmpConf.projColWidth == [10, 20, 30] - assert tmpConf.setProjColWidths([140, 55, 140]) + assert tmpConf.setProjColWidths([200, 60, 140]) assert tmpConf.confChanged assert tmpConf.saveConfig()