Merge pull request #389 from vkbo/dialog_modality

Dialog Modality

nw/gui/build.py

@@ -401,8 +401,6 @@ class GuiBuildNovel(QDialog):
         self.setLayout(self.outerBox)
         self.buildNovel.setFocus()
 
-        self.show()
-
         logger.debug("GuiBuildNovel initialisation complete")
 
         # Load from Cache

nw/gui/docmerge.py

@@ -79,7 +79,6 @@ class GuiDocMerge(QDialog):
         self.setLayout(self.outerBox)
 
         self.rejected.connect(self._doClose)
-        self.show()
 
         self._populateList()
 

nw/gui/docsplit.py

@@ -92,7 +92,6 @@ class GuiDocSplit(QDialog):
         self.setLayout(self.outerBox)
 
         self.rejected.connect(self._doClose)
-        self.show()
 
         self._populateList()
 

nw/gui/mainmenu.py

@@ -28,13 +28,10 @@
 import logging
 import nw
 
-from os import path
-
 from PyQt5.QtCore import QUrl, QProcess
 from PyQt5.QtGui import QDesktopServices
-from PyQt5.QtWidgets import QMenuBar, QAction, QMessageBox
+from PyQt5.QtWidgets import QMenuBar, QAction
 
-from nw.gui.about import GuiAbout
 from nw.constants import nwItemType, nwItemClass, nwDocAction, nwDocInsert
 
 logger = logging.getLogger(__name__)
@@ -150,21 +147,6 @@ class GuiMainMenu(QMenuBar):
         self.theProject.setAutoOutline(theMode)
         return True
 
-    def _showAbout(self):
-        """Show the about dialog.
-        """
-        if self.mainConf.showGUI:
-            msgAbout = GuiAbout(self.theParent)
-            msgAbout.exec_()
-        return True
-
-    def _showAboutQt(self):
-        """Show Qt's own About dialog.
-        """
-        msgBox = QMessageBox()
-        msgBox.aboutQt(self.theParent,"About Qt")
-        return True
-
     def _openAssistant(self):
         """Open the documentation in Qt Assistant.
         """
@@ -853,13 +835,13 @@ class GuiMainMenu(QMenuBar):
         # Help > About
         self.aAboutNW = QAction("About %s" % self.mainConf.appName, self)
         self.aAboutNW.setStatusTip("About %s" % self.mainConf.appName)
-        self.aAboutNW.triggered.connect(self._showAbout)
+        self.aAboutNW.triggered.connect(self.theParent.showAboutNWDialog)
         self.helpMenu.addAction(self.aAboutNW)
 
         # Help > About Qt5
         self.aAboutQt = QAction("About Qt5", self)
         self.aAboutQt.setStatusTip("About Qt5")
-        self.aAboutQt.triggered.connect(self._showAboutQt)
+        self.aAboutQt.triggered.connect(self.theParent.showAboutQtDialog)
         self.helpMenu.addAction(self.aAboutQt)
 
         # Help > Separator

nw/gui/preferences.py

@@ -71,8 +71,6 @@ class GuiPreferences(PagedDialog):
         self.buttonBox.rejected.connect(self._doClose)
         self.addControls(self.buttonBox)
 
-        self.show()
-
         logger.debug("GuiPreferences initialisation complete")
 
         return

nw/guimain.py

@@ -43,7 +43,7 @@ from nw.gui import (
     GuiBuildNovel, GuiDocEditor, GuiDocMerge, GuiDocSplit, GuiDocViewDetails,
     GuiDocViewer, GuiItemDetails, GuiItemEditor, GuiMainMenu, GuiMainStatus,
     GuiOutline, GuiOutlineDetails, GuiPreferences, GuiProjectLoad, GuiTheme,
-    GuiProjectSettings, GuiProjectTree, GuiWritingStats
+    GuiProjectSettings, GuiProjectTree, GuiWritingStats, GuiAbout
 )
 from nw.core import NWProject, NWDoc, NWIndex
 from nw.constants import nwFiles, nwItemType, nwAlert
@@ -803,16 +803,34 @@ class GuiMain(QMainWindow):
         """Open the build project dialog.
         """
         if self.hasProject:
-            dlgExport = GuiBuildNovel(self, self.theProject)
-            dlgExport.exec_()
+            dlgBuild = GuiBuildNovel(self, self.theProject)
+            dlgBuild.setModal(False)
+            dlgBuild.show()
         return True
 
     def showWritingStatsDialog(self):
         """Open the session log dialog.
         """
         if self.hasProject:
-            dlgTLine = GuiWritingStats(self, self.theProject)
-            dlgTLine.exec_()
+            dlgStats = GuiWritingStats(self, self.theProject)
+            dlgStats.setModal(False)
+            dlgStats.show()
+        return True
+
+    def showAboutNWDialog(self):
+        """Show the about dialog for novelWriter.
+        """
+        if self.mainConf.showGUI:
+            dlgAbout = GuiAbout(self)
+            dlgAbout.exec_()
+        return True
+
+    def showAboutQtDialog(self):
+        """Show the about dialog for Qt.
+        """
+        if self.mainConf.showGUI:
+            msgBox = QMessageBox()
+            msgBox.aboutQt(self, "About Qt")
         return True
 
     def makeAlert(self, theMessage, theLevel=nwAlert.INFO):