Redesign button row on welcome dialog

novelwriter/assets/icons/typicons_dark/icons.conf

@@ -60,11 +60,13 @@ fmt_superscript = nw_tb-superscript.svg
 fmt_underline   = nw_tb-underline.svg
 forward         = typ_chevron-right.svg
 import          = mixed_import.svg
+list            = typ_th-list.svg
 maximise        = typ_arrow-maximise.svg
 menu            = typ_th-dot-menu.svg
 minimise        = typ_arrow-minimise.svg
 more            = typ_th-dot-more.svg
 noncheckable    = mixed_input-none.svg
+open            = typ_folder.svg
 panel           = nw_panel.svg
 proj_chapter    = mixed_document-chapter.svg
 proj_details    = typ_th-list-grey.svg

novelwriter/assets/icons/typicons_dark/typ_th-list.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#69c" stroke-width="1.0526">
+  <path d="m19.632 17.263h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053s0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053s-0.94421-2.1053-2.1053-2.1053zm0-7.3684h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053s0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053s-0.94421-2.1053-2.1053-2.1053zm0-7.3684h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053 0 1.1611 0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053 0-1.1611-0.94421-2.1053-2.1053-2.1053z"/>
+  <circle cx="4.8947" cy="19.368" r="2.6316"/>
+  <circle cx="4.8947" cy="12" r="2.6316"/>
+  <circle cx="4.8947" cy="4.6316" r="2.6316"/>
+ </g>
+</svg>

novelwriter/assets/icons/typicons_light/icons.conf

@@ -60,11 +60,13 @@ fmt_superscript = nw_tb-superscript.svg
 fmt_underline   = nw_tb-underline.svg
 forward         = typ_chevron-right.svg
 import          = mixed_import.svg
+list            = typ_th-list.svg
 maximise        = typ_arrow-maximise.svg
 menu            = typ_th-dot-menu.svg
 minimise        = typ_arrow-minimise.svg
 more            = typ_th-dot-more.svg
 noncheckable    = mixed_input-none.svg
+open            = typ_folder.svg
 panel           = nw_panel.svg
 proj_chapter    = mixed_document-chapter.svg
 proj_details    = typ_th-list-grey.svg

novelwriter/assets/icons/typicons_light/typ_th-list.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" version="1.2" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <g fill="#4271ae" stroke-width="1.0526">
+  <path d="m19.632 17.263h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053s0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053s-0.94421-2.1053-2.1053-2.1053zm0-7.3684h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053s0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053s-0.94421-2.1053-2.1053-2.1053zm0-7.3684h-7.3684c-1.1611 0-2.1053 0.94421-2.1053 2.1053 0 1.1611 0.94421 2.1053 2.1053 2.1053h7.3684c1.1611 0 2.1053-0.94421 2.1053-2.1053 0-1.1611-0.94421-2.1053-2.1053-2.1053z"/>
+  <circle cx="4.8947" cy="19.368" r="2.6316"/>
+  <circle cx="4.8947" cy="12" r="2.6316"/>
+  <circle cx="4.8947" cy="4.6316" r="2.6316"/>
+ </g>
+</svg>

novelwriter/gui/theme.py

@@ -453,9 +453,9 @@ class GuiIcons:
 
         # General Button Icons
         "add", "add_document", "backward", "bookmark", "browse", "checked", "close", "cross",
-        "document", "down", "edit", "export", "forward", "import", "maximise", "menu", "minimise",
+        "document", "down", "edit", "export", "forward", "import", "list", "maximise", "menu",
-        "more", "noncheckable", "panel", "refresh", "remove", "revert", "search_replace", "search",
+        "minimise", "more", "noncheckable", "open", "panel", "refresh", "remove", "revert",
-        "settings", "star", "unchecked", "up", "view",
+        "search_replace", "search", "settings", "star", "unchecked", "up", "view",
 
         # Switches
         "sticky-on", "sticky-off",

novelwriter/tools/welcome.py

@@ -34,10 +34,10 @@ from PyQt5.QtCore import (
     pyqtSignal, pyqtSlot
 )
 from PyQt5.QtWidgets import (
-    QAction, QDialog, QDialogButtonBox, QFileDialog, QFormLayout, QHBoxLayout,
+    QAction, QDialog, QFileDialog, QFormLayout, QHBoxLayout, QLabel, QLineEdit,
-    QLabel, QLineEdit, QListView, QMenu, QPushButton, QScrollArea, QShortcut,
+    QListView, QMenu, QPushButton, QScrollArea, QShortcut, QStackedWidget,
-    QStackedWidget, QStyle, QStyleOptionViewItem, QStyledItemDelegate,
+    QStyle, QStyleOptionViewItem, QStyledItemDelegate, QToolButton,
-    QToolButton, QVBoxLayout, QWidget, qApp
+    QVBoxLayout, QWidget, qApp
 )
 
 from novelwriter import CONFIG, SHARED
@@ -98,7 +98,6 @@ class GuiWelcome(QDialog):
         self.tabOpen.openProjectRequest.connect(self._openProjectPath)
 
         self.tabNew = _NewProjectPage(self)
-        self.tabNew.cancelNewProject.connect(self._showOpenProjectPage)
         self.tabNew.openProjectRequest.connect(self._openProjectPath)
 
         self.mainStack = QStackedWidget(self)
@@ -108,17 +107,39 @@ class GuiWelcome(QDialog):
         # Buttons
         # =======
 
-        self.btnBox = QDialogButtonBox(QDialogButtonBox.Open | QDialogButtonBox.Cancel, self)
+        self.btnList = QPushButton(self.tr("List Projects"), self)
-        self.btnBox.accepted.connect(self._openSelectedItem)
+        self.btnList.setIcon(SHARED.theme.getIcon("list"))
-        self.btnBox.rejected.connect(self.close)
+        self.btnList.clicked.connect(self._showOpenProjectPage)
 
