-Fix for 1483

 "ZKB should keep user settings in $HOME/Settings instead of $OPIEDIR/share/zkb"

 Now by default it loads and saves to $HOME/Applications/zkb but falls
 back to $OPIEDIR/share/zkb to find the included files

5 files changed, 19 insertions, 18 deletions

diff --git a/noncore/applets/zkbapplet/applet/zkbwidget.cpp b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
index 13729ea..55c08b3 100644
--- a/noncore/applets/zkbapplet/applet/zkbwidget.cpp
+++ b/noncore/applets/zkbapplet/applet/zkbwidget.cpp
@@ -29,11 +29,9 @@ ZkbWidget::ZkbWidget(QWidget* parent)
 
 ZkbWidget::~ZkbWidget()
 {
-    if (keymap != 0) {
         delete keymap;
         keymap = 0;
     }
-}
 
 int ZkbWidget::position()
 {
@@ -41,13 +39,11 @@ int ZkbWidget::position()
 }
 
 bool ZkbWidget::loadKeymap() {
-    ZkbConfig c(QPEApplication::qpeDir()+"share/zkb");
+    ZkbConfig c(Global::applicationFileName("zkb", QString::null) );
     QFontMetrics fm(font());
 
-    if (keymap != 0) {
         delete keymap;
         keymap = 0;
-    }
 
     Keymap* km = new Keymap();
 
@@ -98,10 +94,6 @@ bool ZkbWidget::loadKeymap() {
     return true;
 }
 
-QSize ZkbWidget::sizeHint() const {
-    return QSize(AppLnk::smallIconSize(),AppLnk::smallIconSize());
-}
-
 void ZkbWidget::stateChanged(const QString& s) {
 //  odebug << "stateChanged: " << s.utf8() << "\n" << oendl;
     setText(s);
diff --git a/noncore/applets/zkbapplet/applet/zkbwidget.h b/noncore/applets/zkbapplet/applet/zkbwidget.h
index 9bce85a..13906c0 100644
--- a/noncore/applets/zkbapplet/applet/zkbwidget.h
+++ b/noncore/applets/zkbapplet/applet/zkbwidget.h
@@ -17,8 +17,6 @@ public:
     ~ZkbWidget();
     static int position();
 
-    QSize sizeHint() const;
-
 protected:
     QLabel* label;
     Keymap* keymap;
diff --git a/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp b/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp
index 4190a9e..6f24ea0 100644
--- a/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/cfgdlg.cpp
@@ -124,7 +124,7 @@ void CfgDlg::accept() {
 	cfile->setAutorepeatPeriod(ap->value());
 
 	CfgParser p;
-	p.save(QPEApplication::qpeDir()+"share/zkb/zkb.xml", *cfile);
+        p.save(Global::applicationFileName("zkb", "zkb.xml" ), *cfile);
 	QCopEnvelope("QPE/zkb", "reload()");
 
 	QDialog::accept();
diff --git a/noncore/applets/zkbapplet/keyzcfg/main.cpp b/noncore/applets/zkbapplet/keyzcfg/main.cpp
index afd0f6a..d7926f0 100644
--- a/noncore/applets/zkbapplet/keyzcfg/main.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/main.cpp
@@ -1,5 +1,7 @@
 #include <stdio.h>
 #include <qpe/qpeapplication.h>
+#include <qpe/global.h>
+
 #include <qlayout.h>
 #include <qmainwindow.h>
 
@@ -9,7 +11,7 @@ int main( int argc, char **argv ) {
 	QPEApplication app(argc, argv);
 	CfgFile cfile;
 	CfgParser cp;
-	cp.load(QPEApplication::qpeDir()+"share/zkb/zkb.xml", cfile);
+        cp.load(Global::applicationFileName("zkb", "zkb.xml"), cfile);
 
 
 	CfgDlg c(0, &cfile, &app, true);
diff --git a/noncore/applets/zkbapplet/keyzcfg/zkbcfg.cpp b/noncore/applets/zkbapplet/keyzcfg/zkbcfg.cpp
index 24bd897..6f3b9bf 100644
--- a/noncore/applets/zkbapplet/keyzcfg/zkbcfg.cpp
+++ b/noncore/applets/zkbapplet/keyzcfg/zkbcfg.cpp
@@ -2,6 +2,7 @@
 
 /* OPIE */
 #include <opie2/odebug.h>
+#include <opie2/oapplication.h>
 using namespace Opie::Core;
 
 /* QT */
@@ -16,16 +17,23 @@ ZkbConfig::~ZkbConfig() {
 
 bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix) {
 	bool ret;
-	QFile f(path+"/"+file);
-	QFileInfo fi(f);
+    QFile *f = new QFile(path+"/"+file);
+    QFileInfo fi(*f);
 
-	odebug << "start loading file=" << file.utf8() << "\n" << oendl; 
+    /* Try */
+    if ( !fi.exists() && !path.contains( QPEApplication::qpeDir()) ) {
+        delete f;
+        f  = new QFile( QPEApplication::qpeDir() + "share/zkb/" + file );
+        fi = QFileInfo( *f );
+    }
+
+    odebug << "start loading file=" << file << "\n" << oendl;
 	if (includedFiles.find(fi.absFilePath()) != includedFiles.end()) {
 		return false;
 	}
 
 	includedFiles.insert(fi.absFilePath(), 1);
-	QXmlInputSource is(f);
+    QXmlInputSource is(*f);
 	QXmlSimpleReader reader;
 	ZkbHandler h(*this, keymap, prefix);
 
@@ -34,7 +42,8 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
 	ret = reader.parse(is);
 	includedFiles.remove(fi.absFilePath());
 
-	odebug << "end loading file=" << file.utf8() << ": status=" << err.utf8() << oendl;
+    odebug << "end loading file=" << file << ": status=" << err << oendl;
+    delete f;
 	return ret;
 }