summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp58
1 files changed, 32 insertions, 26 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 5aba8dd..8756d37 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -200,7 +200,6 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e )
200 when user presses key, unless keyboard has been requested from app. 200 when user presses key, unless keyboard has been requested from app.
201 will not send multiple repeats if user holds key 201 will not send multiple repeats if user holds key
202 i.e. one shot 202 i.e. one shot
203
204 */ 203 */
205 if (!keyRegisterList.isEmpty()) { 204 if (!keyRegisterList.isEmpty()) {
206 KeyRegisterList::Iterator it; 205 KeyRegisterList::Iterator it;
@@ -531,7 +530,7 @@ void Desktop::raiseMenu()
531 QString tempItem; 530 QString tempItem;
532 tempItem = cfg.readEntry( "Right2nd" , "Popup Menu" ); 531 tempItem = cfg.readEntry( "Right2nd" , "Popup Menu" );
533 if ( tempItem == "Popup Menu" || tempItem.isEmpty() ) { 532 if ( tempItem == "Popup Menu" || tempItem.isEmpty() ) {
534 Global::terminateBuiltin("calibrate"); 533 Global::terminateBuiltin( "calibrate" );
535 tb->startMenu()->launch(); 534 tb->startMenu()->launch();
536 } else { 535 } else {
537 QCopEnvelope e("QPE/System","execute(QString)"); 536 QCopEnvelope e("QPE/System","execute(QString)");
@@ -541,7 +540,7 @@ void Desktop::raiseMenu()
541 540
542void Desktop::raiseEmail() 541void Desktop::raiseEmail()
543{ 542{
544 Config cfg( "qpe" ); //F13, 'Mail' 543 Config cfg( "qpe" ); //F13, 'Mail' // only in zaurus, on ipaq mail key is F11
545 cfg.setGroup( "AppsKey" ); 544 cfg.setGroup( "AppsKey" );
546 QString tempItem; 545 QString tempItem;
547 tempItem = cfg.readEntry( "RightEnd", "Mail" ); 546 tempItem = cfg.readEntry( "RightEnd", "Mail" );
@@ -553,7 +552,8 @@ void Desktop::raiseEmail()
553} 552}
554 553
555// autoStarts apps on resume and start 554// autoStarts apps on resume and start
556void Desktop::execAutoStart() { 555void Desktop::execAutoStart()
556{
557 QString appName; 557 QString appName;
558 int delay; 558 int delay;
559 QDateTime now = QDateTime::currentDateTime(); 559 QDateTime now = QDateTime::currentDateTime();
@@ -764,43 +764,49 @@ void Desktop::rereadVolumes()
764 touchclick = cfg.readBoolEntry("TouchSound"); 764 touchclick = cfg.readBoolEntry("TouchSound");
765 keyclick = cfg.readBoolEntry("KeySound"); 765 keyclick = cfg.readBoolEntry("KeySound");
766 alarmsound = cfg.readBoolEntry("AlarmSound"); 766 alarmsound = cfg.readBoolEntry("AlarmSound");
767// Config cfg("Sound");
768// cfg.setGroup("System");
769// touchclick = cfg.readBoolEntry("Touch");
770// keyclick = cfg.readBoolEntry("Key");
771} 767}
772 768
773void Desktop::keyClick() 769void Desktop::keyClick()
774{ 770{
775 if ( keyclick ) 771 if ( keyclick )
776 ODevice::inst ( )-> keySound ( ); 772 ODevice::inst ( )-> keySound ( );
777} 773}
778 774
779void Desktop::screenClick() 775void Desktop::screenClick()
780{ 776{
781 if ( touchclick ) 777 if ( touchclick )
782 ODevice::inst ( )-> touchSound ( ); 778 ODevice::inst ( )-> touchSound ( );
783} 779}
784 780
785void Desktop::soundAlarm() 781void Desktop::soundAlarm()
786{ 782{
787 if ( qpedesktop-> alarmsound ) 783 if ( qpedesktop-> alarmsound )
788 ODevice::inst ( )-> alarmSound ( ); 784 ODevice::inst ( )-> alarmSound ( );
789} 785}
790 786
791bool Desktop::eventFilter( QObject *, QEvent *ev ) 787bool Desktop::eventFilter( QObject *, QEvent *ev )
792{ 788{
793 if ( ev-> type ( ) == QEvent::KeyPress ) { 789 if ( ev-> type ( ) == QEvent::KeyPress ) {
794 QKeyEvent *ke = (QKeyEvent *) ev; 790 QKeyEvent *ke = (QKeyEvent *) ev;
795 if ( ke-> key ( ) == Qt::Key_F11 ) { // menu key 791 if ( ke-> key ( ) == Qt::Key_F11 ) { // menu key
796 QWidget *active = qApp-> activeWindow ( ); 792 QWidget *active = qApp-> activeWindow ( );
797 793
798 if ( active && active-> isPopup ( )) 794 if ( active && active-> isPopup ( ))
799 active->close(); 795 active->close();
800 796
801 raiseMenu ( ); 797 /*
802 return true; 798 * On iPAQ 38xx that key is not the "menu key" but the mail key
799 * To not confuse the users, make it launch the mail app on 38xx
800 */
801 if (ODevice::inst()->model() == OMODEL_iPAQ_H38xx ) {
802 QCopEnvelope e( "QPE/System", "execute(QString)" );
803 e << QString( "mail" );
804 return true;
805 } else {
806 raiseMenu ( );
807 return true;
808 }
809 }
803 } 810 }
804 } 811 return false;
805 return false;
806} 812}