diff --git a/LogarithmPlotter/logarithmplotter.py b/LogarithmPlotter/logarithmplotter.py index b71d18c..1e534f2 100644 --- a/LogarithmPlotter/logarithmplotter.py +++ b/LogarithmPlotter/logarithmplotter.py @@ -181,14 +181,15 @@ def run(): engine.addImportPath(path.realpath(path.join(getcwd(), "qml"))) engine.load(path.realpath(path.join(getcwd(), "qml", "eu", "ad5001", "LogarithmPlotter", "LogarithmPlotter.qml"))) + if not engine.rootObjects(): + print("No root object", path.realpath(path.join(getcwd(), "qml"))) + print(path.realpath(path.join(getcwd(), "qml", "eu", "ad5001", "LogarithmPlotter", "LogarithmPlotter.qml"))) + exit(-1) + chdir(pwd) if len(argv) > 0 and path.exists(argv[-1]) and argv[-1].split('.')[-1] in ['lpf']: engine.rootObjects()[0].loadDiagram(argv[-1]) chdir(path.dirname(path.realpath(__file__))) - - if not engine.rootObjects(): - print("No root object") - exit(-1) if platform == "darwin": macOSFileOpenHandler.init_graphics(engine.rootObjects()[0]) diff --git a/package-windows.bat b/package-windows.bat index 2414542..777f2f9 100644 --- a/package-windows.bat +++ b/package-windows.bat @@ -4,3 +4,4 @@ XCOPY LICENSE.md dist\logarithmplotter /C /D /Y rem Creating installer cd dist\logarithmplotter "C:\Program Files (x86)\NSIS\makensis" installer.nsi +cd ..\.. diff --git a/win/inst_banner.bmp b/win/inst_banner.bmp index 72b9178..6eb8b65 100644 Binary files a/win/inst_banner.bmp and b/win/inst_banner.bmp differ diff --git a/win/installer.nsi b/win/installer.nsi index 1ac3c7c..1ceaab2 100644 --- a/win/installer.nsi +++ b/win/installer.nsi @@ -56,6 +56,7 @@ VIAddVersionKey "FileVersion" "${APP_VERSION}" ;Icons Icon "logarithmplotter.ico" +!define MUI_ICON "logarithmplotter.ico" ;!define MUI_HEADERIMAGE ;!define MUI_HEADERIMAGE_BITMAP "logarithmplotter.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "inst_banner.bmp"