diff --git a/installer.nsi b/installer.nsi index ec6da5f8e4..79704eece8 100644 --- a/installer.nsi +++ b/installer.nsi @@ -1,5 +1,5 @@ !ifndef VERSION - !define VERSION '15.05.97' + !define VERSION '15.09.80' !endif ; The name of the installer @@ -45,7 +45,7 @@ SetCompressor /SOLID lzma !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink" ;Add an option to show release notes -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\release_notes.txt" +!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\plugins\ChangeLogPlugin\changelog.txt" ; Pages ;!insertmacro MUI_PAGE_WELCOME @@ -111,24 +111,24 @@ Section "Install Visual Studio 2010 Redistributable" SectionEnd -;Section "Install Arduino Drivers" -; ; Set output path to the driver directory. -; SetOutPath "$INSTDIR\drivers\" -; File /r "drivers\" -; -; ${If} ${RunningX64} -; IfSilent +2 -; ExecWait '"$INSTDIR\drivers\dpinst64.exe" /lm' -; ${Else} -; IfSilent +2 -; ExecWait '"$INSTDIR\drivers\dpinst32.exe" /lm' -; ${EndIf} -;SectionEnd +Section "Install Arduino Drivers" + ; Set output path to the driver directory. + SetOutPath "$INSTDIR\drivers\" + File /r "drivers\" + + ${If} ${RunningX64} + IfSilent +2 + ExecWait '"$INSTDIR\drivers\dpinst64.exe" /lm' + ${Else} + IfSilent +2 + ExecWait '"$INSTDIR\drivers\dpinst32.exe" /lm' + ${EndIf} +SectionEnd Section "Open STL files with Cura" WriteRegStr HKCR .stl "" "Cura STL model file" DeleteRegValue HKCR .stl "Content Type" - WriteRegStr HKCR "Cura STL model file\DefaultIcon" "" "$INSTDIR\resources\stl.ico,0" + WriteRegStr HKCR "Cura STL model file\DefaultIcon" "" "$INSTDIR\Cura.exe,0" WriteRegStr HKCR "Cura STL model file\shell" "" "open" WriteRegStr HKCR "Cura STL model file\shell\open\command" "" '"$INSTDIR\Cura.exe" "%1"' SectionEnd @@ -136,7 +136,7 @@ SectionEnd Section /o "Open OBJ files with Cura" WriteRegStr HKCR .obj "" "Cura OBJ model file" DeleteRegValue HKCR .obj "Content Type" - WriteRegStr HKCR "Cura OBJ model file\DefaultIcon" "" "$INSTDIR\resources\stl.ico,0" + WriteRegStr HKCR "Cura OBJ model file\DefaultIcon" "" "$INSTDIR\Cura.exe,0" WriteRegStr HKCR "Cura OBJ model file\shell" "" "open" WriteRegStr HKCR "Cura OBJ model file\shell\open\command" "" '"$INSTDIR\Cura.exe" "%1"' SectionEnd diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json index 555c7e7363..ca3ea7f3e3 100644 --- a/resources/machines/ultimaker_original.json +++ b/resources/machines/ultimaker_original.json @@ -9,11 +9,11 @@ "inherits": "fdmprinter.json", - "add_pages": [ - {"page": "SelectUpgradedParts", "title": "Select Upgraded Parts"}, - {"page": "UpgradeFirmware", "title": "Upgrade Ultimaker Firmware"}, - {"page": "UltimakerCheckup", "title": "Ultimaker Checkup"}, - {"page": "Bedleveling", "title": "Bedleveling Wizard"} + "pages": [ + "SelectUpgradedParts", + "UpgradeFirmware", + "UltimakerCheckup", + "BedLeveling" ], "machine_extruder_trains": [ diff --git a/resources/machines/ultimaker_original_plus.json b/resources/machines/ultimaker_original_plus.json index baed0ca3aa..4bb4b94a45 100644 --- a/resources/machines/ultimaker_original_plus.json +++ b/resources/machines/ultimaker_original_plus.json @@ -11,7 +11,6 @@ "inherits": "ultimaker_original.json", "pages": [ - "SelectUpgradedParts", "UpgradeFirmware", "UltimakerCheckup", "BedLeveling" diff --git a/resources/qml/AddMachineWizard.qml b/resources/qml/AddMachineWizard.qml index 22b5e67a74..1c743834de 100644 --- a/resources/qml/AddMachineWizard.qml +++ b/resources/qml/AddMachineWizard.qml @@ -22,7 +22,7 @@ UM.Wizard firstRun: false Component.onCompleted: { - base.appendPage(UM.Resources.getPath(Cura.ResourceTypes.QmlFiles, "WizardPages/AddMachine.qml"), catalog.i18nc("@title", "Add Printer")); + base.appendPage(Qt.resolvedUrl("WizardPages/AddMachine.qml"), catalog.i18nc("@title", "Add Printer")); base.currentPage = 0; } diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index 50808f9777..4b0770d652 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -193,14 +193,21 @@ Rectangle { color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button Behavior on color { ColorAnimation { duration: 50; } } width: { + var w = 0; if (base.width*0.55 > actualLabel.width + (UM.Theme.sizes.default_margin.width * 2)){ saveToButton.resizedWidth = base.width*0.55 - return base.width*0.55 + w = base.width*0.55 } else { saveToButton.resizedWidth = actualLabel.width + (UM.Theme.sizes.default_margin.width * 2) - return actualLabel.width + (UM.Theme.sizes.default_margin.width * 2) + w = actualLabel.width + (UM.Theme.sizes.default_margin.width * 2) } + + if(w < base.width * 0.55) { + w = base.width * 0.55; + } + + return w; } Label { id: actualLabel diff --git a/resources/qml/WizardPages/AddMachine.qml b/resources/qml/WizardPages/AddMachine.qml index 826a9bc0d7..0719e0b593 100644 --- a/resources/qml/WizardPages/AddMachine.qml +++ b/resources/qml/WizardPages/AddMachine.qml @@ -203,16 +203,16 @@ Item console.log(pages[i]) switch(pages[i]) { case "SelectUpgradedParts": - base.wizard.appendPage(UM.Resources.getPath(Cura.ResourceTypes.QmlFiles, "WizardPages/SelectUpgradedParts.qml"), catalog.i18nc("@title", "Select Upgraded Parts")); + base.wizard.appendPage(Qt.resolvedUrl("SelectUpgradedParts.qml"), catalog.i18nc("@title", "Select Upgraded Parts")); break; case "UpgradeFirmware": - base.wizard.appendPage(UM.Resources.getPath(Cura.ResourceTypes.QmlFiles, "WizardPages/UpgradeFirmware.qml"), catalog.i18nc("@title", "Upgrade Firmware")); + base.wizard.appendPage(Qt.resolvedUrl("UpgradeFirmware.qml"), catalog.i18nc("@title", "Upgrade Firmware")); break; case "UltimakerCheckup": - base.wizard.appendPage(UM.Resources.getPath(Cura.ResourceTypes.QmlFiles, "WizardPages/UltimakerCheckup.qml"), catalog.i18nc("@title", "Check Printer")); + base.wizard.appendPage(Qt.resolvedUrl("UltimakerCheckup.qml"), catalog.i18nc("@title", "Check Printer")); break; case "BedLeveling": - base.wizard.appendPage(UM.Resources.getPath(Cura.ResourceTypes.QmlFiles, "WizardPages/Bedleveling.qml"), catalog.i18nc("@title", "Bed Levelling")); + base.wizard.appendPage(Qt.resolvedUrl("Bedleveling.qml"), catalog.i18nc("@title", "Bed Levelling")); break; default: break; diff --git a/setup.py b/setup.py index 08b1564c16..f5b3c3e106 100644 --- a/setup.py +++ b/setup.py @@ -5,6 +5,7 @@ from distutils.core import setup import py2exe import UM import UM.Qt +import cura import os import re import shutil @@ -22,7 +23,7 @@ def copytree(src, dst, symlinks=False, ignore=None): else: shutil.copy2(s, d) -includes = ["sip", "ctypes", "UM", "PyQt5.QtNetwork", "PyQt5._QOpenGLFunctions_2_0", "serial", "Arcus", "google", "google.protobuf", "google.protobuf.descriptor", "xml.etree", "xml.etree.ElementTree", "cura"] +includes = ["sip", "ctypes", "UM", "PyQt5.QtNetwork", "PyQt5._QOpenGLFunctions_2_0", "serial", "Arcus", "google", "google.protobuf", "google.protobuf.descriptor", "xml.etree", "xml.etree.ElementTree", "cura", "cura.OneAtATimeIterator"] # Include all the UM modules in the includes. As py2exe fails to properly find all the dependencies due to the plugin architecture. for dirpath, dirnames, filenames in os.walk(os.path.dirname(UM.__file__)): if "__" in dirpath: @@ -41,9 +42,9 @@ print("Removing previous distribution package") shutil.rmtree("dist", True) setup(name="Cura", - version="15.05.97", + version="15.09.80", author="Ultimaker", - author_email="d.braam@ultimaker.com", + author_email="a.hiemstra@ultimaker.com", url="http://software.ultimaker.com/", license="GNU AFFERO GENERAL PUBLIC LICENSE (AGPL)", scripts=["cura_app.py"], @@ -54,9 +55,9 @@ setup(name="Cura", print("Coping Cura plugins.") shutil.copytree(os.path.dirname(UM.__file__) + "/../plugins", "dist/plugins", ignore = shutil.ignore_patterns("ConsoleLogger", "OBJWriter", "MLPWriter", "MLPReader")) for path in os.listdir("plugins"): - shutil.copytree("plugins/" + path, "dist/plugins/" + path) + copytree("plugins/" + path, "dist/plugins/" + path) print("Coping resources.") -shutil.copytree(os.path.dirname(UM.__file__) + "/../resources", "dist/resources") +copytree(os.path.dirname(UM.__file__) + "/../resources", "dist/resources") copytree("resources", "dist/resources") print("Coping Uranium QML.") shutil.copytree(os.path.dirname(UM.__file__) + "/Qt/qml/UM", "dist/qml/UM")