mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-07-11 03:11:48 +08:00
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
This commit is contained in:
commit
b0befb6309
BIN
resources/images/Ultimaker2ExtendedPlusbackplate.png
Normal file
BIN
resources/images/Ultimaker2ExtendedPlusbackplate.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 15 KiB |
Binary file not shown.
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 15 KiB |
BIN
resources/images/Ultimaker2Plusbackplate.png
Normal file
BIN
resources/images/Ultimaker2Plusbackplate.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 13 KiB |
Binary file not shown.
Before Width: | Height: | Size: 13 KiB |
@ -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",
|
||||||
|
@ -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",
|
||||||
|
@ -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",
|
||||||
|
@ -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",
|
||||||
|
@ -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",
|
||||||
|
@ -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",
|
||||||
|
@ -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,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,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,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",
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user