summaryrefslogtreecommitdiff
path: root/core
authorzecke <zecke>2004-07-15 19:01:40 (UTC)
committer zecke <zecke>2004-07-15 19:01:40 (UTC)
commitdffb08422497af5ccb0e66fc3434f171d57c2216 (patch) (side-by-side diff)
tree5d6407302546f769f6017b406efe8fc12ee7a4d5 /core
parentc96296038ac74083c5bf8009449cb22392cd02dc (diff)
downloadopie-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
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.cpp20
-rw-r--r--core/launcher/launcher.h5
-rw-r--r--core/launcher/taskbar.cpp2
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
@@ -473,11 +473,6 @@ 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&)) );
connect( tabs, SIGNAL(selected(const QString&)),
@@ -554,21 +549,6 @@ bool Launcher::eventFilter( QObject*, QEvent *ev )
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
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,10 +135,7 @@ signals:
void executing( const AppLnk * );
private slots:
- void systemMessage( const QCString &, const QByteArray &);
- void toggleSymbolInput();
- void toggleNumLockState();
- void toggleCapsLockState();
+ void systemMessage( const QCString &, const QByteArray &);
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
@@ -207,7 +207,7 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn
#endif
// ## make customizable in some way?
-#ifdef QT_QWS_CUSTOM
+#ifdef OPIE_TASKBAR_LOCK_KEY_STATE
lockState = new LockKeyState( this );
#else
lockState = 0;