diff -r 15bc28c9dd51 -r d58987eac7e8 filemanager/src/filemanager/src/fmfileview.cpp --- a/filemanager/src/filemanager/src/fmfileview.cpp Tue Aug 24 10:24:14 2010 +0800 +++ b/filemanager/src/filemanager/src/fmfileview.cpp Wed Sep 29 10:37:03 2010 +0800 @@ -199,12 +199,12 @@ setLayout( vLayout ); - connect( mWidget, SIGNAL( startSearch( const QString&, const QString& ) ), - this, SLOT( startSearch( const QString&, const QString& ) ) ); + connect( mWidget, SIGNAL( startSearch( QString ) ), + this, SLOT( startSearch( QString ) ) ); connect( mWidget, SIGNAL( setEmptyMenu( bool ) ), this, SLOT( on_mainWidget_setEmptyMenu( bool ) ) ); - connect( mWidget, SIGNAL( setTitle( const QString & ) ), - this, SLOT( on_mainWidget_setTitle( const QString & ) ) ); + connect( mWidget, SIGNAL( setTitle( QString ) ), + this, SLOT( on_mainWidget_setTitle( QString ) ) ); } void FmFileView::initToolBar() @@ -256,7 +256,7 @@ void FmFileView::infoNoFileSelected() { - FmDlgUtils::information( hbTrId("No File/Folder selected" ) ); + FmDlgUtils::warning( hbTrId("No File/Folder selected" ) ); } #ifdef FM_CHANGE_ORIENT_ENABLE @@ -303,13 +303,13 @@ break; case FmErrAlreadyStarted: // last operation have not finished - FmDlgUtils::information( hbTrId( "Operatin already started!" ) ); + FmDlgUtils::warning( hbTrId( "Operatin already started!" ) ); break; case FmErrWrongParam: - FmDlgUtils::information( hbTrId( "Wrong parameters!" ) ); + FmDlgUtils::warning( hbTrId( "Wrong parameters!" ) ); break; default: - FmDlgUtils::information( hbTrId( "Operation fail to start!" ) ); + FmDlgUtils::warning( hbTrId( "Operation fail to start!" ) ); } setSelectable( false ); } @@ -341,13 +341,13 @@ break; case FmErrAlreadyStarted: // last operation have not finished - FmDlgUtils::information( hbTrId( "Operatin already started!" ) ); + FmDlgUtils::warning( hbTrId( "Operatin already started!" ) ); break; case FmErrWrongParam: - FmDlgUtils::information( hbTrId( "Wrong parameters!" ) ); + FmDlgUtils::warning( hbTrId( "Wrong parameters!" ) ); break; default: - FmDlgUtils::information( hbTrId( "Operation fail to start!" ) ); + FmDlgUtils::warning( hbTrId( "Operation fail to start!" ) ); } setSelectable( false ); } @@ -379,13 +379,13 @@ break; case FmErrAlreadyStarted: // last operation have not finished - FmDlgUtils::information( hbTrId( "Operatin already started!" ) ); + FmDlgUtils::warning( hbTrId( "Operatin already started!" ) ); break; case FmErrWrongParam: - FmDlgUtils::information( hbTrId( "Wrong parameters!" ) ); + FmDlgUtils::warning( hbTrId( "Wrong parameters!" ) ); break; default: - FmDlgUtils::information( hbTrId( "Operation fail to start!" ) ); + FmDlgUtils::warning( hbTrId( "Operation fail to start!" ) ); } setSelectable( false ); } @@ -411,11 +411,11 @@ QString errString; // check if name/path is available for use if( !FmUtils::checkNewFolderOrFile( dirName, newTargetPath, errString ) ) { - FmDlgUtils::information( errString ); + FmDlgUtils::warning( errString, HbMessageBox::Ok, true ); continue; } if( !dir.mkdir( dirName ) ) { - FmDlgUtils::information( hbTrId("Operation failed!") ); + FmDlgUtils::warning( hbTrId("Operation failed!") ); } break; } @@ -471,10 +471,11 @@ mWidget->sortFiles( FmFileBrowseWidget::ESortByType ); } -void FmFileView::startSearch( const QString &targetPath, const QString &criteria ) +void FmFileView::startSearch( const QString &criteria ) { - if ( !criteria.isEmpty() && !targetPath.isEmpty() ) { - FmViewManager::viewManager()->createFindView( criteria, targetPath ); + if ( !criteria.isEmpty() ) { + QString targetPath( mWidget->currentPath().filePath() ); + FmViewManager::viewManager()->createFindView( criteria, QStringList()<