diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index fd9cbf1cb6..e13b5b58a9 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -60,7 +60,7 @@ class CuraApplication(QtApplication): if not hasattr(sys, "frozen"): Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) - super().__init__(name = "cura", version = "15.9.80") + super().__init__(name = "cura", version = "15.09.81") self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png"))) diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index 84b2ca78ac..46e83bc8f1 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -297,7 +297,7 @@ class CuraEngineBackend(Backend): def _handlePerObjectSettings(self, node, message): profile = node.callDecoration("getProfile") if profile: - for key, value in profile.getChangedSettings().items(): + for key, value in profile.getChangedSettingValues().items(): setting = message.settings.add() setting.name = key setting.value = str(value).encode() diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index b1c50d1201..85f7d1b9f1 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -390,6 +390,13 @@ "default": "lines", "visible": false }, + "skin_no_small_gaps_heuristic": { + "label": "Model has small Z gaps", + "description": "When the model has small vertical gaps about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces.", + "type": "boolean", + "default": false, + "visible": false + }, "skin_alternate_rotation": { "label": "Alternate Skin Rotation", "description": "Alternate between diagonal skin fill and horizontal + vertical skin fill. Although the diagonal directions can print quicker, this option can improve on the printing quality by reducing the pillowing effect.", diff --git a/resources/qml/AboutDialog.qml b/resources/qml/AboutDialog.qml index b81496f18c..48ecdf0563 100644 --- a/resources/qml/AboutDialog.qml +++ b/resources/qml/AboutDialog.qml @@ -63,7 +63,7 @@ UM.Dialog width: parent.width //: About dialog application author note - text: catalog.i18nc("@label","Cura has been developed by Ultimaker B.V. in cooperation with the community.") + text: catalog.i18nc("@info:credit","Cura has been developed by Ultimaker B.V. in cooperation with the community.") wrapMode: Text.WordWrap anchors.top: description.bottom } diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 9b5b69f2e2..bf2718a6fa 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -41,7 +41,7 @@ UM.MainWindow Menu { id: recentFilesMenu; - title: catalog.i18nc("@title:menu","Open Recent") + title: catalog.i18nc("@title:menu", "Open Recent") iconName: "document-open-recent"; enabled: Printer.recentFiles.length > 0; @@ -70,7 +70,7 @@ UM.MainWindow MenuItem { - text: catalog.i18nc("@action:menu", "Save Selection to File"); + text: catalog.i18nc("@action:inmenu", "Save Selection to File"); enabled: UM.Selection.hasSelection; iconName: "document-save-as"; onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file"); diff --git a/resources/qml/GeneralPage.qml b/resources/qml/GeneralPage.qml index 0e90c77515..6624248b2c 100644 --- a/resources/qml/GeneralPage.qml +++ b/resources/qml/GeneralPage.qml @@ -11,7 +11,7 @@ import UM 1.1 as UM UM.PreferencesPage { //: General configuration page title - title: catalog.i18nc("@title:wizard","General"); + title: catalog.i18nc("@title","General"); function reset() { @@ -80,7 +80,8 @@ UM.PreferencesPage // Because ListModel is stupid and does not allow using qsTr() for values. for(var i = 0; i < languageList.count; ++i) { - languageList.setProperty(i, "text", catalog.i18nc("@action:menu",languageList.get(i).text)); + //languageList.setProperty(i, "text", catalog.i18nc("@action:menu",languageList.get(i).text)); + languageList.setProperty(i, "text", languageList.get(i).text); } // Glorious hack time. ComboBox does not update the text properly after changing the @@ -112,7 +113,7 @@ UM.PreferencesPage id: pushFreeText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox //: Display Overhang preference checkbox - text: catalog.i18nc("@action:checkbox","Automatic push free"); + text: catalog.i18nc("@option:check","Automatic push free"); onClicked: pushFreeCheckbox.checked = !pushFreeCheckbox.checked //: Display Overhang preference tooltip @@ -145,7 +146,7 @@ UM.PreferencesPage id: sendDataText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox //: Display Overhang preference checkbox - text: catalog.i18nc("@action:checkbox","Send (anonymous) slice info"); + text: catalog.i18nc("@option:check","Send (anonymous) slice info"); onClicked: sendDataCheckbox.checked = !sendDataCheckbox.checked //: Display Overhang preference tooltip @@ -177,7 +178,7 @@ UM.PreferencesPage id: scaleToFitText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox //: Display Overhang preference checkbox - text: catalog.i18nc("@action:checkbox","Scale loaded meshes when too large"); + text: catalog.i18nc("@option:check","Scale loaded meshes when too large"); onClicked: scaleToFitCheckbox.checked = !scaleToFitCheckbox.checked //: Display Overhang preference tooltip diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index a51fab70bf..7737edcb17 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -138,7 +138,7 @@ Rectangle { anchors.leftMargin: UM.Theme.sizes.default_margin.width/2 font: UM.Theme.fonts.default color: UM.Theme.colors.text - text: (!base.printDuration || !base.printDuration.valid) ? "" : catalog.i18nc("@label", "%1 m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short)) + text: (!base.printDuration || !base.printDuration.valid) ? "" : catalog.i18nc("@label", "%1 h:m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short)) } } Item{ diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index e79deaf613..53be4ff27f 100644 --- a/resources/qml/Sidebar.qml +++ b/resources/qml/Sidebar.qml @@ -126,7 +126,7 @@ Rectangle { for(var i = 0; i < modesListModel.count; ++i) { - modesListModel.setProperty(i, "text", catalog.i18nc("@label", modesListModel.get(i).text)); + modesListModel.setProperty(i, "text", modesListModel.get(i).text); } } } diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 612ff0aeb3..7cfdb4f692 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -27,7 +27,7 @@ Item Label{ id: settingsModeLabel - text: catalog.i18nc("@label","Print setup: "); + text: catalog.i18nc("@label:listbox","Print setup: "); anchors.left: parent.left anchors.leftMargin: UM.Theme.sizes.default_margin.width; anchors.verticalCenter: parent.verticalCenter @@ -94,7 +94,7 @@ Item Label{ id: machineSelectionLabel //: Machine selection label - text: catalog.i18nc("@label","Machine:"); + text: catalog.i18nc("@label:listbox","Machine:"); anchors.left: parent.left anchors.leftMargin: UM.Theme.sizes.default_margin.width anchors.verticalCenter: parent.verticalCenter diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 9b02e44851..76b86aee9d 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -138,7 +138,7 @@ Item anchors.left: parent.left anchors.leftMargin: UM.Theme.sizes.default_margin.width //: Helpers selection label - text: catalog.i18nc("@label","Helpers:"); + text: catalog.i18nc("@label:listbox","Helpers:"); font: UM.Theme.fonts.default; } } @@ -151,7 +151,7 @@ Item CheckBox{ Layout.preferredHeight: UM.Theme.sizes.section.height; //: Setting enable skirt adhesion checkbox - text: catalog.i18nc("@action:checkbox","Enable Skirt Adhesion"); + text: catalog.i18nc("@option:check","Enable Skirt Adhesion"); style: UM.Theme.styles.checkbox; checked: Printer.getSettingValue("skirt_line_count") == null ? false: Printer.getSettingValue("skirt_line_count"); onCheckedChanged: @@ -166,7 +166,7 @@ Item Layout.preferredHeight: UM.Theme.sizes.section.height; //: Setting enable support checkbox - text: catalog.i18nc("@action:checkbox","Enable Support"); + text: catalog.i18nc("@option:check","Enable Support"); style: UM.Theme.styles.checkbox; diff --git a/resources/qml/ViewPage.qml b/resources/qml/ViewPage.qml index 1d0f28ba6f..37a5024375 100644 --- a/resources/qml/ViewPage.qml +++ b/resources/qml/ViewPage.qml @@ -38,7 +38,7 @@ UM.PreferencesPage id: viewText //is a button so the user doesn't have te click inconvenientley precise to enable or disable the checkbox //: Display Overhang preference checkbox - text: catalog.i18nc("@action:button","Display Overhang"); + text: catalog.i18nc("@option:check","Display Overhang"); onClicked: overhangCheckbox.checked = !overhangCheckbox.checked //: Display Overhang preference tooltip diff --git a/resources/qml/WizardPages/AddMachine.qml b/resources/qml/WizardPages/AddMachine.qml index 0719e0b593..a28c46ffd0 100644 --- a/resources/qml/WizardPages/AddMachine.qml +++ b/resources/qml/WizardPages/AddMachine.qml @@ -177,7 +177,7 @@ Item Label { id: insertNameLabel - text: catalog.i18nc("@label", "Printer Name:"); + text: catalog.i18nc("@label:textbox", "Printer Name:"); } TextField { diff --git a/resources/qml/WizardPages/Bedleveling.qml b/resources/qml/WizardPages/Bedleveling.qml index edfde107d6..0de0f4d8cf 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -18,6 +18,7 @@ Column anchors.fill: parent; property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer Component.onCompleted: printer_connection.homeHead() + UM.I18nCatalog { id: catalog; name:"cura"} Label { text: "" @@ -25,7 +26,7 @@ Column } Button { - text: "Move to next position" + text: catalog.i18nc("@action:button","Move to next position"); onClicked: { if(wizardPage.leveling_state == 0) diff --git a/resources/qml/WizardPages/SelectUpgradedParts.qml b/resources/qml/WizardPages/SelectUpgradedParts.qml index 23962bcc40..584ae5ffd2 100644 --- a/resources/qml/WizardPages/SelectUpgradedParts.qml +++ b/resources/qml/WizardPages/SelectUpgradedParts.qml @@ -46,20 +46,20 @@ Item CheckBox { - text: catalog.i18nc("@action:checkbox","Extruder driver ugrades") + text: catalog.i18nc("@option:check","Extruder driver ugrades") checked: true } CheckBox { - text: catalog.i18nc("@action:checkbox","Heated printer bed (kit)") + text: catalog.i18nc("@option:check","Heated printer bed (kit)") } CheckBox { - text: catalog.i18nc("@action:checkbox","Heated printer bed (self built)") + text: catalog.i18nc("@option:check","Heated printer bed (self built)") } CheckBox { - text: catalog.i18nc("@action:checkbox","Dual extrusion (experimental)") + text: catalog.i18nc("@option:check","Dual extrusion (experimental)") } } diff --git a/resources/qml/WizardPages/UltimakerCheckup.qml b/resources/qml/WizardPages/UltimakerCheckup.qml index 7c85f7b987..793108e745 100644 --- a/resources/qml/WizardPages/UltimakerCheckup.qml +++ b/resources/qml/WizardPages/UltimakerCheckup.qml @@ -20,6 +20,7 @@ Column property int extruder_target_temp: 0 property int bed_target_temp: 0 property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.rowCount() != 0 ? UM.USBPrinterManager.connectedPrinterList.getItem(0).printer: null + UM.I18nCatalog { id: catalog; name:"cura"} Component.onCompleted: { @@ -31,7 +32,6 @@ Column if (printer_connection != null) printer_connection.stopPollEndstop() } - UM.I18nCatalog { id: catalog; name:"cura"} Label { text: parent.title @@ -52,7 +52,7 @@ Column } Label { - text: UM.USBPrinterManager.connectedPrinterList.count ? "Done":"Incomplete" + text: UM.USBPrinterManager.connectedPrinterList.count ? catalog.i18nc("@info:status","Done"):catalog.i18nc("@info:status","Incomplete") } } Row @@ -63,7 +63,7 @@ Column } Label { - text: x_min_pressed ? catalog.i18nc("@label","Works") : catalog.i18nc("@label","Not checked") + text: x_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked") } } Row @@ -74,7 +74,7 @@ Column } Label { - text: y_min_pressed ? catalog.i18nc("@label","Works") : catalog.i18nc("@label","Not checked") + text: y_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked") } } @@ -86,7 +86,7 @@ Column } Label { - text: z_min_pressed ? catalog.i18nc("@label","Works") : catalog.i18nc("@label","Not checked") + text: z_min_pressed ? catalog.i18nc("@info:status","Works") : catalog.i18nc("@info:status","Not checked") } } @@ -107,7 +107,7 @@ Column { if(printer_connection != null) { - heater_status_label.text = catalog.i18nc("@label","Checking") + heater_status_label.text = catalog.i18nc("@info:progress","Checking") printer_connection.heatupNozzle(190) wizardPage.extruder_target_temp = 190 } @@ -116,7 +116,7 @@ Column Label { id: heater_status_label - text: catalog.i18nc("@label","Not checked") + text: catalog.i18nc("@info:status","Not checked") } } @@ -137,7 +137,7 @@ Column { if(printer_connection != null) { - bed_status_label.text = catalog.i18nc("@label","Checking") + bed_status_label.text = catalog.i18nc("@info:progress","Checking") printer_connection.printer.heatupBed(60) wizardPage.bed_target_temp = 60 } @@ -146,7 +146,7 @@ Column Label { id: bed_status_label - text: catalog.i18nc("@label","Not checked") + text: catalog.i18nc("@info:status","Not checked") } } @@ -175,7 +175,7 @@ Column { if(printer_connection != null) { - heater_status_label.text = catalog.i18nc("@label","Works") + heater_status_label.text = catalog.i18nc("@info:status","Works") printer_connection.heatupNozzle(0) } } @@ -184,7 +184,7 @@ Column { if(printer_connection.bedTemperature > wizardPage.bed_target_temp - 5 && printer_connection.bedTemperature < wizardPage.bed_target_temp + 5) { - bed_status_label.text = catalog.i18nc("@label","Works") + bed_status_label.text = catalog.i18nc("@info:status","Works") printer_connection.heatupBed(0) } } diff --git a/resources/qml/WizardPages/UpgradeFirmware.qml b/resources/qml/WizardPages/UpgradeFirmware.qml index 9bb7152931..8730157170 100644 --- a/resources/qml/WizardPages/UpgradeFirmware.qml +++ b/resources/qml/WizardPages/UpgradeFirmware.qml @@ -13,6 +13,7 @@ Column id: wizardPage property string title anchors.fill: parent; + UM.I18nCatalog { id: catalog; name:"cura"} Label { text: parent.title @@ -38,12 +39,13 @@ Column } Button { - text: "Update"; + text: catalog.i18nc("@action:button","Update") + onClicked: { if(!UM.USBPrinterManager.updateFirmwareBySerial(text_area.text)) { - status_text.text = "ERROR" + status_text.text = catalog.i18nc("@info:status","ERROR") } } } diff --git a/resources/themes/cura/icons/plus.svg b/resources/themes/cura/icons/plus.svg index a8f9f201ca..de5d8c2eb9 100644 --- a/resources/themes/cura/icons/plus.svg +++ b/resources/themes/cura/icons/plus.svg @@ -1,8 +1,45 @@ - - - - - - + + + +image/svg+xml \ No newline at end of file diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 91023d61b3..a85e4350fa 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -139,7 +139,10 @@ "message_text": [32, 166, 219, 255], "message_dismiss": [139, 143, 153, 255], - "tool_panel_background": [255, 255, 255, 255] + "tool_panel_background": [255, 255, 255, 255], + + "per_object_settings_panel_background": [255, 255, 255, 255], + "per_object_settings_panel_border": [208, 210, 211, 255] }, "sizes": { @@ -207,6 +210,10 @@ "message": [30.0, 5.0], "message_close": [1.25, 1.25], - "message_button": [6.0, 1.8] + "message_button": [6.0, 1.8], + + "per_object_settings_button": [2.0, 2.0], + "per_object_settings_panel": [24.0, 10.0], + "per_object_settings_panel_border": [0.1, 0.1] } }