GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 20:29:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Ultimaker/Cura

Browse Source
This commit is contained in:
Tim Kuipers 2015-09-04 10:12:20 +02:00
commit 6d207a75d1
7 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
installer.nsi
View File

@ -1,5 +1,5 @@
!ifndef VERSION !ifndef VERSION
!define VERSION '15.05.97' !define VERSION '15.09.80'
!endif !endif
; The name of the installer ; The name of the installer
@ -45,7 +45,7 @@ SetCompressor /SOLID lzma
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink" !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchLink"
;Add an option to show release notes ;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 ; Pages
;!insertmacro MUI_PAGE_WELCOME ;!insertmacro MUI_PAGE_WELCOME
@ -111,24 +111,24 @@ Section "Install Visual Studio 2010 Redistributable"
SectionEnd SectionEnd
;Section "Install Arduino Drivers" Section "Install Arduino Drivers"
; ; Set output path to the driver directory. ; Set output path to the driver directory.
; SetOutPath "$INSTDIR\drivers\" SetOutPath "$INSTDIR\drivers\"
; File /r "drivers\" File /r "drivers\"
;
; ${If} ${RunningX64} ${If} ${RunningX64}
; IfSilent +2 IfSilent +2
; ExecWait '"$INSTDIR\drivers\dpinst64.exe" /lm' ExecWait '"$INSTDIR\drivers\dpinst64.exe" /lm'
; ${Else} ${Else}
; IfSilent +2 IfSilent +2
; ExecWait '"$INSTDIR\drivers\dpinst32.exe" /lm' ExecWait '"$INSTDIR\drivers\dpinst32.exe" /lm'
; ${EndIf} ${EndIf}
;SectionEnd SectionEnd
Section "Open STL files with Cura" Section "Open STL files with Cura"
WriteRegStr HKCR .stl "" "Cura STL model file" WriteRegStr HKCR .stl "" "Cura STL model file"
DeleteRegValue HKCR .stl "Content Type" 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"
WriteRegStr HKCR "Cura STL model file\shell\open\command" "" '"$INSTDIR\Cura.exe" "%1"' WriteRegStr HKCR "Cura STL model file\shell\open\command" "" '"$INSTDIR\Cura.exe" "%1"'
SectionEnd SectionEnd
@ -136,7 +136,7 @@ SectionEnd
Section /o "Open OBJ files with Cura" Section /o "Open OBJ files with Cura"
WriteRegStr HKCR .obj "" "Cura OBJ model file" WriteRegStr HKCR .obj "" "Cura OBJ model file"
DeleteRegValue HKCR .obj "Content Type" 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"
WriteRegStr HKCR "Cura OBJ model file\shell\open\command" "" '"$INSTDIR\Cura.exe" "%1"' WriteRegStr HKCR "Cura OBJ model file\shell\open\command" "" '"$INSTDIR\Cura.exe" "%1"'
SectionEnd SectionEnd

10
resources/machines/ultimaker_original.json
View File

