summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-01-28 20:56:23 +0100
committerPetr Mrázek <peterix@gmail.com>2015-01-28 20:56:23 +0100
commitd03dbea1b771f3d83cb2d89d2174720f4ea843f7 (patch)
tree426dd3451aafa0a1b1b25dd9fdbbc42fb07a641a
parentc6427caa9e78189cb819ef26aa358f681130d3fa (diff)
downloadMultiMC-d03dbea1b771f3d83cb2d89d2174720f4ea843f7.tar
MultiMC-d03dbea1b771f3d83cb2d89d2174720f4ea843f7.tar.gz
MultiMC-d03dbea1b771f3d83cb2d89d2174720f4ea843f7.tar.lz
MultiMC-d03dbea1b771f3d83cb2d89d2174720f4ea843f7.tar.xz
MultiMC-d03dbea1b771f3d83cb2d89d2174720f4ea843f7.zip
NOISSUE change icon themes without restart
-rw-r--r--gui/MainWindow.cpp1
-rw-r--r--gui/pages/global/MultiMCPage.cpp6
2 files changed, 7 insertions, 0 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp
index 7df3ac0e..357d3497 100644
--- a/gui/MainWindow.cpp
+++ b/gui/MainWindow.cpp
@@ -975,6 +975,7 @@ void MainWindow::on_actionSettings_triggered()
proxymodel->invalidate();
proxymodel->sort(0);
updateToolsMenu();
+ update();
}
void MainWindow::on_actionInstanceSettings_triggered()
diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp
index 2ecf1c96..34958e2c 100644
--- a/gui/pages/global/MultiMCPage.cpp
+++ b/gui/pages/global/MultiMCPage.cpp
@@ -272,6 +272,7 @@ void MultiMCPage::applySettings()
// Updates
s->set("AutoUpdate", ui->autoUpdateCheckBox->isChecked());
s->set("UpdateChannel", m_currentUpdateChannel);
+ auto original = s->get("IconTheme").toString();
//FIXME: make generic
switch (ui->themeComboBox->currentIndex())
{
@@ -299,6 +300,11 @@ void MultiMCPage::applySettings()
break;
}
+ if(original != s->get("IconTheme"))
+ {
+ QIcon::setThemeName(s->get("IconTheme").toString());
+ }
+
// Console settings
s->set("ShowConsole", ui->showConsoleCheck->isChecked());
s->set("AutoCloseConsole", ui->autoCloseConsoleCheck->isChecked());