diff options
82 files changed, 1634 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 88e72353..70031bd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -718,6 +718,8 @@ set(MULTIMC_QRCS resources/pe_light/pe_light.qrc resources/pe_colored/pe_colored.qrc resources/pe_blue/pe_blue.qrc + resources/OSX/OSX.qrc + resources/iOS/iOS.qrc resources/instances/instances.qrc resources/versions/versions.qrc ) 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> @@ -39,6 +39,8 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(pe_light); Q_INIT_RESOURCE(pe_blue); Q_INIT_RESOURCE(pe_colored); + Q_INIT_RESOURCE(OSX); + Q_INIT_RESOURCE(iOS); switch (app.status()) { diff --git a/resources/OSX/OSX.qrc b/resources/OSX/OSX.qrc new file mode 100644 index 00000000..24e1a0bf --- /dev/null +++ b/resources/OSX/OSX.qrc @@ -0,0 +1,34 @@ +<!DOCTYPE RCC> +<RCC version="1.0"> + <qresource prefix="/icons/OSX"> + <file>index.theme</file> + <file>scalable/about.svg</file> + <file>scalable/accounts.svg</file> + <file>scalable/bug.svg</file> + <file>scalable/centralmods.svg</file> + <file>scalable/checkupdate.svg</file> + <file>scalable/copy.svg</file> + <file>scalable/coremods.svg</file> + <file>scalable/externaltools.svg</file> + <file>scalable/instance-settings.svg</file> + <file>scalable/jarmods.svg</file> + <file>scalable/java.svg</file> + <file>scalable/loadermods.svg</file> + <file>scalable/log.svg</file> + <file>scalable/minecraft.svg</file> + <file>scalable/multimc.svg</file> + <file>scalable/new.svg</file> + <file>scalable/news.svg</file> + <file>scalable/notes.svg</file> + <file>scalable/patreon.svg</file> + <file>scalable/proxy.svg</file> + <file>scalable/quickmods.svg</file> + <file>scalable/refresh.svg</file> + <file>scalable/resourcepacks.svg</file> + <file>scalable/screenshots.svg</file> + <file>scalable/settings.svg</file> + <file>scalable/status-bad.svg</file> + <file>scalable/status-good.svg</file> + <file>scalable/viewfolder.svg</file> + </qresource> +</RCC> diff --git a/resources/OSX/index.theme b/resources/OSX/index.theme new file mode 100644 index 00000000..7f90a32e --- /dev/null +++ b/resources/OSX/index.theme @@ -0,0 +1,11 @@ +[Icon Theme] +Name=OSX +Comment=OSX theme by pexner +Inherits=multimc +Directories=scalable + +[scalable] +Size=48 +Type=Scalable +MinSize=16 +MaxSize=256 diff --git a/resources/OSX/scalable/about.svg b/resources/OSX/scalable/about.svg new file mode 100644 index 00000000..eb87ccf1 --- /dev/null +++ b/resources/OSX/scalable/about.svg @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"> +<rect fill-rule="evenodd" clip-rule="evenodd" fill="none" width="32" height="32"/> +<path fill="#B6B5B6" d="M30,28H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v18C32,27.1,31.1,28,30,28z"/> +<path fill="#FBFBFB" d="M30,27H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v17C32,26.1,31.1,27,30,27z"/> +<g> + <polygon fill="#585858" points="17.2,20.2 17.2,15.2 14,15.2 14,16.5 15.2,16.5 15.2,20.2 14,20.2 14,21.5 18.5,21.5 18.5,20.2 + "/> + <g id="_x38__12_"> + <g> + <path fill="#585858" d="M16,9c-4.4,0-8,3.6-8,8c0,4.4,3.6,8,8,8s8-3.6,8-8C24,12.6,20.4,9,16,9z M16,24c-3.9,0-7-3.1-7-7 + c0-3.9,3.1-7,7-7s7,3.1,7,7C23,20.9,19.9,24,16,24z"/> + </g> + </g> + <circle fill="#585858" cx="16.2" cy="13.2" r="1"/> +</g> +</svg> diff --git a/resources/OSX/scalable/accounts.svg b/resources/OSX/scalable/accounts.svg new file mode 100644 index 00000000..163bcee0 --- /dev/null +++ b/resources/OSX/scalable/accounts.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve"> +<rect fill="none" width="24" height="24"/> +<g id="_x36__10_"> + <g> + <path fill="#585858" d="M21,12.2c0.6-0.9,1-2,1-3.2c0-2.8-2-5-4.5-5S13,6.2,13,9c0,1.2,0.4,2.3,1,3.2c-1.2,0.4-2,1.5-2,2.8v2 + c0,1.7,1.3,3,3,3h5c1.7,0,3-1.3,3-3v-2C23,13.7,22.2,12.6,21,12.2z"/> + </g> +</g> +<ellipse fill-rule="evenodd" clip-rule="evenodd" fill="#F2F2F2" cx="17.5" cy="9" rx="3.5" ry="4"/> +<path fill-rule="evenodd" clip-rule="evenodd" fill="#CCCCCC" d="M22,15.2c0-1.1-0.8-1.9-1.9-2.2c-0.7,0.6-1.6,0.9-2.6,0.9 + c-1,0-1.9-0.3-2.6-0.9c-1.1,0.2-1.9,1.1-1.9,2.2v1.5c0,1.2,1.1,2.2,2.5,2.2h4.1c1.4,0,2.5-1,2.5-2.2V15.2z"/> +</svg> diff --git a/resources/OSX/scalable/bug.svg b/resources/OSX/scalable/bug.svg new file mode 100644 index 00000000..00565bb6 --- /dev/null +++ b/resources/OSX/scalable/bug.svg @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"> +<rect fill-rule="evenodd" clip-rule="evenodd" fill="none" width="32" height="32"/> +<path fill="#B6B5B6" d="M30,28H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v18C32,27.1,31.1,28,30,28z"/> +<path fill="#FBFBFB" d="M30,27H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v17C32,26.1,31.1,27,30,27z"/> +<path fill="#585858" d="M23.5,18.9c0.3,0,0.5-0.2,0.5-0.5c0-0.3-0.2-0.5-0.5-0.5H21c0-0.1,0-0.2,0-0.3c0-0.4,0-0.7,0-1 + c0.7-0.1,1.2-0.4,1.6-0.9c1.3-1.5,0.9-4.4,0.9-4.5c0-0.3-0.3-0.4-0.5-0.4c-0.3,0-0.4,0.3-0.4,0.5c0,0,0.4,2.6-0.7,3.8 + c-0.3,0.3-0.6,0.5-1.1,0.6c-0.1-0.2-0.2-0.3-0.3-0.5c-0.2-0.2-0.4-0.3-0.7-0.4c0.2-0.3,0.4-0.6,0.4-1.1c0-1.2-0.8-2.2-2.1-2.8l0,0 + C17.9,9.8,17,9,16,9c-1,0-1.9,0.8-2,1.9l0,0v0c-1.3,0.6-2.1,1.6-2.1,2.8c0,0.5,0.1,0.8,0.4,1.1c-0.3,0.1-0.5,0.2-0.7,0.4 + c-0.1,0.1-0.2,0.3-0.3,0.5c-0.4-0.1-0.8-0.2-1.1-0.6c-1-1.2-0.7-3.7-0.7-3.8c0-0.3-0.1-0.5-0.4-0.5c-0.3,0-0.5,0.1-0.5,0.4 + c0,0.1-0.4,3,0.9,4.5c0.4,0.5,1,0.8,1.6,0.9c0,0.3,0,0.6,0,1c0,0.1,0,0.2,0,0.3H8.5c-0.3,0-0.5,0.2-0.5,0.5c0,0.3,0.2,0.5,0.5,0.5 + h2.6c0,0.6,0.1,1.2,0.3,1.7c-0.8,0.1-1.5,0.4-2,1c-1.1,1.2-0.9,3-0.9,3c0,0.2,0.2,0.4,0.5,0.4c0,0,0,0,0,0c0.3,0,0.5-0.3,0.4-0.5 + c0,0-0.1-1.4,0.7-2.3c0.4-0.4,0.9-0.6,1.6-0.7c0.9,1.8,2.5,3.1,4.3,3.1c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c1.9,0,3.5-1.2,4.3-3.1 + c0.7,0,1.2,0.3,1.6,0.7c0.8,0.9,0.7,2.3,0.7,2.3c0,0.3,0.2,0.5,0.4,0.5c0,0,0,0,0,0c0.2,0,0.4-0.2,0.5-0.4c0-0.1,0.1-1.9-0.9-3 + c-0.5-0.5-1.1-0.9-1.9-1c0.2-0.5,0.3-1.1,0.3-1.7H23.5z M16,9.9c0.4,0,0.8,0.2,1,0.6c-0.1,0-0.2,0-0.3,0c-0.1,0-0.1,0-0.2,0 + c-0.2,0-0.4,0-0.5,0c-0.2,0-0.4,0-0.5,0c-0.1,0-0.1,0-0.2,0c-0.1,0-0.2,0-0.3,0C15.2,10.2,15.6,9.9,16,9.9z M12.8,13.7 + c0-0.9,0.7-1.7,1.8-2.1c0.9-0.3,2-0.3,2.9,0c1.1,0.4,1.8,1.2,1.8,2.1c0,0.5-0.1,0.8-1.6,0.8c-0.5,0-1,0-1.6,0c0,0,0,0,0,0 + c0,0,0,0,0,0c0,0,0,0,0,0c-0.6,0-1.1,0-1.6,0C13,14.5,12.8,14.2,12.8,13.7z M16.5,23.6v-5.1c0-0.3-0.2-0.5-0.5-0.5s-0.5,0.2-0.5,0.5 + v5.1c-2-0.3-3.5-2.5-3.5-5.1c0-0.3,0-0.6,0-0.9c0-0.9,0-1.5,0.2-1.7c0.3-0.3,1.1-0.4,2.3-0.5c0.2,0,0.4,0,0.7,0c0.6,0,1.2,0,1.7,0 + c0.3,0,0.5,0,0.8,0c1.2,0,1.9,0.2,2.2,0.5c0.3,0.3,0.2,0.8,0.2,1.7c0,0.2,0,0.5,0,0.8c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0.1 + C20,21.1,18.5,23.3,16.5,23.6z"/> +</svg> diff --git a/resources/OSX/scalable/centralmods.svg b/resources/OSX/scalable/centralmods.svg new file mode 100644 index 00000000..37b821e4 --- /dev/null +++ b/resources/OSX/scalable/centralmods.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" + viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"> +<rect fill-rule="evenodd" clip-rule="evenodd" fill="none" width="32" height="32"/> +<path fill="#B6B5B6" d="M30,28H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v18C32,27.1,31.1,28,30,28z"/> +<path fill="#FBFBFB" d="M30,27H2c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h28c1.1,0,2,0.9,2,2v17C32,26.1,31.1,27,30,27z"/> +<path fill-rule="evenodd" clip-rule="evenodd" fill="#585858" d="M22,25H10c-1.1,0-2-0.9-2-2V11c0-1.1,0.9-2,2-2h3c1.1,0,2,0.9,2,2 + h7c1.1,0,2, |
