From 25f9f0519f1e5a88b4d63c449dec0138a5990caa Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sun, 30 Jul 2023 19:55:47 +0200
Subject: [PATCH] Fix raise window issue on Mac

---
 novelwriter/__init__.py            | 2 +-
 novelwriter/guimain.py             | 3 ---
 novelwriter/tools/manussettings.py | 6 ++++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/novelwriter/__init__.py b/novelwriter/__init__.py
index 2e591ee6..4731b73b 100644
--- a/novelwriter/__init__.py
+++ b/novelwriter/__init__.py
@@ -189,7 +189,7 @@ def main(sysArgs=None):
         errDlg = QErrorMessage()
         errDlg.resize(500, 300)
         errDlg.showMessage((
-            "<h3>A critical error has been encountered</h3>"
+            "<h3>A critical error was encountered</h3>"
             "<p>novelWriter cannot start due to the following issues:<p>"
             "<p>&nbsp;-&nbsp;%s</p>"
             "<p>Shutting down ...</p>"
diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py
index 2b536b8a..c0a66402 100644
--- a/novelwriter/guimain.py
+++ b/novelwriter/guimain.py
@@ -301,9 +301,6 @@ class GuiMain(QMainWindow):
         # Forward Functions
         self.setStatus = self.mainStatus.setStatus
 
-        # Force a show of the GUI
-        self.show()
-
         # Check that config loaded fine
         self.reportConfErr()
 
diff --git a/novelwriter/tools/manussettings.py b/novelwriter/tools/manussettings.py
index 6a031bf0..c69eb679 100644
--- a/novelwriter/tools/manussettings.py
+++ b/novelwriter/tools/manussettings.py
@@ -75,6 +75,7 @@ class GuiBuildSettings(QDialog):
         logger.debug("Create: GuiBuildSettings")
         self.setObjectName("GuiBuildSettings")
 
+        self.guiParent  = parent
         self.mainGui    = mainGui
         self.mainTheme  = mainGui.mainTheme
         self.theProject = mainGui.theProject
@@ -208,8 +209,10 @@ class GuiBuildSettings(QDialog):
         elif role == QDialogButtonBox.AcceptRole:
             self._emitBuildData()
             self.close()
+            self.guiParent.raise_()  # Issue #1494
         elif role == QDialogButtonBox.RejectRole:
             self.close()
+            self.guiParent.raise_()  # Issue #1494
         return
 
     ##
@@ -941,6 +944,7 @@ class _FormatTab(QWidget):
     def __init__(self, buildMain: GuiBuildSettings, build: BuildSettings):
         super().__init__(parent=buildMain)
 
+        self.buildMain  = buildMain
         self.mainGui    = buildMain.mainGui
         self.mainTheme  = buildMain.mainGui.mainTheme
 
@@ -1160,6 +1164,8 @@ class _FormatTab(QWidget):
         if theStatus:
             self.textFont.setText(theFont.family())
             self.textSize.setValue(theFont.pointSize())
+        self.buildMain.guiParent.raise_()  # Issue #1494
+        self.buildMain.raise_()  # Issue #1494
         return
 
     @pyqtSlot(int)