Bumped version and removed -t command line argument

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