summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_hatire
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-11-27 04:15:58 +0100
committerStanislaw Halik <sthalik@misaki.pl>2013-11-27 04:15:58 +0100
commit72aac33d3f6e9697b0183f51eaacf8fd454a259f (patch)
tree4fde3f3cf0fad0dc3331a720a8acd1f0d9bc2934 /ftnoir_tracker_hatire
parent7f4488ae5337c7e943140ed5dd1e7a8536e41508 (diff)
convert icon to .png, doesn't work on win32 ironically
Diffstat (limited to 'ftnoir_tracker_hatire')
-rw-r--r--ftnoir_tracker_hatire/ftnoir_hat.qrc8
-rw-r--r--ftnoir_tracker_hatire/ftnoir_hatcontrols.ui8
-rw-r--r--ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp2
-rw-r--r--ftnoir_tracker_hatire/images/hat.icobin1150 -> 0 bytes
-rw-r--r--ftnoir_tracker_hatire/images/hat.pngbin0 -> 376 bytes
5 files changed, 9 insertions, 9 deletions
diff --git a/ftnoir_tracker_hatire/ftnoir_hat.qrc b/ftnoir_tracker_hatire/ftnoir_hat.qrc
index 4c606f92..ad67b862 100644
--- a/ftnoir_tracker_hatire/ftnoir_hat.qrc
+++ b/ftnoir_tracker_hatire/ftnoir_hat.qrc
@@ -1,6 +1,6 @@
<RCC>
- <qresource prefix="/">
- <file>images/hat.ico</file>
- <file>images/hat_logo.png</file>
- </qresource>
+ <qresource prefix="/">
+ <file>images/hat_logo.png</file>
+ <file>images/hat.png</file>
+ </qresource>
</RCC>
diff --git a/ftnoir_tracker_hatire/ftnoir_hatcontrols.ui b/ftnoir_tracker_hatire/ftnoir_hatcontrols.ui
index 8882fffb..97db404f 100644
--- a/ftnoir_tracker_hatire/ftnoir_hatcontrols.ui
+++ b/ftnoir_tracker_hatire/ftnoir_hatcontrols.ui
@@ -30,7 +30,7 @@
</property>
<property name="windowIcon">
<iconset>
- <normaloff>images/hat.ico</normaloff>images/hat.ico</iconset>
+ <normaloff>images/hat.png</normaloff>images/hat.png</iconset>
</property>
<property name="windowOpacity">
<double>1.000000000000000</double>
@@ -57,15 +57,15 @@
</size>
</property>
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<property name="usesScrollButtons">
<bool>true</bool>
</property>
<widget class="QWidget" name="tab_config">
<attribute name="icon">
- <iconset resource="ftnoir_hat.qrc">
- <normaloff>:/images/hat.ico</normaloff>:/images/hat.ico</iconset>
+ <iconset>
+ <normaloff>:/images/hat.png</normaloff>:/images/hat.png</iconset>
</attribute>
<attribute name="title">
<string>General</string>
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp
index c19f68d3..cd1475f8 100644
--- a/ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp
+++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp
@@ -29,7 +29,7 @@ void FTNoIR_TrackerDll::getDescription(QString *strToBeFilled)
void FTNoIR_TrackerDll::getIcon(QIcon *icon)
{
- *icon = QIcon(":/images/hat.ico");
+ *icon = QIcon(":/images/hat.png");
}
extern "C" FTNOIR_TRACKER_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
diff --git a/ftnoir_tracker_hatire/images/hat.ico b/ftnoir_tracker_hatire/images/hat.ico
deleted file mode 100644
index d8f5aac4..00000000
--- a/ftnoir_tracker_hatire/images/hat.ico
+++ /dev/null
Binary files differ
diff --git a/ftnoir_tracker_hatire/images/hat.png b/ftnoir_tracker_hatire/images/hat.png
new file mode 100644
index 00000000..46a6e442
--- /dev/null
+++ b/ftnoir_tracker_hatire/images/hat.png
Binary files differ