From 5088d33fd2aec8fed9725f9dedb64e9629226c11 Mon Sep 17 00:00:00 2001 From: TheKodeToad Date: Thu, 20 Jul 2023 14:16:44 +0100 Subject: Finish things :P Signed-off-by: TheKodeToad --- launcher/ui/themes/IconTheme.cpp | 4 ++-- launcher/ui/themes/IconTheme.h | 2 +- launcher/ui/themes/ThemeManager.cpp | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'launcher/ui/themes') diff --git a/launcher/ui/themes/IconTheme.cpp b/launcher/ui/themes/IconTheme.cpp index cd1dfbaf..4bd88985 100644 --- a/launcher/ui/themes/IconTheme.cpp +++ b/launcher/ui/themes/IconTheme.cpp @@ -25,7 +25,7 @@ IconTheme::IconTheme(const QString& id, const QString& path) : m_id(id), m_path( bool IconTheme::load() { - QString path = m_path + "/index.theme"; + const QString path = m_path + "/index.theme"; if (!QFile::exists(path)) return false; @@ -50,4 +50,4 @@ QString IconTheme::path() QString IconTheme::name() { return m_name; -} \ No newline at end of file +} diff --git a/launcher/ui/themes/IconTheme.h b/launcher/ui/themes/IconTheme.h index 458ea12c..4e466c6a 100644 --- a/launcher/ui/themes/IconTheme.h +++ b/launcher/ui/themes/IconTheme.h @@ -34,4 +34,4 @@ class IconTheme { QString m_id; QString m_path; QString m_name; -}; \ No newline at end of file +}; diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp index 32585618..c929549e 100644 --- a/launcher/ui/themes/ThemeManager.cpp +++ b/launcher/ui/themes/ThemeManager.cpp @@ -72,17 +72,12 @@ void ThemeManager::initializeIcons() { // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies! // set icon theme search path! - - if (!m_iconThemeFolder.mkpath(".")) - themeWarningLog() << "Couldn't create icon theme folder"; - themeDebugLog() << "Icon Theme Folder Path: " << m_iconThemeFolder.absolutePath(); + themeDebugLog() << "<> Initializing Icon Themes"; auto searchPaths = QIcon::themeSearchPaths(); searchPaths.append(m_iconThemeFolder.path()); QIcon::setThemeSearchPaths(searchPaths); - themeDebugLog() << "<> Initializing Icon Themes"; - for (const QString& id : builtinIcons) { IconTheme theme(id, QString(":/icons/%1").arg(id)); if (!theme.load()) { @@ -94,6 +89,10 @@ void ThemeManager::initializeIcons() themeDebugLog() << "Loaded Built-In Icon Theme" << id; } + if (!m_iconThemeFolder.mkpath(".")) + themeWarningLog() << "Couldn't create icon theme folder"; + themeDebugLog() << "Icon Theme Folder Path: " << m_iconThemeFolder.absolutePath(); + QDirIterator directoryIterator(m_iconThemeFolder.path(), QDir::Dirs | QDir::NoDotAndDotDot); while (directoryIterator.hasNext()) { QDir dir(directoryIterator.next()); -- cgit