From 86be7e5874209ddb5ab9966d40159bd996fdfbb5 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 24 May 2000 18:29:33 +0000
Subject: [PATCH] kde_toolbar dir is gone - install those three icons in
 .../konsole/pics Seems that kcmkonsole isn't compiled at the moment, anyway.

svn path=/trunk/kdebase/konsole/; revision=50586
---
 other/Makefile.am  | 3 ++-
 other/kcmkonsole.C | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/other/Makefile.am b/other/Makefile.am
index ae12b122..767231b5 100644
--- a/other/Makefile.am
+++ b/other/Makefile.am
@@ -11,7 +11,8 @@ data_DATA = BlackOnLightYellow.schema BlackOnWhite.schema \
 
 KDE_ICON = konsole
 
-kde_toolbar_DATA = colourness.png brightness.png contrast.png
+appicondir = $(kde_datadir)/konsole/pics
+appicon_DATA = colourness.png brightness.png contrast.png
 
 EXTRA_DIST = $(data_DATA) $(kde_toolbar_DATA)
 
diff --git a/other/kcmkonsole.C b/other/kcmkonsole.C
index 8272745c..ec14112d 100644
--- a/other/kcmkonsole.C
+++ b/other/kcmkonsole.C
@@ -307,7 +307,7 @@ SchemaConfig::SchemaConfig(QWidget* parent) : PageFrame(parent)
   slayout->setColStretch(0,1);
   slayout->setColStretch(1,2);
 
-  QPixmap pm0 = BarIcon(QString("contrast"));
+  QPixmap pm0 = UserIcon(QString::fromLatin1("contrast"));
   QLabel* ll0 = new QLabel(bigWidget);
   ll0->setPixmap(pm0);
   ll0->setFixedSize( ll0->sizeHint() );
@@ -320,7 +320,7 @@ SchemaConfig::SchemaConfig(QWidget* parent) : PageFrame(parent)
   QToolTip::add(sl0,i18n("Contrast"));
   QToolTip::add(ll0,i18n("Contrast"));
 
-  QPixmap pm1 = BarIcon("brightness");
+  QPixmap pm1 = UserIcon(QString::fromLatin1("brightness"));
   QLabel* ll1 = new QLabel(bigWidget);
   ll1->setPixmap(pm1);
   ll1->setFixedSize( ll1->sizeHint() );
@@ -333,7 +333,7 @@ SchemaConfig::SchemaConfig(QWidget* parent) : PageFrame(parent)
   QToolTip::add(sl1,i18n("Brightness"));
   QToolTip::add(ll1,i18n("Brightness"));
 
-  QPixmap pm2 = BarIcon("colourness");
+  QPixmap pm2 = UserIcon(QString::fromLatin1("colourness"));
   QLabel* ll2 = new QLabel(bigWidget);
   ll2->setPixmap(pm2);
   ll2->setFixedSize( ll2->sizeHint() );