diff --git a/nw/__init__.py b/nw/__init__.py index 02b62656..e5da6b5c 100644 --- a/nw/__init__.py +++ b/nw/__init__.py @@ -25,8 +25,8 @@ __package__ = "novelWriter" __author__ = "Veronica Berglyd Olsen" __copyright__ = "Copyright 2018–2019, Veronica Berglyd Olsen" __license__ = "GPLv3" -__version__ = "0.4.3" -__date__ = "2019-11-24" +__version__ = "0.4.4" +__date__ = "2020-02-17" __maintainer__ = "Veronica Berglyd Olsen" __email__ = "code@vkbo.net" __status__ = "Development" @@ -77,14 +77,13 @@ def main(sysArgs=None): sysArgs = sys.argv[1:] # Valid Input Options - shortOpt = "hdiqtl:v" + shortOpt = "hdiql:v" longOpt = [ "help", "debug", "info", "verbose", "quiet", - "time", "logfile=", "version", "config=", @@ -103,7 +102,6 @@ def main(sysArgs=None): " -d, --debug Print debug output.\n" " --verbose Increase verbosity of debug output.\n" " -q, --quiet Disable output to command line. Does not affect log file.\n" - " -t, --time Shows time stamp in logging output.\n" " -l, --logfile= Specify log file.\n" " --style= Set Qt5 style flag. Defaults to 'Fusion'.\n" " --config= Alternative config file.\n" @@ -118,11 +116,9 @@ def main(sysArgs=None): # Defaults debugLevel = logging.WARN debugStr = "{levelname:8} {message:}" - timeStr = "[{asctime:}] " logFile = "" toFile = False toStd = True - showTime = False confPath = None testMode = False qtStyle = "Fusion" @@ -149,7 +145,7 @@ def main(sysArgs=None): debugLevel = logging.INFO elif inOpt in ("-d", "--debug"): debugLevel = logging.DEBUG - debugStr = "{name:>30}:{lineno:<4d} {levelname:8} {message:}" + debugStr = "[{asctime:}] {name:>30}:{lineno:<4d} {levelname:8} {message:}" elif inOpt in ("-l","--logfile"): logFile = inArg toFile = True @@ -157,8 +153,6 @@ def main(sysArgs=None): toStd = False elif inOpt in ("--verbose"): debugLevel = VERBOSE - elif inOpt in ("-t","--time"): - showTime = True elif inOpt in ("--style"): qtStyle = inArg elif inOpt in ("--config"): @@ -172,7 +166,6 @@ def main(sysArgs=None): CONFIG.cmdOpen = cmdOpen # Set Logging - if showTime: debugStr = timeStr+debugStr logFmt = logging.Formatter(fmt=debugStr,datefmt="%Y-%m-%d %H:%M:%S",style="{") if not logFile == "" and toFile: @@ -201,6 +194,8 @@ def main(sysArgs=None): return nwGUI else: nwApp = QApplication([__package__,("-style=%s" % qtStyle)]) + nwApp.setApplicationName(__package__) + nwApp.setApplicationVersion(__version__) nwGUI = GuiMain() sys.exit(nwApp.exec_()) diff --git a/setup.py b/setup.py index 081befd5..7d2436dd 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open("README.md", "r") as inFile: setuptools.setup( name = "novelWriter", - version = "0.4.3", + version = "0.4.4", author = "Veronica Berglyd Olsen", author_email = "code@vkbo.net", description = "A markdown-like document editor for writing novels", @@ -35,7 +35,7 @@ setuptools.setup( "Natural Language :: English", "Topic :: Text Editors", ], - python_requires = ">=3.5", + python_requires = ">=3.6", install_requires = [ "pyqt5", "lxml",