summaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
Diffstat (limited to 'gui')
-rw-r--r--gui/MainWindow.ui2
-rw-r--r--gui/pages/InstanceSettingsPage.h2
-rw-r--r--gui/pages/NotesPage.h5
-rw-r--r--gui/pages/global/AccountListPage.h7
-rw-r--r--gui/pages/global/MultiMCPage.cpp14
-rw-r--r--gui/pages/global/MultiMCPage.ui10
6 files changed, 37 insertions, 3 deletions
diff --git a/gui/MainWindow.ui b/gui/MainWindow.ui
index 9fce38c4..e6812353 100644
--- a/gui/MainWindow.ui
+++ b/gui/MainWindow.ui
@@ -505,6 +505,8 @@
<include location="../resources/pe_clolored/pe_colored.qrc"/>
<include location="../resources/multimc/multimc.qrc"/>
<include location="../resources/instances/instances.qrc"/>
+ <include location="../resources/OSX/OSX.qrc"/>
+ <include location="../resources/iOS/iOS.qrc"/>
</resources>
<connections/>
</ui>
diff --git a/gui/pages/InstanceSettingsPage.h b/gui/pages/InstanceSettingsPage.h
index 988862cf..7d653fab 100644
--- a/gui/pages/InstanceSettingsPage.h
+++ b/gui/pages/InstanceSettingsPage.h
@@ -41,7 +41,7 @@ public:
}
virtual QIcon icon() const override
{
- return QIcon::fromTheme("settings");
+ return QIcon::fromTheme("instance-settings");
}
virtual QString id() const override
{
diff --git a/gui/pages/NotesPage.h b/gui/pages/NotesPage.h
index 81338e57..0e9391df 100644
--- a/gui/pages/NotesPage.h
+++ b/gui/pages/NotesPage.h
@@ -40,7 +40,10 @@ public:
}
virtual QIcon icon() const override
{
- return QIcon::fromTheme("news");
+ auto icon = QIcon::fromTheme("notes");
+ if(icon.isNull())
+ icon = QIcon::fromTheme("news");
+ return icon;
}
virtual QString id() const override
{
diff --git a/gui/pages/global/AccountListPage.h b/gui/pages/global/AccountListPage.h
index fd2c96e3..cc695614 100644
--- a/gui/pages/global/AccountListPage.h
+++ b/gui/pages/global/AccountListPage.h
@@ -42,7 +42,12 @@ public:
}
QIcon icon() const override
{
- return QIcon::fromTheme("noaccount");
+ auto icon = QIcon::fromTheme("accounts");
+ if(icon.isNull())
+ {
+ icon = QIcon::fromTheme("noaccount");
+ }
+ return icon;
}
QString id() const override
{
diff --git a/gui/pages/global/MultiMCPage.cpp b/gui/pages/global/MultiMCPage.cpp
index 9694a138..79797aa7 100644
--- a/gui/pages/global/MultiMCPage.cpp
+++ b/gui/pages/global/MultiMCPage.cpp
@@ -282,6 +282,12 @@ void MultiMCPage::applySettings()
case 4:
s->set("IconTheme", "pe_colored");
break;
+ case 5:
+ s->set("IconTheme", "OSX");
+ break;
+ case 6:
+ s->set("IconTheme", "iOS");
+ break;
case 0:
default:
s->set("IconTheme", "multimc");
@@ -347,6 +353,14 @@ void MultiMCPage::loadSettings()
{
ui->themeComboBox->setCurrentIndex(4);
}
+ else if (theme == "OSX")
+ {
+ ui->themeComboBox->setCurrentIndex(5);
+ }
+ else if (theme == "iOS")
+ {
+ ui->themeComboBox->setCurrentIndex(6);
+ }
else
{
ui->themeComboBox->setCurrentIndex(0);
diff --git a/gui/pages/global/MultiMCPage.ui b/gui/pages/global/MultiMCPage.ui
index 94592476..308d8842 100644
--- a/gui/pages/global/MultiMCPage.ui
+++ b/gui/pages/global/MultiMCPage.ui
@@ -354,6 +354,16 @@
<string>Simple (Colored Icons)</string>
</property>
</item>
+ <item>
+ <property name="text">
+ <string>OSX</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>iOS</string>
+ </property>
+ </item>
</widget>
</item>
</layout>