Merge pull request #625 from vkbo/issue623_justify_prefs

Fix issue #623

nw/gui/preferences.py

@@ -532,7 +532,7 @@ class GuiConfigEditLayoutTab(QWidget):
 
         ## Justify Text
         self.textJustify = QSwitch()
-        self.textJustify.setChecked(self.mainConf.textFixedW)
+        self.textJustify.setChecked(self.mainConf.doJustify)
         self.mainForm.addRow(
             "Justify the text margins in editor and viewer",
             self.textJustify,

tests/reference/guiPreferences_novelwriter.conf

@@ -33,7 +33,7 @@ margin = 45
 tabwidth = 45
 focuswidth = 900
 hidefocusfooter = True
-justify = False
+justify = True
 autoselect = False
 autoreplace = False
 repsquotes = True

tests/test_gui_preferences.py

@@ -140,9 +140,9 @@ def testGuiPreferences_Main(qtbot, monkeypatch, fncDir, outDir, refDir):
     assert tabLayout.hideFocusFooter.isChecked()
 
     qtbot.wait(keyDelay)
-    assert tabLayout.textJustify.isChecked()
-    qtbot.mouseClick(tabLayout.textJustify, Qt.LeftButton)
     assert not tabLayout.textJustify.isChecked()
+    qtbot.mouseClick(tabLayout.textJustify, Qt.LeftButton)
+    assert tabLayout.textJustify.isChecked()
 
     qtbot.wait(keyDelay)
     assert tabLayout.scrollPastEnd.isChecked()