From 817de9d39e096c0419e288bb21c230f4bb771bda Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Wed, 24 May 2017 17:42:11 +0200 Subject: [PATCH] Get a list of available themes instead of the hardcoded list --- resources/qml/Preferences/GeneralPage.qml | 6 +++++- resources/themes/cura/theme.json | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index a01abb06ee..3e734f0e53 100755 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -218,7 +218,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() }); + } } } diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index 5f0b3656c8..c398cbe165 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -1,4 +1,7 @@ { + "metadata": { + "name": "Ultimaker" + }, "fonts": { "large": { "size": 1.25,