Fix bug #9 except that we need something else to translate keyboard names.

7 files changed, 14 insertions, 9 deletions

diff --git a/inputmethods/dvorak/dvorakimpl.cpp b/inputmethods/dvorak/dvorakimpl.cpp
index 5b83b8f..d58b6b9 100644
--- a/inputmethods/dvorak/dvorakimpl.cpp
+++ b/inputmethods/dvorak/dvorakimpl.cpp
@@ -87,34 +87,34 @@ QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 
 void KeyboardImpl::resetState()
 {
     if ( input )
         input->resetState();
 }
 
 QPixmap *KeyboardImpl::icon()
 {
     if ( !icn )
         icn = new QPixmap( (const char **)kb_xpm );
     return icn;
 }
 
 QString KeyboardImpl::name()
 {
-    return qApp->translate( "InputMethods", "Dvorak" );
-//    return qApp->translate( "InputMethods", "Opti" );
+    // return qApp->translate( "InputMethods", "Dvorak" );
+    return "Dvorak";
 }
 
 void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 {
     if ( input )
         QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
diff --git a/inputmethods/handwriting/handwritingimpl.cpp b/inputmethods/handwriting/handwritingimpl.cpp
index c39e1aa..0ea140c 100644
--- a/inputmethods/handwriting/handwritingimpl.cpp
+++ b/inputmethods/handwriting/handwritingimpl.cpp
@@ -70,33 +70,34 @@ QWidget *HandwritingImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 
 void HandwritingImpl::resetState()
 {
     if ( input )
         input->resetState();
 }
 
 QPixmap *HandwritingImpl::icon()
 {
     if ( !icn )
         icn = new QPixmap( (const char **)pen_xpm );
     return icn;
 }
 
 QString HandwritingImpl::name()
 {
-    return qApp->translate( "InputMethods", "Handwriting" );
+    // return qApp->translate( "InputMethods", "Handwriting" );
+    return "Handwriting";
 }
 
 void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot )
 {
     if ( input )
         QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT HandwritingImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
diff --git a/inputmethods/jumpx/keyboardimpl.cpp b/inputmethods/jumpx/keyboardimpl.cpp
index 92abb09..004f0b0 100644
--- a/inputmethods/jumpx/keyboardimpl.cpp
+++ b/inputmethods/jumpx/keyboardimpl.cpp
@@ -54,33 +54,34 @@ QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 
 void KeyboardImpl::resetState()
 {
     if ( input )
         input->resetState();
 }
 
 QPixmap *KeyboardImpl::icon()
 {
     if ( !icn )
         icn = new QPixmap( (const char **)icon_xpm );
     return icn;
 }
 
 QString KeyboardImpl::name()
 {
-    return qApp->translate( "InputMethods", "JumpX" );
+    // return qApp->translate( "InputMethods", "JumpX" );
+    return "JumpX";
 }
 
 void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 {
     if ( input )
         QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
diff --git a/inputmethods/keyboard/keyboardimpl.cpp b/inputmethods/keyboard/keyboardimpl.cpp
index ea61272..56e6870 100644
--- a/inputmethods/keyboard/keyboardimpl.cpp
+++ b/inputmethods/keyboard/keyboardimpl.cpp
@@ -87,34 +87,34 @@ QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 
 void KeyboardImpl::resetState()
 {
     if ( input )
         input->resetState();
 }
 
 QPixmap *KeyboardImpl::icon()
 {
     if ( !icn )
         icn = new QPixmap( (const char **)kb_xpm );
     return icn;
 }
 
 QString KeyboardImpl::name()
 {
-    return qApp->translate( "InputMethods", "Keyboard" );
-//    return qApp->translate( "InputMethods", "Opti" );
+    // return qApp->translate( "InputMethods", "Keyboard" );
+    return "Keyboard";
 }
 
 void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 {
     if ( input )
         QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
diff --git a/inputmethods/kjumpx/keyboardimpl.cpp b/inputmethods/kjumpx/keyboardimpl.cpp
index 5d8e0d3..dbae2b4 100644
--- a/inputmethods/kjumpx/keyboardimpl.cpp
+++ b/inputmethods/kjumpx/keyboardimpl.cpp
@@ -54,33 +54,34 @@ QWidget *KeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 
 void KeyboardImpl::resetState()
 {
     if ( input )
         input->resetState();
 }
 
 QPixmap *KeyboardImpl::icon()
 {
     if ( !icn )
         icn = new QPixmap( (const char **)icon_xpm );
     return icn;
 }
 
 QString KeyboardImpl::name()
 {
-    return qApp->translate( "InputMethods", "KJumpX" );
+    // return qApp->translate( "InputMethods", "KJumpX" );
+    return "KJumpX";
 }
 
 void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 {
     if ( input )
         QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT KeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
diff --git a/inputmethods/pickboard/pickboardimpl.cpp b/inputmethods/pickboard/pickboardimpl.cpp
index a4e8f02..617acff 100644
--- a/inputmethods/pickboard/pickboardimpl.cpp
+++ b/inputmethods/pickboard/pickboardimpl.cpp
@@ -57,33 +57,34 @@ QWidget *PickboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 
 void PickboardImpl::resetState()
 {
     if ( pickboard )
         pickboard->resetState();
 }
 
 QPixmap *PickboardImpl::icon()
 {
     if ( !icn )
         icn = new QPixmap( (const char **)pb_xpm );
     return icn;
 }
 
 QString PickboardImpl::name()
 {
-    return qApp->translate( "InputMethods", "Pickboard" );
+    // return qApp->translate( "InputMethods", "Pickboard" );
+    return "Pickboard";
 }
 
 void PickboardImpl::onKeyPress( QObject *receiver, const char *slot )
 {
     if ( pickboard )
         QObject::connect( pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 #ifndef QT_NO_COMPONENT
 QRESULT PickboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;
diff --git a/inputmethods/unikeyboard/unikeyboardimpl.cpp b/inputmethods/unikeyboard/unikeyboardimpl.cpp
index fe601e0..aa05b31 100644
--- a/inputmethods/unikeyboard/unikeyboardimpl.cpp
+++ b/inputmethods/unikeyboard/unikeyboardimpl.cpp
@@ -62,33 +62,34 @@ QWidget *UniKeyboardImpl::inputMethod( QWidget *parent, Qt::WFlags f )
 
 void UniKeyboardImpl::resetState()
 {
     if ( input )
         input->resetState();
 }
 
 QPixmap *UniKeyboardImpl::icon()
 {
     if ( !icn )
         icn = new QPixmap( (const char **)uni_xpm );
     return icn;
 }
 
 QString UniKeyboardImpl::name()
 {
-    return qApp->translate( "InputMethods", "Unicode" );
+    // return qApp->translate( "InputMethods", "Unicode" );
+    return "Unicode";
 }
 
 void UniKeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
 {
     if ( input )
             QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
 }
 
 QRESULT UniKeyboardImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
 {
     *iface = 0;
     if ( uuid == IID_QUnknown )
         *iface = this;
     else if ( uuid == IID_InputMethod )
         *iface = this;