From 9f75bed8c21b808657d78957f0094f423a5489ee Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sun, 6 Dec 2015 16:52:48 +0100
Subject: [PATCH] Changed: Use PNG images

---
 .../client_config_qt/client_config_dialog.cpp | 16 ++++++-------
 .../client_config_qt/client_config_dialog.ui  |  6 ++---
 .../tools/client/client_config_qt/main.cpp    |  4 +++-
 .../client/client_config_qt/resources.qrc     | 24 +++++++++----------
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
index aa4fe9128..c6bd9190f 100644
--- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
+++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp
@@ -181,14 +181,14 @@ void CClientConfigDialog::onClickCategory( QTreeWidgetItem *item )
 
 	static const char *iconNames[] =
 	{
-		":/resources/general_icon.bmp",
-		":/resources/display_icon.bmp",
-		":/resources/display_properties_icon.bmp",
-		":/resources/display_config_icon.bmp",
-		":/resources/sound_icon.bmp",
-		":/resources/general_icon.bmp",
-		":/resources/card_icon.bmp",
-		":/resources/card_icon.bmp"
+		":/resources/general_icon.png",
+		":/resources/display_icon.png",
+		":/resources/display_properties_icon.png",
+		":/resources/display_config_icon.png",
+		":/resources/sound_icon.png",
+		":/resources/general_icon.png",
+		":/resources/card_icon.png",
+		":/resources/card_icon.png"
 	};
 
 	sint32 index = item->data( 0, Qt::UserRole ).toInt();
diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui b/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui
index d8fde7665..03f4234a6 100644
--- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui
+++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.ui
@@ -31,7 +31,7 @@
         <string/>
        </property>
        <property name="pixmap">
-        <pixmap resource="resources.qrc">:/resources/left_bitmap_0.bmp</pixmap>
+        <pixmap resource="resources.qrc">:/resources/left_bitmap_0.png</pixmap>
        </property>
       </widget>
      </item>
@@ -60,7 +60,7 @@
           <string/>
          </property>
          <property name="pixmap">
-          <pixmap resource="resources.qrc">:/resources/general_icon.bmp</pixmap>
+          <pixmap resource="resources.qrc">:/resources/general_icon.png</pixmap>
          </property>
         </widget>
        </item>
@@ -101,7 +101,7 @@
           </font>
          </property>
          <property name="styleSheet">
-          <string notr="true">background-image: url(:/resources/top_right.bmp);</string>
+          <string notr="true">background-image: url(:/resources/top_right.png);</string>
          </property>
          <property name="text">
           <string>General</string>
diff --git a/code/ryzom/tools/client/client_config_qt/main.cpp b/code/ryzom/tools/client/client_config_qt/main.cpp
index 8bdf12193..bc04d797a 100644
--- a/code/ryzom/tools/client/client_config_qt/main.cpp
+++ b/code/ryzom/tools/client/client_config_qt/main.cpp
@@ -24,7 +24,9 @@
 int main( sint32 argc, char **argv )
 {
 	QApplication app( argc, argv );
-	QPixmap pixmap( ":/resources/splash_screen.bmp" );
+
+	QApplication::setWindowIcon(QIcon(":/resources/welcome_icon.png"));
+	QPixmap pixmap(":/resources/splash_screen.png" );
 	QSplashScreen splash( pixmap );
 
 	splash.show();
diff --git a/code/ryzom/tools/client/client_config_qt/resources.qrc b/code/ryzom/tools/client/client_config_qt/resources.qrc
index d2e13bcdc..1d86eaded 100644
--- a/code/ryzom/tools/client/client_config_qt/resources.qrc
+++ b/code/ryzom/tools/client/client_config_qt/resources.qrc
@@ -1,16 +1,16 @@
 <RCC>
     <qresource prefix="/">
-        <file>resources/card_icon.bmp</file>
-        <file>resources/display_config_icon.bmp</file>
-        <file>resources/display_icon.bmp</file>
-        <file>resources/display_properties_icon.bmp</file>
-        <file>resources/general_icon.bmp</file>
-        <file>resources/left_bitmap_0.bmp</file>
-        <file>resources/network_icon.bmp</file>
-        <file>resources/sound_icon.bmp</file>
-        <file>resources/splash_screen.bmp</file>
-        <file>resources/top_right.bmp</file>
-        <file>resources/update_icon.bmp</file>
-        <file>resources/welcome_icon.bmp</file>
+        <file>resources/card_icon.png</file>
+        <file>resources/display_config_icon.png</file>
+        <file>resources/display_icon.png</file>
+        <file>resources/display_properties_icon.png</file>
+        <file>resources/general_icon.png</file>
+        <file>resources/left_bitmap_0.png</file>
+        <file>resources/network_icon.png</file>
+        <file>resources/sound_icon.png</file>
+        <file>resources/splash_screen.png</file>
+        <file>resources/top_right.png</file>
+        <file>resources/update_icon.png</file>
+        <file>resources/welcome_icon.png</file>
     </qresource>
 </RCC>