diff -r 12b82dc0e8db -r 81668a704644 filemanager/src/filemanager/src/operationservice/fmoperationresultprocesser.cpp --- a/filemanager/src/filemanager/src/operationservice/fmoperationresultprocesser.cpp Thu Sep 30 16:33:59 2010 +0800 +++ b/filemanager/src/filemanager/src/operationservice/fmoperationresultprocesser.cpp Mon Oct 18 09:44:31 2010 +0800 @@ -25,6 +25,9 @@ #include "fmviewdetailsdialog.h" #include "fmdlgutils.h" #include "fmutils.h" +#include "fmviewmanager.h" +#include "fmserviceutils.h" + #include #include #include @@ -86,7 +89,7 @@ if ( ( srcFileInfo.suffix().compare( destFileInfo.suffix(), Qt::CaseInsensitive ) != 0 ) && srcFileInfo.isFile() ) { // popup warning when the suffix of file is changed. - FmDlgUtils::warning( hbTrId( "File may become unusable when file name extension is changed" ) ); + FmDlgUtils::warning( hbTrId( "File may become unusable when file name extension is changed" ), HbMessageBox::Ok, true ); } } } @@ -175,13 +178,17 @@ break; case FmOperationService::EOperationTypeFormat: title = hbTrId("format preparing"); - FmUtils::setSystem( true ); break; default: break; } - showPreparing( title, cancelable ); + + // closeApps before format + if( operationBase->operationType() == FmOperationService::EOperationTypeFormat ) { + FmUtils::setSystem( true ); + FmViewManager::viewManager()->serviceUtils()->closeApps(); + } } /* @@ -259,6 +266,8 @@ case FmOperationService::EOperationTypeFormat: { FmUtils::setSystem( false ); + // restart apps after format finished. + FmViewManager::viewManager()->serviceUtils()->restartApps(); FmDlgUtils::information( QString( hbTrId("Format succeed!")), HbMessageBox::Ok, true ); FmOperationFormat *paramFormat = static_cast( operationBase ); QString title( hbTrId( "Drive name ") ); @@ -421,6 +430,8 @@ switch( operationBase->operationType() ) { case FmOperationService::EOperationTypeFormat: + // restart apps after format failed. + FmViewManager::viewManager()->serviceUtils()->restartApps(); FmDlgUtils::warning( QString( hbTrId("Format failed!")) ); break; default: