An uncaught exception has occurred!
Please use the information below to post a bug report at http://github.com/Ultimaker/Cura/issues
")) + label.setText(catalog.i18nc("@label", "An uncaught exception has occurred!
Please use the information below to post a bug report at http://github.com/Ultimaker/Cura/issues
")) textarea = QTextEdit(dialog) layout.addWidget(textarea) @@ -43,7 +43,7 @@ def show(type, value, tb): buttons = QDialogButtonBox(QDialogButtonBox.Close, dialog) layout.addWidget(buttons) - buttons.addButton(self._i18n_catalog.i18nc("action:button", "Open Web Page"), QDialogButtonBox.HelpRole) + buttons.addButton(catalog.i18nc("@action:button", "Open Web Page"), QDialogButtonBox.HelpRole) buttons.rejected.connect(lambda: dialog.close()) buttons.helpRequested.connect(lambda: webbrowser.open("http://github.com/Ultimaker/Cura/issues")) diff --git a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py index 2e2303863f..b150222489 100644 --- a/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py +++ b/plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py @@ -27,7 +27,7 @@ class ProcessSlicedObjectListJob(Job): def run(self): if Application.getInstance().getController().getActiveView().getPluginId() == "LayerView": - self._progress = Message(catalog.i18nc("@info", "Layers"), 0, False, 0) + self._progress = Message(catalog.i18nc("@info:status", "Processing Layers"), 0, False, 0) self._progress.show() Application.getInstance().getController().activeViewChanged.connect(self._onActiveViewChanged) @@ -108,7 +108,7 @@ class ProcessSlicedObjectListJob(Job): if self.isRunning(): if Application.getInstance().getController().getActiveView().getPluginId() == "LayerView": if not self._progress: - self._progress = Message(catalog.i18nc("Layers View mode", "Layers"), 0, False, 0) + self._progress = Message(catalog.i18nc("@info:status", "Processing Layers"), 0, False, 0) self._progress.show() else: if self._progress: diff --git a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py index ed95e87e14..2cf1cafde9 100644 --- a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py +++ b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py @@ -39,10 +39,10 @@ class RemovableDrivePlugin(OutputDevicePlugin): def ejectDevice(self, device): result = self.performEjectDevice(device) if result: - message = Message(catalog.i18n("@info:status", "Ejected {0}. You can now safely remove the drive.").format(device.getName())) + message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(device.getName())) message.show() else: - message = Message(catalog.i18n("@info:status", "Failed to eject {0}. Maybe it is still in use?").format(device.getName())) + message = Message(catalog.i18nc("@info:status", "Failed to eject {0}. Maybe it is still in use?").format(device.getName())) message.show() def performEjectDevice(self, device): diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index af202c6116..175fc24819 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -24,7 +24,6 @@ Item //property alias unMergeObjects: unMergeObjectsAction; property alias multiplyObject: multiplyObjectAction; - property alias splitObject: splitObjectAction; property alias deleteAll: deleteAllAction; property alias reloadAll: reloadAllAction; @@ -51,6 +50,7 @@ Item id:toggleFullScreenAction shortcut: StandardKey.FullScreen; text: catalog.i18nc("@action","Toggle Full Screen"); + iconName: "view-fullscreen"; } Action @@ -93,14 +93,15 @@ Item Action { id: settingsAction; - text: catalog.i18nc("@action","Manage Printers"); + text: catalog.i18nc("@action","Manage Printers..."); iconName: "configure"; } Action { id: manageProfilesAction; - text: catalog.i18nc("@action","Manage Profiles"); + text: catalog.i18nc("@action","Manage Profiles..."); + iconName: "configure"; } Action @@ -151,6 +152,7 @@ Item id: groupObjectsAction text: catalog.i18nc("@action","Group Objects"); enabled: UM.Scene.numObjectsSelected > 1 ? true: false + iconName: "object-group" } Action @@ -158,6 +160,7 @@ Item id: unGroupObjectsAction text: catalog.i18nc("@action","Ungroup Objects"); enabled: UM.Scene.isGroupSelected + iconName: "object-ungroup" } Action @@ -165,32 +168,28 @@ Item id: mergeObjectsAction text: catalog.i18nc("@action","Merge Objects"); enabled: UM.Scene.numObjectsSelected > 1 ? true: false + iconName: "merge"; } Action { id: multiplyObjectAction; text: catalog.i18nc("@action","Duplicate Object"); - } - - Action - { - id: splitObjectAction; - text: catalog.i18nc("@action","Split Object into Parts"); - enabled: false; + iconName: "edit-duplicate" } Action { id: deleteAllAction; text: catalog.i18nc("@action","Clear Build Platform"); - iconName: "edit-clear"; + iconName: "edit-delete"; } Action { id: reloadAllAction; text: catalog.i18nc("@action","Reload All Objects"); + iconName: "document-revert"; } Action diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index cea32b2abf..3d4575e14f 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:inmenu", "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"); @@ -78,8 +78,8 @@ UM.MainWindow Menu { id: saveAllMenu - title: catalog.i18nc("@title:menu","Save All") - iconName: "document-save"; + title: catalog.i18nc("@title:menu","Save &All") + iconName: "document-save-all"; enabled: devicesModel.rowCount() > 0 && UM.Backend.progress > 0.99; Instantiator @@ -96,6 +96,8 @@ UM.MainWindow } } + MenuItem { action: actions.reloadAll; } + MenuSeparator { } MenuItem { action: actions.quit; } @@ -111,6 +113,12 @@ UM.MainWindow MenuSeparator { } MenuItem { action: actions.deleteSelection; } MenuItem { action: actions.deleteAll; } + MenuItem { action: actions.resetAllTranslation; } + MenuItem { action: actions.resetAll; } + MenuSeparator { } + MenuItem { action: actions.groupObjects;} + MenuItem { action: actions.mergeObjects;} + MenuItem { action: actions.unGroupObjects;} } Menu @@ -119,7 +127,7 @@ UM.MainWindow id: top_view_menu Instantiator { - model: UM.Models.viewModel + model: UM.ViewModel { } MenuItem { text: model.name; @@ -184,6 +192,32 @@ UM.MainWindow MenuItem { action: actions.configureMachines; } } + Menu + { + id: profileMenu + title: catalog.i18nc("@title:menu", "&Profile") + + Instantiator + { + model: UM.ProfilesModel { } + MenuItem { + text: model.name; + checkable: true; + checked: model.active; + exclusiveGroup: profileMenuGroup; + onTriggered: UM.MachineManager.setActiveProfile(model.name) + } + onObjectAdded: profileMenu.insertItem(index, object) + onObjectRemoved: profileMenu.removeItem(object) + } + + ExclusiveGroup { id: profileMenuGroup; } + + MenuSeparator { } + + MenuItem { action: actions.manageProfiles; } + } + Menu { id: extension_menu @@ -351,7 +385,7 @@ UM.MainWindow id: viewMenu; Instantiator { - model: UM.Models.viewModel; + model: UM.ViewModel { } MenuItem { text: model.name; @@ -515,7 +549,6 @@ UM.MainWindow showEngineLog.onTriggered: engineLog.visible = true; about.onTriggered: aboutDialog.visible = true; toggleFullScreen.onTriggered: base.toggleFullscreen() - } Menu @@ -526,16 +559,14 @@ UM.MainWindow MenuItem { action: actions.centerObject; } MenuItem { action: actions.deleteObject; } MenuItem { action: actions.multiplyObject; } - MenuItem { action: actions.splitObject; } - MenuSeparator { } MenuItem { action: actions.deleteAll; } MenuItem { action: actions.reloadAll; } MenuItem { action: actions.resetAllTranslation; } MenuItem { action: actions.resetAll; } MenuItem { action: actions.groupObjects;} - MenuItem { action: actions.unGroupObjects;} MenuItem { action: actions.mergeObjects;} + MenuItem { action: actions.unGroupObjects;} } Menu @@ -546,8 +577,8 @@ UM.MainWindow MenuItem { action: actions.resetAllTranslation; } MenuItem { action: actions.resetAll; } MenuItem { action: actions.groupObjects;} - MenuItem { action: actions.unGroupObjects;} MenuItem { action: actions.mergeObjects;} + MenuItem { action: actions.unGroupObjects;} } Connections diff --git a/resources/qml/GeneralPage.qml b/resources/qml/GeneralPage.qml index 588b58c6ea..31221ba2e8 100644 --- a/resources/qml/GeneralPage.qml +++ b/resources/qml/GeneralPage.qml @@ -42,20 +42,17 @@ UM.PreferencesPage model: ListModel { id: languageList - //: English language combo box option + ListElement { text: QT_TR_NOOP("English"); code: "en" } - //: German language combo box option ListElement { text: QT_TR_NOOP("German"); code: "de" } - //: French language combo box option - // ListElement { text: QT_TR_NOOP("French"); code: "fr" } - //: Spanish language combo box option + ListElement { text: QT_TR_NOOP("French"); code: "fr" } ListElement { text: QT_TR_NOOP("Spanish"); code: "es" } - //: Italian language combo box option - // ListElement { text: QT_TR_NOOP("Italian"); code: "it" } - //: Finnish language combo box option + ListElement { text: QT_TR_NOOP("Italian"); code: "it" } ListElement { text: QT_TR_NOOP("Finnish"); code: "fi" } - //: Russian language combo box option ListElement { text: QT_TR_NOOP("Russian"); code: "ru" } + ListElement { text: QT_TR_NOOP("Polish"); code: "pl" } + ListElement { text: QT_TR_NOOP("Czech"); code: "cs" } + ListElement { text: QT_TR_NOOP("Bulgarian"); code: "bg" } } currentIndex: @@ -80,7 +77,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:inmenu",languageList.get(i).text)); + languageList.setProperty(i, "text", catalog.i18n(languageList.get(i).text)); } // Glorious hack time. ComboBox does not update the text properly after changing the @@ -96,7 +93,7 @@ UM.PreferencesPage Layout.columnSpan: 2 //: Language change warning - text: catalog.i18nc("@label","You will need to restart the application for language changes to have effect.") + text: catalog.i18nc("@label", "You will need to restart the application for language changes to have effect.") wrapMode: Text.WordWrap font.italic: true } @@ -112,11 +109,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","Automatically arrange the distancing between objects"); + text: catalog.i18nc("@option:check", "Ensure objects are kept apart"); onClicked: pushFreeCheckbox.checked = !pushFreeCheckbox.checked //: Display Overhang preference tooltip - tooltip: catalog.i18nc("@info:tooltip","Are objects on the platform automatically moved so that they no longer intersect") + tooltip: catalog.i18nc("@info:tooltip", "Should objects on the platform be moved so that they no longer intersect.") style: ButtonStyle { @@ -145,11 +142,11 @@ 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("@option:check","Send (anonymous) slice info"); + text: catalog.i18nc("@option:check","Send (Anonymous) Print Information"); onClicked: sendDataCheckbox.checked = !sendDataCheckbox.checked //: Display Overhang preference tooltip - tooltip: catalog.i18nc("@info:tooltip","Should anonymous data about your slices be sent to Ultimaker. No models or IP's are sent / stored.") + tooltip: catalog.i18nc("@info:tooltip","Should anonymous data about your print be sent to Ultimaker? Note, no models, IP addresses or other personally identifiable information is sent or stored.") style: ButtonStyle { @@ -177,11 +174,11 @@ 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("@option:check","Scale loaded meshes when too large"); + text: catalog.i18nc("@option:check","Scale Too Large Files"); onClicked: scaleToFitCheckbox.checked = !scaleToFitCheckbox.checked //: Display Overhang preference tooltip - tooltip: catalog.i18nc("@info:tooltip","Should loaded meshes be scaled to the max build volume if they are too large.") + tooltip: catalog.i18nc("@info:tooltip","Should opened files be scaled to the build volume when they are too large?") style: ButtonStyle { diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 76b86aee9d..4795e3801f 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -21,163 +21,176 @@ Item Component.onDestruction: PrintInformation.enabled = false UM.I18nCatalog { id: catalog; name:"cura"} -// Rectangle { -// anchors.top: simpleModeGrid.top -// anchors.left: simpleModeGrid.left -// width: simpleModeGrid.width -// height: simpleModeGrid.height -// color: "blue" -// } + Rectangle{ + id: infillCellLeft + anchors.top: parent.top + anchors.left: parent.left + width: base.width/100*55 - UM.Theme.sizes.default_margin.width + height: childrenRect.height < UM.Theme.sizes.simple_mode_infill_caption.height ? UM.Theme.sizes.simple_mode_infill_caption.height : childrenRect.height - Grid { - id: simpleModeGrid - anchors.fill: parent; - columns: 2 - spacing: 0 - -// Rectangle{ -// id: infillLabelCell -// width: base.width/100*45 -// height: 100 -// Column { -// spacing: 0 -// anchors{ -// top: parent.top -// topMargin: UM.Theme.sizes.default_margin.height -// right: parent.right -// rightMargin: UM.Theme.sizes.default_margin.width -// bottom: parent.bottom -// bottomMargin: UM.Theme.sizes.default_margin.height -// left: parent.left -// leftMargin: UM.Theme.sizes.default_margin.width -// } -// -// Label{ -// id: infillLabel -// //: Infill selection label -// text: catalog.i18nc("@label","Infill:"); -// font: UM.Theme.fonts.default; -// } -// Label{ -// id: infillCaption -// width: infillLabelCell.width - UM.Theme.sizes.default_margin.width -// text: "hier staat overig tekst hier staat overig tekst hier staat overig tekst" -// font: UM.Theme.fonts.caption -// wrapMode: Text.Wrap -// color: UM.Theme.colors.text -// } -// } -// } -// -// Rectangle{ -// id: infillCell -// height: 100 -// width: base.width/100*55 -// Row { -// spacing: 0 -// anchors.right: parent.right -// anchors.rightMargin: UM.Theme.sizes.default_margin.width -// Rectangle { -// id: infillWrapper -// width: infillCell.width/4; -// height: infillCell.height -// Rectangle{ -// id: infillIconLining -// anchors.top: parent.top -// anchors.topMargin: UM.Theme.sizes.default_margin.height -// anchors.horizontalCenter: parent.horizontalCenter -// z: parent.z + 1 -// width: parent.width - UM.Theme.sizes.default_margin.width/2 -// height: parent.width - UM.Theme.sizes.default_margin.width/2 -// color: "grey" -// border.color: "black" -// border.width:1 -// UM.RecolorImage { -// id: infillIcon -// z: parent.z + 1 -// anchors.verticalCenter: parent.verticalCenter -// anchors.horizontalCenter: parent.horizontalCenter -// width: UM.Theme.sizes.save_button_specs_icons.width -// height: UM.Theme.sizes.save_button_specs_icons.height -// sourceSize.width: width -// sourceSize.height: width -// color: UM.Theme.colors.text_hover -// source: UM.Theme.icons.print_time; -// } -// } -// Label{ -// //: Infill version label "light: -// text: catalog.i18nc("@label","Light"); -// anchors.top: infillIconLining.bottom -// anchors.horizontalCenter: parent.horizontalCenter -// font.bold: true -// } -// } -// Rectangle { -// color: "green"; -// width: infillCell.width/4; -// height: infillCell.height -// } -// Rectangle { -// color: "blue"; -// width: infillCell.width/4; -// height: infillCell.height -// } -// Rectangle { -// color: "yellow"; -// width: infillCell.width/4; -// height: infillCell.height -// } -// } -// } - - Rectangle { - width: parent.width/100*45 - UM.Theme.sizes.default_margin.width - height: 100 - Label{ - anchors.left: parent.left - anchors.leftMargin: UM.Theme.sizes.default_margin.width - //: Helpers selection label - text: catalog.i18nc("@label:listbox","Helpers:"); - font: UM.Theme.fonts.default; - } + Label{ + id: infillLabel + //: Infill selection label + text: catalog.i18nc("@label","Infill:"); + font: UM.Theme.fonts.default; + anchors.top: parent.top + anchors.topMargin: UM.Theme.sizes.default_margin.height + anchors.left: parent.left + anchors.leftMargin: UM.Theme.sizes.default_margin.width } - Rectangle { - width: parent.width/100*55 - UM.Theme.sizes.default_margin.width - height: 100 - Column { - spacing: 4 + Label{ + id: infillCaption + width: infillCellLeft.width - UM.Theme.sizes.default_margin.width + text: infillModel.get(infillListView.activeIndex).text + font: UM.Theme.fonts.caption + wrapMode: Text.Wrap + color: UM.Theme.colors.text + anchors.top: infillLabel.bottom + anchors.left: parent.left + anchors.leftMargin: UM.Theme.sizes.default_margin.width + } + } - CheckBox{ - Layout.preferredHeight: UM.Theme.sizes.section.height; - //: Setting enable skirt adhesion checkbox - 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: - { - if(checked != Printer.getSettingValue("skirt_line_count")) - { - Printer.setSettingValue("skirt_line_count", checked) + Rectangle{ + id: infillCellRight + height: 100 + width: base.width/100*45 + anchors.right: parent.right + anchors.rightMargin: UM.Theme.sizes.default_margin.width - (UM.Theme.sizes.default_margin.width/4) + anchors.top: parent.top + anchors.topMargin: UM.Theme.sizes.default_margin.height + Component{ + id: infillDelegate + Item{ + width: infillCellRight.width/3 + x: index * (infillCellRight.width/3) + anchors.top: parent.top + Rectangle{ + id: infillIconLining + anchors.top: parent.top + anchors.horizontalCenter: parent.horizontalCenter + width: parent.width - (UM.Theme.sizes.default_margin.width/2) + height: parent.width - (UM.Theme.sizes.default_margin.width/2) + border.color: infillListView.activeIndex == index ? UM.Theme.colors.setting_control_text : UM.Theme.colors.setting_control_border + border.width: infillListView.activeIndex == index ? 2 : 1 + color: infillListView.activeIndex == index ? UM.Theme.colors.setting_category_active : "transparent" + UM.RecolorImage { + id: infillIcon + z: parent.z + 1 + anchors.verticalCenter: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter + width: parent.width - UM.Theme.sizes.default_margin.width + height: parent.width - UM.Theme.sizes.default_margin.width + sourceSize.width: width + sourceSize.height: width + color: UM.Theme.colors.setting_control_text + source: UM.Theme.icons[model.icon]; + } + MouseArea { + anchors.fill: parent + onClicked: { + infillListView.activeIndex = index } } } - CheckBox{ - Layout.preferredHeight: UM.Theme.sizes.section.height; + Label{ + id: infillLabel + anchors.top: infillIconLining.bottom + anchors.horizontalCenter: parent.horizontalCenter + color: infillListView.activeIndex == index ? UM.Theme.colors.setting_control_text : UM.Theme.colors.setting_control_border + text: name + //font.bold: infillListView.activeIndex == index ? true : false + } + } + } + ListView{ + id: infillListView + property int activeIndex: 0 + model: infillModel + delegate: infillDelegate + anchors.fill: parent + } + ListModel { + id: infillModel - //: Setting enable support checkbox - text: catalog.i18nc("@option:check","Enable Support"); + ListElement { + name: "Sparse" + percentage: 20 + text: "Sparse (20%) infill will give your model an average strength" + icon: "sparse" + } + ListElement { + name: "Dense" + percentage: 50 + text: "Dense (50%) infill will give your model an above average strength" + icon: "dense" + } + ListElement { + name: "Solid" + percentage: 100; + text: "Solid (100%) infill will make your model completely solid" + icon: "solid" + } + } + } - style: UM.Theme.styles.checkbox; + Rectangle { + id: helpersCellLeft + anchors.top: infillCellLeft.bottom + anchors.topMargin: UM.Theme.sizes.default_margin.height + anchors.left: parent.left + width: parent.width/100*45 - UM.Theme.sizes.default_margin.width + height: childrenRect.height + Label{ + anchors.left: parent.left + anchors.leftMargin: UM.Theme.sizes.default_margin.width + //: Helpers selection label + text: catalog.i18nc("@label:listbox","Helpers:"); + font: UM.Theme.fonts.default; + } + } + Rectangle { + id: helpersCellRight + anchors.top: helpersCellLeft.top + anchors.topMargin: UM.Theme.sizes.default_margin.height + anchors.left: helpersCellLeft.right + width: parent.width/100*55 - UM.Theme.sizes.default_margin.width + height: childrenRect.height - checked: Printer.getSettingValue("support_enable") == null? false: Printer.getSettingValue("support_enable"); - onCheckedChanged: - { - if(checked != Printer.getSettingValue("support_enable")) - { - Printer.setSettingValue("support_enable", checked) - } - } + CheckBox{ + id: skirtCheckBox + anchors.top: parent.top + anchors.left: parent.left + Layout.preferredHeight: UM.Theme.sizes.section.height; + //: Setting enable skirt adhesion checkbox + 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: + { + if(checked != Printer.getSettingValue("skirt_line_count")) + { + Printer.setSettingValue("skirt_line_count", checked) + } + } + } + CheckBox{ + anchors.top: skirtCheckBox.bottom + anchors.topMargin: UM.Theme.sizes.default_lining.height + anchors.left: parent.left + Layout.preferredHeight: UM.Theme.sizes.section.height; + + //: Setting enable support checkbox + text: catalog.i18nc("@option:check","Enable Support"); + + style: UM.Theme.styles.checkbox; + + checked: Printer.getSettingValue("support_enable") == null? false: Printer.getSettingValue("support_enable"); + onCheckedChanged: + { + if(checked != Printer.getSettingValue("support_enable")) + { + Printer.setSettingValue("support_enable", checked) } } } diff --git a/resources/themes/cura/icons/medium.svg b/resources/themes/cura/icons/dense.svg similarity index 100% rename from resources/themes/cura/icons/medium.svg rename to resources/themes/cura/icons/dense.svg diff --git a/resources/themes/cura/icons/strong.svg b/resources/themes/cura/icons/solid.svg similarity index 100% rename from resources/themes/cura/icons/strong.svg rename to resources/themes/cura/icons/solid.svg diff --git a/resources/themes/cura/icons/light.svg b/resources/themes/cura/icons/sparse.svg similarity index 100% rename from resources/themes/cura/icons/light.svg rename to resources/themes/cura/icons/sparse.svg diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index a85e4350fa..026dfb3b40 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -172,6 +172,7 @@ "setting_control_margin": [3.0, 3.0], "setting_unit_margin": [0.5, 0.5], "setting_text_maxwidth": [40.0, 0.0], + "simple_mode_infill_caption": [0.0, 5.0], "standard_list_lineheight": [1.5, 1.5], "standard_list_input": [20.0, 25.0],