Reload InputMethods when LauncherSettings changed InputMethod Options

4 files changed, 27 insertions, 10 deletions

diff --git a/core/launcher/inputmethods.cpp b/core/launcher/inputmethods.cpp
index a0e8939..7e99796 100644
--- a/core/launcher/inputmethods.cpp
+++ b/core/launcher/inputmethods.cpp
@@ -91,7 +91,3 @@ InputMethods::InputMethods( QWidget *parent ) :
 {
-    Config cfg( "Launcher" );
-    cfg.setGroup( "InputMethods" );
-    inputWidgetStyle = QWidget::WStyle_Customize | QWidget::WStyle_StaysOnTop | QWidget::WGroupLeader | QWidget::WStyle_Tool;
-    inputWidgetStyle |= cfg.readBoolEntry( "Float", false ) ? QWidget::WStyle_DialogBorder : 0;
-    inputWidgetWidth = cfg.readNumEntry( "Width", 100 );
+    readConfig();
 
@@ -534,3 +530,3 @@ void InputMethods::showKbd( bool on )
         int height = QMIN( mkeyboard->widget->sizeHint().height(), 134 );
-        int width = qApp->desktop()->width() * (inputWidgetWidth*0.01);
+        int width = static_cast<int>( qApp->desktop()->width() * (inputWidgetWidth*0.01) );
         int left = 0;
@@ -610,3 +606,3 @@ void InputMethods::sendKey( ushort unicode, ushort scancode, ushort mod, bool pr
 
-bool InputMethods::eventFilter( QObject* o, QEvent* e )
+bool InputMethods::eventFilter( QObject* , QEvent* e )
 {
@@ -621 +617,11 @@ bool InputMethods::eventFilter( QObject* o, QEvent* e )
 }
+
+void InputMethods::readConfig() {
+    Config cfg( "Launcher" );
+    cfg.setGroup( "InputMethods" );
+
+    inputWidgetStyle = QWidget::WStyle_Customize | QWidget::WStyle_StaysOnTop | QWidget::WGroupLeader | QWidget::WStyle_Tool;
+    inputWidgetStyle |= cfg.readBoolEntry( "Float", false ) ?
+                        QWidget::WStyle_DialogBorder : 0;
+    inputWidgetWidth = cfg.readNumEntry( "Width", 100 );
+}
diff --git a/core/launcher/inputmethods.h b/core/launcher/inputmethods.h
index 55ac020..2e0b1e8 100644
--- a/core/launcher/inputmethods.h
+++ b/core/launcher/inputmethods.h
@@ -76,2 +76,3 @@ public:
     virtual bool eventFilter( QObject *, QEvent * );
+    void readConfig();
 
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index abe238f..63361fe 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -178,5 +178,4 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
 {
-    Config cfg( "Launcher" );
-    cfg.setGroup( "InputMethods" );
-    resizeRunningApp = cfg.readBoolEntry( "Resize", true );
+    /* Read InputMethod Config */
+    readConfig();
 
@@ -337,2 +336,4 @@ void TaskBar::receive( const QCString &msg, const QByteArray &data )
     } else if ( msg == "reloadInputMethods()" ) {
+        readConfig();
+        inputMethods->readConfig();
 	inputMethods->loadInputMethods();
@@ -379,2 +380,8 @@ void TaskBar::toggleSymbolInput()
 
+void TaskBar::readConfig() {
+    Config cfg( "Launcher" );
+    cfg.setGroup( "InputMethods" );
+    resizeRunningApp = cfg.readBoolEntry( "Resize", true );
+}
+
 #include "taskbar.moc"
diff --git a/core/launcher/taskbar.h b/core/launcher/taskbar.h
index ed558b1..be5fda8 100644
--- a/core/launcher/taskbar.h
+++ b/core/launcher/taskbar.h
@@ -72,2 +72,5 @@ private slots:
 private:
+    void readConfig();
+
+private:
     QTimer *waitTimer;