author | llornkcor <llornkcor> | 2002-09-02 13:59:25 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-09-02 13:59:25 (UTC) |
commit | ffa6856b8ccbaa44d950b7f311011c990f656d47 (patch) (unidiff) | |
tree | dbfd44501dd6e70a2252b23e0fe50d81394ebc26 | |
parent | 4d7f2095e3119cac9319ab6b48492705188ce5cb (diff) | |
download | opie-ffa6856b8ccbaa44d950b7f311011c990f656d47.zip opie-ffa6856b8ccbaa44d950b7f311011c990f656d47.tar.gz opie-ffa6856b8ccbaa44d950b7f311011c990f656d47.tar.bz2 |
fix typo
-rw-r--r-- | core/launcher/desktop.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 8756d37..bf19280 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -457,98 +457,98 @@ static bool hasVisibleWindow(const QString& clientname) | |||
457 | QWSWindow* w; | 457 | QWSWindow* w; |
458 | for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) { | 458 | for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) { |
459 | if ( w->client()->identity() == clientname && !w->isFullyObscured() ) | 459 | if ( w->client()->identity() == clientname && !w->isFullyObscured() ) |
460 | return TRUE; | 460 | return TRUE; |
461 | } | 461 | } |
462 | return FALSE; | 462 | return FALSE; |
463 | } | 463 | } |
464 | 464 | ||
465 | void Desktop::raiseLauncher() | 465 | void Desktop::raiseLauncher() |
466 | { | 466 | { |
467 | Config cfg("qpe"); //F12 'Home' | 467 | Config cfg("qpe"); //F12 'Home' |
468 | cfg.setGroup("AppsKey"); | 468 | cfg.setGroup("AppsKey"); |
469 | QString tempItem; | 469 | QString tempItem; |
470 | tempItem = cfg.readEntry("Middle","Home"); | 470 | tempItem = cfg.readEntry("Middle","Home"); |
471 | if(tempItem == "Home" || tempItem.isEmpty()) { | 471 | if(tempItem == "Home" || tempItem.isEmpty()) { |
472 | if ( isVisibleWindow(launcher->winId()) ) | 472 | if ( isVisibleWindow(launcher->winId()) ) |
473 | launcher->nextView(); | 473 | launcher->nextView(); |
474 | else | 474 | else |
475 | launcher->raise(); | 475 | launcher->raise(); |
476 | } else { | 476 | } else { |
477 | QCopEnvelope e("QPE/System","execute(QString)"); | 477 | QCopEnvelope e("QPE/System","execute(QString)"); |
478 | e << tempItem; | 478 | e << tempItem; |
479 | } | 479 | } |
480 | } | 480 | } |
481 | 481 | ||
482 | void Desktop::executeOrModify(const QString& appLnkFile) | 482 | void Desktop::executeOrModify(const QString& appLnkFile) |
483 | { | 483 | { |
484 | AppLnk lnk(MimeType::appsFolderName() + "/" + appLnkFile); | 484 | AppLnk lnk(MimeType::appsFolderName() + "/" + appLnkFile); |
485 | if ( lnk.isValid() ) { | 485 | if ( lnk.isValid() ) { |
486 | QCString app = lnk.exec().utf8(); | 486 | QCString app = lnk.exec().utf8(); |
487 | Global::terminateBuiltin("calibrate"); | 487 | Global::terminateBuiltin("calibrate"); |
488 | if ( QCopChannel::isRegistered("QPE/Application/" + app) ) { | 488 | if ( QCopChannel::isRegistered("QPE/Application/" + app) ) { |
489 | MRUList::addTask(&lnk); | 489 | MRUList::addTask(&lnk); |
490 | if ( hasVisibleWindow(app) ) | 490 | if ( hasVisibleWindow(app) ) |
491 | QCopChannel::send("QPE/Application/" + app, "nextView()"); | 491 | QCopChannel::send("QPE/Application/" + app, "nextView()"); |
492 | else | 492 | else |
493 | QCopChannel::send("QPE/Application/" + app, "raise()"); | 493 | QCopChannel::send("QPE/Application/" + app, "raise()"); |
494 | } else { | 494 | } else { |
495 | lnk.execute(); | 495 | lnk.execute(); |
496 | } | 496 | } |
497 | } | 497 | } |
498 | } | 498 | } |
499 | 499 | ||
500 | void Desktop::raiseDatebook() | 500 | void Desktop::raiseDatebook() |
501 | { | 501 | { |
502 | Config cfg( "qpe" ); //F9 'Activity' | 502 | Config cfg( "qpe" ); //F9 'Activity' |
503 | cfg.setGroup( "AppsKey" ); | 503 | cfg.setGroup( "AppsKey" ); |
504 | QString tempItem; | 504 | QString tempItem; |
505 | tempItem = cfg.readEntry( "LeftEnd" , "Calender" ); | 505 | tempItem = cfg.readEntry( "LeftEnd" , "Calendar" ); |
506 | if ( tempItem == "Calender" || tempItem.isEmpty() ) { | 506 | if ( tempItem == "Calendar" || tempItem.isEmpty() ) { |
507 | tempItem = "datebook"; | 507 | tempItem = "datebook"; |
508 | } | 508 | } |
509 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 509 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
510 | e << tempItem; | 510 | e << tempItem; |
511 | } | 511 | } |
512 | 512 | ||
513 | void Desktop::raiseContacts() | 513 | void Desktop::raiseContacts() |
514 | { | 514 | { |
515 | Config cfg( "qpe" ); //F10, 'Contacts' | 515 | Config cfg( "qpe" ); //F10, 'Contacts' |
516 | cfg.setGroup( "AppsKey" ); | 516 | cfg.setGroup( "AppsKey" ); |
517 | QString tempItem; | 517 | QString tempItem; |
518 | tempItem = cfg.readEntry( "Left2nd", "Address Book" ); | 518 | tempItem = cfg.readEntry( "Left2nd", "Address Book" ); |
519 | if ( tempItem == "Address Book" || tempItem.isEmpty() ) { | 519 | if ( tempItem == "Address Book" || tempItem.isEmpty() ) { |
520 | tempItem = "addressbook"; | 520 | tempItem = "addressbook"; |
521 | } | 521 | } |
522 | QCopEnvelope e("QPE/System","execute(QString)"); | 522 | QCopEnvelope e("QPE/System","execute(QString)"); |
523 | e << tempItem; | 523 | e << tempItem; |
524 | } | 524 | } |
525 | 525 | ||
526 | void Desktop::raiseMenu() | 526 | void Desktop::raiseMenu() |
527 | { | 527 | { |
528 | Config cfg( "qpe" ); //F11, 'Menu | 528 | Config cfg( "qpe" ); //F11, 'Menu |
529 | cfg.setGroup( "AppsKey" ); | 529 | cfg.setGroup( "AppsKey" ); |
530 | QString tempItem; | 530 | QString tempItem; |
531 | tempItem = cfg.readEntry( "Right2nd" , "Popup Menu" ); | 531 | tempItem = cfg.readEntry( "Right2nd" , "Popup Menu" ); |
532 | if ( tempItem == "Popup Menu" || tempItem.isEmpty() ) { | 532 | if ( tempItem == "Popup Menu" || tempItem.isEmpty() ) { |
533 | Global::terminateBuiltin( "calibrate" ); | 533 | Global::terminateBuiltin( "calibrate" ); |
534 | tb->startMenu()->launch(); | 534 | tb->startMenu()->launch(); |
535 | } else { | 535 | } else { |
536 | QCopEnvelope e("QPE/System","execute(QString)"); | 536 | QCopEnvelope e("QPE/System","execute(QString)"); |
537 | e << tempItem; | 537 | e << tempItem; |
538 | } | 538 | } |
539 | } | 539 | } |
540 | 540 | ||
541 | void Desktop::raiseEmail() | 541 | void Desktop::raiseEmail() |
542 | { | 542 | { |
543 | Config cfg( "qpe" ); //F13, 'Mail' // only in zaurus, on ipaq mail key is F11 | 543 | Config cfg( "qpe" ); //F13, 'Mail' // only in zaurus, on ipaq mail key is F11 |
544 | cfg.setGroup( "AppsKey" ); | 544 | cfg.setGroup( "AppsKey" ); |
545 | QString tempItem; | 545 | QString tempItem; |
546 | tempItem = cfg.readEntry( "RightEnd", "Mail" ); | 546 | tempItem = cfg.readEntry( "RightEnd", "Mail" ); |
547 | if ( tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty() ) { | 547 | if ( tempItem == "Mail" || tempItem == "qtmail" || tempItem.isEmpty() ) { |
548 | tempItem = "mail"; | 548 | tempItem = "mail"; |
549 | } | 549 | } |
550 | QCopEnvelope e("QPE/System","execute(QString)"); | 550 | QCopEnvelope e("QPE/System","execute(QString)"); |
551 | e << tempItem; | 551 | e << tempItem; |
552 | } | 552 | } |
553 | 553 | ||
554 | // autoStarts apps on resume and start | 554 | // autoStarts apps on resume and start |
@@ -558,131 +558,131 @@ void Desktop::execAutoStart() | |||
558 | int delay; | 558 | int delay; |
559 | QDateTime now = QDateTime::currentDateTime(); | 559 | QDateTime now = QDateTime::currentDateTime(); |
560 | Config cfg( "autostart" ); | 560 | Config cfg( "autostart" ); |
561 | cfg.setGroup( "AutoStart" ); | 561 | cfg.setGroup( "AutoStart" ); |
562 | appName = cfg.readEntry( "Apps", "" ); | 562 | appName = cfg.readEntry( "Apps", "" ); |
563 | delay = ( cfg.readEntry( "Delay", "0" ) ).toInt(); | 563 | delay = ( cfg.readEntry( "Delay", "0" ) ).toInt(); |
564 | // If the time between suspend and resume was longer then the | 564 | // If the time between suspend and resume was longer then the |
565 | // value saved as delay, start the app | 565 | // value saved as delay, start the app |
566 | if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) { | 566 | if ( suspendTime.secsTo( now ) >= ( delay * 60 ) && !appName.isEmpty() ) { |
567 | QCopEnvelope e( "QPE/System", "execute(QString)" ); | 567 | QCopEnvelope e( "QPE/System", "execute(QString)" ); |
568 | e << QString( appName ); | 568 | e << QString( appName ); |
569 | } | 569 | } |
570 | } | 570 | } |
571 | 571 | ||
572 | #if defined(QPE_HAVE_TOGGLELIGHT) | 572 | #if defined(QPE_HAVE_TOGGLELIGHT) |
573 | #include <qpe/config.h> | 573 | #include <qpe/config.h> |
574 | 574 | ||
575 | #include <sys/ioctl.h> | 575 | #include <sys/ioctl.h> |
576 | #include <sys/types.h> | 576 | #include <sys/types.h> |
577 | #include <fcntl.h> | 577 | #include <fcntl.h> |
578 | #include <unistd.h> | 578 | #include <unistd.h> |
579 | #include <errno.h> | 579 | #include <errno.h> |
580 | #include <linux/ioctl.h> | 580 | #include <linux/ioctl.h> |
581 | #include <time.h> | 581 | #include <time.h> |
582 | #endif | 582 | #endif |
583 | 583 | ||
584 | static bool blanked=FALSE; | 584 | static bool blanked=FALSE; |
585 | 585 | ||
586 | static void blankScreen() | 586 | static void blankScreen() |
587 | { | 587 | { |
588 | if ( !qt_screen ) return; | 588 | if ( !qt_screen ) return; |
589 | /* Should use a big black window instead. | 589 | /* Should use a big black window instead. |
590 | QGfx* g = qt_screen->screenGfx(); | 590 | QGfx* g = qt_screen->screenGfx(); |
591 | g->fillRect(0,0,qt_screen->width(),qt_screen->height()); | 591 | g->fillRect(0,0,qt_screen->width(),qt_screen->height()); |
592 | delete g; | 592 | delete g; |
593 | */ | 593 | */ |
594 | blanked = TRUE; | 594 | blanked = TRUE; |
595 | } | 595 | } |
596 | 596 | ||
597 | static void darkScreen() | 597 | static void darkScreen() |
598 | { | 598 | { |
599 | extern void qpe_setBacklight(int); | 599 | extern void qpe_setBacklight(int); |
600 | qpe_setBacklight(0); // force off | 600 | qpe_setBacklight(0); // force off |
601 | } | 601 | } |
602 | 602 | ||
603 | 603 | ||
604 | void Desktop::togglePower() | 604 | void Desktop::togglePower() |
605 | { | 605 | { |
606 | extern void qpe_setBacklight ( int ); // We need to toggle the LCD fast - no time to send a QCop | 606 | extern void qpe_setBacklight ( int ); // We need to toggle the LCD fast - no time to send a QCop |
607 | 607 | ||
608 | static bool excllock = false; | 608 | static bool excllock = false; |
609 | 609 | ||
610 | if ( excllock ) | 610 | if ( excllock ) |
611 | return; | 611 | return; |
612 | 612 | ||
613 | excllock = true; | 613 | excllock = true; |
614 | 614 | ||
615 | bool wasloggedin = loggedin; | 615 | bool wasloggedin = loggedin; |
616 | loggedin=0; | 616 | loggedin=0; |
617 | suspendTime = QDateTime::currentDateTime(); | 617 | suspendTime = QDateTime::currentDateTime(); |
618 | 618 | ||
619 | //qpe_setBacklight ( 0 ); // force LCD off (sandman: why ????) | 619 | // qpe_setBacklight ( 0 ); // force LCD off (sandman: why ????) |
620 | 620 | ||
621 | if ( wasloggedin ) | 621 | if ( wasloggedin ) |
622 | blankScreen(); | 622 | blankScreen(); |
623 | 623 | ||
624 | ODevice::inst ( )-> suspend ( ); | 624 | ODevice::inst ( )-> suspend ( ); |
625 | 625 | ||
626 | QWSServer::screenSaverActivate ( false ); | 626 | QWSServer::screenSaverActivate ( false ); |
627 | 627 | ||
628 | qpe_setBacklight ( -3 ); // force LCD on | 628 | qpe_setBacklight ( -3 ); // force LCD on |
629 | 629 | ||
630 | { | 630 | { |
631 | QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep | 631 | QCopEnvelope("QPE/Card", "mtabChanged()" ); // might have changed while asleep |
632 | } | 632 | } |
633 | 633 | ||
634 | if ( wasloggedin ) | 634 | if ( wasloggedin ) |
635 | login(TRUE); | 635 | login(TRUE); |
636 | 636 | ||
637 | execAutoStart(); | 637 | execAutoStart(); |
638 | //qcopBridge->closeOpenConnections(); | 638 | //qcopBridge->closeOpenConnections(); |
639 | 639 | ||
640 | excllock = false; | 640 | excllock = false; |
641 | } | 641 | } |
642 | 642 | ||
643 | void Desktop::toggleLight() | 643 | void Desktop::toggleLight() |
644 | { | 644 | { |
645 | QCopEnvelope e("QPE/System", "setBacklight(int)"); | 645 | QCopEnvelope e("QPE/System", "setBacklight(int)"); |
646 | e << -2; // toggle | 646 | e << -2; // toggle |
647 | } | 647 | } |
648 | 648 | ||
649 | void Desktop::toggleSymbolInput() | 649 | void Desktop::toggleSymbolInput() |
650 | { | 650 | { |
651 | tb->toggleSymbolInput(); | 651 | tb->toggleSymbolInput(); |
652 | } | 652 | } |
653 | 653 | ||
654 | void Desktop::toggleNumLockState() | 654 | void Desktop::toggleNumLockState() |
655 | { | 655 | { |
656 | tb->toggleNumLockState(); | 656 | tb->toggleNumLockState(); |
657 | } | 657 | } |
658 | 658 | ||
659 | void Desktop::toggleCapsLockState() | 659 | void Desktop::toggleCapsLockState() |
660 | { | 660 | { |
661 | tb->toggleCapsLockState(); | 661 | tb->toggleCapsLockState(); |
662 | } | 662 | } |
663 | 663 | ||
664 | void Desktop::styleChange( QStyle &s ) | 664 | void Desktop::styleChange( QStyle &s ) |
665 | { | 665 | { |
666 | QWidget::styleChange( s ); | 666 | QWidget::styleChange( s ); |
667 | int displayw = qApp->desktop()->width(); | 667 | int displayw = qApp->desktop()->width(); |
668 | int displayh = qApp->desktop()->height(); | 668 | int displayh = qApp->desktop()->height(); |
669 | 669 | ||
670 | QSize sz = tb->sizeHint(); | 670 | QSize sz = tb->sizeHint(); |
671 | 671 | ||
672 | tb->setGeometry( 0, displayh-sz.height(), displayw, sz.height() ); | 672 | tb->setGeometry( 0, displayh-sz.height(), displayw, sz.height() ); |
673 | } | 673 | } |
674 | 674 | ||
675 | void DesktopApplication::shutdown() | 675 | void DesktopApplication::shutdown() |
676 | { | 676 | { |
677 | if ( type() != GuiServer ) | 677 | if ( type() != GuiServer ) |
678 | return; | 678 | return; |
679 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); | 679 | ShutdownImpl *sd = new ShutdownImpl( 0, 0, WDestructiveClose ); |
680 | connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)), | 680 | connect( sd, SIGNAL(shutdown(ShutdownImpl::Type)), |
681 | this, SLOT(shutdown(ShutdownImpl::Type)) ); | 681 | this, SLOT(shutdown(ShutdownImpl::Type)) ); |
682 | sd->showMaximized(); | 682 | sd->showMaximized(); |
683 | } | 683 | } |
684 | 684 | ||
685 | void DesktopApplication::shutdown( ShutdownImpl::Type t ) | 685 | void DesktopApplication::shutdown( ShutdownImpl::Type t ) |
686 | { | 686 | { |
687 | switch ( t ) { | 687 | switch ( t ) { |
688 | case ShutdownImpl::ShutdownSystem: | 688 | case ShutdownImpl::ShutdownSystem: |