add multikey patches courtesy Anton Kachalov <mouse@altlinux.ru>

1 files changed, 37 insertions, 5 deletions

diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 2ce6dd3..aec0ad3 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -33,3 +33,3 @@
 #include <ctype.h>
-#include <qfile.h>
+#include <qdir.h>
 #include <qtextstream.h>
@@ -96,2 +96,5 @@ Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
 
+    QCopChannel* kbdChannel = new QCopChannel("MultiKey/Keyboard", this);
+    connect(kbdChannel, SIGNAL(received(const QCString &, const QByteArray &)),
+	    this, SLOT(receive(const QCString &, const QByteArray &)));
 }
@@ -101,3 +104,3 @@ Keyboard::~Keyboard() {
     if ( configdlg ) { 
-        delete (ConfigDlg *) configdlg; 
+        delete configdlg;
         configdlg = 0;
@@ -419,3 +422,3 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
 
-                delete (ConfigDlg *) configdlg; 
+                delete configdlg; 
                 configdlg = 0;
@@ -436,2 +439,4 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
                        this, SLOT(cleanupConfigDlg()));
+               connect(configdlg, SIGNAL(reloadSw()),
+                       this, SLOT(reloadSw()));
                configdlg->showMaximized();
@@ -762,2 +767,13 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
 
+void Keyboard::receive(const QCString &msg, const QByteArray &data)
+{
+    if (msg == "setmultikey(QString)") {
+	QDataStream stream(data, IO_ReadOnly);
+        QString map;
+        stream >> map;
+	setMapToFile(map);
+    } else if (msg == "getmultikey()") {
+	reloadSw();
+    }
+}
 
@@ -913,3 +929,3 @@ void Keyboard::cleanupConfigDlg() {
     if ( configdlg ) { 
-        delete (ConfigDlg *) configdlg; 
+        delete configdlg; 
         configdlg = 0;
@@ -918,2 +934,13 @@ void Keyboard::cleanupConfigDlg() {
 
+void Keyboard::reloadSw() {
+    QCopEnvelope e("MultiKey/Switcher", "setsw(QString,QString)");
+
+    Config* config = new Config("multikey");
+    config->setGroup("keymaps");
+    QString current_map = config->readEntry("current", "en.keymap");
+    delete config;
+
+    e << ConfigDlg::loadSw().join("|") << current_map;
+}
+
 /* Keyboard::setMapTo ... {{{1 */
@@ -928,2 +955,7 @@ void Keyboard::setMapToDefault() {
 
+    /* if Language represents as en_US, ru_RU, etc... */
+    int d = l.find('_');
+    if (d != -1) {
+	l.remove(d, l.length()-d);
+    }
     QString key_map = QPEApplication::qpeDir() + "share/multikey/" 
@@ -1508,3 +1540,3 @@ void Keys::setKeysFromFile(const char * filename) {
 
-            // other variables like lang & title
+            // other variables like lang & title & sw
             else if (buf.contains(QRegExp("^\\s*[a-zA-Z]+\\s*=\\s*[a-zA-Z0-9/]+\\s*$", FALSE, FALSE))) {