5 files changed, 9 insertions, 24 deletions

diff --git a/Rules.make b/Rules.make
index 8511422..e08e5c1 100644
--- a/Rules.make
+++ b/Rules.make
@@ -78,8 +78,11 @@ endif
         echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@
 ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y)
         echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@
 endif
+ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y)
+        echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@
+        endif
 # Write LIB dirs and INC dirs...
 ifeq ($(CONFIG_LIBETPAN_DEP),y)
         echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@
         echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@
diff --git a/config.in b/config.in
index 9586a33..c981fd1 100644
--- a/config.in
+++ b/config.in
@@ -146,8 +146,13 @@ config OPIE_NEW_ALLOC
   boolean "Use malloc and free for the implementation"
   default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP
   default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP)
 
+config OPIE_TASKBAR_LOCK_KEY_STATE
+  boolean "Have a KeyLock state indicator on the taskbar"
+  default y if TARGET_SHARP
+  default n if !TARGET_SHARP
+
 config OPIE_NO_SOUND_PCM_READ_BITS
   boolean "There is not a pcm_read_bits io control"
   default y if TARGET_SHARP
   default n if ! TARGET_SHARP
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index 87a54bf..aa357ca 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -472,13 +472,8 @@ void Launcher::createGUI()
     tb->show();
 
     qApp->installEventFilter( this );
 
-
-    connect( qApp, SIGNAL(symbol()), this, SLOT(toggleSymbolInput()) );
-    connect( qApp, SIGNAL(numLockStateToggle()), this, SLOT(toggleNumLockState()) );
-    connect( qApp, SIGNAL(capsLockStateToggle()), this, SLOT(toggleCapsLockState()) );
-
     connect( tb, SIGNAL(tabSelected(const QString&)),
     this, SLOT(showTab(const QString&)) );
     connect( tabs, SIGNAL(selected(const QString&)),
     this, SLOT(viewSelected(const QString&)) );
@@ -553,23 +548,8 @@ bool Launcher::eventFilter( QObject*, QEvent *ev )
 #endif
     return FALSE;
 }
 
-void Launcher::toggleSymbolInput()
-{
-    tb->toggleSymbolInput();
-}
-
-void Launcher::toggleNumLockState()
-{
-    tb->toggleNumLockState();
-}
-
-void Launcher::toggleCapsLockState()
-{
-    tb->toggleCapsLockState();
-}
-
 static bool isVisibleWindow(int wid)
 {
 #ifdef Q_WS_QWS
     const QList<QWSWindow> &list = qwsServer->clientWindows();
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index 29bd7db..2eaf77c 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -135,11 +135,8 @@ signals:
     void executing( const AppLnk * );
 
 private slots:
     void systemMessage( const QCString &, const QByteArray &);
-    void toggleSymbolInput();
-    void toggleNumLockState();
-    void toggleCapsLockState();
 
 protected:
     bool eventFilter( QObject *o, QEvent *ev );
 
diff --git a/core/launcher/taskbar.cpp b/core/launcher/taskbar.cpp
index 86e0d0d..abe238f 100644
--- a/core/launcher/taskbar.cpp
+++ b/core/launcher/taskbar.cpp
@@ -206,9 +206,9 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
         (void)new SafeMode( this );
 #endif
 
     // ## make customizable in some way?
-#ifdef QT_QWS_CUSTOM
+#ifdef OPIE_TASKBAR_LOCK_KEY_STATE
     lockState = new LockKeyState( this );
 #else
     lockState = 0;
 #endif