author | sandman <sandman> | 2002-11-25 01:14:19 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-11-25 01:14:19 (UTC) |
commit | 1b4665ddf28fdb59810b90138a5a88f87a2d9bc6 (patch) (unidiff) | |
tree | 14254d02145e88f1970f3c26af4ad006ab00c15a /core | |
parent | da8050fe68a443773447ee176793a30df256ea9b (diff) | |
download | opie-1b4665ddf28fdb59810b90138a5a88f87a2d9bc6.zip opie-1b4665ddf28fdb59810b90138a5a88f87a2d9bc6.tar.gz opie-1b4665ddf28fdb59810b90138a5a88f87a2d9bc6.tar.bz2 |
*** empty log message ***
-rw-r--r-- | core/launcher/desktop.cpp | 23 | ||||
-rw-r--r-- | core/launcher/desktop.h | 1 | ||||
-rw-r--r-- | core/launcher/startmenu.cpp | 7 |
3 files changed, 10 insertions, 21 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 3e8c731..34b52d2 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -331,52 +331,52 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) | |||
331 | QCopEnvelope( ( *it ).getChannel().utf8(), ( *it ).getMessage().utf8() ); | 331 | QCopEnvelope( ( *it ).getChannel().utf8(), ( *it ).getMessage().utf8() ); |
332 | } | 332 | } |
333 | } | 333 | } |
334 | } | 334 | } |
335 | 335 | ||
336 | if ( !keyboardGrabbed() ) { | 336 | if ( !keyboardGrabbed() ) { |
337 | if ( ke->simpleData.keycode == Key_F9 ) { | 337 | if ( ke->simpleData.keycode == Key_F9 ) { |
338 | if ( press ) | 338 | if ( press ) |
339 | emit datebook(); | 339 | emit datebook(); |
340 | return TRUE; | 340 | return TRUE; |
341 | } | 341 | } |
342 | if ( ke->simpleData.keycode == Key_F10 ) { | 342 | if ( ke->simpleData.keycode == Key_F10 ) { |
343 | if ( !press && cardSendTimer ) { | 343 | if ( !press && cardSendTimer ) { |
344 | emit contacts(); | 344 | emit contacts(); |
345 | delete cardSendTimer; | 345 | delete cardSendTimer; |
346 | } | 346 | } |
347 | else if ( press ) { | 347 | else if ( press ) { |
348 | cardSendTimer = new QTimer(); | 348 | cardSendTimer = new QTimer(); |
349 | cardSendTimer->start( 2000, TRUE ); | 349 | cardSendTimer->start( 2000, TRUE ); |
350 | connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) ); | 350 | connect( cardSendTimer, SIGNAL( timeout() ), this, SLOT( sendCard() ) ); |
351 | } | 351 | } |
352 | return TRUE; | 352 | return TRUE; |
353 | } | 353 | } |
354 | 354 | ||
355 | // if ( ke->simpleData.keycode == Key_F11 ) { | 355 | if ( ke->simpleData.keycode == Key_F11 ) { |
356 | // if ( press ) emit menu(); | 356 | if ( press ) emit menu(); |
357 | // return TRUE; | 357 | return TRUE; |
358 | // } | 358 | } |
359 | 359 | ||
360 | if ( ke->simpleData.keycode == Key_F12 ) { | 360 | if ( ke->simpleData.keycode == Key_F12 ) { |
361 | while ( activePopupWidget() ) | 361 | while ( activePopupWidget() ) |
362 | activePopupWidget() ->close(); | 362 | activePopupWidget() ->close(); |
363 | if ( press ) | 363 | if ( press ) |
364 | emit launch(); | 364 | emit launch(); |
365 | return TRUE; | 365 | return TRUE; |
366 | } | 366 | } |
367 | if ( ke->simpleData.keycode == Key_F13 ) { | 367 | if ( ke->simpleData.keycode == Key_F13 ) { |
368 | if ( press ) | 368 | if ( press ) |
369 | emit email(); | 369 | emit email(); |
370 | return TRUE; | 370 | return TRUE; |
371 | } | 371 | } |
372 | } | 372 | } |
373 | 373 | ||
374 | if ( ke->simpleData.keycode == Key_F34 ) { | 374 | if ( ke->simpleData.keycode == Key_F34 ) { |
375 | if ( press ) | 375 | if ( press ) |
376 | emit power(); | 376 | emit power(); |
377 | return TRUE; | 377 | return TRUE; |
378 | } | 378 | } |
379 | // This was used for the iPAQ PowerButton | 379 | // This was used for the iPAQ PowerButton |
380 | // See main.cpp for new KeyboardFilter | 380 | // See main.cpp for new KeyboardFilter |
381 | // | 381 | // |
382 | // if ( ke->simpleData.keycode == Key_SysReq ) { | 382 | // if ( ke->simpleData.keycode == Key_SysReq ) { |
@@ -882,39 +882,24 @@ void Desktop::rereadVolumes() | |||
882 | cfg.setGroup( "Volume" ); | 882 | cfg.setGroup( "Volume" ); |
883 | touchclick = cfg.readBoolEntry( "TouchSound" ); | 883 | touchclick = cfg.readBoolEntry( "TouchSound" ); |
884 | keyclick = cfg.readBoolEntry( "KeySound" ); | 884 | keyclick = cfg.readBoolEntry( "KeySound" ); |
885 | alarmsound = cfg.readBoolEntry( "AlarmSound" ); | 885 | alarmsound = cfg.readBoolEntry( "AlarmSound" ); |
886 | } | 886 | } |
887 | 887 | ||
888 | void Desktop::keyClick() | 888 | void Desktop::keyClick() |
889 | { | 889 | { |
890 | if ( keyclick ) | 890 | if ( keyclick ) |
891 | ODevice::inst ( ) -> keySound ( ); | 891 | ODevice::inst ( ) -> keySound ( ); |
892 | } | 892 | } |
893 | 893 | ||
894 | void Desktop::screenClick() | 894 | void Desktop::screenClick() |
895 | { | 895 | { |
896 | if ( touchclick ) | 896 | if ( touchclick ) |
897 | ODevice::inst ( ) -> touchSound ( ); | 897 | ODevice::inst ( ) -> touchSound ( ); |
898 | } | 898 | } |
899 | 899 | ||
900 | void Desktop::soundAlarm() | 900 | void Desktop::soundAlarm() |
901 | { | 901 | { |
902 | if ( qpedesktop-> alarmsound ) | 902 | if ( qpedesktop-> alarmsound ) |
903 | ODevice::inst ( ) -> alarmSound ( ); | 903 | ODevice::inst ( ) -> alarmSound ( ); |
904 | } | 904 | } |
905 | 905 | ||
906 | bool Desktop::eventFilter( QObject *, QEvent *ev ) | ||
907 | { | ||
908 | if ( ev->type() == QEvent::KeyPress ) { | ||
909 | QKeyEvent *ke = (QKeyEvent *)ev; | ||
910 | if ( ke->key() == Qt::Key_F11 ) { // menu key | ||
911 | QWidget *active = qApp->activeWindow(); | ||
912 | if ( active && active->isPopup() ) { | ||
913 | active->close(); | ||
914 | } | ||
915 | raiseMenu(); | ||
916 | return TRUE; | ||
917 | } | ||
918 | } | ||
919 | return FALSE; | ||
920 | } | ||
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h index f6059b8..13f28b3 100644 --- a/core/launcher/desktop.h +++ b/core/launcher/desktop.h | |||
@@ -109,45 +109,44 @@ public: | |||
109 | void screenClick(); | 109 | void screenClick(); |
110 | static void soundAlarm(); | 110 | static void soundAlarm(); |
111 | 111 | ||
112 | public slots: | 112 | public slots: |
113 | void raiseDatebook(); | 113 | void raiseDatebook(); |
114 | void raiseContacts(); | 114 | void raiseContacts(); |
115 | void raiseMenu(); | 115 | void raiseMenu(); |
116 | void raiseLauncher(); | 116 | void raiseLauncher(); |
117 | void raiseEmail(); | 117 | void raiseEmail(); |
118 | void execAutoStart(); | 118 | void execAutoStart(); |
119 | void togglePower(); | 119 | void togglePower(); |
120 | void toggleLight(); | 120 | void toggleLight(); |
121 | void toggleNumLockState(); | 121 | void toggleNumLockState(); |
122 | void toggleCapsLockState(); | 122 | void toggleCapsLockState(); |
123 | void toggleSymbolInput(); | 123 | void toggleSymbolInput(); |
124 | void terminateServers(); | 124 | void terminateServers(); |
125 | void rereadVolumes(); | 125 | void rereadVolumes(); |
126 | 126 | ||
127 | void home ( ); | 127 | void home ( ); |
128 | 128 | ||
129 | protected: | 129 | protected: |
130 | void executeOrModify( const QString& appLnkFile ); | 130 | void executeOrModify( const QString& appLnkFile ); |
131 | void styleChange( QStyle & ); | 131 | void styleChange( QStyle & ); |
132 | void timerEvent( QTimerEvent *e ); | 132 | void timerEvent( QTimerEvent *e ); |
133 | bool eventFilter( QObject *, QEvent * ); | ||
134 | 133 | ||
135 | QWidget *bg; | 134 | QWidget *bg; |
136 | Launcher *launcher; | 135 | Launcher *launcher; |
137 | TaskBar *tb; | 136 | TaskBar *tb; |
138 | 137 | ||
139 | private: | 138 | private: |
140 | void startTransferServer(); | 139 | void startTransferServer(); |
141 | bool recoverMemory(); | 140 | bool recoverMemory(); |
142 | 141 | ||
143 | QCopBridge *qcopBridge; | 142 | QCopBridge *qcopBridge; |
144 | TransferServer *transferServer; | 143 | TransferServer *transferServer; |
145 | PackageSlave *packageSlave; | 144 | PackageSlave *packageSlave; |
146 | 145 | ||
147 | QDateTime suspendTime; | 146 | QDateTime suspendTime; |
148 | bool keyclick, touchclick, alarmsound; | 147 | bool keyclick, touchclick, alarmsound; |
149 | }; | 148 | }; |
150 | 149 | ||
151 | 150 | ||
152 | #endif // __DESKTOP_H__ | 151 | #endif // __DESKTOP_H__ |
153 | 152 | ||
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp index d9382d2..e663072 100644 --- a/core/launcher/startmenu.cpp +++ b/core/launcher/startmenu.cpp | |||
@@ -226,50 +226,55 @@ bool StartMenu::loadMenu( AppLnkSet *folder, QPopupMenu *menu ) | |||
226 | pmenu->insertItem( app->pixmap(), t, app->id() ); | 226 | pmenu->insertItem( app->pixmap(), t, app->id() ); |
227 | } | 227 | } |
228 | result=TRUE; | 228 | result=TRUE; |
229 | } | 229 | } |
230 | } | 230 | } |
231 | } | 231 | } |
232 | 232 | ||
233 | if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries | 233 | if ( sepId && ( menu-> idAt ( 0 ) == sepId )) { // no tabs entries |
234 | menu-> removeItem ( sepId ); | 234 | menu-> removeItem ( sepId ); |
235 | sepId = 0; | 235 | sepId = 0; |
236 | } | 236 | } |
237 | if ( !menu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later | 237 | if ( !menu-> count ( )) // if we don't do this QPopupMenu will insert a dummy Separator, which won't go away later |
238 | sepId = menu-> insertSeparator ( ); | 238 | sepId = menu-> insertSeparator ( ); |
239 | 239 | ||
240 | return result; | 240 | return result; |
241 | } | 241 | } |
242 | 242 | ||
243 | 243 | ||
244 | void StartMenu::launch() | 244 | void StartMenu::launch() |
245 | { | 245 | { |
246 | int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height(); | 246 | int y = mapToGlobal( QPoint() ).y() - launchMenu->sizeHint().height(); |
247 | 247 | ||
248 | if ( launchMenu->isVisible() ) | 248 | if ( launchMenu->isVisible() ) |
249 | launchMenu->hide(); | 249 | launchMenu->hide(); |
250 | else | 250 | else { |
251 | QWidget *active = qApp->activeWindow(); | ||
252 | if ( active && active->isPopup() ) | ||
253 | active->close(); | ||
254 | |||
251 | launchMenu->popup( QPoint( 1, y ) ); | 255 | launchMenu->popup( QPoint( 1, y ) ); |
256 | } | ||
252 | } | 257 | } |
253 | 258 | ||
254 | const AppLnk* StartMenu::execToLink(const QString& appname) | 259 | const AppLnk* StartMenu::execToLink(const QString& appname) |
255 | { | 260 | { |
256 | const AppLnk* a = apps->findExec( appname ); | 261 | const AppLnk* a = apps->findExec( appname ); |
257 | return a; | 262 | return a; |
258 | } | 263 | } |
259 | 264 | ||
260 | void StartPopupMenu::keyPressEvent( QKeyEvent *e ) | 265 | void StartPopupMenu::keyPressEvent( QKeyEvent *e ) |
261 | { | 266 | { |
262 | if ( e->key() == Key_F33 || e->key() == Key_Space ) { | 267 | if ( e->key() == Key_F33 || e->key() == Key_Space ) { |
263 | // "OK" button, little hacky | 268 | // "OK" button, little hacky |
264 | QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0); | 269 | QKeyEvent ke(QEvent::KeyPress, Key_Enter, 13, 0); |
265 | QPopupMenu::keyPressEvent( &ke ); | 270 | QPopupMenu::keyPressEvent( &ke ); |
266 | } else { | 271 | } else { |
267 | QPopupMenu::keyPressEvent( e ); | 272 | QPopupMenu::keyPressEvent( e ); |
268 | } | 273 | } |
269 | } | 274 | } |
270 | 275 | ||
271 | static int compareAppletPositions(const void *a, const void *b) | 276 | static int compareAppletPositions(const void *a, const void *b) |
272 | { | 277 | { |
273 | const MenuApplet* aa = *(const MenuApplet**)a; | 278 | const MenuApplet* aa = *(const MenuApplet**)a; |
274 | const MenuApplet* ab = *(const MenuApplet**)b; | 279 | const MenuApplet* ab = *(const MenuApplet**)b; |
275 | int d = aa->iface->position() - ab->iface->position(); | 280 | int d = aa->iface->position() - ab->iface->position(); |