Clean up the launcher script, and some other bits.
This commit is contained in:
@@ -3,10 +3,6 @@
|
|||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
if sys.hexversion < 0x030600F0:
|
|
||||||
print("ERROR: At least Python 3.6 is required")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import PyQt5.QtWidgets
|
import PyQt5.QtWidgets
|
||||||
import PyQt5.QtGui
|
import PyQt5.QtGui
|
||||||
@@ -15,18 +11,6 @@ except:
|
|||||||
print("ERROR: Failed to load dependency python3-pyqt5")
|
print("ERROR: Failed to load dependency python3-pyqt5")
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
try:
|
|
||||||
import PyQt5.QtSvg
|
|
||||||
except:
|
|
||||||
print("ERROR: Failed to load dependency python3-pyqt5.qtsvg")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
try:
|
|
||||||
import lxml
|
|
||||||
except:
|
|
||||||
print("ERROR: Failed to load dependency python3-lxml")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
import nw
|
import nw
|
||||||
nw.main(sys.argv[1:])
|
nw.main(sys.argv[1:])
|
||||||
|
|||||||
+2
-2
@@ -67,7 +67,7 @@ __credits__ = [
|
|||||||
# VERBOSE Use for outputting values and program flow details
|
# VERBOSE Use for outputting values and program flow details
|
||||||
#
|
#
|
||||||
|
|
||||||
# Adding verbose logging levels
|
# Add verbose logging level
|
||||||
VERBOSE = 5
|
VERBOSE = 5
|
||||||
logging.addLevelName(VERBOSE, "VERBOSE")
|
logging.addLevelName(VERBOSE, "VERBOSE")
|
||||||
def logVerbose(self, message, *args, **kws):
|
def logVerbose(self, message, *args, **kws):
|
||||||
@@ -254,8 +254,8 @@ def main(sysArgs=None):
|
|||||||
errApp.exec_()
|
errApp.exec_()
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
# Finish initialising config, and launch GUI
|
||||||
CONFIG.initConfig(confPath, dataPath)
|
CONFIG.initConfig(confPath, dataPath)
|
||||||
|
|
||||||
if testMode:
|
if testMode:
|
||||||
nwGUI = GuiMain()
|
nwGUI = GuiMain()
|
||||||
return nwGUI
|
return nwGUI
|
||||||
|
|||||||
Reference in New Issue
Block a user