-rw-r--r-- | core/launcher/desktop.cpp | 40 | ||||
-rw-r--r-- | core/launcher/desktop.h | 1 |
2 files changed, 10 insertions, 31 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 4640a12..68949e6 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -58,6 +58,8 @@ | |||
58 | #include <unistd.h> | 58 | #include <unistd.h> |
59 | #include <fcntl.h> | 59 | #include <fcntl.h> |
60 | 60 | ||
61 | using namespace Opie; | ||
62 | |||
61 | class QCopKeyRegister | 63 | class QCopKeyRegister |
62 | { | 64 | { |
63 | public: | 65 | public: |
@@ -177,7 +179,7 @@ public: | |||
177 | if ( !m_lcd_status ) // We must have turned it off | 179 | if ( !m_lcd_status ) // We must have turned it off |
178 | ODevice::inst ( ) -> setDisplayStatus ( true ); | 180 | ODevice::inst ( ) -> setDisplayStatus ( true ); |
179 | 181 | ||
180 | setBacklight ( -1 ); | 182 | setBacklight ( -3 ); |
181 | } | 183 | } |
182 | bool save( int level ) | 184 | bool save( int level ) |
183 | { | 185 | { |
@@ -319,8 +321,13 @@ void DesktopApplication::switchLCD ( bool on ) | |||
319 | if ( qApp ) { | 321 | if ( qApp ) { |
320 | DesktopApplication *dapp = (DesktopApplication *) qApp; | 322 | DesktopApplication *dapp = (DesktopApplication *) qApp; |
321 | 323 | ||
322 | if ( dapp-> m_screensaver ) | 324 | if ( dapp-> m_screensaver ) { |
323 | dapp-> m_screensaver-> setBacklight ( on ? -3 : -1 ); | 325 | if ( on ) |
326 | dapp-> m_screensaver-> restore ( ); //setBacklight ( on ? -3 : -1 ); | ||
327 | else | ||
328 | dapp-> m_screensaver-> save ( 1 ); | ||
329 | |||
330 | } | ||
324 | } | 331 | } |
325 | } | 332 | } |
326 | 333 | ||
@@ -1006,30 +1013,3 @@ void Desktop::soundAlarm() | |||
1006 | ODevice::inst ( ) -> alarmSound ( ); | 1013 | ODevice::inst ( ) -> alarmSound ( ); |
1007 | } | 1014 | } |
1008 | 1015 | ||
1009 | bool Desktop::eventFilter( QObject *, QEvent *ev ) | ||
1010 | { | ||
1011 | if ( ev-> type ( ) == QEvent::KeyPress ) { | ||
1012 | QKeyEvent * ke = ( QKeyEvent * ) ev; | ||
1013 | if ( ke-> key ( ) == Qt::Key_F11 ) { // menu key | ||
1014 | QWidget * active = qApp-> activeWindow ( ); | ||
1015 | |||
1016 | if ( active && active-> isPopup ( ) ) | ||
1017 | active->close(); | ||
1018 | |||
1019 | /* | ||
1020 | * On iPAQ 38xx that key is not the "menu key" but the mail key | ||
1021 | * To not confuse the users, make it launch the mail app on 38xx | ||
1022 | */ | ||
1023 | if ( ODevice::inst() ->model() == OMODEL_iPAQ_H38xx ) { | ||
1024 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | ||
1025 | e << QString( "mail" ); | ||
1026 | return true; | ||
1027 | } | ||
1028 | else { | ||
1029 | raiseMenu ( ); | ||
1030 | return true; | ||
1031 | } | ||
1032 | } | ||
1033 | } | ||
1034 | return false; | ||
1035 | } | ||
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h index b9ff39f..f7c3e3f 100644 --- a/core/launcher/desktop.h +++ b/core/launcher/desktop.h | |||
@@ -122,7 +122,6 @@ protected: | |||
122 | void executeOrModify( const QString& appLnkFile ); | 122 | void executeOrModify( const QString& appLnkFile ); |
123 | void styleChange( QStyle & ); | 123 | void styleChange( QStyle & ); |
124 | void timerEvent( QTimerEvent *e ); | 124 | void timerEvent( QTimerEvent *e ); |
125 | bool eventFilter( QObject *, QEvent * ); | ||
126 | 125 | ||
127 | QWidget *bg; | 126 | QWidget *bg; |
128 | Launcher *launcher; | 127 | Launcher *launcher; |