Merge branch '3.4'

2025-07-23 14:44:13 -06:00 · 2018-06-06 10:59:14 +02:00 · 2018-06-06 10:59:14 +02:00 · 4b581d09e7
commit 4b581d09e7
parent 753101a988 da4932435c
3 changed files with 44 additions and 17 deletions
--- 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
--- 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