-        self.newButton = self.btnBox.addButton(self.tr("New Project"), QDialogButtonBox.ActionRole)
+        self.btnNew = QPushButton(self.tr("New Project"), self)
-        self.newButton.setIcon(SHARED.theme.getIcon("add"))
+        self.btnNew.setIcon(SHARED.theme.getIcon("add"))
-        self.newButton.clicked.connect(self._showNewProjectPage)
+        self.btnNew.clicked.connect(self._showNewProjectPage)
 
-        self.browseButton = self.btnBox.addButton(self.tr("Browse"), QDialogButtonBox.ActionRole)
+        self.btnBrowse = QPushButton(self.tr("Browse"), self)
-        self.browseButton.setIcon(SHARED.theme.getIcon("browse"))
+        self.btnBrowse.setIcon(SHARED.theme.getIcon("browse"))
-        self.browseButton.clicked.connect(self._browseForProject)
+        self.btnBrowse.clicked.connect(self._browseForProject)
+
+        self.btnCancel = QPushButton(self.tr("Cancel"), self)
+        self.btnCancel.setIcon(SHARED.theme.getIcon("cross"))
+        self.btnCancel.clicked.connect(self.close)
+
+        self.btnCreate = QPushButton(self.tr("Create"), self)
+        self.btnCreate.setIcon(SHARED.theme.getIcon("star"))
+        self.btnCreate.clicked.connect(self.tabNew.createNewProject)
+
+        self.btnOpen = QPushButton(self.tr("Open"), self)
+        self.btnOpen.setIcon(SHARED.theme.getIcon("open"))
+        self.btnOpen.clicked.connect(self._openSelectedItem)
+
+        self.btnBox = QHBoxLayout()
+        self.btnBox.addStretch(1)
+        self.btnBox.addWidget(self.btnList)
+        self.btnBox.addWidget(self.btnNew)
+        self.btnBox.addWidget(self.btnBrowse)
+        self.btnBox.addWidget(self.btnCancel)
+        self.btnBox.addWidget(self.btnCreate)
+        self.btnBox.addWidget(self.btnOpen)
+        self._setButtonVisibility()
 
         # Assemble
         # ========
@@ -130,7 +151,7 @@ class GuiWelcome(QDialog):
         self.innerBox.addSpacing(hA)
         self.innerBox.addWidget(self.mainStack)
         self.innerBox.addSpacing(hB)
-        self.innerBox.addWidget(self.btnBox)
+        self.innerBox.addLayout(self.btnBox)
 
         topRight = Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignRight
 
@@ -180,12 +201,14 @@ class GuiWelcome(QDialog):
     def _showNewProjectPage(self) -> None:
         """Show the create new project page."""
         self.mainStack.setCurrentWidget(self.tabNew)
+        self._setButtonVisibility()
         return
 
     @pyqtSlot()
     def _showOpenProjectPage(self) -> None:
         """Show the open exiting project page."""
         self.mainStack.setCurrentWidget(self.tabOpen)
+        self._setButtonVisibility()
         return
 
     @pyqtSlot()
@@ -224,6 +247,20 @@ class GuiWelcome(QDialog):
         CONFIG.setWelcomeWinSize(self.width(), self.height())
         return
 
+    def _setButtonVisibility(self) -> None:
+        """Change the visibility of the dialog buttons."""
+        listMode = self.mainStack.currentWidget() == self.tabOpen
+        self.btnList.setVisible(not listMode)
+        self.btnNew.setVisible(listMode)
+        self.btnBrowse.setVisible(listMode)
+        self.btnCreate.setVisible(not listMode)
+        self.btnOpen.setVisible(listMode)
+        if listMode:
+            self.btnOpen.setFocus()
+        else:
+            self.btnCreate.setFocus()
+        return
+
 # END Class GuiWelcome
 
 
@@ -453,7 +490,6 @@ class _ProjectListModel(QAbstractListModel):
 
 class _NewProjectPage(QWidget):
 
-    cancelNewProject = pyqtSignal()
     openProjectRequest = pyqtSignal(Path)
 
     def __init__(self, parent: QWidget) -> None:
@@ -470,28 +506,11 @@ class _NewProjectPage(QWidget):
         self.scrollArea.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
         self.scrollArea.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
 
-        # Controls
-        # ========
-
-        self.cancelButton = QPushButton(self.tr("Go Back"), self)
-        self.cancelButton.setIcon(SHARED.theme.getIcon("backward"))
-        self.cancelButton.clicked.connect(lambda: self.cancelNewProject.emit())
-
-        self.createButton = QPushButton(self.tr("Create Project"), self)
-        self.createButton.setIcon(SHARED.theme.getIcon("star"))
-        self.createButton.clicked.connect(self._createNewProject)
-
-        self.buttonBox = QHBoxLayout()
-        self.buttonBox.addStretch(1)
-        self.buttonBox.addWidget(self.cancelButton, 0)
-        self.buttonBox.addWidget(self.createButton, 0)
-
         # Assemble
         # ========
 
         self.outerBox = QVBoxLayout()
         self.outerBox.addWidget(self.scrollArea)
-        self.outerBox.addLayout(self.buttonBox)
         self.outerBox.setContentsMargins(0, 0, 0, 0)
 
         self.setLayout(self.outerBox)
@@ -512,7 +531,7 @@ class _NewProjectPage(QWidget):
     ##
 
     @pyqtSlot()
-    def _createNewProject(self) -> None:
+    def createNewProject(self) -> None:
         """Create a new project from the data in the form."""
         data = self.projectForm.getProjectData()
         if not data.get("name"):