From af8b974db51754d5a06a4a013542db74ac2134c3 Mon Sep 17 00:00:00 2001
From: Michael Koch <koch@kde.org>
Date: Mon, 27 Sep 1999 07:36:12 +0000
Subject: [PATCH] xpm -> png

svn path=/trunk/kdebase/konsole/; revision=29721
---
 other/Makefile.am    |   2 +-
 other/brightness.png | Bin 0 -> 298 bytes
 other/brightness.xpm |  21 ---------------------
 other/colourness.png | Bin 0 -> 308 bytes
 other/colourness.xpm |  22 ----------------------
 other/contrast.png   | Bin 0 -> 286 bytes
 other/contrast.xpm   |  22 ----------------------
 src/kcmkonsole.C     |   3 ++-
 8 files changed, 3 insertions(+), 67 deletions(-)
 create mode 100644 other/brightness.png
 delete mode 100644 other/brightness.xpm
 create mode 100644 other/colourness.png
 delete mode 100644 other/colourness.xpm
 create mode 100644 other/contrast.png
 delete mode 100644 other/contrast.xpm

diff --git a/other/Makefile.am b/other/Makefile.am
index ec47f072..ec5afdbe 100644
--- a/other/Makefile.am
+++ b/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)
 
diff --git a/other/brightness.png b/other/brightness.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2ac02ee17b98d303535c95ba089eb84964ceded
GIT binary patch
literal 298
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K10wgEik39&an3BBRT^RPt$G%|(@_am9978H@
zwN9|)V=&}kKK|$bdB3fz3tV<M9ZqD}<a4>fZrw&7(}L4n3To|E$L_{0SX~`v^PR0=
z$=%t9jsDo55q*Bx<jb1))$)-Qj_e#tLOe(3YNUY7tqO@K3C>R|DNig)WniedReT}f
z+LtrFKK@^Qea`!w3p2QAe91U$!<H-N23O4uLOk?N>FBL2Ik8qp@1)N)Z{2I&nz|>>
zYhUy}cb=8uOQBF>u7syD&|G7%xtZyCi6x~FgS|Zs&3(;0eT=-#JWafOd^dU+d2TY<
jXkuvO>E&%^=)=meAd$1qb)K;bP&<RCtDnm{r-UW|3Jz+~

literal 0
HcmV?d00001

diff --git a/other/brightness.xpm b/other/brightness.xpm
deleted file mode 100644
index e17745a5..00000000
--- a/other/brightness.xpm
+++ /dev/null
@@ -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..   ",
-"     .....     ",
-" .           . ",
-"       .       "};
diff --git a/other/colourness.png b/other/colourness.png
new file mode 100644
index 0000000000000000000000000000000000000000..996529a31a532c060b27dbb2ac38cd0ab828178d
GIT binary patch
literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K11|+SoP4xm&Y)RhkE)07?Fw^Pk3ZO`kr;B4q
z#jU%O4ssnZ;BcP&Z^x6<Z&xnXwtC|kq33j>TaIPdkt5%|rU|B`F)(=gb2F#S$>m-%
zXVc+%jqZ)^AGX#p1Yb&@v0gCe99P7bhDYsRGnx302#TCnXnzDW-KQ!fq9iy!t)x7$
zD3yVs;#Tp6fNNjQ`1<&N_4PULb1ux_qVXl;unk+Tm>XO*Hwf|2JEfzyvgE{C9leu2
z*SvMFd28yPIIn%t``md}hA)Lejkyw@%0P3C!RBVB=OvbuLJT(cF){EqF*EV@_A@dz
t+hpKvYUFF^WoB;fZ(``bb;AY*hVHK%*&Dpv8i3jvJYD@<);T3K0RRkmamoMy

literal 0
HcmV?d00001

diff --git a/other/colourness.xpm b/other/colourness.xpm
deleted file mode 100644
index a5128a45..00000000
--- a/other/colourness.xpm
+++ /dev/null
@@ -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..   ",
-"     .....     ",
-"               ",
-"               "};
diff --git a/other/contrast.png b/other/contrast.png
new file mode 100644
index 0000000000000000000000000000000000000000..537d8daaa86348857d7a4311542721ed06aaf3ef
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^{2<K10wgEik39&an3BBRT^RPt$G%|(@*F%}978H@
zZ4EFNVo>1l{;|XV_`#<3!bfLBF0nOmRTS(Gy*-WDLHbDel`AP{B6cZ1IByp8d-YkJ
z;;c=+2cKNedNEm=r*HYnH@!f!e5yhsN`mv#O3D+9QW+R3ZWUh$xc23YuaEy%U!U_n
z=fVsw8ecLF+py(|xxrO)gAfnBQ#yJpOHQoS(L3pL&0F`Hx2Eoi^V%1^&z)yw_);j;
zm@DC_3^dmmY;I<HUSdfp#9(71PhUS{UqdrLV?#4<V-FuQV}COvV?Q$kFSD&%JUm$$
Yrnqx_cHC5z1k}#p>FVdQ&MBb@0IQ;D761SM

literal 0
HcmV?d00001

diff --git a/other/contrast.xpm b/other/contrast.xpm
deleted file mode 100644
index ecd33c63..00000000
--- a/other/contrast.xpm
+++ /dev/null
@@ -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..   ",
-"     .....     ",
-"               ",
-"               "};
diff --git a/src/kcmkonsole.C b/src/kcmkonsole.C
index 12f21f04..0d80e067 100644
--- a/src/kcmkonsole.C
+++ b/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() );