3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 04:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '3.5' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2018-09-13 16:23:55 +02:00
commit 757c8754b1
25 changed files with 50 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/Settings/ExtruderManager.py
View file

@ -314,11 +314,11 @@ class ExtruderManager(QObject):
if not global_stack: if not global_stack:
return [] 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") machine_extruder_count = global_stack.getProperty("machine_extruder_count", "value")
return result_list[:machine_extruder_count]
return result[:machine_extruder_count]
def _globalContainerStackChanged(self) -> None: def _globalContainerStackChanged(self) -> None:
# If the global container changed, the machine changed and might have extruders that were not registered yet # If the global container changed, the machine changed and might have extruders that were not registered yet

2
plugins/MachineSettingsAction/MachineSettingsAction.qml
View file

@ -891,7 +891,7 @@ Cura.MachineAction
{ {
id: machineHeadPolygonProvider id: machineHeadPolygonProvider
containerStackId: base.acthiveMachineId containerStackId: base.activeMachineId
key: "machine_head_with_fans_polygon" key: "machine_head_with_fans_polygon"
watchedProperties: [ "value" ] watchedProperties: [ "value" ]
storeIndex: manager.containerIndex storeIndex: manager.containerIndex

1
plugins/SimulationView/SimulationView.qml
View file

@ -670,6 +670,7 @@ Item
onCurrentLayerChanged: onCurrentLayerChanged:
{ {
playButton.pauseSimulation() playButton.pauseSimulation()
pathSlider.setHandleValue(0) // After updating the layer set Path slider to 0
layerSlider.setUpperValue(UM.SimulationView.currentLayer) layerSlider.setUpperValue(UM.SimulationView.currentLayer)
} }
} }

2
plugins/Toolbox/src/Toolbox.py
View file

@ -626,7 +626,7 @@ class Toolbox(QObject, Extension):
# HACK: Do nothing because we'll handle these from the "packages" call # HACK: Do nothing because we'll handle these from the "packages" call
if type in do_not_handle: if type in do_not_handle:
return continue
if reply.url() == url: if reply.url() == url:
if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200: if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200:

4
resources/extruders/ultimaker_s5_extruder_left.def.json
View file

@ -17,10 +17,10 @@
"machine_nozzle_offset_y": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 },
"machine_extruder_start_pos_abs": { "default_value": true }, "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_start_pos_y": { "default_value": 237 },
"machine_extruder_end_pos_abs": { "default_value": true }, "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_extruder_end_pos_y": { "default_value": 237 },
"machine_nozzle_head_distance": { "default_value": 2.7 }, "machine_nozzle_head_distance": { "default_value": 2.7 },
"extruder_prime_pos_x": { "default_value": -3 }, "extruder_prime_pos_x": { "default_value": -3 },

4
resources/extruders/ultimaker_s5_extruder_right.def.json
View file

@ -17,10 +17,10 @@
"machine_nozzle_offset_y": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 },
"machine_extruder_start_pos_abs": { "default_value": true }, "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_start_pos_y": { "default_value": 219 },
"machine_extruder_end_pos_abs": { "default_value": true }, "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_extruder_end_pos_y": { "default_value": 219 },
"machine_nozzle_head_distance": { "default_value": 4.2 }, "machine_nozzle_head_distance": { "default_value": 4.2 },
"extruder_prime_pos_x": { "default_value": 333 }, "extruder_prime_pos_x": { "default_value": 333 },

2
resources/i18n/cura.pot
View file

@ -3955,7 +3955,7 @@ msgstr ""
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "" msgstr ""
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232

4
resources/i18n/de_DE/cura.po
View file

@ -3802,8 +3802,8 @@ msgstr "&Fehler melden"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "&Über..." msgstr "Über..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

4
resources/i18n/es_ES/cura.po
View file

@ -3814,8 +3814,8 @@ msgstr "Informar de un &error"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "&Acerca de..." msgstr "Acerca de..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

4
resources/i18n/fi_FI/cura.po
View file

@ -3821,8 +3821,8 @@ msgstr "Ilmoita &virheestä"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "Ti&etoja..." msgstr "Tietoja..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

4
resources/i18n/fr_FR/cura.po
View file

@ -3802,8 +3802,8 @@ msgstr "Notifier un &bug"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "&À propos de..." msgstr "À propos de..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

4
resources/i18n/it_IT/cura.po
View file

@ -3800,8 +3800,8 @@ msgstr "Se&gnala un errore"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "I&nformazioni..." msgstr "Informazioni..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

2
resources/i18n/ja_JP/cura.po
View file

