summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make3
-rw-r--r--config.in5
-rw-r--r--core/launcher/launcher.cpp20
-rw-r--r--core/launcher/launcher.h5
-rw-r--r--core/launcher/taskbar.cpp2
5 files changed, 10 insertions, 25 deletions
diff --git a/Rules.make b/Rules.make
index 8511422..e08e5c1 100644
--- a/Rules.make
+++ b/Rules.make
@@ -80,4 +80,7 @@ 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)
diff --git a/config.in b/config.in
index 9586a33..c981fd1 100644
--- a/config.in
+++ b/config.in
@@ -148,4 +148,9 @@ config OPIE_NEW_ALLOC
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"
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