3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Hide button is now in correct location

Browse source 
CURA-1278
This commit is contained in:
Jaime van Kessel 2016-05-31 11:12:22 +02:00
parent 72d7bd5769
commit 152f362562
1 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

64
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -41,40 +41,44 @@ Item {
} }
} }
delegate: Loader delegate: Row
{ {
width: UM.Theme.getSize("setting").width; Loader
height: UM.Theme.getSize("setting").height;
property var definition: model
property var settingDefinitionsModel: addedSettingsModel
property var propertyProvider: provider
//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,
//causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely.
asynchronous: model.type != "enum"
source:
{ {
switch(model.type) // TODO: This needs to be fixed properly. Got frustrated with it not working, so this is the patch job! width: UM.Theme.getSize("setting").width;
height: UM.Theme.getSize("setting").height;
property var definition: model
property var settingDefinitionsModel: addedSettingsModel
property var propertyProvider: provider
//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,
//causing nasty issues when selecting different options. So disable asynchronous loading of enum type completely.
asynchronous: model.type != "enum"
source:
{ {
case "int": switch(model.type) // TODO: This needs to be fixed properly. Got frustrated with it not working, so this is the patch job!
return "../../resources/qml/Settings/SettingTextField.qml" {
case "float": case "int":
return "../../resources/qml/Settings/SettingTextField.qml" return "../../resources/qml/Settings/SettingTextField.qml"
case "enum": case "float":
return "../../resources/qml/Settings/SettingComboBox.qml" return "../../resources/qml/Settings/SettingTextField.qml"
case "bool": case "enum":
return "../../resources/qml/Settings/SettingCheckBox.qml" return "../../resources/qml/Settings/SettingComboBox.qml"
case "str": case "bool":
return "../../resources/qml/Settings/SettingTextField.qml" return "../../resources/qml/Settings/SettingCheckBox.qml"
case "category": case "str":
return "../../resources/qml/Settings/SettingCategory.qml" return "../../resources/qml/Settings/SettingTextField.qml"
default: case "category":
return "../../resources/qml/Settings/SettingUnknown.qml" return "../../resources/qml/Settings/SettingCategory.qml"
default:
return "../../resources/qml/Settings/SettingUnknown.qml"
}
} }
} }
Button Button
{ {
width: UM.Theme.getSize("setting").height; width: UM.Theme.getSize("setting").height;
@ -111,8 +115,8 @@ Item {
storeIndex: 0 storeIndex: 0
} }
} }
} }
Button Button
{ {
id: customise_settings_button; id: customise_settings_button;