author | zecke <zecke> | 2004-07-15 19:01:40 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-15 19:01:40 (UTC) |
commit | dffb08422497af5ccb0e66fc3434f171d57c2216 (patch) (side-by-side diff) | |
tree | 5d6407302546f769f6017b406efe8fc12ee7a4d5 /core/launcher | |
parent | c96296038ac74083c5bf8009449cb22392cd02dc (diff) | |
download | opie-dffb08422497af5ccb0e66fc3434f171d57c2216.zip opie-dffb08422497af5ccb0e66fc3434f171d57c2216.tar.gz opie-dffb08422497af5ccb0e66fc3434f171d57c2216.tar.bz2 |
-Remove double 'connection' of num/capslock/symbol toggle from launcher.
taskbar itself takes care about it
-Make having the LockKeyState indicator in the taskbar configurable and
have it enabled by default for Sharp Zaurus which actually got a keyboard :)
Initial KeyLock State is still not defined/used from within Sharp
-rw-r--r-- | core/launcher/launcher.cpp | 20 | ||||
-rw-r--r-- | core/launcher/launcher.h | 5 | ||||
-rw-r--r-- | core/launcher/taskbar.cpp | 2 |
3 files changed, 2 insertions, 25 deletions
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 @@ -474,9 +474,4 @@ void Launcher::createGUI() 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&)) ); @@ -555,19 +550,4 @@ 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 @@ -136,8 +136,5 @@ signals: private slots: - void systemMessage( const QCString &, const QByteArray &); - void toggleSymbolInput(); - void toggleNumLockState(); - void toggleCapsLockState(); + void systemMessage( const QCString &, const QByteArray &); protected: 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 @@ -208,5 +208,5 @@ 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 ); #else |