@ -9,11 +9,11 @@
"inherits": "fdmprinter.json", "inherits": "fdmprinter.json",
"add_pages": [ "pages": [
{"page": "SelectUpgradedParts", "title": "Select Upgraded Parts"}, "SelectUpgradedParts",
{"page": "UpgradeFirmware", "title": "Upgrade Ultimaker Firmware"}, "UpgradeFirmware",
{"page": "UltimakerCheckup", "title": "Ultimaker Checkup"}, "UltimakerCheckup",
{"page": "Bedleveling", "title": "Bedleveling Wizard"} "BedLeveling"
], ],
"machine_extruder_trains": [ "machine_extruder_trains": [

1
resources/machines/ultimaker_original_plus.json
View File

@ -11,7 +11,6 @@
"inherits": "ultimaker_original.json", "inherits": "ultimaker_original.json",
"pages": [ "pages": [
"SelectUpgradedParts",
"UpgradeFirmware", "UpgradeFirmware",
"UltimakerCheckup", "UltimakerCheckup",
"BedLeveling" "BedLeveling"

2
resources/qml/AddMachineWizard.qml
View File

@ -22,7 +22,7 @@ UM.Wizard
firstRun: false firstRun: false
Component.onCompleted: { 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; base.currentPage = 0;
} }

11
resources/qml/SaveButton.qml
View File

@ -193,14 +193,21 @@ Rectangle {
color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button color: control.hovered ? UM.Theme.colors.load_save_button_hover : UM.Theme.colors.load_save_button
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
width: { width: {
var w = 0;
if (base.width*0.55 > actualLabel.width + (UM.Theme.sizes.default_margin.width * 2)){ if (base.width*0.55 > actualLabel.width + (UM.Theme.sizes.default_margin.width * 2)){
saveToButton.resizedWidth = base.width*0.55 saveToButton.resizedWidth = base.width*0.55
return base.width*0.55 w = base.width*0.55
} }
else { else {
saveToButton.resizedWidth = actualLabel.width + (UM.Theme.sizes.default_margin.width * 2) 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 { Label {
id: actualLabel id: actualLabel

8
resources/qml/WizardPages/AddMachine.qml
View File

@ -203,16 +203,16 @@ Item
console.log(pages[i]) console.log(pages[i])
switch(pages[i]) { switch(pages[i]) {
case "SelectUpgradedParts": 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; break;
case "UpgradeFirmware": 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; break;
case "UltimakerCheckup": 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; break;
case "BedLeveling": 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; break;
default: default:
break; break;

11
setup.py
View File

@ -5,6 +5,7 @@ from distutils.core import setup
import py2exe import py2exe
import UM import UM
import UM.Qt import UM.Qt
import cura
import os import os
import re import re
import shutil import shutil
@ -22,7 +23,7 @@ def copytree(src, dst, symlinks=False, ignore=None):
else: else:
shutil.copy2(s, d) 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. # 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__)): for dirpath, dirnames, filenames in os.walk(os.path.dirname(UM.__file__)):
if "__" in dirpath: if "__" in dirpath:
@ -41,9 +42,9 @@ print("Removing previous distribution package")
shutil.rmtree("dist", True) shutil.rmtree("dist", True)
setup(name="Cura", setup(name="Cura",
version="15.05.97", version="15.09.80",
author="Ultimaker", author="Ultimaker",
author_email="d.braam@ultimaker.com", author_email="a.hiemstra@ultimaker.com",
url="http://software.ultimaker.com/", url="http://software.ultimaker.com/",
license="GNU AFFERO GENERAL PUBLIC LICENSE (AGPL)", license="GNU AFFERO GENERAL PUBLIC LICENSE (AGPL)",
scripts=["cura_app.py"], scripts=["cura_app.py"],
@ -54,9 +55,9 @@ setup(name="Cura",
print("Coping Cura plugins.") print("Coping Cura plugins.")
shutil.copytree(os.path.dirname(UM.__file__) + "/../plugins", "dist/plugins", ignore = shutil.ignore_patterns("ConsoleLogger", "OBJWriter", "MLPWriter", "MLPReader")) shutil.copytree(os.path.dirname(UM.__file__) + "/../plugins", "dist/plugins", ignore = shutil.ignore_patterns("ConsoleLogger", "OBJWriter", "MLPWriter", "MLPReader"))
for path in os.listdir("plugins"): for path in os.listdir("plugins"):
shutil.copytree("plugins/" + path, "dist/plugins/" + path) copytree("plugins/" + path, "dist/plugins/" + path)
print("Coping resources.") 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") copytree("resources", "dist/resources")
print("Coping Uranium QML.") print("Coping Uranium QML.")
shutil.copytree(os.path.dirname(UM.__file__) + "/Qt/qml/UM", "dist/qml/UM") shutil.copytree(os.path.dirname(UM.__file__) + "/Qt/qml/UM", "dist/qml/UM")