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

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

Browse Source
This commit is contained in:
Diego Prado Gesto 2018-06-06 14:58:23 +02:00
commit 343c606df6
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura_app.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright (c) 2015 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import argparse import argparse
@ -27,7 +27,7 @@ known_args = vars(parser.parse_known_args()[0])
if not known_args["debug"]: if not known_args["debug"]:
def get_cura_dir_path(): def get_cura_dir_path():
if Platform.isWindows(): if Platform.isWindows():
return os.path.expanduser("~/AppData/Roaming/cura/") return os.path.expanduser("~/AppData/Roaming/cura")
elif Platform.isLinux(): elif Platform.isLinux():
return os.path.expanduser("~/.local/share/cura") return os.path.expanduser("~/.local/share/cura")
elif Platform.isOSX(): elif Platform.isOSX():

17
resources/qml/WorkspaceSummaryDialog.qml
View File

@ -148,9 +148,22 @@ UM.Dialog
{ {
height: childrenRect.height height: childrenRect.height
width: parent.width width: parent.width
Label Label
{ {
text: catalog.i18nc("@action:label", "Extruder %1").arg(modelData) text: {
var extruder = Number(modelData)
var extruder_id = ""
if(!isNaN(extruder))
{
extruder_id = extruder + 1 // The extruder counter start from One and not Zero
}
else
{
extruder_id = modelData
}
return catalog.i18nc("@action:label", "Extruder %1").arg(extruder_id)
}
font.bold: true font.bold: true
} }
Row Row

1
resources/setting_visibility/basic.cfg
View File

@ -34,6 +34,7 @@ retraction_hop_enabled
[cooling] [cooling]
cool_fan_enabled cool_fan_enabled
cool_fan_speed
[support] [support]
support_enable support_enable