Merge branch 'main' into features/footnotes

novelwriter/__init__.py

@@ -32,7 +32,7 @@ from typing import TYPE_CHECKING
 from PyQt5.QtWidgets import QApplication, QErrorMessage
 
 from novelwriter.config import Config
-from novelwriter.error import exceptionHandler, logException
+from novelwriter.error import exceptionHandler
 from novelwriter.shared import SharedData
 
 if TYPE_CHECKING:  # pragma: no cover
@@ -48,7 +48,7 @@ __author__     = "Veronica Berglyd Olsen"
 __maintainer__ = "Veronica Berglyd Olsen"
 __email__      = "code@vkbo.net"
 __version__    = "2.5a2"
-__hexversion__ = "0x020500a1"
+__hexversion__ = "0x020500a2"
 __date__       = "2024-04-16"
 __status__     = "Stable"
 __domain__     = "novelwriter.io"
@@ -198,24 +198,21 @@ def main(sysArgs: list | None = None) -> GuiMain | None:
     # Finish initialising config
     CONFIG.initConfig(confPath, dataPath)
 
-    if CONFIG.osDarwin:
+    if sys.platform == "darwin":
         try:
             from Foundation import NSBundle  # type: ignore
             bundle = NSBundle.mainBundle()
             info = bundle.localizedInfoDictionary() or bundle.infoDictionary()
             info["CFBundleName"] = "novelWriter"
         except Exception:
-            logger.error("Failed to set application name")
-            logException()
-
-    elif CONFIG.osWindows:
+            pass  # Quietly ignore error
+    elif sys.platform == "win32":
         try:
             import ctypes
             appID = f"io.novelwriter.{__version__}"
             ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(appID)  # type: ignore
         except Exception:
-            logger.error("Failed to set application name")
-            logException()
+            pass  # Quietly ignore error
 
     # Import GUI (after dependency checks), and launch
     from novelwriter.guimain import GuiMain

novelwriter/gui/outline.py

@@ -45,6 +45,7 @@ from novelwriter.enum import nwDocMode, nwItemClass, nwItemLayout, nwItemType, n
 from novelwriter.error import logException
 from novelwriter.common import checkInt, formatFileFilter, makeFileNameSafe
 from novelwriter.constants import nwHeaders, trConst, nwKeyWords, nwLabels
+from novelwriter.extensions.configlayout import NColourLabel
 from novelwriter.extensions.novelselector import NovelSelector
 from novelwriter.types import (
     QtAlignLeftTop, QtAlignRight, QtAlignRightTop, QtDecoration,
@@ -208,19 +209,18 @@ class GuiOutlineToolBar(QToolBar):
 
         logger.debug("Create: GuiOutlineToolBar")
 
-        iSz = SHARED.theme.baseIconSize
-        mPx = CONFIG.pxInt(12)
-
         self.setMovable(False)
-        self.setIconSize(iSz)
+        self.setIconSize(1.4*SHARED.theme.baseIconSize)
         self.setContentsMargins(0, 0, 0, 0)
 
         stretch = QWidget(self)
         stretch.setSizePolicy(QtSizeExpanding, QtSizeExpanding)
 
         # Novel Selector
-        self.novelLabel = QLabel(self.tr("Outline of"), self)
-        self.novelLabel.setContentsMargins(0, 0, mPx, 0)
+        self.novelLabel = NColourLabel(
+            self.tr("Outline of"), parent=self, scale=NColourLabel.HEADER_SCALE, bold=True
+        )
+        self.novelLabel.setContentsMargins(0, 0, CONFIG.pxInt(12), 0)
 
         self.novelValue = NovelSelector(self)
         self.novelValue.setIncludeAll(True)