GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 01:15:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Defaults" button on General page

Browse Source 
CURA-1278
This commit is contained in:
fieldOfView 2016-05-27 17:11:54 +02:00
parent c1b64274e8
commit f5fce51238
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
resources/qml/GeneralPage.qml
View File

@ -5,6 +5,7 @@ import QtQuick 2.1
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.1
import QtQml.Models 2.2
import UM 1.1 as UM import UM 1.1 as UM
@ -28,18 +29,23 @@ UM.PreferencesPage
function reset() function reset()
{ {
UM.Preferences.resetPreference("general/language") UM.Preferences.resetPreference("general/language")
UM.Preferences.resetPreference("physics/automatic_push_free")
UM.Preferences.resetPreference("mesh/scale_to_fit")
UM.Preferences.resetPreference("info/send_slice_info")
UM.Preferences.resetPreference("cura/jobname_prefix")
pushFreeCheckbox.checked = boolCheck(UM.Preferences.getValue("physics/automatic_push_free"))
sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
scaleToFitCheckbox.checked = boolCheck(UM.Preferences.getValue("mesh/scale_to_fit"))
prefixJobNameCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/jobname_prefix"))
var defaultLanguage = UM.Preferences.getValue("general/language") var defaultLanguage = UM.Preferences.getValue("general/language")
setDefaultLanguage(defaultLanguage) setDefaultLanguage(defaultLanguage)
if (UM.Models.pluginsModel.find("id", "UpdateChecker") > -1) { UM.Preferences.resetPreference("physics/automatic_push_free")
pushFreeCheckbox.checked = boolCheck(UM.Preferences.getValue("physics/automatic_push_free"))
UM.Preferences.resetPreference("mesh/scale_to_fit")
scaleToFitCheckbox.checked = boolCheck(UM.Preferences.getValue("mesh/scale_to_fit"))
UM.Preferences.resetPreference("mesh/scale_tiny_meshes")
scaleTinyCheckbox.checked = boolCheck(UM.Preferences.getValue("mesh/scale_tiny_meshes"))
UM.Preferences.resetPreference("cura/jobname_prefix")
prefixJobNameCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/jobname_prefix"))
if (plugins.model.find("id", "SliceInfoPlugin") > -1) {
UM.Preferences.resetPreference("info/send_slice_info")
sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
}
if (plugins.model.find("id", "UpdateChecker") > -1) {
UM.Preferences.resetPreference("info/automatic_update_check") UM.Preferences.resetPreference("info/automatic_update_check")
checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check")) checkUpdatesCheckbox.checked = boolCheck(UM.Preferences.getValue("info/automatic_update_check"))
} }
@ -158,9 +164,9 @@ UM.PreferencesPage
} }
UM.TooltipArea { UM.TooltipArea {
visible: UM.Models.pluginsModel.find("id", "UpdateChecker") > -1 visible: plugins.model.find("id", "UpdateChecker") > -1
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: visible ? childrenRect.height : 0
text: catalog.i18nc("@info:tooltip","Should Cura check for updates when the program is started?") text: catalog.i18nc("@info:tooltip","Should Cura check for updates when the program is started?")
CheckBox CheckBox
@ -173,8 +179,9 @@ UM.PreferencesPage
} }
UM.TooltipArea { UM.TooltipArea {
visible: plugins.model.find("id", "SliceInfoPlugin-1") > -1
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: visible ? childrenRect.height : 0
text: 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.") text: 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.")
CheckBox CheckBox
@ -199,5 +206,11 @@ UM.PreferencesPage
onCheckedChanged: UM.Preferences.setValue("cura/jobname_prefix", checked) onCheckedChanged: UM.Preferences.setValue("cura/jobname_prefix", checked)
} }
} }
DelegateModel
{
id: plugins
model: UM.PluginsModel { }
}
} }
} }