3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 15:25:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'CURA-5734-rework-and-unit-test-setting-visibility-preset'

Browse source
This commit is contained in:
Ghostkeeper 2018-10-18 14:59:41 +02:00
commit 3888d79b34
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
8 changed files with 260 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

8
resources/qml/Menus/SettingVisibilityPresetsMenu.qml
View file

@ -18,17 +18,17 @@ Menu
Instantiator
{
model: settingVisibilityPresetsModel
model: settingVisibilityPresetsModel.items
MenuItem
{
text: model.name
text: modelData.name
checkable: true
checked: model.id == settingVisibilityPresetsModel.activePreset
checked: modelData.presetId == settingVisibilityPresetsModel.activePreset
exclusiveGroup: group
onTriggered:
{
settingVisibilityPresetsModel.setActivePreset(model.id);
settingVisibilityPresetsModel.setActivePreset(modelData.presetId);
}
}

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

@ -110,24 +110,25 @@ UM.PreferencesPage
right: parent.right
}
model: settingVisibilityPresetsModel
model: settingVisibilityPresetsModel.items
textRole: "name"
currentIndex:
{
// Load previously selected preset.
var index = settingVisibilityPresetsModel.find("id", settingVisibilityPresetsModel.activePreset)
if (index == -1)
for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
{
return 0
if(settingVisibilityPresetsModel.items[i].id == settingVisibilityPresetsModel.activePreset)
{
currentIndex = i;
return;
}
}
return index
return -1
}
onActivated:
{
var preset_id = settingVisibilityPresetsModel.getItem(index).id;
var preset_id = settingVisibilityPresetsModel.items[index].id;
settingVisibilityPresetsModel.setActivePreset(preset_id);
}
}