diff options
Diffstat (limited to 'resources/qml/Preferences/GeneralPage.qml')
| -rw-r--r-- | resources/qml/Preferences/GeneralPage.qml | 54 |
1 files changed, 47 insertions, 7 deletions
diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 5ce309cf8b..c0c443eec2 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2020 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.1 @@ -12,7 +12,7 @@ import Cura 1.0 as Cura UM.PreferencesPage { //: General configuration page title - title: catalog.i18nc("@title:tab","General") + title: catalog.i18nc("@title:tab", "General") id: generalPreferencesPage function setDefaultLanguage(languageCode) @@ -72,6 +72,9 @@ UM.PreferencesPage var defaultTheme = UM.Preferences.getValue("general/theme") setDefaultTheme(defaultTheme) + UM.Preferences.resetPreference("cura/single_instance") + singleInstanceCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/single_instance")) + UM.Preferences.resetPreference("physics/automatic_push_free") pushFreeCheckbox.checked = boolCheck(UM.Preferences.getValue("physics/automatic_push_free")) UM.Preferences.resetPreference("physics/automatic_drop_down") @@ -86,6 +89,8 @@ UM.PreferencesPage prefixJobNameCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/jobname_prefix")) UM.Preferences.resetPreference("view/show_overhang"); showOverhangCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_overhang")) + UM.Preferences.resetPreference("view/show_xray_warning"); + showXrayErrorCheckbox.checked = boolCheck(UM.Preferences.getValue("view/show_xray_warning")) UM.Preferences.resetPreference("view/center_on_select"); centerOnSelectCheckbox.checked = boolCheck(UM.Preferences.getValue("view/center_on_select")) UM.Preferences.resetPreference("view/invert_zoom"); @@ -129,7 +134,7 @@ UM.PreferencesPage Label { font.bold: true - text: catalog.i18nc("@label","Interface") + text: catalog.i18nc("@label", "Interface") } GridLayout @@ -140,7 +145,7 @@ UM.PreferencesPage Label { id: languageLabel - text: catalog.i18nc("@label","Language:") + text: "Language:" //Don't translate this, to make it easier to find the language drop-down if you can't read the current language. } ComboBox @@ -152,6 +157,7 @@ UM.PreferencesPage Component.onCompleted: { append({ text: "English", code: "en_US" }) + //Czech is disabled for being incomplete: append({ text: "Čeština", code: "cs_CZ" }) append({ text: "Deutsch", code: "de_DE" }) append({ text: "Español", code: "es_ES" }) //Finnish is disabled for being incomplete: append({ text: "Suomi", code: "fi_FI" }) @@ -160,7 +166,7 @@ UM.PreferencesPage append({ text: "日本語", code: "ja_JP" }) append({ text: "한국어", code: "ko_KR" }) append({ text: "Nederlands", code: "nl_NL" }) - append({ text: "Polski", code: "pl_PL" }) + //Polish is disabled for being incomplete: append({ text: "Polski", code: "pl_PL" }) append({ text: "Português do Brasil", code: "pt_BR" }) append({ text: "Português", code: "pt_PT" }) append({ text: "Русский", code: "ru_RU" }) @@ -330,12 +336,31 @@ UM.PreferencesPage id: showOverhangCheckbox checked: boolCheck(UM.Preferences.getValue("view/show_overhang")) - onClicked: UM.Preferences.setValue("view/show_overhang", checked) + onClicked: UM.Preferences.setValue("view/show_overhang", checked) text: catalog.i18nc("@option:check", "Display overhang"); } } + + UM.TooltipArea + { + width: childrenRect.width; + height: childrenRect.height; + + text: catalog.i18nc("@info:tooltip", "Highlight missing or extraneous surfaces of the model using warning signs. The toolpaths will often be missing parts of the intended geometry.") + + CheckBox + { + id: showXrayErrorCheckbox + + checked: boolCheck(UM.Preferences.getValue("view/show_xray_warning")) + onClicked: UM.Preferences.setValue("view/show_xray_warning", checked) + + text: catalog.i18nc("@option:check", "Display model errors"); + } + } + UM.TooltipArea { width: childrenRect.width; @@ -384,7 +409,7 @@ UM.PreferencesPage text: catalog.i18nc("@action:button", "Zoom toward mouse direction") checked: boolCheck(UM.Preferences.getValue("view/zoom_to_mouse")) && zoomToMouseCheckbox.enabled onClicked: UM.Preferences.setValue("view/zoom_to_mouse", checked) - enabled: UM.Preferences.getValue("general/camera_perspective_mode") !== "orthogonal" + enabled: UM.Preferences.getValue("general/camera_perspective_mode") !== "orthographic" } //Because there is no signal for individual preferences, we need to manually link to the onPreferenceChanged signal. @@ -542,6 +567,21 @@ UM.PreferencesPage { width: childrenRect.width height: childrenRect.height + text: catalog.i18nc("@info:tooltip","Should opening files from the desktop or external applications open in the same instance of Cura?") + + CheckBox + { + id: singleInstanceCheckbox + text: catalog.i18nc("@option:check","Use a single instance of Cura") + checked: boolCheck(UM.Preferences.getValue("cura/single_instance")) + onCheckedChanged: UM.Preferences.setValue("cura/single_instance", checked) + } + } + + UM.TooltipArea + { + width: childrenRect.width + height: childrenRect.height text: catalog.i18nc("@info:tooltip","Should models be scaled to the build volume if they are too large?") CheckBox |