From 0d34a71f3cab7f2cd6cb569d58001b3faabceec3 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Sun, 17 May 2020 16:34:51 +0200
Subject: [PATCH] Some minor cleanup in project settings and preferences

---
 nw/gui/dialogs/configeditor.py  |  3 ++-
 nw/gui/dialogs/projecteditor.py | 48 +++++++++++++++++----------------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/nw/gui/dialogs/configeditor.py b/nw/gui/dialogs/configeditor.py
index 61726a93..cd54ee28 100644
--- a/nw/gui/dialogs/configeditor.py
+++ b/nw/gui/dialogs/configeditor.py
@@ -761,6 +761,7 @@ class GuiConfigEditAutoReplaceTab(QWidget):
     def saveValues(self):
 
         validEntries = True
+        needsRestart = False
 
         autoSelect      = self.autoSelect.isChecked()
         doReplace       = self.autoReplaceMain.isChecked()
@@ -815,7 +816,7 @@ class GuiConfigEditAutoReplaceTab(QWidget):
 
         self.mainConf.confChanged = True
 
-        return validEntries, False
+        return validEntries, needsRestart
 
     ##
     #  Slots
diff --git a/nw/gui/dialogs/projecteditor.py b/nw/gui/dialogs/projecteditor.py
index 4c425770..1c494ac0 100644
--- a/nw/gui/dialogs/projecteditor.py
+++ b/nw/gui/dialogs/projecteditor.py
@@ -31,14 +31,14 @@ import nw
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QIcon, QPixmap, QColor, QBrush
 from PyQt5.QtWidgets import (
-    QDialog, QHBoxLayout, QVBoxLayout, QFormLayout, QLineEdit, QPlainTextEdit,
+    QDialog, QHBoxLayout, QVBoxLayout, QGridLayout, QLineEdit, QPlainTextEdit,
     QLabel, QWidget, QTabWidget, QDialogButtonBox, QListWidget, QPushButton,
     QListWidgetItem, QColorDialog, QAbstractItemView, QTreeWidget, QCheckBox,
     QTreeWidgetItem
 )
 
 from nw.constants import nwAlert
-from nw.gui.additions import PagedDialog
+from nw.gui.additions import QSwitch, PagedDialog
 
 logger = logging.getLogger(__name__)
 
@@ -83,7 +83,7 @@ class GuiProjectEditor(PagedDialog):
         projName    = self.tabMain.editName.text()
         bookTitle   = self.tabMain.editTitle.text()
         bookAuthors = self.tabMain.editAuthors.toPlainText()
-        doBackup    = self.tabMain.doBackup.isChecked()
+        doBackup    = not self.tabMain.doBackup.isChecked()
         self.theProject.setProjectName(projName)
         self.theProject.setBookTitle(bookTitle)
         self.theProject.setBookAuthors(bookAuthors)
@@ -119,37 +119,39 @@ class GuiProjectEditMain(QWidget):
 
         self.theParent   = theParent
         self.theProject  = theProject
-        self.mainForm    = QFormLayout()
+        self.mainForm    = QGridLayout()
         self.backupBox   = QHBoxLayout()
-        self.editName    = QLineEdit()
-        self.editTitle   = QLineEdit()
-        self.editAuthors = QPlainTextEdit()
-        self.doBackup    = QCheckBox(self)
 
+        self.editName  = QLineEdit()
         self.editName.setMaxLength(200)
-        self.editTitle.setMaxLength(200)
-
-        self.mainForm.addRow("Working Title",  self.editName)
-        self.mainForm.addRow("Book Title",     self.editTitle)
-        self.mainForm.addRow("Book Authors",   self.editAuthors)
-        self.mainForm.addRow(self.backupBox)
-        self.backupBox.addStretch(1)
-        self.backupBox.addWidget(QLabel("Backup on Close"))
-        self.backupBox.addWidget(self.doBackup)
-
         self.editName.setText(self.theProject.projName)
+
+        self.editTitle = QLineEdit()
+        self.editTitle.setMaxLength(200)
         self.editTitle.setText(self.theProject.bookTitle)
+
+        self.editAuthors = QPlainTextEdit()
         bookAuthors = ""
         for bookAuthor in self.theProject.bookAuthors:
             bookAuthors += bookAuthor+"\n"
         self.editAuthors.setPlainText(bookAuthors)
-        if self.theProject.doBackup:
-            self.doBackup.setCheckState(Qt.Checked)
-        else:
-            self.doBackup.setCheckState(Qt.Unchecked)
+        self.editAuthors.setMaximumHeight(120)
+
+        self.doBackup = QSwitch(self)
+        self.doBackup.setChecked(not self.theProject.doBackup)
+        self.backupBox.addStretch(1)
+        self.backupBox.addWidget(QLabel("Disable backup on close"))
+        self.backupBox.addWidget(self.doBackup)
+
+        self.mainForm.addWidget(QLabel("Working title"), 0, 0, 1, 1, Qt.AlignTop)
+        self.mainForm.addWidget(self.editName,           0, 1, 1, 1, Qt.AlignTop)
+        self.mainForm.addWidget(QLabel("Book title"),    1, 0, 1, 1, Qt.AlignTop)
+        self.mainForm.addWidget(self.editTitle,          1, 1, 1, 1, Qt.AlignTop)
+        self.mainForm.addWidget(QLabel("Book authors"),  2, 0, 1, 1, Qt.AlignTop)
+        self.mainForm.addWidget(self.editAuthors,        2, 1, 1, 1, Qt.AlignTop)
+        self.mainForm.addLayout(self.backupBox,          3, 0, 1, 2, Qt.AlignTop)
 
         self.setLayout(self.mainForm)
-        self.editAuthors.setMaximumHeight(120)
 
         return