summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-08-25 23:35:52 +0200
committerPetr Mrázek <peterix@gmail.com>2013-08-25 23:35:52 +0200
commita852dff98d808726551543aaed33cd49decf13bc (patch)
tree71ee33ed5c802c8634048f7f566bd0f1c8fc4cc0
parentf0990fae4bc6e54837764c0ded1461b9f1770401 (diff)
downloadMultiMC-a852dff98d808726551543aaed33cd49decf13bc.tar
MultiMC-a852dff98d808726551543aaed33cd49decf13bc.tar.gz
MultiMC-a852dff98d808726551543aaed33cd49decf13bc.tar.lz
MultiMC-a852dff98d808726551543aaed33cd49decf13bc.tar.xz
MultiMC-a852dff98d808726551543aaed33cd49decf13bc.zip
Add cat icon for the cat button. Meow. >:3
-rw-r--r--gui/mainwindow.ui6
-rw-r--r--multimc.qrc1
-rw-r--r--resources/icons/toolbar/Cat.pngbin0 -> 811 bytes
3 files changed, 6 insertions, 1 deletions
diff --git a/gui/mainwindow.ui b/gui/mainwindow.ui
index 7bc2c3eb..4360f5f6 100644
--- a/gui/mainwindow.ui
+++ b/gui/mainwindow.ui
@@ -432,11 +432,15 @@
<property name="checkable">
<bool>true</bool>
</property>
+ <property name="icon">
+ <iconset resource="../multimc.qrc">
+ <normaloff>:/icons/toolbar/cat</normaloff>:/icons/toolbar/cat</iconset>
+ </property>
<property name="text">
<string>Meow</string>
</property>
<property name="toolTip">
- <string>Catnatok. Or just a cant with a ball of yarn? WHO KNOWS?!</string>
+ <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-weight:600; color:#ff0004;&quot;&gt;Catnatok!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;Or just a cat with a ball of yarn?&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;WHO KNOWS?!&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;img src=&quot;:/icons/instances/tnt&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</action>
</widget>
diff --git a/multimc.qrc b/multimc.qrc
index 3e6e7698..06a64952 100644
--- a/multimc.qrc
+++ b/multimc.qrc
@@ -10,6 +10,7 @@
<file alias="refresh">resources/icons/toolbar/refresh.png</file>
<file alias="settings">resources/icons/toolbar/settings.png</file>
<file alias="viewfolder">resources/icons/toolbar/viewfolder.png</file>
+ <file alias="cat">resources/icons/toolbar/Cat.png</file>
</qresource>
<qresource prefix="/icons/instances">
<file alias="brick">resources/icons/instances/brick.png</file>
diff --git a/resources/icons/toolbar/Cat.png b/resources/icons/toolbar/Cat.png
new file mode 100644
index 00000000..4fcda3ea
--- /dev/null
+++ b/resources/icons/toolbar/Cat.png
Binary files differ