summaryrefslogtreecommitdiffstats
path: root/src/launcher-lib/launchermain.cpp
diff options
context:
space:
mode:
authorDominik Holland <dominik.holland@pelagicore.com>2018-06-07 08:57:41 +0200
committerRobert Griebl <robert.griebl@pelagicore.com>2018-06-07 09:18:50 +0000
commit7e050758810b64cd6f2c096ccd9f71de9ad4c9c1 (patch)
tree1712685faa5b0a6f32e9ff641c83c79e93f0d0ef /src/launcher-lib/launchermain.cpp
parent650f39ae68027089935d3d23b9a29f9c814b6769 (diff)
Add options to specify iconTheme and searchPaths in am-config.yaml
This makes it easier to use a custom icon theme in the system-ui as well as in the apps. Change-Id: I8490e74541d0d9cb12e7ff542ef05679c2489812 Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com> Reviewed-by: Lukáš Tinkl <ltinkl@luxoft.com> Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src/launcher-lib/launchermain.cpp')
-rw-r--r--src/launcher-lib/launchermain.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/launcher-lib/launchermain.cpp b/src/launcher-lib/launchermain.cpp
index b1e08113..5958ee1f 100644
--- a/src/launcher-lib/launchermain.cpp
+++ b/src/launcher-lib/launchermain.cpp
@@ -124,6 +124,15 @@ QVariantMap LauncherMain::openGLConfiguration() const
return m_openGLConfiguration;
}
+QString LauncherMain::iconThemeName() const
+{
+ return m_iconThemeName;
+}
+
+QStringList LauncherMain::iconThemeSearchPaths() const
+{
+ return m_iconThemeSearchPaths;
+}
QVariantMap LauncherMain::windowProperties(QWindow *window) const
{
@@ -170,6 +179,8 @@ void LauncherMain::loadConfiguration(const QByteArray &configYaml) Q_DECL_NOEXCE
QVariantMap uiConfig = m_configuration.value(qSL("ui")).toMap();
m_slowAnimations = uiConfig.value(qSL("slowAnimations")).toBool();
m_openGLConfiguration = uiConfig.value(qSL("opengl")).toMap();
+ m_iconThemeName = uiConfig.value(qSL("iconThemeName")).toString();
+ m_iconThemeSearchPaths = uiConfig.value(qSL("iconThemeSearchPaths")).toStringList();
// un-comment this if things go south:
//qWarning() << "### LOG " << m_loggingRules;