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

Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown

Browse source 
Conflicts:
	resources/qml/ActionPanel/OutputProcessWidget.qml -> Due to removed theme entry.
This commit is contained in:
Ghostkeeper 2018-12-04 15:21:36 +01:00
commit b5bb3232f3
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
13 changed files with 49 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/qml/Preferences/SettingVisibilityPage.qml
View file

@ -115,15 +115,16 @@ UM.PreferencesPage
currentIndex:
{
var idx = -1;
for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
{
if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
{
currentIndex = i;
return;
idx = i;
break;
}
}
return -1
return idx;
}
onActivated: