Merge branch 'feature_lsit_themes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_lsit_themes

This commit is contained in:
Ghostkeeper 2017-06-19 11:05:20 +02:00
commit 9acaef8ecc
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
2 changed files with 8 additions and 1 deletions

View file

@ -219,7 +219,11 @@ UM.PreferencesPage
id: themeList
Component.onCompleted: {
append({ text: catalog.i18nc("@item:inlistbox", "Ultimaker"), code: "cura" })
var themes = UM.Theme.getThemes()
for (var i = 0; i < themes.length; i++)
{
append({ text: themes[i].name.toString(), code: themes[i].id.toString() });
}
}
}

View file

@ -1,4 +1,7 @@
{
"metadata": {
"name": "Ultimaker"
},
"fonts": {
"large": {
"size": 1.25,