-rw-r--r-- | core/launcher/launcher.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 344cd46..bdddd37 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -548,101 +548,100 @@ void Launcher::toggleSymbolInput() | |||
548 | { | 548 | { |
549 | tb->toggleSymbolInput(); | 549 | tb->toggleSymbolInput(); |
550 | } | 550 | } |
551 | 551 | ||
552 | void Launcher::toggleNumLockState() | 552 | void Launcher::toggleNumLockState() |
553 | { | 553 | { |
554 | tb->toggleNumLockState(); | 554 | tb->toggleNumLockState(); |
555 | } | 555 | } |
556 | 556 | ||
557 | void Launcher::toggleCapsLockState() | 557 | void Launcher::toggleCapsLockState() |
558 | { | 558 | { |
559 | tb->toggleCapsLockState(); | 559 | tb->toggleCapsLockState(); |
560 | } | 560 | } |
561 | 561 | ||
562 | static bool isVisibleWindow(int wid) | 562 | static bool isVisibleWindow(int wid) |
563 | { | 563 | { |
564 | #ifdef Q_WS_QWS | 564 | #ifdef Q_WS_QWS |
565 | const QList<QWSWindow> &list = qwsServer->clientWindows(); | 565 | const QList<QWSWindow> &list = qwsServer->clientWindows(); |
566 | QWSWindow* w; | 566 | QWSWindow* w; |
567 | for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) { | 567 | for (QListIterator<QWSWindow> it(list); (w=it.current()); ++it) { |
568 | if ( w->winId() == wid ) | 568 | if ( w->winId() == wid ) |
569 | return !w->isFullyObscured(); | 569 | return !w->isFullyObscured(); |
570 | } | 570 | } |
571 | #endif | 571 | #endif |
572 | return FALSE; | 572 | return FALSE; |
573 | } | 573 | } |
574 | 574 | ||
575 | void Launcher::viewSelected(const QString& s) | 575 | void Launcher::viewSelected(const QString& s) |
576 | { | 576 | { |
577 | setCaption( s + tr(" - Launcher") ); | 577 | setCaption( s + tr(" - Launcher") ); |
578 | } | 578 | } |
579 | 579 | ||
580 | void Launcher::showTab(const QString& id) | 580 | void Launcher::showTab(const QString& id) |
581 | { | 581 | { |
582 | tabs->categoryBar->showTab(id); | 582 | tabs->categoryBar->showTab(id); |
583 | raise(); | 583 | raise(); |
584 | } | 584 | } |
585 | 585 | ||
586 | void Launcher::select( const AppLnk *appLnk ) | 586 | void Launcher::select( const AppLnk *appLnk ) |
587 | { | 587 | { |
588 | if ( appLnk->type() == "Folder" ) { // No tr | 588 | if ( appLnk->type() == "Folder" ) { // No tr |
589 | // Not supported: flat is simpler for the user | 589 | // Not supported: flat is simpler for the user |
590 | } else { | 590 | } else { |
591 | if ( appLnk->exec().isNull() ) { | 591 | if ( appLnk->exec().isNull() ) { |
592 | int i = QMessageBox::information(this,tr("No application"), | 592 | int i = QMessageBox::information(this,tr("No application"), |
593 | tr("<p>No application is defined for this document." | 593 | tr("<p>No application is defined for this document." |
594 | "<p>Type is %1.").arg(appLnk->type()), tr("OK"), tr("View as text"), 0, 0, 1); | 594 | "<p>Type is %1.").arg(appLnk->type()), tr("OK"), tr("View as text"), 0, 0, 1); |
595 | 595 | ||
596 | #if 0 | ||
597 | /* ### Fixme */ | 596 | /* ### Fixme */ |
598 | if ( i == 1 ) | 597 | if ( i == 1 ) |
599 | Global::execute(Service::app("Open/text/*"),appLnk->file()); | 598 | Global::execute("textedit",appLnk->file()); |
600 | #endif | 599 | |
601 | return; | 600 | return; |
602 | } | 601 | } |
603 | tabs->setBusy(TRUE); | 602 | tabs->setBusy(TRUE); |
604 | emit executing( appLnk ); | 603 | emit executing( appLnk ); |
605 | appLnk->execute(); | 604 | appLnk->execute(); |
606 | } | 605 | } |
607 | } | 606 | } |
608 | 607 | ||
609 | void Launcher::properties( AppLnk *appLnk ) | 608 | void Launcher::properties( AppLnk *appLnk ) |
610 | { | 609 | { |
611 | if ( appLnk->type() == "Folder" ) { // No tr | 610 | if ( appLnk->type() == "Folder" ) { // No tr |
612 | // Not supported: flat is simpler for the user | 611 | // Not supported: flat is simpler for the user |
613 | } else { | 612 | } else { |
614 | /* ### libqtopia FIXME also moving docLnks... */ | 613 | /* ### libqtopia FIXME also moving docLnks... */ |
615 | LnkProperties prop(appLnk,0 ); | 614 | LnkProperties prop(appLnk,0 ); |
616 | 615 | ||
617 | prop.showMaximized(); | 616 | prop.showMaximized(); |
618 | prop.exec(); | 617 | prop.exec(); |
619 | } | 618 | } |
620 | } | 619 | } |
621 | 620 | ||
622 | void Launcher::storageChanged( const QList<FileSystem> &fs ) | 621 | void Launcher::storageChanged( const QList<FileSystem> &fs ) |
623 | { | 622 | { |
624 | // ### update combo boxes if we had a combo box for the storage type | 623 | // ### update combo boxes if we had a combo box for the storage type |
625 | } | 624 | } |
626 | 625 | ||
627 | void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | 626 | void Launcher::systemMessage( const QCString &msg, const QByteArray &data) |
628 | { | 627 | { |
629 | QDataStream stream( data, IO_ReadOnly ); | 628 | QDataStream stream( data, IO_ReadOnly ); |
630 | if ( msg == "busy()" ) { | 629 | if ( msg == "busy()" ) { |
631 | tb->startWait(); | 630 | tb->startWait(); |
632 | } else if ( msg == "notBusy(QString)" ) { | 631 | } else if ( msg == "notBusy(QString)" ) { |
633 | QString app; | 632 | QString app; |
634 | stream >> app; | 633 | stream >> app; |
635 | tabs->setBusy(FALSE); | 634 | tabs->setBusy(FALSE); |
636 | tb->stopWait(app); | 635 | tb->stopWait(app); |
637 | } else if (msg == "applyStyle()") { | 636 | } else if (msg == "applyStyle()") { |
638 | tabs->currentView()->relayout(); | 637 | tabs->currentView()->relayout(); |
639 | } | 638 | } |
640 | } | 639 | } |
641 | 640 | ||
642 | // These are the update functions from the server | 641 | // These are the update functions from the server |
643 | void Launcher::typeAdded( const QString& type, const QString& name, | 642 | void Launcher::typeAdded( const QString& type, const QString& name, |
644 | const QPixmap& pixmap, const QPixmap& ) | 643 | const QPixmap& pixmap, const QPixmap& ) |
645 | { | 644 | { |
646 | tabs->newView( type, pixmap, name ); | 645 | tabs->newView( type, pixmap, name ); |
647 | ids.append( type ); | 646 | ids.append( type ); |
648 | tb->refreshStartMenu(); | 647 | tb->refreshStartMenu(); |