diff --git a/tests/reference/baseConfig_novelwriter.conf b/tests/reference/baseConfig_novelwriter.conf index 588d5263..1ab78ea7 100644 --- a/tests/reference/baseConfig_novelwriter.conf +++ b/tests/reference/baseConfig_novelwriter.conf @@ -1,12 +1,12 @@ [Main] -timestamp = 2020-10-11 22:50:45 +timestamp = 2021-02-09 21:07:03 theme = default syntax = default_light icons = typicons_colour_light guidark = False guifont = guifontsize = 11 -lastnotes = 1.0 +lastnotes = 0x0 [Sizes] geometry = 1200, 650 @@ -56,6 +56,8 @@ highlightquotes = True allowopensquote = False allowopendquote = True highlightemph = True +stopwhenidle = True +useridletime = 300 [Backup] backuppath = diff --git a/tests/reference/guiPreferences_novelwriter.conf b/tests/reference/guiPreferences_novelwriter.conf index db78d507..f440e00b 100644 --- a/tests/reference/guiPreferences_novelwriter.conf +++ b/tests/reference/guiPreferences_novelwriter.conf @@ -1,18 +1,18 @@ [Main] -timestamp = 2020-06-29 17:34:15 +timestamp = 2021-02-09 21:07:17 theme = default syntax = default_light icons = typicons_colour_light guidark = True -guifont = Cantarell +guifont = Sans guifontsize = 12 -lastnotes = 1.0 +lastnotes = 0x0 [Sizes] -geometry = 1100, 650 -treecols = 120, 30, 50 +geometry = 1200, 650 +treecols = 200, 50, 30 novelcols = 200, 50 -projcols = 140, 55, 140 +projcols = 200, 60, 140 mainpane = 300, 800 docpane = 400, 400 viewpane = 500, 150 @@ -26,7 +26,7 @@ autosaveproject = 40 autosavedoc = 20 [Editor] -textfont = Cantarell +textfont = None textsize = 13 fixedwidth = False width = 700 @@ -56,6 +56,8 @@ highlightquotes = False allowopensquote = False allowopendquote = True highlightemph = False +stopwhenidle = True +useridletime = 300 [Backup] backuppath = some/dir diff --git a/tests/test_gui/test_gui_writingstats.py b/tests/test_gui/test_gui_writingstats.py index 071ea9f7..c96bf14d 100644 --- a/tests/test_gui/test_gui_writingstats.py +++ b/tests/test_gui/test_gui_writingstats.py @@ -101,17 +101,17 @@ def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj): writeFile(sessFile, ( "# Offset 1075\n" - "# Start Time End Time Novel Notes\n" - "2021-01-31 19:00:00 2021-01-31 19:30:00 700 375\n" - "2021-02-01 19:00:00 2021-02-01 19:30:00 700 375\n" - "2021-02-01 20:00:00 2021-02-01 20:30:00 600 275\n" - "2021-02-02 19:00:00 2021-02-02 19:30:00 750 425\n" - "2021-02-02 20:00:00 2021-02-02 20:30:00 690 365\n" - "2021-02-03 19:00:00 2021-02-03 19:30:00 680 355\n" - "2021-02-04 19:00:00 2021-02-04 19:30:00 700 375\n" - "2021-02-05 19:00:00 2021-02-05 19:30:00 500 175\n" - "2021-02-06 19:00:00 2021-02-06 19:30:00 600 275\n" - "2021-02-07 19:00:00 2021-02-07 19:30:00 600 275\n" + "# Start Time End Time Novel Notes Idle\n" + "2021-01-31 19:00:00 2021-01-31 19:30:00 700 375 0\n" + "2021-02-01 19:00:00 2021-02-01 19:30:00 700 375 10\n" + "2021-02-01 20:00:00 2021-02-01 20:30:00 600 275 20\n" + "2021-02-02 19:00:00 2021-02-02 19:30:00 750 425 30\n" + "2021-02-02 20:00:00 2021-02-02 20:30:00 690 365 40\n" + "2021-02-03 19:00:00 2021-02-03 19:30:00 680 355 50\n" + "2021-02-04 19:00:00 2021-02-04 19:30:00 700 375 60\n" + "2021-02-05 19:00:00 2021-02-05 19:30:00 500 175 70\n" + "2021-02-06 19:00:00 2021-02-06 19:30:00 600 275 80\n" + "2021-02-07 19:00:00 2021-02-07 19:30:00 600 275 90\n" )) sessLog.populateGUI() @@ -156,28 +156,28 @@ def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj): assert jsonData == [ { "date": "2021-01-31 19:00:00", "length": 1800.0, - "newWords": 1, "novelWords": 700, "noteWords": 375 + "newWords": 1, "novelWords": 700, "noteWords": 375, "idleTime": 0 }, { "date": "2021-02-01 20:00:00", "length": 1800.0, - "newWords": -200, "novelWords": 600, "noteWords": 275 + "newWords": -200, "novelWords": 600, "noteWords": 275, "idleTime": 20 }, { "date": "2021-02-02 19:00:00", "length": 1800.0, - "newWords": 300, "novelWords": 750, "noteWords": 425 + "newWords": 300, "novelWords": 750, "noteWords": 425, "idleTime": 30 }, { "date": "2021-02-02 20:00:00", "length": 1800.0, - "newWords": -120, "novelWords": 690, "noteWords": 365 + "newWords": -120, "novelWords": 690, "noteWords": 365, "idleTime": 40 }, { "date": "2021-02-03 19:00:00", "length": 1800.0, - "newWords": -20, "novelWords": 680, "noteWords": 355 + "newWords": -20, "novelWords": 680, "noteWords": 355, "idleTime": 50 }, { "date": "2021-02-04 19:00:00", "length": 1800.0, - "newWords": 40, "novelWords": 700, "noteWords": 375 + "newWords": 40, "novelWords": 700, "noteWords": 375, "idleTime": 60 }, { "date": "2021-02-05 19:00:00", "length": 1800.0, - "newWords": -400, "novelWords": 500, "noteWords": 175 + "newWords": -400, "novelWords": 500, "noteWords": 175, "idleTime": 70 }, { "date": "2021-02-06 19:00:00", "length": 1800.0, - "newWords": 200, "novelWords": 600, "noteWords": 275 + "newWords": 200, "novelWords": 600, "noteWords": 275, "idleTime": 80 } ] @@ -206,28 +206,28 @@ def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj): assert jsonData == [ { "date": "2021-01-31 19:00:00", "length": 1800.0, - "newWords": 1, "novelWords": 700, "noteWords": 375 + "newWords": 1, "novelWords": 700, "noteWords": 375, "idleTime": 0 }, { "date": "2021-02-01 20:00:00", "length": 1800.0, - "newWords": -100, "novelWords": 600, "noteWords": 275 + "newWords": -100, "novelWords": 600, "noteWords": 275, "idleTime": 20 }, { "date": "2021-02-02 19:00:00", "length": 1800.0, - "newWords": 150, "novelWords": 750, "noteWords": 425 + "newWords": 150, "novelWords": 750, "noteWords": 425, "idleTime": 30 }, { "date": "2021-02-02 20:00:00", "length": 1800.0, - "newWords": -60, "novelWords": 690, "noteWords": 365 + "newWords": -60, "novelWords": 690, "noteWords": 365, "idleTime": 40 }, { "date": "2021-02-03 19:00:00", "length": 1800.0, - "newWords": -10, "novelWords": 680, "noteWords": 355 + "newWords": -10, "novelWords": 680, "noteWords": 355, "idleTime": 50 }, { "date": "2021-02-04 19:00:00", "length": 1800.0, - "newWords": 20, "novelWords": 700, "noteWords": 375 + "newWords": 20, "novelWords": 700, "noteWords": 375, "idleTime": 60 }, { "date": "2021-02-05 19:00:00", "length": 1800.0, - "newWords": -200, "novelWords": 500, "noteWords": 175 + "newWords": -200, "novelWords": 500, "noteWords": 175, "idleTime": 70 }, { "date": "2021-02-06 19:00:00", "length": 1800.0, - "newWords": 100, "novelWords": 600, "noteWords": 275 + "newWords": 100, "novelWords": 600, "noteWords": 275, "idleTime": 80 } ] @@ -254,28 +254,28 @@ def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj): assert jsonData == [ { "date": "2021-01-31 19:00:00", "length": 1800.0, - "newWords": 1, "novelWords": 700, "noteWords": 375 + "newWords": 1, "novelWords": 700, "noteWords": 375, "idleTime": 0 }, { "date": "2021-02-01 20:00:00", "length": 1800.0, - "newWords": -100, "novelWords": 600, "noteWords": 275 + "newWords": -100, "novelWords": 600, "noteWords": 275, "idleTime": 20 }, { "date": "2021-02-02 19:00:00", "length": 1800.0, - "newWords": 150, "novelWords": 750, "noteWords": 425 + "newWords": 150, "novelWords": 750, "noteWords": 425, "idleTime": 30 }, { "date": "2021-02-02 20:00:00", "length": 1800.0, - "newWords": -60, "novelWords": 690, "noteWords": 365 + "newWords": -60, "novelWords": 690, "noteWords": 365, "idleTime": 40 }, { "date": "2021-02-03 19:00:00", "length": 1800.0, - "newWords": -10, "novelWords": 680, "noteWords": 355 + "newWords": -10, "novelWords": 680, "noteWords": 355, "idleTime": 50 }, { "date": "2021-02-04 19:00:00", "length": 1800.0, - "newWords": 20, "novelWords": 700, "noteWords": 375 + "newWords": 20, "novelWords": 700, "noteWords": 375, "idleTime": 60 }, { "date": "2021-02-05 19:00:00", "length": 1800.0, - "newWords": -200, "novelWords": 500, "noteWords": 175 + "newWords": -200, "novelWords": 500, "noteWords": 175, "idleTime": 70 }, { "date": "2021-02-06 19:00:00", "length": 1800.0, - "newWords": 100, "novelWords": 600, "noteWords": 275 + "newWords": 100, "novelWords": 600, "noteWords": 275, "idleTime": 80 } ] @@ -300,16 +300,16 @@ def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj): assert jsonData == [ { "date": "2021-01-31 19:00:00", "length": 1800.0, - "newWords": 1, "novelWords": 700, "noteWords": 375 + "newWords": 1, "novelWords": 700, "noteWords": 375, "idleTime": 0 }, { "date": "2021-02-02 19:00:00", "length": 1800.0, - "newWords": 300, "novelWords": 750, "noteWords": 425 + "newWords": 300, "novelWords": 750, "noteWords": 425, "idleTime": 30 }, { "date": "2021-02-04 19:00:00", "length": 1800.0, - "newWords": 40, "novelWords": 700, "noteWords": 375 + "newWords": 40, "novelWords": 700, "noteWords": 375, "idleTime": 60 }, { "date": "2021-02-06 19:00:00", "length": 1800.0, - "newWords": 200, "novelWords": 600, "noteWords": 275 + "newWords": 200, "novelWords": 600, "noteWords": 275, "idleTime": 80 } ] @@ -338,34 +338,34 @@ def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj): assert jsonData == [ { "date": "2021-01-31 19:00:00", "length": 1800.0, - "newWords": 1, "novelWords": 700, "noteWords": 375 + "newWords": 1, "novelWords": 700, "noteWords": 375, "idleTime": 0 }, { "date": "2021-02-01 19:00:00", "length": 1800.0, - "newWords": 0, "novelWords": 700, "noteWords": 375 + "newWords": 0, "novelWords": 700, "noteWords": 375, "idleTime": 10 }, { "date": "2021-02-01 20:00:00", "length": 1800.0, - "newWords": -200, "novelWords": 600, "noteWords": 275 + "newWords": -200, "novelWords": 600, "noteWords": 275, "idleTime": 20 }, { "date": "2021-02-02 19:00:00", "length": 1800.0, - "newWords": 300, "novelWords": 750, "noteWords": 425 + "newWords": 300, "novelWords": 750, "noteWords": 425, "idleTime": 30 }, { "date": "2021-02-02 20:00:00", "length": 1800.0, - "newWords": -120, "novelWords": 690, "noteWords": 365 + "newWords": -120, "novelWords": 690, "noteWords": 365, "idleTime": 40 }, { "date": "2021-02-03 19:00:00", "length": 1800.0, - "newWords": -20, "novelWords": 680, "noteWords": 355 + "newWords": -20, "novelWords": 680, "noteWords": 355, "idleTime": 50 }, { "date": "2021-02-04 19:00:00", "length": 1800.0, - "newWords": 40, "novelWords": 700, "noteWords": 375 + "newWords": 40, "novelWords": 700, "noteWords": 375, "idleTime": 60 }, { "date": "2021-02-05 19:00:00", "length": 1800.0, - "newWords": -400, "novelWords": 500, "noteWords": 175 + "newWords": -400, "novelWords": 500, "noteWords": 175, "idleTime": 70 }, { "date": "2021-02-06 19:00:00", "length": 1800.0, - "newWords": 200, "novelWords": 600, "noteWords": 275 + "newWords": 200, "novelWords": 600, "noteWords": 275, "idleTime": 80 }, { "date": "2021-02-07 19:00:00", "length": 1800.0, - "newWords": 0, "novelWords": 600, "noteWords": 275 + "newWords": 0, "novelWords": 600, "noteWords": 275, "idleTime": 90 } ] @@ -391,28 +391,28 @@ def testGuiWritingStats_Dialog(qtbot, monkeypatch, nwGUI, fncDir, fncProj): assert jsonData == [ { "date": "2021-01-31", "length": 1800.0, - "newWords": 1, "novelWords": 700, "noteWords": 375 + "newWords": 1, "novelWords": 700, "noteWords": 375, "idleTime": 10 }, { "date": "2021-02-01", "length": 3600.0, - "newWords": -200, "novelWords": 600, "noteWords": 275 + "newWords": -200, "novelWords": 600, "noteWords": 275, "idleTime": 30 }, { "date": "2021-02-02", "length": 3600.0, - "newWords": 180, "novelWords": 690, "noteWords": 365 + "newWords": 180, "novelWords": 690, "noteWords": 365, "idleTime": 50 }, { "date": "2021-02-03", "length": 1800.0, - "newWords": -20, "novelWords": 680, "noteWords": 355 + "newWords": -20, "novelWords": 680, "noteWords": 355, "idleTime": 60 }, { "date": "2021-02-04", "length": 1800.0, - "newWords": 40, "novelWords": 700, "noteWords": 375 + "newWords": 40, "novelWords": 700, "noteWords": 375, "idleTime": 70 }, { "date": "2021-02-05", "length": 1800.0, - "newWords": -400, "novelWords": 500, "noteWords": 175 + "newWords": -400, "novelWords": 500, "noteWords": 175, "idleTime": 80 }, { "date": "2021-02-06", "length": 1800.0, - "newWords": 200, "novelWords": 600, "noteWords": 275 + "newWords": 200, "novelWords": 600, "noteWords": 275, "idleTime": 90 }, { "date": "2021-02-07", "length": 1800.0, - "newWords": 0, "novelWords": 600, "noteWords": 275 + "newWords": 0, "novelWords": 600, "noteWords": 275, "idleTime": 90 } ]