GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-11 08:31:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tim Kuipers 2016-03-03 17:11:12 +01:00
commit b0befb6309
15 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/images/Ultimaker2ExtendedPlusbackplate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
resources/images/Ultimaker2Extendedbackplate.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
resources/images/Ultimaker2Plusbackplate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

BIN
resources/images/ultimaker2plus_backplate.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

2
resources/machines/ultimaker2_extended_plus.json
View File

@ -5,7 +5,7 @@
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
"visible": false, "visible": false,
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2plus.json", "inherits": "ultimaker2plus.json",

4
resources/machines/ultimaker2_extended_plus_025.json
View File

@ -1,11 +1,11 @@
{ {
"id": "ultimaker2_extended_plus", "id": "ultimaker2_extended_plus",
"version": 1, "version": 1,
"name": "Ultimaker 2 Extended+", "name": "Ultimaker 2 Extended+",
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2_extended_plus.json", "inherits": "ultimaker2_extended_plus.json",
"variant": "0.25 mm", "variant": "0.25 mm",

4
resources/machines/ultimaker2_extended_plus_040.json
View File

@ -1,11 +1,11 @@
{ {
"id": "ultimaker2_extended_plus", "id": "ultimaker2_extended_plus",
"version": 1, "version": 1,
"name": "Ultimaker 2 Extended+", "name": "Ultimaker 2 Extended+",
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2_extended_plus.json", "inherits": "ultimaker2_extended_plus.json",
"variant": "0.4 mm", "variant": "0.4 mm",

4
resources/machines/ultimaker2_extended_plus_060.json
View File

@ -1,11 +1,11 @@
{ {
"id": "ultimaker2_extended_plus", "id": "ultimaker2_extended_plus",
"version": 1, "version": 1,
"name": "Ultimaker 2 Extended+", "name": "Ultimaker 2 Extended+",
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2_extended_plus.json", "inherits": "ultimaker2_extended_plus.json",
"variant": "0.6 mm", "variant": "0.6 mm",

4
resources/machines/ultimaker2_extended_plus_080.json
View File

@ -1,11 +1,11 @@
{ {
"id": "ultimaker2_extended_plus", "id": "ultimaker2_extended_plus",
"version": 1, "version": 1,
"name": "Ultimaker 2 Extended+", "name": "Ultimaker 2 Extended+",
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2ExtendedPlusbackplate.png",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2_extended_plus.json", "inherits": "ultimaker2_extended_plus.json",
"variant": "0.8 mm", "variant": "0.8 mm",

2
resources/machines/ultimaker2plus.json
View File

@ -5,7 +5,7 @@
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2Plusbackplate.png",
"visible": false, "visible": false,
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2.json", "inherits": "ultimaker2.json",

2
resources/machines/ultimaker2plus_025.json
View File

@ -5,7 +5,7 @@
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2Plusbackplate.png",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2plus.json", "inherits": "ultimaker2plus.json",

2
resources/machines/ultimaker2plus_040.json
View File

@ -5,7 +5,7 @@
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2Plusbackplate.png",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2plus.json", "inherits": "ultimaker2plus.json",

2
resources/machines/ultimaker2plus_060.json
View File

@ -5,7 +5,7 @@
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2Plusbackplate.png",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2plus.json", "inherits": "ultimaker2plus.json",

2
resources/machines/ultimaker2plus_080.json
View File

@ -5,7 +5,7 @@
"manufacturer": "Ultimaker", "manufacturer": "Ultimaker",
"author": "Ultimaker", "author": "Ultimaker",
"platform": "ultimaker2_platform.obj", "platform": "ultimaker2_platform.obj",
"platform_texture": "ultimaker2plus_backplate.png", "platform_texture": "Ultimaker2Plusbackplate.png",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"inherits": "ultimaker2plus.json", "inherits": "ultimaker2plus.json",

5
resources/qml/SaveButton.qml
View File

@ -79,8 +79,9 @@ Rectangle {
enabled: base.backendState == 2 && base.activity == true enabled: base.backendState == 2 && base.activity == true
height: UM.Theme.getSize("save_button_save_to_button").height height: UM.Theme.getSize("save_button_save_to_button").height
anchors.top:parent.top anchors.top: parent.top
anchors.right: deviceSelectionMenu.left; anchors.right: deviceSelectionMenu.left;
anchors.rightMargin: -3 * UM.Theme.getSize("default_lining").width;
text: UM.OutputDeviceManager.activeDeviceShortDescription text: UM.OutputDeviceManager.activeDeviceShortDescription
onClicked: onClicked:
@ -120,7 +121,7 @@ Rectangle {
Button { Button {
id: deviceSelectionMenu id: deviceSelectionMenu
tooltip: catalog.i18nc("@info:tooltip","Select the active output device"); tooltip: catalog.i18nc("@info:tooltip","Select the active output device");
anchors.top:parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width