@ -3806,7 +3806,7 @@ msgstr "報告＆バグ"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "アバウト..." msgstr "アバウト..."
# can’t enter japanese text # can’t enter japanese text

2
resources/i18n/ko_KR/cura.po
View file

@ -3798,7 +3798,7 @@ msgstr "버그 리포트"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "소개..." msgstr "소개..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232

4
resources/i18n/nl_NL/cura.po
View file

@ -3800,8 +3800,8 @@ msgstr "Een &Bug Rapporteren"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "&Over..." msgstr "Over..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

4
resources/i18n/pl_PL/cura.po
View file

@ -3836,8 +3836,8 @@ msgstr "Zgłoś błąd"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "&O..." msgstr "O..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

4
resources/i18n/pt_BR/cura.po
View file

@ -3839,8 +3839,8 @@ msgstr "Relatar um &Bug"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "Sobre (&A)..." msgstr "Sobre..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

4
resources/i18n/pt_PT/cura.po
View file

@ -3918,8 +3918,8 @@ msgstr "Reportar um &erro"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "&Sobre..." msgstr "Sobre..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

2
resources/i18n/ru_RU/cura.po
View file

@ -3806,7 +3806,7 @@ msgstr "Отправить отчёт об ошибке"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "О Cura..." msgstr "О Cura..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232

4
resources/i18n/tr_TR/cura.po
View file

@ -3800,8 +3800,8 @@ msgstr "Hata Bildir"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "&Hakkında..." msgstr "Hakkında..."
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

4
resources/i18n/zh_CN/cura.po
View file

@ -3836,8 +3836,8 @@ msgstr "BUG 反馈(&B)"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "关于(&A)…" msgstr "关于…"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

4
resources/i18n/zh_TW/cura.po
View file

@ -3837,8 +3837,8 @@ msgstr "BUG 回報（&B）"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:225
msgctxt "@action:inmenu menubar:help" msgctxt "@action:inmenu menubar:help"
msgid "&About..." msgid "About..."
msgstr "關於（&A）…" msgstr "關於…"
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:232
#: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242 #: /home/ruben/Projects/Cura/resources/qml/Actions.qml:242

2
resources/qml/Actions.qml
View file

@ -222,7 +222,7 @@ Item
Action Action
{ {
id: aboutAction; id: aboutAction;
text: catalog.i18nc("@action:inmenu menubar:help","&About..."); text: catalog.i18nc("@action:inmenu menubar:help","About...");
iconName: "help-about"; iconName: "help-about";
} }

2
resources/variants/ultimaker2_plus_0.4.inst.cfg
View file

@ -12,5 +12,5 @@ hardware_type = nozzle
machine_nozzle_size = 0.4 machine_nozzle_size = 0.4
machine_nozzle_tip_outer_diameter = 1.05 machine_nozzle_tip_outer_diameter = 1.05
speed_wall = =round(speed_print / 1.25, 1) 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) speed_topbottom = =round(speed_print / 2.25, 1)

16
scripts/check_shortcut_keys.py Normal file → Executable file
View file

@ -85,10 +85,12 @@ class ShortcutKeysChecker:
msg_section = data_dict[self.MSGCTXT] msg_section = data_dict[self.MSGCTXT]
keys_dict = shortcut_dict[msg_section] keys_dict = shortcut_dict[msg_section]
if shortcut_key not in keys_dict: if shortcut_key not in keys_dict:
keys_dict[shortcut_key] = dict() keys_dict[shortcut_key] = {"shortcut_key": shortcut_key,
existing_data_dict = keys_dict[shortcut_key] "section": msg_section,
"existing_lines": dict(),
}
existing_data_dict = keys_dict[shortcut_key]["existing_lines"]
existing_data_dict[start_line] = {"message": msg, existing_data_dict[start_line] = {"message": msg,
"shortcut_key": shortcut_key,
} }
def _get_shortcut_key(self, text: str) -> Optional[str]: def _get_shortcut_key(self, text: str) -> Optional[str]:
@ -105,16 +107,18 @@ class ShortcutKeysChecker:
has_duplicates = False has_duplicates = False
for keys_dict in shortcut_dict.values(): for keys_dict in shortcut_dict.values():
for shortcut_key, data_dict in keys_dict.items(): for shortcut_key, data_dict in keys_dict.items():
if len(data_dict) == 1: if len(data_dict["existing_lines"]) == 1:
continue continue
has_duplicates = True has_duplicates = True
print("") print("")
print("The following messages have the same shortcut key '%s':" % shortcut_key) 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:] 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 return has_duplicates