diff --git a/cura_app.py b/cura_app.py index 8a04b8fe09..d540c8a8c4 100755 --- a/cura_app.py +++ b/cura_app.py @@ -1,6 +1,6 @@ #!/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. import argparse @@ -27,7 +27,7 @@ known_args = vars(parser.parse_known_args()[0]) if not known_args["debug"]: def get_cura_dir_path(): if Platform.isWindows(): - return os.path.expanduser("~/AppData/Roaming/cura/") + return os.path.expanduser("~/AppData/Roaming/cura") elif Platform.isLinux(): return os.path.expanduser("~/.local/share/cura") elif Platform.isOSX(): diff --git a/resources/qml/WorkspaceSummaryDialog.qml b/resources/qml/WorkspaceSummaryDialog.qml index 0869d7e698..079d840ae7 100644 --- a/resources/qml/WorkspaceSummaryDialog.qml +++ b/resources/qml/WorkspaceSummaryDialog.qml @@ -148,9 +148,22 @@ UM.Dialog { height: childrenRect.height 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 } Row diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 4196a3a9e7..82045db93b 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -34,6 +34,7 @@ retraction_hop_enabled [cooling] cool_fan_enabled +cool_fan_speed [support] support_enable