From 72aac33d3f6e9697b0183f51eaacf8fd454a259f Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 27 Nov 2013 04:15:58 +0100
Subject: convert icon to .png, doesn't work on win32 ironically

---
 ftnoir_tracker_hatire/ftnoir_hat.qrc             |   8 ++++----
 ftnoir_tracker_hatire/ftnoir_hatcontrols.ui      |   8 ++++----
 ftnoir_tracker_hatire/ftnoir_tracker_hat_dll.cpp |   2 +-
 ftnoir_tracker_hatire/images/hat.ico             | Bin 1150 -> 0 bytes
 ftnoir_tracker_hatire/images/hat.png             | Bin 0 -> 376 bytes
 5 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 ftnoir_tracker_hatire/images/hat.ico
 create mode 100644 ftnoir_tracker_hatire/images/hat.png

(limited to 'ftnoir_tracker_hatire')

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
Binary files a/ftnoir_tracker_hatire/images/hat.ico and /dev/null differ
diff --git a/ftnoir_tracker_hatire/images/hat.png b/ftnoir_tracker_hatire/images/hat.png
new file mode 100644
index 00000000..46a6e442
Binary files /dev/null and b/ftnoir_tracker_hatire/images/hat.png differ
-- 
cgit v1.2.3