Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed how the application name is passed around

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-07-31 16:41:46 +02:00
parent 02f85bd5d7
commit fc017cd8da
7 changed files with 46 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/__init__.py
+10 -11
View File
@@ -37,7 +37,6 @@ from PyQt5.QtWidgets import QApplication, QErrorMessage
from nw.config import Config from nw.config import Config
__package__ = "nw" __package__ = "nw"
__appname__ = "novelWriter"
__author__ = "Veronica Berglyd Olsen" __author__ = "Veronica Berglyd Olsen"
__copyright__ = "Copyright 2018–2020, Veronica Berglyd Olsen" __copyright__ = "Copyright 2018–2020, Veronica Berglyd Olsen"
__license__ = "GPLv3" __license__ = "GPLv3"
@@ -46,7 +45,7 @@ __hexversion__ = "0x001002f0"
__date__ = "2020-07-29" __date__ = "2020-07-29"
__maintainer__ = "Veronica Berglyd Olsen" __maintainer__ = "Veronica Berglyd Olsen"
__email__ = "code@vkbo.net" __email__ = "code@vkbo.net"
__status__ = "Pre-Release" __status__ = "Beta"
__url__ = "https://github.com/vkbo/novelWriter" __url__ = "https://github.com/vkbo/novelWriter"
__issuesurl__ = "https://github.com/vkbo/novelWriter/issues" __issuesurl__ = "https://github.com/vkbo/novelWriter/issues"
__domain__ = "novelwriter.io" __domain__ = "novelwriter.io"
@@ -91,7 +90,6 @@ CONFIG = Config()
def main(sysArgs=None): def main(sysArgs=None):
"""Parses command line, sets up logging, and launches main GUI. """Parses command line, sets up logging, and launches main GUI.
""" """
if sysArgs is None: if sysArgs is None:
sysArgs = sys.argv[1:] sysArgs = sys.argv[1:]
@@ -112,7 +110,7 @@ def main(sysArgs=None):
] ]
helpMsg = ( helpMsg = (
"{appname} {version} ({status} {date})\n" "novelWriter {version} ({status} {date})\n"
"{copyright}\n" "{copyright}\n"
"\n" "\n"
"This program is distributed in the hope that it will be useful,\n" "This program is distributed in the hope that it will be useful,\n"
@@ -133,7 +131,6 @@ def main(sysArgs=None):
" --data= Alternative user data path.\n" " --data= Alternative user data path.\n"
" --testmode Do not display GUI. Used by the test suite.\n" " --testmode Do not display GUI. Used by the test suite.\n"
).format( ).format(
appname = __appname__,
version = __version__, version = __version__,
status = __status__, status = __status__,
copyright = __copyright__, copyright = __copyright__,
@@ -168,7 +165,9 @@ def main(sysArgs=None):
print(helpMsg) print(helpMsg)
sys.exit() sys.exit()
elif inOpt in ("-v", "--version"): elif inOpt in ("-v", "--version"):
print("%s %s Version %s [%s]" % (__appname__,__status__,__version__,__date__)) print("%s %s Version %s [%s]" % (
CONFIG.appName, __status__, __version__, __date__)
)
sys.exit() sys.exit()
elif inOpt == "--info": elif inOpt == "--info":
debugLevel = logging.INFO debugLevel = logging.INFO
@@ -219,7 +218,7 @@ def main(sysArgs=None):
logger.setLevel(debugLevel) logger.setLevel(debugLevel)
logger.info("Starting %s %s (%s) %s" % ( logger.info("Starting %s %s (%s) %s" % (
__appname__, __version__, __hexversion__, __date__ CONFIG.appName, __version__, __hexversion__, __date__
)) ))
# Check Packages and Versions # Check Packages and Versions
@@ -256,7 +255,7 @@ def main(sysArgs=None):
"ERROR: %s cannot start due to the following issues:<br><br>" "ERROR: %s cannot start due to the following issues:<br><br>"
"&nbsp;-&nbsp;%s<br><br>Exiting." "&nbsp;-&nbsp;%s<br><br>Exiting."
) % ( ) % (
__appname__, "<br>&nbsp;-&nbsp;".join(errorData) CONFIG.appName, "<br>&nbsp;-&nbsp;".join(errorData)
)) ))
errApp.exec_() errApp.exec_()
sys.exit(1) sys.exit(1)
@@ -270,11 +269,11 @@ def main(sysArgs=None):
nwGUI = GuiMain() nwGUI = GuiMain()
return nwGUI return nwGUI
else: else:
nwApp = QApplication([__appname__,("-style=%s" % qtStyle)]) nwApp = QApplication([CONFIG.appName, ("-style=%s" % qtStyle)])
nwApp.setApplicationName(__appname__) nwApp.setApplicationName(CONFIG.appName)
nwApp.setApplicationVersion(__version__) nwApp.setApplicationVersion(__version__)
nwApp.setWindowIcon(QIcon(CONFIG.appIcon)) nwApp.setWindowIcon(QIcon(CONFIG.appIcon))
nwApp.setOrganizationDomain("novelwriter.io") nwApp.setOrganizationDomain(__domain__)
nwGUI = GuiMain() nwGUI = GuiMain()
sys.exit(nwApp.exec_()) sys.exit(nwApp.exec_())
nw/config.py
+2 -2
View File
@@ -52,8 +52,8 @@ class Config:
def __init__(self): def __init__(self):
# Set Application Variables # Set Application Variables
self.appName = nw.__appname__ self.appName = "novelWriter"
self.appHandle = nw.__appname__.lower() self.appHandle = self.appName.lower()
self.showGUI = True self.showGUI = True
self.debugInfo = False self.debugInfo = False
self.cmdOpen = None self.cmdOpen = None
nw/core/project.py
+12 -14
View File
@@ -368,23 +368,21 @@ class NWProject():
if fileVersion == "1.0": if fileVersion == "1.0":
msgBox = QMessageBox() msgBox = QMessageBox()
msgRes = msgBox.question(self.theParent, "Old Project Version", ( msgRes = msgBox.question(self.theParent, "Old Project Version", (
"The project file and data is created by a %s version lower than 0.7. " "The project file and data is created by a novelWriter version "
"Do you want to upgrade the project to the most recent format?<br><br>" "lower than 0.7. Do you want to upgrade the project to the "
"Note that after the upgrade, you cannot open the project with an older " "most recent format?<br><br>Note that after the upgrade, you "
"version of %s any more, so make sure you have a recent backup." "cannot open the project with an older version of novelWriter "
) % ( "any more, so make sure you have a recent backup."
nw.__appname__, nw.__appname__
)) ))
if msgRes != QMessageBox.Yes: if msgRes != QMessageBox.Yes:
return False return False
elif fileVersion != "1.1" and fileVersion != "1.2": elif fileVersion != "1.1" and fileVersion != "1.2":
self.makeAlert(( self.makeAlert((
"Unknown or unsupported {nw:s} project file format. " "Unknown or unsupported novelWriter project file format. "
"The project cannot be opened by this version of {nw:s}. " "The project cannot be opened by this version of novelWriter. "
"The file was saved with {nw:s} version {vers:s}." "The file was saved with novelWriter version {vers:s}."
).format( ).format(
nw = nw.__appname__,
vers = appVersion, vers = appVersion,
), nwAlert.ERROR) ), nwAlert.ERROR)
return False return False
@@ -395,11 +393,11 @@ class NWProject():
if int(hexVersion, 16) > int(nw.__hexversion__, 16) and self.mainConf.showGUI: if int(hexVersion, 16) > int(nw.__hexversion__, 16) and self.mainConf.showGUI:
msgBox = QMessageBox() msgBox = QMessageBox()
msgRes = msgBox.question(self.theParent, "Version Conflict", ( msgRes = msgBox.question(self.theParent, "Version Conflict", (
"This project was saved by a newer version of %s, version %s. This is version %s. " "This project was saved by a newer version of novelWriter, version %s. "
"If you continue to open the project, some attributes and settings may not be " "This is version %s. If you continue to open the project, some attributes "
"preserved. Continue opening the project?" "and settings may not be preserved. Continue opening the project?"
) % ( ) % (
nw.__appname__, appVersion, nw.__version__ appVersion, nw.__version__
)) ))
if msgRes != QMessageBox.Yes: if msgRes != QMessageBox.Yes:
return False return False
nw/gui/about.py
+3 -3
View File
@@ -54,13 +54,13 @@ class GuiAbout(QDialog):
self.innerBox = QHBoxLayout() self.innerBox = QHBoxLayout()
self.innerBox.setSpacing(self.mainConf.pxInt(16)) 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.setMinimumWidth(self.mainConf.pxInt(650))
self.setMinimumHeight(self.mainConf.pxInt(600)) self.setMinimumHeight(self.mainConf.pxInt(600))
iPx = self.mainConf.pxInt(96) iPx = self.mainConf.pxInt(96)
self.guiDeco = self.theParent.theTheme.loadDecoration("nwicon", (iPx, iPx)) 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.lblVers = QLabel("v%s" % nw.__version__)
self.lblDate = QLabel(datetime.strptime(nw.__date__, "%Y-%m-%d").strftime("%x")) self.lblDate = QLabel(datetime.strptime(nw.__date__, "%Y-%m-%d").strftime("%x"))
@@ -132,7 +132,7 @@ class GuiAbout(QDialog):
"<h3>Credits</h3>" "<h3>Credits</h3>"
"<p>{credits:s}</p>" "<p>{credits:s}</p>"
).format( ).format(
name = nw.__appname__, name = self.mainConf.appName,
copyright = nw.__copyright__, copyright = nw.__copyright__,
website = nw.__url__, website = nw.__url__,
domain = nw.__domain__, domain = nw.__domain__,
nw/gui/mainmenu.py
+3 -3
View File
@@ -258,7 +258,7 @@ class GuiMainMenu(QMenuBar):
# Project > Exit # Project > Exit
self.aExitNW = QAction("Exit", self) 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.setShortcut("Ctrl+Q")
self.aExitNW.triggered.connect(self._menuExit) self.aExitNW.triggered.connect(self._menuExit)
self.projMenu.addAction(self.aExitNW) self.projMenu.addAction(self.aExitNW)
@@ -804,8 +804,8 @@ class GuiMainMenu(QMenuBar):
self.helpMenu = self.addMenu("&Help") self.helpMenu = self.addMenu("&Help")
# Help > About # Help > About
self.aAboutNW = QAction("About %s" % nw.__appname__, self) self.aAboutNW = QAction("About %s" % self.mainConf.appName, self)
self.aAboutNW.setStatusTip("About %s" % nw.__appname__) self.aAboutNW.setStatusTip("About %s" % self.mainConf.appName)
self.aAboutNW.triggered.connect(self._showAbout) self.aAboutNW.triggered.connect(self._showAbout)
self.helpMenu.addAction(self.aAboutNW) self.helpMenu.addAction(self.aAboutNW)
nw/gui/preferences.py
+5 -5
View File
@@ -108,7 +108,7 @@ class GuiPreferences(PagedDialog):
msgBox = QMessageBox() msgBox = QMessageBox()
msgBox.information( msgBox.information(
self, "Preferences", 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: if validEntries:
@@ -154,7 +154,7 @@ class GuiConfigEditGeneralTab(QWidget):
self.mainForm.addRow( self.mainForm.addRow(
"Main GUI theme", "Main GUI theme",
self.selectTheme, self.selectTheme,
"Changing this requires restarting %s." % nw.__appname__ "Changing this requires restarting novelWriter."
) )
## Select Icon Theme ## Select Icon Theme
@@ -170,7 +170,7 @@ class GuiConfigEditGeneralTab(QWidget):
self.mainForm.addRow( self.mainForm.addRow(
"Main icon theme", "Main icon theme",
self.selectIcons, self.selectIcons,
"Changing this requires restarting %s." % nw.__appname__ "Changing this requires restarting novelWriter."
) )
## Dark Icons ## Dark Icons
@@ -193,7 +193,7 @@ class GuiConfigEditGeneralTab(QWidget):
self.mainForm.addRow( self.mainForm.addRow(
"Font family", "Font family",
self.guiFont, self.guiFont,
"Changing this requires restarting %s." % nw.__appname__, "Changing this requires restarting novelWriter.",
theButton = self.fontButton theButton = self.fontButton
) )
@@ -206,7 +206,7 @@ class GuiConfigEditGeneralTab(QWidget):
self.mainForm.addRow( self.mainForm.addRow(
"Font size", "Font size",
self.guiFontSize, self.guiFontSize,
"Changing this requires restarting %s." % nw.__appname__, "Changing this requires restarting novelWriter.",
theUnit = "pt" theUnit = "pt"
) )
nw/guimain.py
+11 -11
View File
@@ -45,8 +45,8 @@ from nw.gui import (
GuiOutline, GuiOutlineDetails, GuiPreferences, GuiProjectLoad, GuiTheme, GuiOutline, GuiOutlineDetails, GuiPreferences, GuiProjectLoad, GuiTheme,
GuiProjectSettings, GuiProjectTree, GuiWritingStats GuiProjectSettings, GuiProjectTree, GuiWritingStats
) )
from .core import NWProject, NWDoc, NWIndex from nw.core import NWProject, NWDoc, NWIndex
from .constants import nwFiles, nwItemType, nwAlert from nw.constants import nwFiles, nwItemType, nwAlert
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -220,7 +220,7 @@ class GuiMain(QMainWindow):
else: else:
self.manageProjects() self.manageProjects()
logger.debug("%s is ready ..." % nw.__appname__) logger.debug("novelWriter is ready ...")
return return
@@ -384,13 +384,13 @@ class GuiMain(QMainWindow):
msgBox = QMessageBox() msgBox = QMessageBox()
msgRes = msgBox.warning( msgRes = msgBox.warning(
self, "Project Locked", ( self, "Project Locked", (
"The project is already open by another instance of %s, and is " "The project is already open by another instance of novelWriter, and "
"therefore locked. Override lock and continue anyway?<br><br>" "is therefore locked. Override lock and continue anyway?<br><br>"
"Note: If the program or the computer previously crashed, the lock " "Note: If the program or the computer previously crashed, the lock "
"can safely be overridden. If, however, another instance of %s has " "can safely be overridden. If, however, another instance of "
"the project open, overriding the lock may corrupt the project, and " "novelWriter has the project open, overriding the lock may corrupt "
"is not recommended.%s" "the project, and is not recommended.%s"
) % (nw.__appname__, nw.__appname__, lockDetails), ) % lockDetails,
QMessageBox.Yes | QMessageBox.No, QMessageBox.No QMessageBox.Yes | QMessageBox.No, QMessageBox.No
) )
if msgRes == QMessageBox.Yes: if msgRes == QMessageBox.Yes:
@@ -872,7 +872,7 @@ class GuiMain(QMainWindow):
if msgRes != QMessageBox.Yes: if msgRes != QMessageBox.Yes:
return False return False
logger.info("Exiting %s" % nw.__appname__) logger.info("Exiting novelWriter")
if not self.isFocusMode: if not self.isFocusMode:
self.mainConf.setMainPanePos(self.splitMain.sizes()) self.mainConf.setMainPanePos(self.splitMain.sizes())
@@ -1037,7 +1037,7 @@ class GuiMain(QMainWindow):
return True return True
def _setWindowTitle(self, projName=None): def _setWindowTitle(self, projName=None):
winTitle = "%s" % nw.__appname__ winTitle = self.mainConf.appName
if projName is not None: if projName is not None:
winTitle += " - %s" % projName winTitle += " - %s" % projName
self.setWindowTitle(winTitle) self.setWindowTitle(winTitle)