3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-11 16:00:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7122_Include_description_in_search_field

Browse source
This commit is contained in:
Jaime van Kessel 2020-06-29 13:55:09 +02:00
commit 134d79608f
No known key found for this signature in database
GPG key ID: 3710727397403C91
38 changed files with 559 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Preferences/GeneralPage.qml
View file

@ -90,7 +90,7 @@ UM.PreferencesPage
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_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");
@ -336,7 +336,7 @@ 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");
}