diff options
25 files changed, 50 insertions, 45 deletions
diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index badb66fb55..a410d10cc1 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -314,11 +314,11 @@ class ExtruderManager(QObject): if not global_stack: return [] - result = list(global_stack.extruders.values()) + result_tuple_list = sorted(list(global_stack.extruders.items()), key = lambda x: int(x[0])) + result_list = [item[1] for item in result_tuple_list] machine_extruder_count = global_stack.getProperty("machine_extruder_count", "value") - - return result[:machine_extruder_count] + return result_list[:machine_extruder_count] def _globalContainerStackChanged(self) -> None: # If the global container changed, the machine changed and might have extruders that were not registered yet diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.qml b/plugins/MachineSettingsAction/MachineSettingsAction.qml index 8c2262b5b7..505c988a13 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.qml +++ b/plugins/MachineSettingsAction/MachineSettingsAction.qml @@ -891,7 +891,7 @@ Cura.MachineAction { id: machineHeadPolygonProvider - containerStackId: base.acthiveMachineId + containerStackId: base.activeMachineId key: "machine_head_with_fans_polygon" watchedProperties: [ "value" ] storeIndex: manager.containerIndex diff --git a/plugins/SimulationView/SimulationView.qml b/plugins/SimulationView/SimulationView.qml index b4ca9584c7..8d671dcb56 100644 --- a/plugins/SimulationView/SimulationView.qml +++ b/plugins/SimulationView/SimulationView.qml @@ -670,6 +670,7 @@ Item onCurrentLayerChanged: { playButton.pauseSimulation() + pathSlider.setHandleValue(0) // After updating the layer set Path slider to 0 layerSlider.setUpperValue(UM.SimulationView.currentLayer) } } diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index cc9f8ac354..9488b50e4e 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -626,7 +626,7 @@ class Toolbox(QObject, Extension): # HACK: Do nothing because we'll handle these from the "packages" call if type in do_not_handle: - return + continue if reply.url() == url: if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200: diff --git a/resources/extruders/ultimaker_s5_extruder_left.def.json b/resources/extruders/ultimaker_s5_extruder_left.def.json index c92873b987..275f60bb31 100644 --- a/resources/extruders/ultimaker_s5_extruder_left.def.json +++ b/resources/extruders/ultimaker_s5_extruder_left.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0 }, "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 310 }, + "machine_extruder_start_pos_x": { "default_value": 330 }, "machine_extruder_start_pos_y": { "default_value": 237 }, "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 310 }, + "machine_extruder_end_pos_x": { "default_value": 330 }, "machine_extruder_end_pos_y": { "default_value": 237 }, "machine_nozzle_head_distance": { "default_value": 2.7 }, "extruder_prime_pos_x": { "default_value": -3 }, diff --git a/resources/extruders/ultimaker_s5_extruder_right.def.json b/resources/extruders/ultimaker_s5_extruder_right.def.json index 89d62b89a4..92e08f5cc5 100644 --- a/resources/extruders/ultimaker_s5_extruder_right.def.json +++ b/resources/extruders/ultimaker_s5_extruder_right.def.json @@ -17,10 +17,10 @@ "machine_nozzle_offset_y": { "default_value": 0 }, "machine_extruder_start_pos_abs": { "default_value": true }, - "machine_extruder_start_pos_x": { "default_value": 310 }, + "machine_extruder_start_pos_x": { "default_value": 330 }, "machine_extruder_start_pos_y": { "default_value": 219 }, "machine_extruder_end_pos_abs": { "default_value": true }, - "machine_extruder_end_pos_x": { "default_value": 310 }, + "machine_extruder_end_pos_x": { "default_value": 330 }, "machine_extruder_end_pos_y": { "default_value": 219 }, "machine_nozzle_head_distance": { "default_value": 4.2 }, "extruder_prime_pos_x": { "default_value": 333 }, diff --git a/resources/i18n/cura.pot b/resources/i18n/cura.pot index 71c55ffc21..4235f75461 100644 --- a/resources/i18n/cura.pot +++ b/resources/i18n/cura.pot @@ -3955,7 +3955,7 @@ msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." +msgid "About..." msgstr "" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 diff --git a/resources/i18n/de_DE/cura.po b/resources/i18n/de_DE/cura.po index 645082a2bb..9428eef444 100644 --- a/resources/i18n/de_DE/cura.po +++ b/resources/i18n/de_DE/cura.po @@ -3802,8 +3802,8 @@ msgstr "&Fehler melden" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "&Über..." +msgid "About..." +msgstr "Über..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/es_ES/cura.po b/resources/i18n/es_ES/cura.po index 88b8e779ff..66968f77ab 100644 --- a/resources/i18n/es_ES/cura.po +++ b/resources/i18n/es_ES/cura.po @@ -3814,8 +3814,8 @@ msgstr "Informar de un &error" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "&Acerca de..." +msgid "About..." +msgstr "Acerca de..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/fi_FI/cura.po b/resources/i18n/fi_FI/cura.po index 4684ff69d8..eb2d6ef7fb 100644 --- a/resources/i18n/fi_FI/cura.po +++ b/resources/i18n/fi_FI/cura.po @@ -3821,8 +3821,8 @@ msgstr "Ilmoita &virheestä" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "Ti&etoja..." +msgid "About..." +msgstr "Tietoja..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/fr_FR/cura.po b/resources/i18n/fr_FR/cura.po index 6591073c98..980cb7fa3a 100644 --- a/resources/i18n/fr_FR/cura.po +++ b/resources/i18n/fr_FR/cura.po @@ -3802,8 +3802,8 @@ msgstr "Notifier un &bug" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "&À propos de..." +msgid "About..." +msgstr "À propos de..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/it_IT/cura.po b/resources/i18n/it_IT/cura.po index 361a65c542..e8d84822b8 100644 --- a/resources/i18n/it_IT/cura.po +++ b/resources/i18n/it_IT/cura.po @@ -3800,8 +3800,8 @@ msgstr "Se&gnala un errore" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "I&nformazioni..." +msgid "About..." +msgstr "Informazioni..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/ja_JP/cura.po b/resources/i18n/ja_JP/cura.po index 5bfcf0af02..3f002a6346 100644 --- a/resources/i18n/ja_JP/cura.po +++ b/resources/i18n/ja_JP/cura.po @@ -3806,7 +3806,7 @@ msgstr "報告&バグ" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." +msgid "About..." msgstr "アバウト..." # can’t enter japanese text diff --git a/resources/i18n/ko_KR/cura.po b/resources/i18n/ko_KR/cura.po index a3bd842bd3..77e12af28e 100644 --- a/resources/i18n/ko_KR/cura.po +++ b/resources/i18n/ko_KR/cura.po @@ -3798,7 +3798,7 @@ msgstr "버그 리포트" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." +msgid "About..." msgstr "소개..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 diff --git a/resources/i18n/nl_NL/cura.po b/resources/i18n/nl_NL/cura.po index 24e27c09b5..8d21c5a805 100644 --- a/resources/i18n/nl_NL/cura.po +++ b/resources/i18n/nl_NL/cura.po @@ -3800,8 +3800,8 @@ msgstr "Een &Bug Rapporteren" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "&Over..." +msgid "About..." +msgstr "Over..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/pl_PL/cura.po b/resources/i18n/pl_PL/cura.po index acfcc54f76..722826cc8b 100644 --- a/resources/i18n/pl_PL/cura.po +++ b/resources/i18n/pl_PL/cura.po @@ -3836,8 +3836,8 @@ msgstr "Zgłoś błąd" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "&O..." +msgid "About..." +msgstr "O..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/pt_BR/cura.po b/resources/i18n/pt_BR/cura.po index a6a93bb2a3..34e842eb55 100644 --- a/resources/i18n/pt_BR/cura.po +++ b/resources/i18n/pt_BR/cura.po @@ -3839,8 +3839,8 @@ msgstr "Relatar um &Bug" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "Sobre (&A)..." +msgid "About..." +msgstr "Sobre..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/pt_PT/cura.po b/resources/i18n/pt_PT/cura.po index fe8d44d361..8a8ff0a769 100644 --- a/resources/i18n/pt_PT/cura.po +++ b/resources/i18n/pt_PT/cura.po @@ -3918,8 +3918,8 @@ msgstr "Reportar um &erro" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "&Sobre..." +msgid "About..." +msgstr "Sobre..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/ru_RU/cura.po b/resources/i18n/ru_RU/cura.po index 7622349423..acc35df94f 100644 --- a/resources/i18n/ru_RU/cura.po +++ b/resources/i18n/ru_RU/cura.po @@ -3806,7 +3806,7 @@ msgstr "Отправить отчёт об ошибке" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." +msgid "About..." msgstr "О Cura..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 diff --git a/resources/i18n/tr_TR/cura.po b/resources/i18n/tr_TR/cura.po index 6c216b7d1c..b6eb498620 100644 --- a/resources/i18n/tr_TR/cura.po +++ b/resources/i18n/tr_TR/cura.po @@ -3800,8 +3800,8 @@ msgstr "Hata Bildir" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "&Hakkında..." +msgid "About..." +msgstr "Hakkında..." #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/zh_CN/cura.po b/resources/i18n/zh_CN/cura.po index aab579ac0b..019f8bc7c3 100644 --- a/resources/i18n/zh_CN/cura.po +++ b/resources/i18n/zh_CN/cura.po @@ -3836,8 +3836,8 @@ msgstr "BUG 反馈(&B)" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "关于(&A)…" +msgid "About..." +msgstr "关于…" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/i18n/zh_TW/cura.po b/resources/i18n/zh_TW/cura.po index 8d8b7c97d6..5667b643a8 100644 --- a/resources/i18n/zh_TW/cura.po +++ b/resources/i18n/zh_TW/cura.po @@ -3837,8 +3837,8 @@ msgstr "BUG 回報(&B)" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 msgctxt "@action:inmenu menubar:help" -msgid "&About..." -msgstr "關於(&A)…" +msgid "About..." +msgstr "關於…" #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 1b2f636f3e..82c177951d 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -222,7 +222,7 @@ Item Action { id: aboutAction; - text: catalog.i18nc("@action:inmenu menubar:help","&About..."); + text: catalog.i18nc("@action:inmenu menubar:help","About..."); iconName: "help-about"; } diff --git a/resources/variants/ultimaker2_plus_0.4.inst.cfg b/resources/variants/ultimaker2_plus_0.4.inst.cfg index d9d982ef11..3b54e0cdef 100644 --- a/resources/variants/ultimaker2_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.4.inst.cfg @@ -12,5 +12,5 @@ hardware_type = nozzle machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.05 speed_wall = =round(speed_print / 1.25, 1) -speed_wall_0 = =min(speed_wall - 10, 1) +speed_wall_0 = =max(speed_wall - 10, 1) speed_topbottom = =round(speed_print / 2.25, 1) diff --git a/scripts/check_shortcut_keys.py b/scripts/check_shortcut_keys.py index 2796002c3f..a47a8143f7 100644..100755 --- a/scripts/check_shortcut_keys.py +++ b/scripts/check_shortcut_keys.py @@ -85,10 +85,12 @@ class ShortcutKeysChecker: msg_section = data_dict[self.MSGCTXT] keys_dict = shortcut_dict[msg_section] if shortcut_key not in keys_dict: - keys_dict[shortcut_key] = dict() - existing_data_dict = keys_dict[shortcut_key] + keys_dict[shortcut_key] = {"shortcut_key": shortcut_key, + "section": msg_section, + "existing_lines": dict(), + } + existing_data_dict = keys_dict[shortcut_key]["existing_lines"] existing_data_dict[start_line] = {"message": msg, - "shortcut_key": shortcut_key, } def _get_shortcut_key(self, text: str) -> Optional[str]: @@ -105,16 +107,18 @@ class ShortcutKeysChecker: has_duplicates = False for keys_dict in shortcut_dict.values(): for shortcut_key, data_dict in keys_dict.items(): - if len(data_dict) == 1: + if len(data_dict["existing_lines"]) == 1: continue has_duplicates = True print("") print("The following messages have the same shortcut key '%s':" % shortcut_key) - for line, msg in data_dict.items(): + print(" shortcut: '%s'" % data_dict["shortcut_key"]) + print(" section : '%s'" % data_dict["section"]) + for line, msg in data_dict["existing_lines"].items(): relative_filename = (filename.rsplit("..", 1)[-1])[1:] - print(" - [%s] L%7d : [%s]" % (relative_filename, line, msg)) + print(" - [%s] L%7d : '%s'" % (relative_filename, line, msg["message"])) return has_duplicates |