xpm -> png

svn path=/trunk/kdebase/konsole/; revision=29721

other/Makefile.am

@@ -9,7 +9,7 @@ data_DATA = BlackOnLightYellow.schema BlackOnWhite.schema \
 
 KDE_ICON = konsole
 
-kde_toolbar_DATA = colourness.xpm brightness.xpm contrast.xpm
+kde_toolbar_DATA = colourness.png brightness.png contrast.png
 
 EXTRA_DIST = $(data_DATA) $(kde_toolbar_DATA)
 

other/brightness.xpm

@@ -1,21 +0,0 @@
-/* XPM */
-static char * brightness_xpm[] = {
-"15 15 3 1",
-" 	c None",
-".	c black",
-"X	c white",
-"       .       ",
-" .           . ",
-"     .....     ",
-"   ..XXXXX..   ",
-"   .XXXXXXX.   ",
-"  .XXXXXXXXX.  ",
-"  .XXXXXXXXX.  ",
-". .XXXXXXXXX. .",
-"  .XXXXXXXXX.  ",
-"  .XXXXXXXXX.  ",
-"   .XXXXXXX.   ",
-"   ..XXXXX..   ",
-"     .....     ",
-" .           . ",
-"       .       "};

other/colourness.xpm

@@ -1,22 +0,0 @@
-/* XPM */
-static char * colourness_xpm[] = {
-"15 15 4 1",
-" 	c None",
-".	c black",
-"X	c gray50",
-"o	c red",
-"               ",
-"               ",
-"     .....     ",
-"   ..XX.oo..   ",
-"   .XXX.ooo.   ",
-"  .XXXX.oooo.  ",
-"  .XXXX.oooo.  ",
-"  .XXXX.oooo.  ",
-"  .XXXX.oooo.  ",
-"  .XXXX.oooo.  ",
-"   .XXX.ooo.   ",
-"   ..XX.oo..   ",
-"     .....     ",
-"               ",
-"               "};

other/contrast.xpm

@@ -1,22 +0,0 @@
-/* XPM */
-static char * contrast_xpm[] = {
-"15 15 4 1",
-" 	c None",
-".	c black",
-"X	c gray50",
-"o	c white",
-"               ",
-"               ",
-"     .....     ",
-"   ....Xoo..   ",
-"   ....Xooo.   ",
-"  .....Xoooo.  ",
-"  .....Xoooo.  ",
-"  .....Xoooo.  ",
-"  .....Xoooo.  ",
-"  .....Xoooo.  ",
-"   ....Xooo.   ",
-"   ....Xoo..   ",
-"     .....     ",
-"               ",
-"               "};

src/kcmkonsole.C

@@ -21,6 +21,7 @@
 #include <kiconloader.h>
 
 #include <stdio.h>
+#include <kstddirs.h>
 #include <klocale.h>
 #include <kglobal.h>
 
@@ -48,7 +49,7 @@ void PageFrame::Contents(const char* header, QWidget* body, const char* footer)
     topLayout->addWidget( sb , 2);
     QBoxLayout *sbl = new QHBoxLayout( sb,5,5 ); 
     QLabel* logo = new QLabel(sb);
-    QPixmap pm = KGlobal::iconLoader()->loadApplicationIcon("konsole.xpm");
+    QPixmap pm = KGlobal::iconLoader()->loadIcon(locate("icon","konsole"));
     logo->setPixmap(pm);
     logo->setAlignment( AlignCenter );
     logo->setMinimumSize( logo->sizeHint() );