From 658b15eae106cdd3c40b786f20974ee971fb2409 Mon Sep 17 00:00:00 2001
From: Lars Doelle <lars.doelle@on-line.de>
Date: Wed, 6 Jan 1999 05:27:09 +0000
Subject: [PATCH] 'about' [de] fixed. support for KDEDIR not at /opt. support
 for moved KDEDIR.

svn path=/trunk/kdebase/konsole/; revision=14906
---
 CONTRIBUTORS              |  5 +++++
 ChangeLog                 |  3 +++
 other/DarkPicture.schema  |  2 +-
 other/LightPicture.schema |  2 +-
 other/linux.kdelnk        |  1 +
 other/mc.kdelnk           |  1 +
 other/shell.kdelnk        |  1 +
 src/main.C                |  2 +-
 src/schema.C              | 11 ++++++++---
 9 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e2185258..ff86739f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -12,8 +12,13 @@ CONTRIBUTORS
   - dnd adjustsments
   - "-e" included into session management.
   - minor overall improvements.
+- Sven Fischer <herpes@kawo2.rwth-aachen.de>
+  - bug fixing
+  - moved installations
 - Dale M. Flaven <dflaven@netport.com>
   - bug fixing
+- Martin Jones <mjones@powerup.com.au>
+  - support for atypical kde apps dir locn.
 - Lars Knoll <knoll@mpi-hd.mpg.de>
   - bug fixing
 - Peter Silva <peter.silva@videotron.ca>
diff --git a/ChangeLog b/ChangeLog
index 99ff79ae..6ba14b75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+05 Jan 1998
+- improved handling of atypical or moved installations (Martin,Sven,Lars)
+- a QString::printf issue resolved (Sven,Lars)
 20 Dec 1998 David Faure <David.Faure@insa-lyon.fr
 - "-e" added to session management
 - slight overall improvements
diff --git a/other/DarkPicture.schema b/other/DarkPicture.schema
index 28c132c5..85aa208b 100644
--- a/other/DarkPicture.schema
+++ b/other/DarkPicture.schema
@@ -4,7 +4,7 @@
 
 title Circuit
 
-image tile /opt/kde/share/wallpapers/circuit.jpg
+image tile circuit.jpg
 
 # foreground colors
 
diff --git a/other/LightPicture.schema b/other/LightPicture.schema
index f4a23b9a..2e654724 100644
--- a/other/LightPicture.schema
+++ b/other/LightPicture.schema
@@ -4,7 +4,7 @@
 
 title Paper
 
-image tile /opt/kde/share/wallpapers/gray2.jpg
+image tile gray2.jpg
 
 # foreground colors
 
diff --git a/other/linux.kdelnk b/other/linux.kdelnk
index e603c87e..0f4db3cd 100644
--- a/other/linux.kdelnk
+++ b/other/linux.kdelnk
@@ -4,6 +4,7 @@ Type=KonsoleApplication
 Name=Linux
 Comment=Linux Console
 Comment[cs]=Linuxová konzole
+Comment[de]=Linux Konsole
 Comment[es]=Consola Linux
 Comment[fi]=Linux -konsoli
 Comment[is]=Aðalskjár Linux
diff --git a/other/mc.kdelnk b/other/mc.kdelnk
index 55b975be..9f67e4ca 100644
--- a/other/mc.kdelnk
+++ b/other/mc.kdelnk
@@ -3,6 +3,7 @@
 Type=KonsoleApplication
 Name=MC
 Comment=Midnight Commander
+Comment[de]=Mitternachtskommandant
 Comment[is]=mc:  Skráarstjóri fyrir textaham
 Comment[ro]=Midnite Commander
 Exec=mc -c
diff --git a/other/shell.kdelnk b/other/shell.kdelnk
index 49b4aab8..624b1b75 100644
--- a/other/shell.kdelnk
+++ b/other/shell.kdelnk
@@ -8,6 +8,7 @@ Name[no]=Skall
 Name[ro]=Interpretor
 Name[sv]=Skal
 Comment=Shell
+Comment[de]=Befehlseingabe
 Comment[fi]=Komentotulkki
 Comment[is]=Skel
 Comment[no]=Skall
diff --git a/src/main.C b/src/main.C
index 83e88fa1..5017d071 100644
--- a/src/main.C
+++ b/src/main.C
@@ -602,7 +602,7 @@ void TEDemo::changeTitle(int, const char*s)
 void TEDemo::about()
 //FIXME: make this a little nicer
 {
-  QString title, msg;
+  QString title, msg(1000);
 
   title.sprintf(i18n("About %s"), PACKAGE);
   msg.sprintf(i18n(
diff --git a/src/schema.C b/src/schema.C
index d3d9f2ca..0fbeb267 100644
--- a/src/schema.C
+++ b/src/schema.C
@@ -54,7 +54,10 @@ ColorSchema* ColorSchema::readSchema(const char* path)
         if (!strcmp(rend,"center")) attr = 3; else
         if (!strcmp(rend,"full"  )) attr = 4; else
           continue;
-        res->imagepath = path;
+
+        // if this is not an absolute filename, prepend the wallpaper dir
+        if (path[0] != '/') res->imagepath = kapp->kde_wallpaperdir() + '/';
+        res->imagepath += path;
         res->alignment = attr;
       }
       if (!strncmp(line,"color",5))
@@ -101,12 +104,14 @@ ColorSchema* ColorSchema::readSchema(const char* path)
 
 ColorSchema* ColorSchema::find(int numb)
 {
-  return numb2schema.find(numb);
+  ColorSchema* res = numb2schema.find(numb);
+  return res ? res : numb2schema.find(0);
 }
 
 ColorSchema* ColorSchema::find(const char* path)
 {
-  return path2schema.find(path);
+  ColorSchema* res = path2schema.find(path);
+  return res ? res : numb2schema.find(0);
 }
 
 int ColorSchema::count()