Changed how the application name is passed around

nw/gui/about.py

@@ -54,13 +54,13 @@ class GuiAbout(QDialog):
         self.innerBox = QHBoxLayout()
         self.innerBox.setSpacing(self.mainConf.pxInt(16))
 
-        self.setWindowTitle("About %s" % nw.__appname__)
+        self.setWindowTitle("About %s" % self.mainConf.appName)
         self.setMinimumWidth(self.mainConf.pxInt(650))
         self.setMinimumHeight(self.mainConf.pxInt(600))
 
         iPx = self.mainConf.pxInt(96)
         self.guiDeco = self.theParent.theTheme.loadDecoration("nwicon", (iPx, iPx))
-        self.lblName = QLabel("<b>%s</b>" % nw.__appname__)
+        self.lblName = QLabel("<b>%s</b>" % self.mainConf.appName)
         self.lblVers = QLabel("v%s" % nw.__version__)
         self.lblDate = QLabel(datetime.strptime(nw.__date__, "%Y-%m-%d").strftime("%x"))
 
@@ -132,7 +132,7 @@ class GuiAbout(QDialog):
             "<h3>Credits</h3>"
             "<p>{credits:s}</p>"
         ).format(
-            name      = nw.__appname__,
+            name      = self.mainConf.appName,
             copyright = nw.__copyright__,
             website   = nw.__url__,
             domain    = nw.__domain__,

nw/gui/mainmenu.py

@@ -258,7 +258,7 @@ class GuiMainMenu(QMenuBar):
 
         # Project > Exit
         self.aExitNW = QAction("Exit", self)
-        self.aExitNW.setStatusTip("Exit %s" % nw.__appname__)
+        self.aExitNW.setStatusTip("Exit %s" % self.mainConf.appName)
         self.aExitNW.setShortcut("Ctrl+Q")
         self.aExitNW.triggered.connect(self._menuExit)
         self.projMenu.addAction(self.aExitNW)
@@ -804,8 +804,8 @@ class GuiMainMenu(QMenuBar):
         self.helpMenu = self.addMenu("&Help")
 
         # Help > About
-        self.aAboutNW = QAction("About %s" % nw.__appname__, self)
-        self.aAboutNW.setStatusTip("About %s" % nw.__appname__)
+        self.aAboutNW = QAction("About %s" % self.mainConf.appName, self)
+        self.aAboutNW.setStatusTip("About %s" % self.mainConf.appName)
         self.aAboutNW.triggered.connect(self._showAbout)
         self.helpMenu.addAction(self.aAboutNW)
 

nw/gui/preferences.py

@@ -108,7 +108,7 @@ class GuiPreferences(PagedDialog):
             msgBox = QMessageBox()
             msgBox.information(
                 self, "Preferences",
-                "Some changes will not be applied until %s has been restarted." % nw.__appname__
+                "Some changes will not be applied until novelWriter has been restarted."
             )
 
         if validEntries:
@@ -154,7 +154,7 @@ class GuiConfigEditGeneralTab(QWidget):
         self.mainForm.addRow(
             "Main GUI theme",
             self.selectTheme,
-            "Changing this requires restarting %s." % nw.__appname__
+            "Changing this requires restarting novelWriter."
         )
 
         ## Select Icon Theme
@@ -170,7 +170,7 @@ class GuiConfigEditGeneralTab(QWidget):
         self.mainForm.addRow(
             "Main icon theme",
             self.selectIcons,
-            "Changing this requires restarting %s." % nw.__appname__
+            "Changing this requires restarting novelWriter."
         )
 
         ## Dark Icons
@@ -193,7 +193,7 @@ class GuiConfigEditGeneralTab(QWidget):
         self.mainForm.addRow(
             "Font family",
             self.guiFont,
-            "Changing this requires restarting %s." % nw.__appname__,
+            "Changing this requires restarting novelWriter.",
             theButton = self.fontButton
         )
 
@@ -206,7 +206,7 @@ class GuiConfigEditGeneralTab(QWidget):
         self.mainForm.addRow(
             "Font size",
             self.guiFontSize,
-            "Changing this requires restarting %s." % nw.__appname__,
+            "Changing this requires restarting novelWriter.",
             theUnit = "pt"
         )