novelWriter 2.3rc1__py3-none-any.whl → 2.4__py3-none-any.whl

novelwriter/tools/noveldetails.py

@@ -26,8 +26,8 @@ from __future__ import annotations
 import math
 import logging
 
+from PyQt5.QtCore import pyqtSlot
 from PyQt5.QtGui import QCloseEvent
-from PyQt5.QtCore import QSize, Qt, pyqtSlot
 from PyQt5.QtWidgets import (
     QAbstractItemView, QDialog, QDialogButtonBox, QFormLayout, QGridLayout,
     QHBoxLayout, QLabel, QSpinBox, QStackedWidget, QTreeWidget,
@@ -37,10 +37,11 @@ from PyQt5.QtWidgets import (
 from novelwriter import CONFIG, SHARED
 from novelwriter.common import formatTime, numberToRoman
 from novelwriter.constants import nwUnicode
-from novelwriter.extensions.switch import NSwitch
 from novelwriter.extensions.configlayout import NColourLabel, NFixedPage, NScrollablePage
-from novelwriter.extensions.pagedsidebar import NPagedSideBar
 from novelwriter.extensions.novelselector import NovelSelector
+from novelwriter.extensions.pagedsidebar import NPagedSideBar
+from novelwriter.extensions.switch import NSwitch
+from novelwriter.types import QtAlignRight, QtDecoration, QtDialogClose
 
 logger = logging.getLogger(__name__)
 
@@ -94,7 +95,7 @@ class GuiNovelDetails(QDialog):
         self.mainStack.addWidget(self.contentsPage)
 
         # Buttons
-        self.buttonBox = QDialogButtonBox(QDialogButtonBox.StandardButton.Close)
+        self.buttonBox = QDialogButtonBox(QtDialogClose, self)
         self.buttonBox.rejected.connect(self.close)
 
         # Assemble
@@ -216,7 +217,7 @@ class _OverviewPage(NScrollablePage):
         self.projForm.addRow("<b>{0}</b>".format(self.tr("Editing Time")), self.projEditTime)
         self.projForm.addRow("<b>{0}</b>".format(self.tr("Word Count")), self.projWords)
         self.projForm.addRow("<b>\u2026 {0}</b>".format(self.tr("In Novels")), self.projNovels)
-        self.projForm.addRow("<b>\u2026 {0}</b>".format(self.tr("In Notes ")), self.projNotes)
+        self.projForm.addRow("<b>\u2026 {0}</b>".format(self.tr("In Notes")), self.projNotes)
         self.projForm.setContentsMargins(mPx, 0, 0, 0)
         self.projForm.setHorizontalSpacing(hPx)
         self.projForm.setVerticalSpacing(vPx)
@@ -309,7 +310,8 @@ class _ContentsPage(NFixedPage):
         self._data = []
         self._currentRoot = None
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         hPx = CONFIG.pxInt(12)
         vPx = CONFIG.pxInt(4)
         options = SHARED.project.options
@@ -322,7 +324,7 @@ class _ContentsPage(NFixedPage):
 
         # Contents Tree
         self.tocTree = QTreeWidget(self)
-        self.tocTree.setIconSize(QSize(iPx, iPx))
+        self.tocTree.setIconSize(iSz)
         self.tocTree.setIndentation(0)
         self.tocTree.setColumnCount(6)
         self.tocTree.setSelectionMode(QAbstractItemView.SelectionMode.NoSelection)
@@ -337,10 +339,10 @@ class _ContentsPage(NFixedPage):
 
         treeHeadItem = self.tocTree.headerItem()
         if treeHeadItem:
-            treeHeadItem.setTextAlignment(self.C_WORDS, Qt.AlignmentFlag.AlignRight)
-            treeHeadItem.setTextAlignment(self.C_PAGES, Qt.AlignmentFlag.AlignRight)
-            treeHeadItem.setTextAlignment(self.C_PAGE,  Qt.AlignmentFlag.AlignRight)
-            treeHeadItem.setTextAlignment(self.C_PROG,  Qt.AlignmentFlag.AlignRight)
+            treeHeadItem.setTextAlignment(self.C_WORDS, QtAlignRight)
+            treeHeadItem.setTextAlignment(self.C_PAGES, QtAlignRight)
+            treeHeadItem.setTextAlignment(self.C_PAGE,  QtAlignRight)
+            treeHeadItem.setTextAlignment(self.C_PROG,  QtAlignRight)
 
         treeHeader = self.tocTree.header()
         treeHeader.setStretchLastSection(True)
@@ -364,7 +366,7 @@ class _ContentsPage(NFixedPage):
         countFrom    = options.getInt("GuiNovelDetails", "countFrom", 1)
         clearDouble  = options.getBool("GuiNovelDetails", "clearDouble", True)
 
-        self.wpLabel = QLabel(self.tr("Words per page"))
+        self.wpLabel = QLabel(self.tr("Words per page"), self)
 
         self.wpValue = QSpinBox(self)
         self.wpValue.setMinimum(10)
@@ -373,7 +375,7 @@ class _ContentsPage(NFixedPage):
         self.wpValue.setValue(wordsPerPage)
         self.wpValue.valueChanged.connect(self._populateTree)
 
-        self.poLabel = QLabel(self.tr("First page offset"))
+        self.poLabel = QLabel(self.tr("First page offset"), self)
 
         self.poValue = QSpinBox(self)
         self.poValue.setMinimum(1)
@@ -382,7 +384,7 @@ class _ContentsPage(NFixedPage):
         self.poValue.setValue(countFrom)
         self.poValue.valueChanged.connect(self._populateTree)
 
-        self.dblLabel = QLabel(self.tr("Chapters on odd pages"))
+        self.dblLabel = QLabel(self.tr("Chapters on odd pages"), self)
 
         self.dblValue = NSwitch(self, height=iPx)
         self.dblValue.setChecked(clearDouble)
@@ -483,17 +485,17 @@ class _ContentsPage(NFixedPage):
             if tTitle.strip() == "":
                 tTitle = self.tr("Untitled")
 
-            newItem.setData(self.C_TITLE, Qt.DecorationRole, hDec)
+            newItem.setData(self.C_TITLE, QtDecoration, hDec)
             newItem.setText(self.C_TITLE, tTitle)
             newItem.setText(self.C_WORDS, f"{wCount:n}")
             newItem.setText(self.C_PAGES, f"{pCount:n}")
             newItem.setText(self.C_PAGE,  progPage)
             newItem.setText(self.C_PROG,  progText)
 
-            newItem.setTextAlignment(self.C_WORDS, Qt.AlignRight)
-            newItem.setTextAlignment(self.C_PAGES, Qt.AlignRight)
-            newItem.setTextAlignment(self.C_PAGE,  Qt.AlignRight)
-            newItem.setTextAlignment(self.C_PROG,  Qt.AlignRight)
+            newItem.setTextAlignment(self.C_WORDS, QtAlignRight)
+            newItem.setTextAlignment(self.C_PAGES, QtAlignRight)
+            newItem.setTextAlignment(self.C_PAGE,  QtAlignRight)
+            newItem.setTextAlignment(self.C_PROG,  QtAlignRight)
 
             # Make pages and titles/partitions stand out
             if tLevel < 2:

novelwriter/tools/welcome.py

@@ -25,33 +25,35 @@ from __future__ import annotations
 
 import logging
 
-from pathlib import Path
 from datetime import datetime
+from pathlib import Path
 
-from PyQt5.QtGui import QCloseEvent, QColor, QFont, QPaintEvent, QPainter, QPen
 from PyQt5.QtCore import (
     QAbstractListModel, QEvent, QModelIndex, QObject, QPoint, QSize, Qt,
     pyqtSignal, pyqtSlot
 )
+from PyQt5.QtGui import QCloseEvent, QColor, QFont, QPaintEvent, QPainter, QPen
 from PyQt5.QtWidgets import (
-    QAction, QDialog, QFileDialog, QFormLayout, QHBoxLayout, QLabel, QLineEdit,
-    QListView, QMenu, QPushButton, QScrollArea, QShortcut, QStackedWidget,
-    QStyle, QStyleOptionViewItem, QStyledItemDelegate, QToolButton,
-    QVBoxLayout, QWidget, qApp
+    QAction, QApplication, QDialog, QFileDialog, QFormLayout, QHBoxLayout,
+    QLabel, QLineEdit, QListView, QMenu, QPushButton, QScrollArea, QShortcut,
+    QStackedWidget, QStyleOptionViewItem, QStyledItemDelegate, QVBoxLayout,
+    QWidget
 )
 
 from novelwriter import CONFIG, SHARED
-from novelwriter.enum import nwItemClass
-from novelwriter.common import formatInt, makeFileNameSafe
+from novelwriter.common import cssCol, formatInt, makeFileNameSafe
 from novelwriter.constants import nwFiles
 from novelwriter.core.coretools import ProjectBuilder
+from novelwriter.enum import nwItemClass
+from novelwriter.extensions.configlayout import NWrappedWidgetBox
+from novelwriter.extensions.modified import NIconToolButton, NSpinBox
 from novelwriter.extensions.switch import NSwitch
-from novelwriter.extensions.modified import NSpinBox
 from novelwriter.extensions.versioninfo import VersionInfoWidget
+from novelwriter.types import QtAlignLeft, QtAlignRightTop, QtSelected
 
 logger = logging.getLogger(__name__)
 
-PANEL_ALPHA = 0.7
+PANEL_ALPHA = 178
 
 
 class GuiWelcome(QDialog):
@@ -74,8 +76,9 @@ class GuiWelcome(QDialog):
         hD = CONFIG.pxInt(36)
         hE = CONFIG.pxInt(48)
         hF = CONFIG.pxInt(128)
-        self._hPx = CONFIG.pxInt(600)
+        btnIconSize = SHARED.theme.buttonIconSize
 
+        self._hPx = CONFIG.pxInt(600)
         self.resize(*CONFIG.welcomeWinSize)
 
         # Elements
@@ -108,26 +111,32 @@ class GuiWelcome(QDialog):
 
         self.btnList = QPushButton(self.tr("List"), self)
         self.btnList.setIcon(SHARED.theme.getIcon("list"))
+        self.btnList.setIconSize(btnIconSize)
         self.btnList.clicked.connect(self._showOpenProjectPage)
 
         self.btnNew = QPushButton(self.tr("New"), self)
         self.btnNew.setIcon(SHARED.theme.getIcon("add"))
+        self.btnNew.setIconSize(btnIconSize)
         self.btnNew.clicked.connect(self._showNewProjectPage)
 
         self.btnBrowse = QPushButton(self.tr("Browse"), self)
         self.btnBrowse.setIcon(SHARED.theme.getIcon("browse"))
+        self.btnBrowse.setIconSize(btnIconSize)
         self.btnBrowse.clicked.connect(self._browseForProject)
 
         self.btnCancel = QPushButton(self.tr("Cancel"), self)
         self.btnCancel.setIcon(SHARED.theme.getIcon("cross"))
+        self.btnCancel.setIconSize(btnIconSize)
         self.btnCancel.clicked.connect(self.close)
 
         self.btnCreate = QPushButton(self.tr("Create"), self)
         self.btnCreate.setIcon(SHARED.theme.getIcon("star"))
+        self.btnCreate.setIconSize(btnIconSize)
         self.btnCreate.clicked.connect(self.tabNew.createNewProject)
 
         self.btnOpen = QPushButton(self.tr("Open"), self)
         self.btnOpen.setIcon(SHARED.theme.getIcon("open"))
+        self.btnOpen.setIconSize(btnIconSize)
         self.btnOpen.clicked.connect(self._openSelectedItem)
 
         self.btnBox = QHBoxLayout()
@@ -152,10 +161,8 @@ class GuiWelcome(QDialog):
         self.innerBox.addSpacing(hB)
         self.innerBox.addLayout(self.btnBox)
 
-        topRight = Qt.AlignmentFlag.AlignTop | Qt.AlignmentFlag.AlignRight
-
         self.outerBox = QHBoxLayout()
-        self.outerBox.addWidget(self.nwLogo, 3, topRight)
+        self.outerBox.addWidget(self.nwLogo, 3, QtAlignRightTop)
         self.outerBox.addLayout(self.innerBox, 9)
         self.outerBox.setContentsMargins(hF, hE, hC, hE)
 
@@ -305,12 +312,12 @@ class _OpenProjectPage(QWidget):
 
         self._selectFirstItem()
 
-        baseCol = self.palette().base().color()
-        self.setStyleSheet((
-            "QListView {{border: none; background: rgba({r},{g},{b},{a});}} "
-            "QLineEdit {{border: none; background: rgba({r},{g},{b},{a}); padding: {m}px;}} "
-        ).format(r=baseCol.red(), g=baseCol.green(), b=baseCol.blue(),
-                 a=PANEL_ALPHA, m=CONFIG.pxInt(4)))
+        mPx = CONFIG.pxInt(4)
+        baseCol = cssCol(self.palette().base().color(), PANEL_ALPHA)
+        self.setStyleSheet(
+            f"QListView {{border: none; background: {baseCol};}} "
+            f"QLineEdit {{border: none; background: {baseCol}; padding: {mPx}px;}} "
+        )
 
         return
 
@@ -370,7 +377,7 @@ class _OpenProjectPage(QWidget):
         action.triggered.connect(self.openSelectedItem)
         action = ctxMenu.addAction(self.tr("Remove Project"))
         action.triggered.connect(self._deleteSelectedItem)
-        ctxMenu.exec_(self.mapToGlobal(pos))
+        ctxMenu.exec(self.mapToGlobal(pos))
         ctxMenu.deleteLater()
         return
 
@@ -404,11 +411,11 @@ class _ProjectListItem(QStyledItemDelegate):
         self._pPx = (mPx//2, 3*mPx//2, iPx + mPx, mPx, mPx + tPx)  # Painter coordinates
         self._hPx = 2*mPx + tPx + fPx  # Fixed height
 
-        self._tFont = qApp.font()
+        self._tFont = QApplication.font()
         self._tFont.setPointSizeF(1.2*fPt)
         self._tFont.setWeight(QFont.Weight.Bold)
 
-        self._dFont = qApp.font()
+        self._dFont = QApplication.font()
         self._dFont.setPointSizeF(fPt)
         self._dPen = QPen(SHARED.theme.helpText)
 
@@ -424,9 +431,9 @@ class _ProjectListItem(QStyledItemDelegate):
         ix, iy, x, y1, y2 = self._pPx
 
         painter.save()
-        if opt.state & QStyle.StateFlag.State_Selected == QStyle.StateFlag.State_Selected:
+        if opt.state & QtSelected == QtSelected:
             painter.setOpacity(0.25)
-            painter.fillRect(rect, qApp.palette().highlight())
+            painter.fillRect(rect, QApplication.palette().highlight())
             painter.setOpacity(1.0)
 
         painter.drawPixmap(ix, rect.top() + iy, self._icon)
@@ -455,7 +462,7 @@ class _ProjectListModel(QAbstractListModel):
         opened = self.tr("Last Opened")
         records = sorted(CONFIG.recentProjects.listEntries(), key=lambda x: x[3], reverse=True)
         for path, title, count, time in records:
-            when = datetime.fromtimestamp(time).strftime("%x")
+            when = CONFIG.localDate(datetime.fromtimestamp(time))
             data.append((title, path, f"{opened}: {when}, {words}: {formatInt(count)}"))
         self._data = data
         return
@@ -517,11 +524,11 @@ class _NewProjectPage(QWidget):
         # Styles
         # ======
 
-        baseCol = self.palette().base().color()
-        self.setStyleSheet((
-            "QScrollArea {{border: none; background: rgba({r},{g},{b},{a});}} "
-            "_NewProjectForm {{border: none; background: rgba({r},{g},{b},{a});}} "
-        ).format(r=baseCol.red(), g=baseCol.green(), b=baseCol.blue(), a=PANEL_ALPHA))
+        baseCol = cssCol(self.palette().base().color(), PANEL_ALPHA)
+        self.setStyleSheet(
+            f"QScrollArea {{border: none; background: {baseCol};}} "
+            f"_NewProjectForm {{border: none; background: {baseCol};}} "
+        )
 
         return
 
@@ -553,11 +560,12 @@ class _NewProjectForm(QWidget):
     def __init__(self, parent: QWidget) -> None:
         super().__init__(parent=parent)
 
-        self._basePath = CONFIG.lastPath()
+        self._basePath = CONFIG.homePath()
         self._fillMode = self.FILL_BLANK
         self._copyPath = None
 
-        iPx = SHARED.theme.baseIconSize
+        iPx = SHARED.theme.baseIconHeight
+        iSz = SHARED.theme.baseIconSize
         sPx = CONFIG.pxInt(16)
 
         # Project Settings
@@ -578,8 +586,7 @@ class _NewProjectForm(QWidget):
         self.projPath = QLineEdit(self)
         self.projPath.setReadOnly(True)
 
-        self.browsePath = QToolButton(self)
-        self.browsePath.setIcon(SHARED.theme.getIcon("browse"))
+        self.browsePath = NIconToolButton(self, iSz, "browse")
         self.browsePath.clicked.connect(self._doBrowse)
 
         self.pathBox = QHBoxLayout()
@@ -590,8 +597,7 @@ class _NewProjectForm(QWidget):
         self.projFill = QLineEdit(self)
         self.projFill.setReadOnly(True)
 
-        self.browseFill = QToolButton(self)
-        self.browseFill.setIcon(SHARED.theme.getIcon("add_document"))
+        self.browseFill = NIconToolButton(self, iSz, "add_document")
 
         self.fillMenu = _PopLeftDirectionMenu(self.browseFill)
 
@@ -608,7 +614,6 @@ class _NewProjectForm(QWidget):
         self.fillCopy.triggered.connect(self._setFillCopy)
 
         self.browseFill.setMenu(self.fillMenu)
-        self.browseFill.setPopupMode(QToolButton.ToolButtonPopupMode.InstantPopup)
 
         self.fillBox = QHBoxLayout()
         self.fillBox.addWidget(self.projFill)
@@ -616,7 +621,7 @@ class _NewProjectForm(QWidget):
 
         # Project Form
         self.projectForm = QFormLayout()
-        self.projectForm.setAlignment(Qt.AlignmentFlag.AlignLeft)
+        self.projectForm.setAlignment(QtAlignLeft)
         self.projectForm.addRow(self.tr("Project Name"), self.projName)
         self.projectForm.addRow(self.tr("Author"), self.projAuthor)
         self.projectForm.addRow(self.tr("Project Path"), self.pathBox)
@@ -627,23 +632,21 @@ class _NewProjectForm(QWidget):
 
         self.numChapters = NSpinBox(self)
         self.numChapters.setRange(0, 200)
-        self.numChapters.setValue(5)
+        self.numChapters.setValue(0)
         self.numChapters.setToolTip(self.tr("Set to 0 to only add scenes"))
 
-        self.chapterBox = QHBoxLayout()
-        self.chapterBox.addWidget(QLabel(self.tr("Add")))
-        self.chapterBox.addWidget(self.numChapters)
-        self.chapterBox.addWidget(QLabel(self.tr("chapter documents")))
+        self.chapterBox = NWrappedWidgetBox(
+            self.tr("Add {0} chapter documents"), self.numChapters
+        )
         self.chapterBox.addStretch(1)
 
         self.numScenes = NSpinBox(self)
         self.numScenes.setRange(0, 200)
-        self.numScenes.setValue(5)
+        self.numScenes.setValue(0)
 
-        self.sceneBox = QHBoxLayout()
-        self.sceneBox.addWidget(QLabel(self.tr("Add")))
-        self.sceneBox.addWidget(self.numScenes)
-        self.sceneBox.addWidget(QLabel(self.tr("scene documents (to each chapter)")))
+        self.sceneBox = NWrappedWidgetBox(
+            self.tr("Add {0} scene documents (to each chapter)"), self.numScenes
+        )
         self.sceneBox.addStretch(1)
 
         self.novelForm = QVBoxLayout()
@@ -669,7 +672,7 @@ class _NewProjectForm(QWidget):
         self.addNotes.setChecked(False)
 
         self.notesForm = QFormLayout()
-        self.notesForm.setAlignment(Qt.AlignmentFlag.AlignLeft)
+        self.notesForm.setAlignment(QtAlignLeft)
         self.notesForm.addRow(self.tr("Add a folder for plot notes"), self.addPlot)
         self.notesForm.addRow(self.tr("Add a folder for character notes"), self.addChar)
         self.notesForm.addRow(self.tr("Add a folder for location notes"), self.addWorld)
@@ -679,10 +682,10 @@ class _NewProjectForm(QWidget):
         # ========
 
         self.extraBox = QVBoxLayout()
-        self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Chapters and Scenes"))))
+        self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Chapters and Scenes")), self))
         self.extraBox.addLayout(self.novelForm)
         self.extraBox.addSpacing(sPx)
-        self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Project Notes"))))
+        self.extraBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Project Notes")), self))
         self.extraBox.addLayout(self.notesForm)
         self.extraBox.setContentsMargins(0, 0, 0, 0)
 
@@ -691,7 +694,7 @@ class _NewProjectForm(QWidget):
         self.extraWidget.setContentsMargins(0, 0, 0, 0)
 
         self.formBox = QVBoxLayout()
-        self.formBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Create New Project"))))
+        self.formBox.addWidget(QLabel("<b>{0}</b>".format(self.tr("Create New Project")), self))
         self.formBox.addLayout(self.projectForm)
         self.formBox.addSpacing(sPx)
         self.formBox.addWidget(self.extraWidget)
@@ -735,11 +738,10 @@ class _NewProjectForm(QWidget):
         """Select a project folder."""
         if projDir := QFileDialog.getExistingDirectory(
             self, self.tr("Select Project Folder"),
-            str(self._basePath), options=QFileDialog.ShowDirsOnly
+            str(self._basePath), options=QFileDialog.Option.ShowDirsOnly
         ):
             self._basePath = Path(projDir)
             self._updateProjPath()
-            CONFIG.setLastPath(self._basePath)
         return
 
     @pyqtSlot()
@@ -750,7 +752,7 @@ class _NewProjectForm(QWidget):
         return
 
     @pyqtSlot()
-    def _syncSwitches(self):
+    def _syncSwitches(self) -> None:
         """Check if the add notes option should also be switched off."""
         addPlot = self.addPlot.isChecked()
         addChar = self.addChar.isChecked()
@@ -810,7 +812,7 @@ class _PopLeftDirectionMenu(QMenu):
 
     def event(self, event: QEvent) -> bool:
         """Overload the show event and move the menu popup location."""
-        if event.type() == QEvent.Show:
+        if event.type() == QEvent.Type.Show:
             if isinstance(parent := self.parent(), QWidget):
                 offset = QPoint(parent.width() - self.width(), parent.height())
                 self.move(parent.mapToGlobal(offset))