3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'preference_qml_early_out' of github.com:Ultimaker/Cura into 4.0

Browse source
This commit is contained in:
Jaime van Kessel 2019-01-17 14:23:06 +01:00
commit aff2ffc67a
7 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
resources/qml/ActionPanel/SliceProcessWidget.qml
View file

@ -142,6 +142,11 @@ Column
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "general/auto_slice")
{
return;
}
var autoSlice = UM.Preferences.getValue("general/auto_slice")
if(prepareButtons.autoSlice != autoSlice)
{

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

@ -746,6 +746,11 @@ UM.PreferencesPage
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "info/send_slice_info")
{
return;
}
sendDataCheckbox.checked = boolCheck(UM.Preferences.getValue("info/send_slice_info"))
}
}

5
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View file

@ -139,6 +139,11 @@ Item
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "cura/expanded_types" && preference !== "cura/expanded_brands")
{
return;
}
expanded = materialList.expandedBrands.indexOf(sectionName) > -1
}
}

5
resources/qml/Preferences/Materials/MaterialsTypeSection.qml
View file

@ -130,6 +130,11 @@ Item
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "cura/expanded_types" && preference !== "cura/expanded_brands")
{
return;
}
expanded = materialList.expandedTypes.indexOf(materialType.brand + "_" + materialType.name) > -1
}
}

5
resources/qml/PrintSetupSelector/PrintSetupSelectorContents.qml
View file

@ -77,6 +77,11 @@ Item
target: UM.Preferences
onPreferenceChanged:
{
if (preference !== "view/settings_list_height" && preference !== "general/window_height" && preference !== "general/window_state")
{
return;
}
customPrintSetup.height =
Math.min
(