From 1401265fc1e448d431f912039a26a965c7d3786f Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 9 Sep 2015 13:48:15 +0200 Subject: [PATCH 1/8] JSON bugfix: default support roof pattern --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 85f7d1b9f1..d3401e8299 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1231,7 +1231,7 @@ "concentric": "Concentric", "zigzag": "Zig Zag" }, - "default": "Concentric" + "default": "concentric" }, "support_use_towers": { "label": "Use towers.", From ef93524d78a7d32c5656731cfc24c91b07380a39 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Wed, 9 Sep 2015 15:25:39 +0200 Subject: [PATCH 2/8] adds/adapts translation context markers last nesscessary changes for internationalisation -> Cura Contributes to: issue CURA-116 --- plugins/3MFReader/__init__.py | 2 +- plugins/GCodeWriter/__init__.py | 2 +- plugins/USBPrinting/USBPrinterManager.py | 4 ---- resources/qml/GeneralPage.qml | 7 +++---- resources/qml/SaveButton.qml | 2 +- resources/qml/Sidebar.qml | 2 +- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/plugins/3MFReader/__init__.py b/plugins/3MFReader/__init__.py index 7d9b00a74e..e3f96282d4 100644 --- a/plugins/3MFReader/__init__.py +++ b/plugins/3MFReader/__init__.py @@ -17,7 +17,7 @@ def getMetaData(): }, "mesh_reader": { "extension": "3mf", - "description": catalog.i18nc("@item:inlistbox", "3MF File") + "description": catalog.i18nc("@item:inlistbox displays the fileformat in a list", "3MF File") } } diff --git a/plugins/GCodeWriter/__init__.py b/plugins/GCodeWriter/__init__.py index 2c3a47ecef..2b84b99d1a 100644 --- a/plugins/GCodeWriter/__init__.py +++ b/plugins/GCodeWriter/__init__.py @@ -19,7 +19,7 @@ def getMetaData(): "mesh_writer": { "output": [{ "extension": "gcode", - "description": catalog.i18nc("@item:inlistbox", "GCode File"), + "description": catalog.i18nc("@item:inlistbox displays the fileformat in a list", "GCode File"), "mime_type": "text/x-gcode", "mode": GCodeWriter.GCodeWriter.OutputMode.TextMode }] diff --git a/plugins/USBPrinting/USBPrinterManager.py b/plugins/USBPrinting/USBPrinterManager.py index fb4dcb8ffb..a601b4a414 100644 --- a/plugins/USBPrinting/USBPrinterManager.py +++ b/plugins/USBPrinting/USBPrinterManager.py @@ -43,10 +43,6 @@ class USBPrinterManager(QObject, SignalEmitter, OutputDevicePlugin, Extension): self._firmware_view = None ## Add menu item to top menu of the application. - #self.setMenuName(self._i18n_catalog.i18n("@title:menu", "Firmware")) - #self.addMenuItem(self._i18n_catalog.i18n("@item:inmenu", "Update Firmware"), self.updateAllFirmware) - - #self.setMenuName("Firmware") self.setMenuName(i18n_catalog.i18nc("@title:menu","Firmware")) self.addMenuItem(i18n_catalog.i18nc("@item:inmenu", "Update Firmware"), self.updateAllFirmware) diff --git a/resources/qml/GeneralPage.qml b/resources/qml/GeneralPage.qml index 6624248b2c..588b58c6ea 100644 --- a/resources/qml/GeneralPage.qml +++ b/resources/qml/GeneralPage.qml @@ -80,8 +80,7 @@ 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", languageList.get(i).text); + languageList.setProperty(i, "text", catalog.i18nc("@action:inmenu",languageList.get(i).text)); } // Glorious hack time. ComboBox does not update the text properly after changing the @@ -113,11 +112,11 @@ 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("@option:check","Automatic push free"); + text: catalog.i18nc("@option:check","Automatically arrange the distancing between objects"); onClicked: pushFreeCheckbox.checked = !pushFreeCheckbox.checked //: Display Overhang preference tooltip - tooltip: catalog.i18nc("@info:tooltip","Are objects on the platform automatically moved so they no longer intersect") + tooltip: catalog.i18nc("@info:tooltip","Are objects on the platform automatically moved so that they no longer intersect") style: ButtonStyle { diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index 7737edcb17..18d089946c 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 h:m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short)) + text: (!base.printDuration || !base.printDuration.valid) ? "" : catalog.i18nc("@label h:m (hours:minutes) is added to the expected printtime (%1)", "%1 h:m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short)) } } Item{ diff --git a/resources/qml/Sidebar.qml b/resources/qml/Sidebar.qml index 53be4ff27f..e79deaf613 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", modesListModel.get(i).text); + modesListModel.setProperty(i, "text", catalog.i18nc("@label", modesListModel.get(i).text)); } } } From dd0fc78e7768251de26ef2e1e885f1a8ae7307d0 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Wed, 9 Sep 2015 15:47:34 +0200 Subject: [PATCH 3/8] adds text as a 'Toggle Full Screen' menu item Contributes to: issue CURA-125 --- resources/qml/Actions.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 7d977f2804..2c2caec13d 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -50,6 +50,7 @@ Item { id:toggleFullScreenAction shortcut: StandardKey.FullScreen; + text: catalog.i18nc("@action","Toggle Full Screen"); } Action @@ -178,7 +179,7 @@ Item text: catalog.i18nc("@action","Merge objects"); enabled: UM.Scene.numObjectsSelected > 1 ? true: false } - + Action { id: multiplyObjectAction; From 032b6e400031f3046e1e6025fa184eccba168536 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Wed, 9 Sep 2015 15:50:28 +0200 Subject: [PATCH 4/8] Just a little cleanup related to the translations Contributes to: issue CURA-116 --- resources/qml/Actions.qml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 2c2caec13d..1f9a4dca5c 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -56,7 +56,6 @@ Item Action { id: undoAction; - //: Undo action text: catalog.i18nc("@action","Undo"); iconName: "edit-undo"; shortcut: StandardKey.Undo; @@ -65,7 +64,6 @@ Item Action { id: redoAction; - //: Redo action text: catalog.i18nc("@action","Redo"); iconName: "edit-redo"; shortcut: StandardKey.Redo; @@ -74,7 +72,6 @@ Item Action { id: quitAction; - //: Quit action text: catalog.i18nc("@action","Quit"); iconName: "application-exit"; shortcut: StandardKey.Quit; @@ -83,7 +80,6 @@ Item Action { id: preferencesAction; - //: Preferences action text: catalog.i18nc("@action","Preferences..."); iconName: "configure"; } @@ -91,14 +87,12 @@ Item Action { id: addMachineAction; - //: Add Printer action text: catalog.i18nc("@action","Add Printer..."); } Action { id: settingsAction; - //: Configure Printers action text: catalog.i18nc("@action","Configure Printers"); iconName: "configure"; } @@ -106,14 +100,12 @@ Item Action { id: manageProfilesAction; - //: manage profiles action text: catalog.i18nc("@action","Manage Profiles"); } Action { id: documentationAction; - //: Show Online Documentation action text: catalog.i18nc("@action","Show Online &Documentation"); iconName: "help-contents"; shortcut: StandardKey.Help; @@ -121,7 +113,6 @@ Item Action { id: reportBugAction; - //: Report a Bug Action text: catalog.i18nc("@action","Report a &Bug"); iconName: "tools-report-bug"; } @@ -129,7 +120,6 @@ Item Action { id: aboutAction; - //: About action text: catalog.i18nc("@action","About..."); iconName: "help-about"; } @@ -137,7 +127,6 @@ Item Action { id: deleteSelectionAction; - //: Delete selection action text: catalog.i18nc("@action","Delete Selection"); iconName: "edit-delete"; shortcut: StandardKey.Delete; @@ -146,7 +135,6 @@ Item Action { id: deleteObjectAction; - //: Delete object action text: catalog.i18nc("@action","Delete Object"); iconName: "edit-delete"; shortcut: StandardKey.Backspace; @@ -155,7 +143,6 @@ Item Action { id: centerObjectAction; - //: Center object action text: catalog.i18nc("@action","Center Object on Platform"); } @@ -183,14 +170,12 @@ Item Action { id: multiplyObjectAction; - //: Duplicate object action text: catalog.i18nc("@action","Duplicate Object"); } Action { id: splitObjectAction; - //: Split object action text: catalog.i18nc("@action","Split Object into Parts"); enabled: false; } @@ -198,7 +183,6 @@ Item Action { id: deleteAllAction; - //: Clear build platform action text: catalog.i18nc("@action","Clear Build Platform"); iconName: "edit-clear"; } @@ -206,28 +190,24 @@ Item Action { id: reloadAllAction; - //: Reload all objects action text: catalog.i18nc("@action","Reload All Objects"); } Action { id: resetAllTranslationAction; - //: Reset all positions action text: catalog.i18nc("@action","Reset All Object Positions"); } Action { id: resetAllAction; - //: Reset all positions action text: catalog.i18nc("@action","Reset All Object Transformations"); } Action { id: openAction; - //: Open file action text: catalog.i18nc("@action","Load file"); iconName: "document-open"; shortcut: StandardKey.Open; @@ -236,7 +216,6 @@ Item Action { id: saveAction; - //: Save file action text: catalog.i18nc("@action","Save..."); iconName: "document-save"; shortcut: StandardKey.Save; @@ -245,7 +224,6 @@ Item Action { id: showEngineLogAction; - //: Show engine log action text: catalog.i18nc("@action","Show engine &log..."); iconName: "view-list-text"; } From ae2a07ca06c3524c4588412fd4be9822ad96ff02 Mon Sep 17 00:00:00 2001 From: Tamara Hogenhout Date: Wed, 9 Sep 2015 16:40:01 +0200 Subject: [PATCH 5/8] re-implements the safebutton -> filename -> textfield Not yet fully functional but re-implemented for stringfreeze Contributes to: issue CURA-125 --- resources/qml/SaveButton.qml | 88 ++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 45 deletions(-) diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index 18d089946c..dc8131ce42 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -48,7 +48,7 @@ Rectangle { } } } - //printJobTextfield.text = abbrMachine + '_' + base.fileBaseName + printJobTextfield.text = abbrMachine + '_' + base.fileBaseName } Connections { @@ -62,49 +62,47 @@ Rectangle { Rectangle{ id: printJobRow implicitWidth: base.width; - //implicitHeight: UM.Theme.sizes.sidebar_header.height /////////////remove this TODO - implicitHeight: 1 + implicitHeight: UM.Theme.sizes.sidebar_header.height anchors.top: parent.top - //color: UM.Theme.colors.sidebar_header_bar - color: UM.Theme.colors.setting_control_border -// Label{ -// id: printJobTextfieldLabel -// text: catalog.i18nc("@label","Printjob name"); -// anchors.left: parent.left -// anchors.leftMargin: UM.Theme.sizes.default_margin.width; -// anchors.verticalCenter: parent.verticalCenter -// font: UM.Theme.fonts.default; -// color: UM.Theme.colors.text_white -// } -// TextField { -// id: printJobTextfield -// anchors.right: parent.right -// anchors.rightMargin: UM.Theme.sizes.default_margin.width; -// anchors.verticalCenter: parent.verticalCenter -// width: parent.width/100*55 -// height: UM.Theme.sizes.sidebar_inputFields.height -// property int unremovableSpacing: 5 -// text: '' -// onEditingFinished: { -// if (printJobTextfield.text != ''){ -// printJobTextfield.focus = false -// } -// } -// validator: RegExpValidator { -// regExp: /^[^\\ \/ \.]*$/ -// } -// style: TextFieldStyle{ -// textColor: UM.Theme.colors.setting_control_text; -// font: UM.Theme.fonts.default; -// background: Rectangle { -// radius: 0 -// implicitWidth: parent.width -// implicitHeight: parent.height -// border.width: 1; -// border.color: UM.Theme.colors.slider_groove_border; -// } -// } -// } + color: UM.Theme.colors.sidebar_header_bar + Label{ + id: printJobTextfieldLabel + text: catalog.i18nc("@label:textbox", "Printjob name"); + anchors.left: parent.left + anchors.leftMargin: UM.Theme.sizes.default_margin.width; + anchors.verticalCenter: parent.verticalCenter + font: UM.Theme.fonts.default; + color: UM.Theme.colors.text_white + } + TextField { + id: printJobTextfield + anchors.right: parent.right + anchors.rightMargin: UM.Theme.sizes.default_margin.width; + anchors.verticalCenter: parent.verticalCenter + width: parent.width/100*55 + height: UM.Theme.sizes.sidebar_inputFields.height + property int unremovableSpacing: 5 + text: '' + onEditingFinished: { + if (printJobTextfield.text != ''){ + printJobTextfield.focus = false + } + } + validator: RegExpValidator { + regExp: /^[^\\ \/ \.]*$/ + } + style: TextFieldStyle{ + textColor: UM.Theme.colors.setting_control_text; + font: UM.Theme.fonts.default; + background: Rectangle { + radius: 0 + implicitWidth: parent.width + implicitHeight: parent.height + border.width: 1; + border.color: UM.Theme.colors.slider_groove_border; + } + } + } } Rectangle { @@ -138,7 +136,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 h:m (hours:minutes) is added to the expected printtime (%1)", "%1 h:m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short)) + text: (!base.printDuration || !base.printDuration.valid) ? "" : catalog.i18nc("@label h:m (abbreviation for hours:minutes) is added to the expected printtime (%1)", "%1 h:m").arg(base.printDuration.getDisplayString(UM.DurationFormat.Short)) } } Item{ @@ -165,7 +163,7 @@ Rectangle { anchors.leftMargin: UM.Theme.sizes.default_margin.width/2 font: UM.Theme.fonts.default color: UM.Theme.colors.text - text: base.printMaterialAmount <= 0 ? "" : catalog.i18nc("@label","%1 m").arg(base.printMaterialAmount) + text: base.printMaterialAmount <= 0 ? "" : catalog.i18nc("@label m (abbreviation for meters) is added to the expected length of filament (%1) ","%1 m").arg(base.printMaterialAmount) } } } From 7e01273d87cf90874ac83377d3042f620c62d128 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 9 Sep 2015 17:05:11 +0200 Subject: [PATCH 6/8] JSON: bugfix: skin_no_small_gaps_heuristic interpreted the wrong way around --- resources/machines/fdmprinter.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index d3401e8299..27de3bfe2a 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -391,10 +391,10 @@ "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.", + "label": "Ingore 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. In such a case set this setting to false.", "type": "boolean", - "default": false, + "default": true, "visible": false }, "skin_alternate_rotation": { From eacc3ac58f17e023723b60f9359bf4c4bbd46589 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 10 Sep 2015 10:09:00 +0200 Subject: [PATCH 7/8] JSON: bugfix: faulty description --- resources/machines/fdmprinter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index 27de3bfe2a..aac90295f5 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1688,7 +1688,7 @@ "enabled": "magic_fuzzy_skin_enabled", "children": { "magic_fuzzy_skin_point_dist": { - "label": "Fuzzy Skin Density", + "label": "Fuzzy Skin Point Distance", "description": "The average distance between the random points introduced on each line segment. Note that the original points of the polygon are discarded, so a high smoothness results in a reduction of the resolution. This value must be higher than half the Fuzzy Skin Thickness.", "type": "float", "unit": "mm", From e78ea4b916a8a6f63d772a93fa216596c2febada Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Thu, 10 Sep 2015 11:02:34 +0200 Subject: [PATCH 8/8] JSON: rename hammock to support roof --- resources/machines/fdmprinter.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index aac90295f5..1156aa3ef6 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -221,8 +221,8 @@ "enabled": "support_enable" }, "support_roof_line_width": { - "label": "Support Hammock line width", - "description": "Width of a single hammock line, used to fill the roof of the support.", + "label": "Support Roof line width", + "description": "Width of a single support roof line, used to fill the top of the support.", "unit": "mm", "default": 0.4, "type": "float", @@ -749,8 +749,8 @@ "enabled": "support_roof_enable" }, "speed_support_roof": { - "label": "Support Hammock Speed", - "description": "The speed at which the roofs of exterior support are printed. Printing the hammock at lower speeds can improve on overhang quality. ", + "label": "Support Roof Speed", + "description": "The speed at which the roofs of exterior support are printed. Printing the support roof at lower speeds can improve on overhang quality. ", "unit": "mm/s", "type": "float", "default": 40, @@ -1185,15 +1185,15 @@ "enabled": "support_enable" }, "support_roof_enable": { - "label": "Enable Hammock", - "description": "Generate a solid support roof on which the model sits.", + "label": "Enable Support Roof", + "description": "Generate a dense top skin at the top of the support on which the model sits.", "type": "boolean", "default": false, "visible": true, "enabled": "support_enable" }, "support_roof_height": { - "label": "Hammock Thickness", + "label": "Support Roof Thickness", "description": "The height of the support roofs. ", "unit": "mm", "type": "float", @@ -1202,15 +1202,15 @@ "enabled": "support_enable" }, "support_roof_density": { - "label": "Hammock Density", + "label": "Support Roof Density", "description": "This controls how densely filled the roofs of the support will be. A higher percentage results in better overhangs, which are more difficult to remove.", "unit": "%", "type": "float", "default": 100, "children": { "support_roof_line_distance": { - "label": "Hammock Line Distance", - "description": "Distance between the printed hammock lines.", + "label": "Support Roof Line Distance", + "description": "Distance between the printed support roof lines.", "unit": "mm", "type": "float", "default": 0.4, @@ -1220,8 +1220,8 @@ } }, "support_roof_pattern": { - "label": "Hammock Pattern", - "description": "The pattern with which the hammock is printed.", + "label": "Support Roof Pattern", + "description": "The pattern with which the top of the support is printed.", "type": "enum", "visible": false, "options": {