summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/dvorak/dvorakimpl.cpp4
-rw-r--r--inputmethods/handwriting/handwritingimpl.cpp3
-rw-r--r--inputmethods/jumpx/keyboardimpl.cpp3
-rw-r--r--inputmethods/keyboard/keyboardimpl.cpp4
-rw-r--r--inputmethods/kjumpx/keyboardimpl.cpp3
-rw-r--r--inputmethods/pickboard/pickboardimpl.cpp3
-rw-r--r--inputmethods/unikeyboard/unikeyboardimpl.cpp3
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
@@ -97,14 +97,14 @@ QPixmap *KeyboardImpl::icon()
97 icn = new QPixmap( (const char **)kb_xpm ); 97 icn = new QPixmap( (const char **)kb_xpm );
98 return icn; 98 return icn;
99} 99}
100 100
101QString KeyboardImpl::name() 101QString KeyboardImpl::name()
102{ 102{
103 return qApp->translate( "InputMethods", "Dvorak" ); 103 // return qApp->translate( "InputMethods", "Dvorak" );
104// return qApp->translate( "InputMethods", "Opti" ); 104 return "Dvorak";
105} 105}
106 106
107void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 107void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
108{ 108{
109 if ( input ) 109 if ( input )
110 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 110 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
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
@@ -80,13 +80,14 @@ QPixmap *HandwritingImpl::icon()
80 icn = new QPixmap( (const char **)pen_xpm ); 80 icn = new QPixmap( (const char **)pen_xpm );
81 return icn; 81 return icn;
82} 82}
83 83
84QString HandwritingImpl::name() 84QString HandwritingImpl::name()
85{ 85{
86 return qApp->translate( "InputMethods", "Handwriting" ); 86 // return qApp->translate( "InputMethods", "Handwriting" );
87 return "Handwriting";
87} 88}
88 89
89void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot ) 90void HandwritingImpl::onKeyPress( QObject *receiver, const char *slot )
90{ 91{
91 if ( input ) 92 if ( input )
92 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 93 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
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
@@ -64,13 +64,14 @@ QPixmap *KeyboardImpl::icon()
64 icn = new QPixmap( (const char **)icon_xpm ); 64 icn = new QPixmap( (const char **)icon_xpm );
65 return icn; 65 return icn;
66} 66}
67 67
68QString KeyboardImpl::name() 68QString KeyboardImpl::name()
69{ 69{
70 return qApp->translate( "InputMethods", "JumpX" ); 70 // return qApp->translate( "InputMethods", "JumpX" );
71 return "JumpX";
71} 72}
72 73
73void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 74void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
74{ 75{
75 if ( input ) 76 if ( input )
76 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 77 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
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
@@ -97,14 +97,14 @@ QPixmap *KeyboardImpl::icon()
97 icn = new QPixmap( (const char **)kb_xpm ); 97 icn = new QPixmap( (const char **)kb_xpm );
98 return icn; 98 return icn;
99} 99}
100 100
101QString KeyboardImpl::name() 101QString KeyboardImpl::name()
102{ 102{
103 return qApp->translate( "InputMethods", "Keyboard" ); 103 // return qApp->translate( "InputMethods", "Keyboard" );
104// return qApp->translate( "InputMethods", "Opti" ); 104 return "Keyboard";
105} 105}
106 106
107void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 107void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
108{ 108{
109 if ( input ) 109 if ( input )
110 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 110 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
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
@@ -64,13 +64,14 @@ QPixmap *KeyboardImpl::icon()
64 icn = new QPixmap( (const char **)icon_xpm ); 64 icn = new QPixmap( (const char **)icon_xpm );
65 return icn; 65 return icn;
66} 66}
67 67
68QString KeyboardImpl::name() 68QString KeyboardImpl::name()
69{ 69{
70 return qApp->translate( "InputMethods", "KJumpX" ); 70 // return qApp->translate( "InputMethods", "KJumpX" );
71 return "KJumpX";
71} 72}
72 73
73void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 74void KeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
74{ 75{
75 if ( input ) 76 if ( input )
76 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 77 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
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
@@ -67,13 +67,14 @@ QPixmap *PickboardImpl::icon()
67 icn = new QPixmap( (const char **)pb_xpm ); 67 icn = new QPixmap( (const char **)pb_xpm );
68 return icn; 68 return icn;
69} 69}
70 70
71QString PickboardImpl::name() 71QString PickboardImpl::name()
72{ 72{
73 return qApp->translate( "InputMethods", "Pickboard" ); 73 // return qApp->translate( "InputMethods", "Pickboard" );
74 return "Pickboard";
74} 75}
75 76
76void PickboardImpl::onKeyPress( QObject *receiver, const char *slot ) 77void PickboardImpl::onKeyPress( QObject *receiver, const char *slot )
77{ 78{
78 if ( pickboard ) 79 if ( pickboard )
79 QObject::connect( pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 80 QObject::connect( pickboard, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );
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
@@ -72,13 +72,14 @@ QPixmap *UniKeyboardImpl::icon()
72 icn = new QPixmap( (const char **)uni_xpm ); 72 icn = new QPixmap( (const char **)uni_xpm );
73 return icn; 73 return icn;
74} 74}
75 75
76QString UniKeyboardImpl::name() 76QString UniKeyboardImpl::name()
77{ 77{
78 return qApp->translate( "InputMethods", "Unicode" ); 78 // return qApp->translate( "InputMethods", "Unicode" );
79 return "Unicode";
79} 80}
80 81
81void UniKeyboardImpl::onKeyPress( QObject *receiver, const char *slot ) 82void UniKeyboardImpl::onKeyPress( QObject *receiver, const char *slot )
82{ 83{
83 if ( input ) 84 if ( input )
84 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot ); 85 QObject::connect( input, SIGNAL(key(ushort,ushort,ushort,bool,bool)), receiver, slot );