0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some issues in the newly added themes

Browse Source
This commit is contained in:
Petr Mrázek 2014-10-27 00:41:40 +01:00
parent 547f6f77d0
commit 9e8a74cc89
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gui/MainWindow.ui
View File

@ -14,8 +14,7 @@
<string>MultiMC 5</string> <string>MultiMC 5</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../resources/multimc/multimc.qrc"> <iconset theme="multimc"/>
<normaloff>:/icons/multimc/scalable/apps/multimc.svg</normaloff>:/icons/multimc/scalable/apps/multimc.svg</iconset>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
@ -502,7 +501,7 @@
<include location="../resources/pe_dark/pe_dark.qrc"/> <include location="../resources/pe_dark/pe_dark.qrc"/>
<include location="../resources/pe_light/pe_light.qrc"/> <include location="../resources/pe_light/pe_light.qrc"/>
<include location="../resources/pe_blue/pe_blue.qrc"/> <include location="../resources/pe_blue/pe_blue.qrc"/>
<include location="../resources/pe_clolored/pe_colored.qrc"/> <include location="../resources/pe_colored/pe_colored.qrc"/>
<include location="../resources/multimc/multimc.qrc"/> <include location="../resources/multimc/multimc.qrc"/>
<include location="../resources/instances/instances.qrc"/> <include location="../resources/instances/instances.qrc"/>
<include location="../resources/OSX/OSX.qrc"/> <include location="../resources/OSX/OSX.qrc"/>

2
gui/dialogs/AboutDialog.cpp
View File

@ -81,7 +81,7 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AboutDia
ui->urlLabel->setOpenExternalLinks(true); ui->urlLabel->setOpenExternalLinks(true);
ui->icon->setPixmap(QIcon(":/icons/multimc/scalable/apps/multimc.svg").pixmap(64)); ui->icon->setPixmap(QIcon::fromTheme("multimc").pixmap(64));
ui->title->setText("MultiMC 5 " + BuildConfig.printableVersionString()); ui->title->setText("MultiMC 5 " + BuildConfig.printableVersionString());
ui->versionLabel->setText(tr("Version") +": " + BuildConfig.printableVersionString()); ui->versionLabel->setText(tr("Version") +": " + BuildConfig.printableVersionString());

7
gui/dialogs/AboutDialog.ui
View File

@ -58,9 +58,6 @@
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
<property name="pixmap">
<pixmap resource="../../resources/multimc/multimc.qrc">:/icons/multimc/scalable/apps/multimc.svg</pixmap>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -464,8 +461,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>98</width> <width>689</width>
<height>88</height> <height>311</height>
</rect> </rect>
</property> </property>
<attribute name="label"> <attribute name="label">

7
gui/pages/global/ExternalToolsPage.h
View File

@ -37,7 +37,12 @@ public:
} }
QIcon icon() const override QIcon icon() const override
{ {
return QIcon::fromTheme("externaltools"); auto icon = QIcon::fromTheme("externaltools");
if(icon.isNull())
{
icon = QIcon::fromTheme("loadermods");
}
return icon;
} }
QString id() const override QString id() const override
{ {