-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
@@ -76,12 +76,15 @@ ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) | |||
76 | echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ | 76 | echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ |
77 | endif | 77 | endif |
78 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ | 78 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ |
79 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) | 79 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) |
80 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ | 80 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ |
81 | endif | 81 | endif |
82 | ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) | ||
83 | echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ | ||
84 | endif | ||
82 | # Write LIB dirs and INC dirs... | 85 | # Write LIB dirs and INC dirs... |
83 | ifeq ($(CONFIG_LIBETPAN_DEP),y) | 86 | ifeq ($(CONFIG_LIBETPAN_DEP),y) |
84 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ | 87 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ |
85 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ | 88 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ |
86 | endif | 89 | endif |
87 | ifeq ($(CONFIG_LIBPCAP_DEP),y) | 90 | ifeq ($(CONFIG_LIBPCAP_DEP),y) |
@@ -144,12 +144,17 @@ config USE_FILE_NOTIFICATION | |||
144 | 144 | ||
145 | config OPIE_NEW_ALLOC | 145 | config OPIE_NEW_ALLOC |
146 | boolean "Use malloc and free for the implementation" | 146 | boolean "Use malloc and free for the implementation" |
147 | default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP | 147 | default y if TARGET_RAMSES || TARGET_IPAQ || TARGET_SIMPAD || TARGET_SHARP |
148 | default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP) | 148 | default n if ! (TARGET_IPAQ || TARGET_SIMPAD || TARGET_RAMSES || TARGET_SHARP) |
149 | 149 | ||
150 | config OPIE_TASKBAR_LOCK_KEY_STATE | ||
151 | boolean "Have a KeyLock state indicator on the taskbar" | ||
152 | default y if TARGET_SHARP | ||
153 | default n if !TARGET_SHARP | ||
154 | |||
150 | config OPIE_NO_SOUND_PCM_READ_BITS | 155 | config OPIE_NO_SOUND_PCM_READ_BITS |
151 | boolean "There is not a pcm_read_bits io control" | 156 | boolean "There is not a pcm_read_bits io control" |
152 | default y if TARGET_SHARP | 157 | default y if TARGET_SHARP |
153 | default n if ! TARGET_SHARP | 158 | default n if ! TARGET_SHARP |
154 | endmenu | 159 | endmenu |
155 | 160 | ||
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 | |||
@@ -470,17 +470,12 @@ void Launcher::createGUI() | |||
470 | 470 | ||
471 | ServerInterface::dockWidget( tb, ServerInterface::Bottom ); | 471 | ServerInterface::dockWidget( tb, ServerInterface::Bottom ); |
472 | tb->show(); | 472 | tb->show(); |
473 | 473 | ||
474 | qApp->installEventFilter( this ); | 474 | qApp->installEventFilter( this ); |
475 | 475 | ||
476 | |||
477 | connect( qApp, SIGNAL(symbol()), this, SLOT(toggleSymbolInput()) ); | ||
478 | connect( qApp, SIGNAL(numLockStateToggle()), this, SLOT(toggleNumLockState()) ); | ||
479 | connect( qApp, SIGNAL(capsLockStateToggle()), this, SLOT(toggleCapsLockState()) ); | ||
480 | |||
481 | connect( tb, SIGNAL(tabSelected(const QString&)), | 476 | connect( tb, SIGNAL(tabSelected(const QString&)), |
482 | this, SLOT(showTab(const QString&)) ); | 477 | this, SLOT(showTab(const QString&)) ); |
483 | connect( tabs, SIGNAL(selected(const QString&)), | 478 | connect( tabs, SIGNAL(selected(const QString&)), |
484 | this, SLOT(viewSelected(const QString&)) ); | 479 | this, SLOT(viewSelected(const QString&)) ); |
485 | connect( tabs, SIGNAL(clicked(const AppLnk*)), | 480 | connect( tabs, SIGNAL(clicked(const AppLnk*)), |
486 | this, SLOT(select(const AppLnk*))); | 481 | this, SLOT(select(const AppLnk*))); |
@@ -551,27 +546,12 @@ bool Launcher::eventFilter( QObject*, QEvent *ev ) | |||
551 | #else | 546 | #else |
552 | Q_UNUSED(ev); | 547 | Q_UNUSED(ev); |
553 | #endif | 548 | #endif |
554 | return FALSE; | 549 | return FALSE; |
555 | } | 550 | } |
556 | 551 | ||
557 | void Launcher::toggleSymbolInput() | ||
558 | { | ||
559 | tb->toggleSymbolInput(); | ||
560 | } | ||
561 | |||
562 | void Launcher::toggleNumLockState() | ||
563 | { | ||
564 | tb->toggleNumLockState(); | ||
565 | } | ||
566 | |||
567 | void Launcher::toggleCapsLockState() | ||
568 | { | ||
569 | tb->toggleCapsLockState(); | ||
570 | } | ||
571 | |||
572 | static bool isVisibleWindow(int wid) | 552 | static bool isVisibleWindow(int wid) |
573 | { | 553 | { |
574 | #ifdef Q_WS_QWS | 554 | #ifdef Q_WS_QWS |
575 | const QList<QWSWindow> &list = qwsServer->clientWindows(); | 555 | const QList<QWSWindow> &list = qwsServer->clientWindows(); |
576 | QWSWindow* w; | 556 | QWSWindow* w; |
577 | for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) { | 557 | for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) { |
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 | |||
@@ -133,15 +133,12 @@ public slots: | |||
133 | 133 | ||
134 | signals: | 134 | signals: |
135 | void executing( const AppLnk * ); | 135 | void executing( const AppLnk * ); |
136 | 136 | ||
137 | private slots: | 137 | private slots: |
138 | void systemMessage( const QCString &, const QByteArray &); | 138 | void systemMessage( const QCString &, const QByteArray &); |
139 | void toggleSymbolInput(); | ||
140 | void toggleNumLockState(); | ||
141 | void toggleCapsLockState(); | ||
142 | 139 | ||
143 | protected: | 140 | protected: |
144 | bool eventFilter( QObject *o, QEvent *ev ); | 141 | bool eventFilter( QObject *o, QEvent *ev ); |
145 | 142 | ||
146 | private: | 143 | private: |
147 | void updateApps(); | 144 | void updateApps(); |
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 | |||
@@ -204,13 +204,13 @@ TaskBar::TaskBar() : QHBox(0, 0, WStyle_Customize | WStyle_Tool | WStyle_StaysOn | |||
204 | #if 0 | 204 | #if 0 |
205 | if (PluginLoader::inSafeMode()) | 205 | if (PluginLoader::inSafeMode()) |
206 | (void)new SafeMode( this ); | 206 | (void)new SafeMode( this ); |
207 | #endif | 207 | #endif |
208 | 208 | ||
209 | // ## make customizable in some way? | 209 | // ## make customizable in some way? |
210 | #ifdef QT_QWS_CUSTOM | 210 | #ifdef OPIE_TASKBAR_LOCK_KEY_STATE |
211 | lockState = new LockKeyState( this ); | 211 | lockState = new LockKeyState( this ); |
212 | #else | 212 | #else |
213 | lockState = 0; | 213 | lockState = 0; |
214 | #endif | 214 | #endif |
215 | 215 | ||
216 | #if defined(Q_WS_QWS) | 216 | #if defined(Q_WS_QWS) |