'about' [de] fixed.

support for KDEDIR not at /opt.
support for moved KDEDIR.

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

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>

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

other/DarkPicture.schema

@@ -4,7 +4,7 @@
 
 title Circuit
 
-image tile /opt/kde/share/wallpapers/circuit.jpg
+image tile circuit.jpg
 
 # foreground colors
 

other/LightPicture.schema

@@ -4,7 +4,7 @@
 
 title Paper
 
-image tile /opt/kde/share/wallpapers/gray2.jpg
+image tile gray2.jpg
 
 # foreground colors
 

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

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

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

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(

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()