-rw-r--r-- | Rules.make | 3 | ||||
-rw-r--r-- | config.in | 5 | ||||
-rw-r--r-- | core/launcher/launcher.cpp | 20 | ||||
-rw-r--r-- | core/launcher/launcher.h | 3 | ||||
-rw-r--r-- | core/launcher/taskbar.cpp | 2 |
5 files changed, 9 insertions, 24 deletions
@@ -81,2 +81,5 @@ ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) endif +ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) + echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ +endif # Write LIB dirs and INC dirs... @@ -149,2 +149,7 @@ config OPIE_NEW_ALLOC +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 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 @@ -475,7 +475,2 @@ void Launcher::createGUI() - - 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&)), @@ -556,17 +551,2 @@ bool Launcher::eventFilter( QObject*, QEvent *ev ) -void Launcher::toggleSymbolInput() -{ - tb->toggleSymbolInput(); -} - -void Launcher::toggleNumLockState() -{ - tb->toggleNumLockState(); -} - -void Launcher::toggleCapsLockState() -{ - tb->toggleCapsLockState(); -} - static bool isVisibleWindow(int wid) 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 @@ -138,5 +138,2 @@ private slots: void systemMessage( const QCString &, const QByteArray &); - void toggleSymbolInput(); - void toggleNumLockState(); - void toggleCapsLockState(); 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 @@ -209,3 +209,3 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn // ## make customizable in some way? -#ifdef QT_QWS_CUSTOM +#ifdef OPIE_TASKBAR_LOCK_KEY_STATE lockState = new LockKeyState( this ); |