summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-05-04 00:03:47 +0200
committerPetr Mrázek <peterix@gmail.com>2017-05-04 00:03:47 +0200
commit35836c7709fec86f1e005528482f7b22fd07c935 (patch)
treee231a203661edf40463849eafe2bc2fda91a709e
parente76e6329cdf4f1613c6303debd3ca43493147f7b (diff)
downloadMultiMC-35836c7709fec86f1e005528482f7b22fd07c935.tar
MultiMC-35836c7709fec86f1e005528482f7b22fd07c935.tar.gz
MultiMC-35836c7709fec86f1e005528482f7b22fd07c935.tar.lz
MultiMC-35836c7709fec86f1e005528482f7b22fd07c935.tar.xz
MultiMC-35836c7709fec86f1e005528482f7b22fd07c935.zip
NOISSUE herp derp custom icon theme support
* Put icon theme in iconthemes/custom/ * Select 'Custom' in the UI. * ... * Maybe it won't explode.
-rw-r--r--application/MultiMC.cpp5
-rw-r--r--application/pages/global/MultiMCPage.cpp7
-rw-r--r--application/pages/global/MultiMCPage.ui5
3 files changed, 17 insertions, 0 deletions
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index d9d59aa6..18314371 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -537,6 +537,11 @@ void MultiMC::initIcons()
m_icons->directoryChanged(value.toString());
});
ENV.registerIconList(m_icons);
+
+ // set icon theme search path!
+ auto searchPaths = QIcon::themeSearchPaths();
+ searchPaths.append("iconthemes");
+ QIcon::setThemeSearchPaths(searchPaths);
}
void appDebugOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp
index 47d79d98..4073f6b7 100644
--- a/application/pages/global/MultiMCPage.cpp
+++ b/application/pages/global/MultiMCPage.cpp
@@ -314,6 +314,9 @@ void MultiMCPage::applySettings()
case 6:
s->set("IconTheme", "iOS");
break;
+ case 7:
+ s->set("IconTheme", "custom");
+ break;
case 0:
default:
s->set("IconTheme", "multimc");
@@ -411,6 +414,10 @@ void MultiMCPage::loadSettings()
{
ui->themeComboBox->setCurrentIndex(6);
}
+ else if (theme == "custom")
+ {
+ ui->themeComboBox->setCurrentIndex(7);
+ }
else
{
ui->themeComboBox->setCurrentIndex(0);
diff --git a/application/pages/global/MultiMCPage.ui b/application/pages/global/MultiMCPage.ui
index bf2b4da7..0b966876 100644
--- a/application/pages/global/MultiMCPage.ui
+++ b/application/pages/global/MultiMCPage.ui
@@ -391,6 +391,11 @@
<string notr="true">iOS</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>Custom</string>
+ </property>
+ </item>
</widget>
</item>
<item row="1" column="1">