From 2152f540666af64297cae3325c28375b956f4486 Mon Sep 17 00:00:00 2001
From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com>
Date: Mon, 22 Feb 2021 20:22:49 +0100
Subject: [PATCH] Make use of the improved layout class in Project Settings and
 Preferences

---
 nw/gui/preferences.py  | 18 +++++++++++++++++-
 nw/gui/projsettings.py | 17 +++++++----------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/nw/gui/preferences.py b/nw/gui/preferences.py
index 3dcff608..2db6528e 100644
--- a/nw/gui/preferences.py
+++ b/nw/gui/preferences.py
@@ -74,12 +74,14 @@ class GuiPreferences(PagedDialog):
         self.buttonBox.rejected.connect(self._doClose)
         self.addControls(self.buttonBox)
 
+        self.resize(*self.mainConf.getPreferencesSize())
+
         logger.debug("GuiPreferences initialisation complete")
 
         return
 
     ##
-    #  Buttons
+    #  Slots
     ##
 
     def _doSave(self):
@@ -102,6 +104,7 @@ class GuiPreferences(PagedDialog):
                 nwAlert.INFO
             )
 
+        self._saveWindowSize()
         self.accept()
 
         return
@@ -109,9 +112,22 @@ class GuiPreferences(PagedDialog):
     def _doClose(self):
         """Close the preferences without saving the changes.
         """
+        self._saveWindowSize()
         self.reject()
         return
 
+    ##
+    #  Internal Functions
+    ##
+
+    def _saveWindowSize(self):
+        """Save the dialog window size.
+        """
+        winWidth  = self.mainConf.rpxInt(self.width())
+        winHeight = self.mainConf.rpxInt(self.height())
+        self.mainConf.setPreferencesSize(winWidth, winHeight)
+        return
+
 # END Class GuiPreferences
 
 class GuiPreferencesGeneral(QWidget):
diff --git a/nw/gui/projsettings.py b/nw/gui/projsettings.py
index fcbb2035..dca62040 100644
--- a/nw/gui/projsettings.py
+++ b/nw/gui/projsettings.py
@@ -169,11 +169,11 @@ class GuiProjectEditMain(QWidget):
         self.mainForm.addGroupLabel(self.tr("Project Settings"))
 
         xW = self.mainConf.pxInt(250)
-        xH = self.mainConf.pxInt(100)
+        xH = self.mainConf.pxInt(80)
 
         self.editName = QLineEdit()
         self.editName.setMaxLength(200)
-        self.editName.setFixedWidth(xW)
+        self.editName.setMaximumWidth(xW)
         self.editName.setText(self.theProject.projName)
         self.mainForm.addRow(
             self.tr("Working title"),
@@ -183,7 +183,7 @@ class GuiProjectEditMain(QWidget):
 
         self.editTitle = QLineEdit()
         self.editTitle.setMaxLength(200)
-        self.editTitle.setFixedWidth(xW)
+        self.editTitle.setMaximumWidth(xW)
         self.editTitle.setText(self.theProject.bookTitle)
         self.mainForm.addRow(
             self.tr("Novel title"),
@@ -192,12 +192,9 @@ class GuiProjectEditMain(QWidget):
         )
 
         self.editAuthors = QPlainTextEdit()
-        bookAuthors = ""
-        for bookAuthor in self.theProject.bookAuthors:
-            bookAuthors += bookAuthor+"\n"
-        self.editAuthors.setPlainText(bookAuthors)
-        self.editAuthors.setFixedHeight(xH)
-        self.editAuthors.setFixedWidth(xW)
+        self.editAuthors.setMinimumHeight(xH)
+        self.editAuthors.setMaximumWidth(xW)
+        self.editAuthors.setPlainText("\n".join(self.theProject.bookAuthors))
         self.mainForm.addRow(
             self.tr("Author(s)"),
             self.editAuthors,
@@ -205,7 +202,7 @@ class GuiProjectEditMain(QWidget):
         )
 
         self.spellLang = QComboBox(self)
-        self.spellLang.setFixedWidth(xW)
+        self.spellLang.setMaximumWidth(xW)
         theDict = self.theParent.docEditor.theDict
         self.spellLang.addItem(self.tr("Default"), "None")
         if theDict is not None: