From c4c7365df453317560a52671fe7adb47ffbc8682 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Wed, 4 Nov 2009 13:52:28 +0000
Subject: [PATCH] store file names using local8bit qstring conversions

---
 src/qtgui/confgui/confgui.cpp      | 33 ++++++++++++++++++++++++------
 src/qtgui/confgui/confgui.h        | 10 +++++----
 src/qtgui/confgui/confguiindex.cpp |  2 ++
 3 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/src/qtgui/confgui/confgui.cpp b/src/qtgui/confgui/confgui.cpp
index 18cc6509..f6edc983 100644
--- a/src/qtgui/confgui/confgui.cpp
+++ b/src/qtgui/confgui/confgui.cpp
@@ -70,7 +70,10 @@ const static int margin = 6;
 
 void ConfParamW::setValue(const QString& value)
 {
-    m_cflink->set(string((const char *)value.utf8()));
+    if (m_fsencoding)
+        m_cflink->set(string((const char *)value.local8Bit()));
+    else
+        m_cflink->set(string((const char *)value.utf8()));
 }
 
 void ConfParamW::setValue(int value)
@@ -169,7 +172,10 @@ void ConfParamStrW::loadValue()
 {
     string s;
     m_cflink->get(s);
-    m_le->setText(QString::fromUtf8(s.c_str()));
+    if (m_fsencoding)
+        m_le->setText(QString::fromLocal8Bit(s.c_str()));
+    else
+        m_le->setText(QString::fromUtf8(s.c_str()));
 }
 
 ConfParamCStrW::ConfParamCStrW(QWidget *parent, ConfLink cflink, 
@@ -200,7 +206,12 @@ void ConfParamCStrW::loadValue()
 {
     string s;
     m_cflink->get(s);
-    QString cs = QString::fromUtf8(s.c_str());
+    QString cs;
+    if (m_fsencoding)
+        cs = QString::fromLocal8Bit(s.c_str());
+    else
+        cs = QString::fromUtf8(s.c_str());
+        
     for (int i = 0; i < m_cmb->count(); i++) {
 	if (!cs.compare(m_cmb->text(i))) {
 	    m_cmb->setCurrentItem(i);
@@ -257,6 +268,7 @@ ConfParamFNW::ConfParamFNW(QWidget *parent, ConfLink cflink,
     if (!createCommon(lbltxt, tltptxt))
 	return;
 
+    m_fsencoding = true;
     m_le = new QLineEdit(this);
     m_le->setMinimumSize(QSize(150, 0 ));
     m_le->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, 
@@ -285,7 +297,7 @@ void ConfParamFNW::loadValue()
 {
     string s;
     m_cflink->get(s);
-    m_le->setText(QString::fromUtf8(s.c_str()));
+    m_le->setText(QString::fromLocal8Bit(s.c_str()));
 }
 
 void ConfParamFNW::showBrowserDialog()
@@ -366,7 +378,10 @@ void ConfParamSLW::loadValue()
     stringToStrings(s, ls);
     QStringList qls;
     for (list<string>::const_iterator it = ls.begin(); it != ls.end(); it++) {
-	qls.push_back(QString::fromUtf8(it->c_str()));
+        if (m_fsencoding)
+            qls.push_back(QString::fromLocal8Bit(it->c_str()));
+        else
+            qls.push_back(QString::fromUtf8(it->c_str()));
     }
     m_lb->clear();
     m_lb->insertStringList(qls);
@@ -394,7 +409,13 @@ void ConfParamSLW::listToConf()
 {
     list<string> ls;
     for (unsigned int i = 0; i < m_lb->count(); i++) {
-	ls.push_back((const char *)m_lb->text(i));
+        // General parameters are encoded as utf-8. File names as
+        // local8bit There is no hope for 8bit file names anyway
+        // except for luck: the original encoding is unknown.
+        if (m_fsencoding)
+            ls.push_back((const char *)(m_lb->text(i).local8Bit()));
+        else
+            ls.push_back((const char *)(m_lb->text(i).utf8()));
     }
     string s;
     stringsToString(ls, s);
diff --git a/src/qtgui/confgui/confgui.h b/src/qtgui/confgui/confgui.h
index 96887779..0b38b01d 100644
--- a/src/qtgui/confgui/confgui.h
+++ b/src/qtgui/confgui/confgui.h
@@ -76,15 +76,17 @@ namespace confgui {
 	Q_OBJECT
     public:
 	ConfParamW(QWidget *parent, ConfLink cflink)
-	    : QWidget(parent), m_cflink(cflink)
+	    : QWidget(parent), m_cflink(cflink), m_fsencoding(false)
 	{
 	}
 	virtual void loadValue() = 0;
-
+        virtual void setFsEncoding(bool onoff) {m_fsencoding = onoff;}
     protected:
 	ConfLink     m_cflink;
 	QHBOXLAYOUT *m_hl;
-
+        // File names are encoded as local8bit in the config files. Other
+        // are encoded as utf-8
+        bool         m_fsencoding;
 	virtual bool createCommon(const QString& lbltxt,
 				  const QString& tltptxt);
 
@@ -176,7 +178,6 @@ namespace confgui {
     protected:
 	QLISTBOX *m_lb;
 	void listToConf();
-	
     };
 
     // Dir name list
@@ -188,6 +189,7 @@ namespace confgui {
 		      const QString& tltptxt)
 	    : ConfParamSLW(parent, cflink, lbltxt, tltptxt)
 	    {
+                m_fsencoding = true;
 	    }
     protected slots:
 	virtual void showInputDialog();
diff --git a/src/qtgui/confgui/confguiindex.cpp b/src/qtgui/confgui/confguiindex.cpp
index 82002c3d..33b8c646 100644
--- a/src/qtgui/confgui/confguiindex.cpp
+++ b/src/qtgui/confgui/confguiindex.cpp
@@ -157,6 +157,7 @@ ConfTopPanelW::ConfTopPanelW(QWidget *parent, ConfNull *config)
 			"to '/usr/home', a correct skippedPath entry "
 			"would be '/home/me/tmp*', not '/usr/home/me/tmp*')"));
     vboxLayout->addWidget(eskp);
+    eskp->setFsEncoding(true);
 
     list<string> cstemlangs = Rcl::Db::getStemmerNames();
     QStringList stemlangs;
@@ -304,6 +305,7 @@ ConfSubPanelW::ConfSubPanelW(QWidget *parent, ConfNull *config)
 		     QObject::tr("These are patterns for file or directory "
 				 " names which should not be indexed."));
     m_widgets.push_back(eskn);
+    eskn->setFsEncoding(true);
 
     list<string> args;
     args.push_back("-l");