GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-21 13:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

CURA-4495 Change property name and add default values

Browse Source
This commit is contained in:
Diego Prado Gesto 2017-12-18 11:58:34 +01:00
parent 6ddf8ce649
commit 4a211c6ac6
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View File

@ -145,6 +145,7 @@ Item {
property var settingDefinitionsModel: addedSettingsModel property var settingDefinitionsModel: addedSettingsModel
property var propertyProvider: provider property var propertyProvider: provider
property var globalPropertyProvider: inheritStackProvider property var globalPropertyProvider: inheritStackProvider
property var externalResetHandler: false
//Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989 //Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
//In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes, //In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,

6
resources/qml/Settings/SettingItem.qml
View File

@ -19,8 +19,6 @@ Item {
property alias contents: controlContainer.children property alias contents: controlContainer.children
property alias hovered: mouse.containsMouse property alias hovered: mouse.containsMouse
property var resetHandler: false
property var showRevertButton: true property var showRevertButton: true
property var showInheritButton: true property var showInheritButton: true
property var showLinkedSettingIcon: true property var showLinkedSettingIcon: true
@ -183,8 +181,8 @@ Item {
onClicked: { onClicked: {
revertButton.focus = true revertButton.focus = true
if (resetHandler) { if (externalResetHandler) {
resetHandler(propertyProvider.key) externalResetHandler(propertyProvider.key)
} else { } else {
Cura.MachineManager.clearUserSettingAllCurrentStacks(propertyProvider.key) Cura.MachineManager.clearUserSettingAllCurrentStacks(propertyProvider.key)
} }

1
resources/qml/Settings/SettingView.qml
View File

@ -287,6 +287,7 @@ Item
property var settingDefinitionsModel: definitionsModel property var settingDefinitionsModel: definitionsModel
property var propertyProvider: provider property var propertyProvider: provider
property var globalPropertyProvider: inheritStackProvider property var globalPropertyProvider: inheritStackProvider
property var externalResetHandler: false
//Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989 //Qt5.4.2 and earlier has a bug where this causes a crash: https://bugreports.qt.io/browse/QTBUG-35989
//In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes, //In addition, while it works for 5.5 and higher, the ordering of the actual combo box drop down changes,