summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp40
-rw-r--r--core/launcher/desktop.h1
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
@@ -55,12 +55,14 @@
#include <qvaluelist.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
+using namespace Opie;
+
class QCopKeyRegister
{
public:
QCopKeyRegister() : keyCode( 0 )
{ }
QCopKeyRegister( int k, const QString &c, const QString &m )
@@ -174,13 +176,13 @@ public:
}
void restore()
{
if ( !m_lcd_status ) // We must have turned it off
ODevice::inst ( ) -> setDisplayStatus ( true );
- setBacklight ( -1 );
+ setBacklight ( -3 );
}
bool save( int level )
{
switch ( level ) {
case 0:
if ( m_disable_suspend > 0 && m_enable_dim ) {
@@ -316,14 +318,19 @@ private:
void DesktopApplication::switchLCD ( bool on )
{
if ( qApp ) {
DesktopApplication *dapp = (DesktopApplication *) qApp;
- if ( dapp-> m_screensaver )
- dapp-> m_screensaver-> setBacklight ( on ? -3 : -1 );
+ if ( dapp-> m_screensaver ) {
+ if ( on )
+ dapp-> m_screensaver-> restore ( ); //setBacklight ( on ? -3 : -1 );
+ else
+ dapp-> m_screensaver-> save ( 1 );
+
+ }
}
}
DesktopApplication::DesktopApplication( int& argc, char **argv, Type appType )
: QPEApplication( argc, argv, appType )
@@ -1003,33 +1010,6 @@ void Desktop::screenClick()
void Desktop::soundAlarm()
{
if ( qpedesktop-> alarmsound )
ODevice::inst ( ) -> alarmSound ( );
}
-bool Desktop::eventFilter( QObject *, QEvent *ev )
-{
- if ( ev-> type ( ) == QEvent::KeyPress ) {
- QKeyEvent * ke = ( QKeyEvent * ) ev;
- if ( ke-> key ( ) == Qt::Key_F11 ) { // menu key
- QWidget * active = qApp-> activeWindow ( );
-
- if ( active && active-> isPopup ( ) )
- active->close();
-
- /*
- * On iPAQ 38xx that key is not the "menu key" but the mail key
- * To not confuse the users, make it launch the mail app on 38xx
- */
- if ( ODevice::inst() ->model() == OMODEL_iPAQ_H38xx ) {
- QCopEnvelope e( "QPE/System", "execute(QString)" );
- e << QString( "mail" );
- return true;
- }
- else {
- raiseMenu ( );
- return true;
- }
- }
- }
- return false;
-}
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
@@ -119,13 +119,12 @@ public slots:
void rereadVolumes();
protected:
void executeOrModify( const QString& appLnkFile );
void styleChange( QStyle & );
void timerEvent( QTimerEvent *e );
- bool eventFilter( QObject *, QEvent * );
QWidget *bg;
Launcher *launcher;
TaskBar *tb;
private: