-rw-r--r-- | core/launcher/launcher.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 98e7481..7887704 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -630,50 +630,52 @@ void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | |||
630 | } else if ( msg == "notBusy(QString)" ) { | 630 | } else if ( msg == "notBusy(QString)" ) { |
631 | QString app; | 631 | QString app; |
632 | stream >> app; | 632 | stream >> app; |
633 | tabs->setBusy(FALSE); | 633 | tabs->setBusy(FALSE); |
634 | tb->stopWait(app); | 634 | tb->stopWait(app); |
635 | } else if (msg == "applyStyle()") { | 635 | } else if (msg == "applyStyle()") { |
636 | tabs->currentView()->relayout(); | 636 | tabs->currentView()->relayout(); |
637 | } | 637 | } |
638 | } | 638 | } |
639 | 639 | ||
640 | // These are the update functions from the server | 640 | // These are the update functions from the server |
641 | void Launcher::typeAdded( const QString& type, const QString& name, | 641 | void Launcher::typeAdded( const QString& type, const QString& name, |
642 | const QPixmap& pixmap, const QPixmap& ) | 642 | const QPixmap& pixmap, const QPixmap& ) |
643 | { | 643 | { |
644 | tabs->newView( type, pixmap, name ); | 644 | tabs->newView( type, pixmap, name ); |
645 | ids.append( type ); | 645 | ids.append( type ); |
646 | tb->refreshStartMenu(); | 646 | /* this will be called in applicationScanningProgress with value 100! */ |
647 | // tb->refreshStartMenu(); | ||
647 | 648 | ||
648 | static bool first = TRUE; | 649 | static bool first = TRUE; |
649 | if ( first ) { | 650 | if ( first ) { |
650 | first = FALSE; | 651 | first = FALSE; |
651 | tabs->categoryBar->showTab(type); | 652 | tabs->categoryBar->showTab(type); |
652 | } | 653 | } |
653 | 654 | ||
654 | tabs->view( type )->setUpdatesEnabled( FALSE ); | 655 | tabs->view( type )->setUpdatesEnabled( FALSE ); |
655 | tabs->view( type )->setSortEnabled( FALSE ); | 656 | tabs->view( type )->setSortEnabled( FALSE ); |
656 | } | 657 | } |
657 | 658 | ||
658 | void Launcher::typeRemoved( const QString& type ) | 659 | void Launcher::typeRemoved( const QString& type ) |
659 | { | 660 | { |
660 | tabs->view( type )->removeAllItems(); | 661 | tabs->view( type )->removeAllItems(); |
661 | tabs->deleteView( type ); | 662 | tabs->deleteView( type ); |
662 | ids.remove( type ); | 663 | ids.remove( type ); |
663 | tb->refreshStartMenu(); | 664 | /* this will be called in applicationScanningProgress with value 100! */ |
665 | // tb->refreshStartMenu(); | ||
664 | } | 666 | } |
665 | 667 | ||
666 | void Launcher::applicationAdded( const QString& type, const AppLnk& app ) | 668 | void Launcher::applicationAdded( const QString& type, const AppLnk& app ) |
667 | { | 669 | { |
668 | if ( app.type() == "Separator" ) // No tr | 670 | if ( app.type() == "Separator" ) // No tr |
669 | return; | 671 | return; |
670 | 672 | ||
671 | LauncherView *view = tabs->view( type ); | 673 | LauncherView *view = tabs->view( type ); |
672 | if ( view ) | 674 | if ( view ) |
673 | view->addItem( new AppLnk( app ), FALSE ); | 675 | view->addItem( new AppLnk( app ), FALSE ); |
674 | else | 676 | else |
675 | qWarning("addAppLnk: No view for type %s. Can't add app %s!", | 677 | qWarning("addAppLnk: No view for type %s. Can't add app %s!", |
676 | type.latin1(),app.name().latin1() ); | 678 | type.latin1(),app.name().latin1() ); |
677 | 679 | ||
678 | MimeType::registerApp( app ); | 680 | MimeType::registerApp( app ); |
679 | } | 681 | } |
@@ -755,24 +757,25 @@ void Launcher::applicationScanningProgress( int percent ) | |||
755 | 757 | ||
756 | void Launcher::documentScanningProgress( int percent ) | 758 | void Launcher::documentScanningProgress( int percent ) |
757 | { | 759 | { |
758 | switch ( percent ) { | 760 | switch ( percent ) { |
759 | case 0: { | 761 | case 0: { |
760 | tabs->setLoadingProgress( 0 ); | 762 | tabs->setLoadingProgress( 0 ); |
761 | tabs->setLoadingWidgetEnabled( TRUE ); | 763 | tabs->setLoadingWidgetEnabled( TRUE ); |
762 | tabs->docView()->setUpdatesEnabled( FALSE ); | 764 | tabs->docView()->setUpdatesEnabled( FALSE ); |
763 | tabs->docView()->setSortEnabled( FALSE ); | 765 | tabs->docView()->setSortEnabled( FALSE ); |
764 | break; | 766 | break; |
765 | } | 767 | } |
766 | case 100: { | 768 | case 100: { |
767 | tabs->docView()->updateTools(); | 769 | tabs->docView()->updateTools(); |
768 | tabs->docView()->setSortEnabled( TRUE ); | 770 | tabs->docView()->setSortEnabled( TRUE ); |
769 | tabs->docView()->setUpdatesEnabled( TRUE ); | 771 | tabs->docView()->setUpdatesEnabled( TRUE ); |
770 | tabs->setLoadingWidgetEnabled( FALSE ); | 772 | tabs->setLoadingWidgetEnabled( FALSE ); |
773 | tb->refreshStartMenu(); | ||
771 | break; | 774 | break; |
772 | } | 775 | } |
773 | default: | 776 | default: |
774 | tabs->setLoadingProgress( percent ); | 777 | tabs->setLoadingProgress( percent ); |
775 | break; | 778 | break; |
776 | } | 779 | } |
777 | } | 780 | } |
778 | 781 | ||