-rw-r--r-- | core/launcher/launcher.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp index 010a2e9..5ec1cf8 100644 --- a/core/launcher/launcher.cpp +++ b/core/launcher/launcher.cpp | |||
@@ -348,30 +348,30 @@ void LauncherTabWidget::setProgressStyle() | |||
348 | * This obviously has a more sinister cause, but this works around it with no | 348 | * This obviously has a more sinister cause, but this works around it with no |
349 | * obvious adverse effects. Please FIXME | 349 | * obvious adverse effects. Please FIXME |
350 | * bkc - 17/6/2004 | 350 | * bkc - 17/6/2004 |
351 | * | 351 | * |
352 | */ | 352 | */ |
353 | 353 | ||
354 | void LauncherTabWidget::setBusy(bool on) | 354 | void LauncherTabWidget::setBusy(bool on) |
355 | { | 355 | { |
356 | if ( on ) | 356 | if ( on ) |
357 | currentView()->setBusy(TRUE); | 357 | currentView()->setBusy(TRUE); |
358 | else { | 358 | else { |
359 | for ( int i = 0; i < categoryBar->count(); i++ ) { | 359 | for ( int i = 0; i < categoryBar->count(); i++ ) { |
360 | if (categoryBar->tab(i)) { | 360 | if (categoryBar->tab(i)) { |
361 | LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view; | 361 | LauncherView *view = ((LauncherTab *)categoryBar->tab(i))->view; |
362 | view->setBusy( FALSE ); | 362 | view->setBusy( FALSE ); |
363 | } else { | 363 | } else { |
364 | odebug << "Averting Disaster with tab " << i << " == NULL! " << oendl; | 364 | odebug << "Averting Disaster with tab " << i << " == NULL! " << oendl; |
365 | } | 365 | } |
366 | } | 366 | } |
367 | } | 367 | } |
368 | } | 368 | } |
369 | 369 | ||
370 | void LauncherTabWidget::setBusyIndicatorType( const QString& str ) { | 370 | void LauncherTabWidget::setBusyIndicatorType( const QString& str ) { |
371 | for (int i = 0; i < categoryBar->count(); i++ ) { | 371 | for (int i = 0; i < categoryBar->count(); i++ ) { |
372 | LauncherView* view = static_cast<LauncherTab*>( categoryBar->tab(i) )->view; | 372 | LauncherView* view = static_cast<LauncherTab*>( categoryBar->tab(i) )->view; |
373 | view->setBusyIndicatorType( str ); | 373 | view->setBusyIndicatorType( str ); |
374 | } | 374 | } |
375 | } | 375 | } |
376 | 376 | ||
377 | LauncherView *LauncherTabWidget::currentView(void) | 377 | LauncherView *LauncherTabWidget::currentView(void) |
@@ -592,27 +592,29 @@ void Launcher::select( const AppLnk *appLnk ) | |||
592 | tabs->setBusy(TRUE); | 592 | tabs->setBusy(TRUE); |
593 | emit executing( appLnk ); | 593 | emit executing( appLnk ); |
594 | appLnk->execute(); | 594 | appLnk->execute(); |
595 | } | 595 | } |
596 | } | 596 | } |
597 | 597 | ||
598 | void Launcher::properties( AppLnk *appLnk ) | 598 | void Launcher::properties( AppLnk *appLnk ) |
599 | { | 599 | { |
600 | if ( appLnk->type() == "Folder" ) { // No tr | 600 | if ( appLnk->type() == "Folder" ) { // No tr |
601 | // Not supported: flat is simpler for the user | 601 | // Not supported: flat is simpler for the user |
602 | } else { | 602 | } else { |
603 | /* ### libqtopia FIXME also moving docLnks... */ | 603 | /* ### libqtopia FIXME also moving docLnks... */ |
604 | LnkProperties prop(appLnk,0 ); | 604 | LnkProperties prop(appLnk,0 ); |
605 | 605 | ||
606 | QPEApplication::execDialog( &prop ); | 606 | if (QPEApplication::execDialog( &prop )==QDialog::Accepted && tabs->currentView()==tabs->docView()) { |
607 | tabs->docView()->updateTools(); | ||
608 | } | ||
607 | } | 609 | } |
608 | } | 610 | } |
609 | 611 | ||
610 | void Launcher::storageChanged( const QList<FileSystem> & ) | 612 | void Launcher::storageChanged( const QList<FileSystem> & ) |
611 | { | 613 | { |
612 | // ### update combo boxes if we had a combo box for the storage type | 614 | // ### update combo boxes if we had a combo box for the storage type |
613 | } | 615 | } |
614 | 616 | ||
615 | void Launcher::systemMessage( const QCString &msg, const QByteArray &data) | 617 | void Launcher::systemMessage( const QCString &msg, const QByteArray &data) |
616 | { | 618 | { |
617 | QDataStream stream( data, IO_ReadOnly ); | 619 | QDataStream stream( data, IO_ReadOnly ); |
618 | if ( msg == "busy()" ) { | 620 | if ( msg == "busy()" ) { |