FCL/sf/app/files: comparison filemanager/src/filemanager/src/fmfilebrowsewidget.cpp

equal deleted inserted replaced

-:ada7962b4308
+:15bc28c9dd51
 #include "fmfilebrowsewidget.h"
 #include "fmviewdetailsdialog.h"
 #include "fmviewmanager.h"
 #include "fmfiledialog.h"
 #include "fmdlgutils.h"
+#include "fmfileiconprovider.h"
 #include <QFile>
-#include <QDirModel>
+#include <QFileSystemModel>
 #include <QSizePolicy>
 #include <QGraphicsLinearLayout>
 #include <hbmenu.h>
 #include <hblistview.h>
 #include <hbtreeview.h>
 #include <hbabstractviewitem.h>
 #include <hbaction.h>
 #include <hbsearchpanel.h>
-#include <hbmessagebox.h>
 #include <hblabel.h>
+// These define comes from implementation of QFileSystemModel
+#define QFileSystemSortName 0
+#define QFileSystemSortSize 1
+#define QFileSystemSortType 2
+#define QFileSystemSortTime 3
 FmFileBrowseWidget::FmFileBrowseWidget( HbWidget *parent, FmFileBrowseWidget::Style style )
 : HbWidget( parent ),
 mTreeView( 0 ),
 mListView( 0 ),
 mSelectable( false ),
 mStyle( NoStyle ),
 mFileBrowseStyle( style ),
 mCurrentItem( 0 ),
 mOperationService( 0 ),
-mSearchPanel( 0 )
+mSearchPanel( 0 ),
+mListLongPressed( false )
 {
 initFileModel();
 initListView();
 initTreeView();
 initSearchPanel();
 //take the model out from view and delete it.
 //so that the model could be destroy earlier
 //since there is a thread running in background
 //if the model destroy later, the thread might not quit properly.
-if( mStyle == ListStyle || mStyle == TreeStyle ) {
-QFileInfo oldFileInfo = mModel->fileInfo( mListView->rootIndex() );
-if( oldFileInfo.exists() ) {
-FmViewManager *viewManager = FmViewManager::viewManager();
-if( viewManager ) {
-viewManager->removeWatchPath( oldFileInfo.absoluteFilePath() );
-}
-}
-}
 mTreeView->setModel( 0 );
 mListView->setModel( 0 );
 delete mModel;
+delete mFileIconProvider;
 }
 QFileInfo FmFileBrowseWidget::currentPath() const
 {
 QModelIndex index = mListView->rootIndex();
 }
 void FmFileBrowseWidget::setRootPath( const QString &pathName )
 {
 QString logString = "FmFileBrowseWidget::setRootPath(" + pathName + ')';
-FmLogger::log( logString );
+FM_LOG( logString );
-if( checkPathAndSetStyle( pathName ) ) {
+int err = checkPathAndSetStyle( pathName );
-mListView->setModel(0);
+switch( err )
-mTreeView->setModel(0);
+{
-delete mModel;
+case FmErrNone:
-mModel = new QDirModel(this);
+{
-mListView->setModel(mModel);
+mListView->setRootIndex( mModel->setRootPath( pathName ) );
-mTreeView->setModel(mModel);
+emit currentPathChanged( pathName );
+break;
-mListView->setRootIndex( mModel->index( pathName ) );
+}
-mTreeView->setRootIndex( mModel->index( pathName ) );
+case FmErrPathNotExist:
-FmViewManager::viewManager()->addWatchPath( pathName );
+{
-}
+FmDlgUtils::information( hbTrId( "Path is not exist" ) );
+break;
+}
+case FmErrDriveNotAvailable:
+{
+// do not take any action as widget set note in label already.
+break;
+}
+case FmErrDriveDenied:
+case FmErrPathDenied:
+{
+FmDlgUtils::information( hbTrId( "Can not access" ) );
+break;
+}
+default:
+Q_ASSERT_X( false, "setRootPath", "please handle all error from isPathAccessabel" );
+break;
+}
 mCurrentDrive = pathName.left( 3 );
 }
 void FmFileBrowseWidget::setStyle( FmFileBrowseWidget::Style style )
 {
 bool FmFileBrowseWidget::rename( const QString &oldName, const QString &newName )
 {
 return QFile::rename( oldName, newName );
-/*
-if (QFile::rename( oldName, newName )) {
-QModelIndex index = mModel->index( newName );
-mModel->refresh( index );
-index = mModel->index( oldName );
-mModel->refresh( index );
-}
-*/
 }
 bool FmFileBrowseWidget::cdUp()
 {
-if (mStyle == ListStyle) {
+	if (mStyle == ListStyle) {
-QModelIndex index = mListView->rootIndex().parent();
+QModelIndex parentIndex = mListView->rootIndex().parent();
-mModel->refresh(index);
+		// QFileSystemModel will auto refresh for file/folder change
-if (index.isValid()) {
+if (parentIndex.isValid()) {
-changeRootIndex( index );
+			changeRootIndex( parentIndex );
 return true;
 }
 }
 return false;
 }
 void FmFileBrowseWidget::on_list_activated( const QModelIndex &index )
 {
+mActivatedModelIndex = index;
+emit listActivated();
+}
+void FmFileBrowseWidget::on_listActivated()
+{
+FM_LOG("FmFileBrowseWidget::on_listActivated start");
+if( mListLongPressed ) {
+FM_LOG("FmFileBrowseWidget::on_list_activated end because longPressed");
+return;
+}
 if (!mSelectable) {
-if (mModel->isDir(index) ) {
+if (mModel->isDir(mActivatedModelIndex) ) {
-changeRootIndex( index );
+FM_LOG("FmFileBrowseWidget::on_list_activated changeRootIndex>>");
+changeRootIndex( mActivatedModelIndex );
+FM_LOG("FmFileBrowseWidget::on_list_activated changeRootIndex<<");
 } else {
-QString filePath( mModel->filePath( index ) );
+QString filePath( mModel->filePath( mActivatedModelIndex ) );
 QFileInfo fileInfo( filePath );
 if ( fileInfo.isFile() ) {
 mOperationService->syncLaunchFileOpen( filePath );
 }
 }
 }
+FM_LOG("FmFileBrowseWidget::on_listActivated end");
 }
 void FmFileBrowseWidget::on_tree_activated( const QModelIndex &index )
 {
 if (!mSelectable) {
 }
 }
 void FmFileBrowseWidget::on_list_longPressed( HbAbstractViewItem *item, const QPointF &coords )
 {
+mListLongPressed = true;
 HbMenu *contextMenu = new HbMenu();
 mCurrentItem = item;
 HbAction *viewAction = new HbAction();
 viewAction->setObjectName( "viewAction" );
 viewAction->setText( hbTrId( "txt_fmgr_menu_view_details_file" ) );
 contextMenu->addAction( viewAction );
 connect( viewAction, SIGNAL( triggered() ),
-this, SLOT( on_viewAction_triggered() ) );
+this, SLOT( on_viewAction_triggered() ), Qt::QueuedConnection );
 //copy
 HbAction *copyAction = new HbAction();
 copyAction->setObjectName( "copyAction" );
 copyAction->setText( hbTrId( "txt_fmgr_menu_copy" ) );
 contextMenu->addAction( copyAction );
 connect( copyAction, SIGNAL( triggered() ),
-this, SLOT( on_copyAction_triggered() ) );
+this, SLOT( on_copyAction_triggered() ), Qt::QueuedConnection );
 QString filePath( mModel->filePath( item->modelIndex() ) );
-QString formatFilePath( FmUtils::formatPath( filePath ) );
+QString formatFilePath( FmUtils::fillPathWithSplash( filePath ) );
 QFileInfo fileInfo( filePath );
 if( ( fileInfo.isFile() ) || ( fileInfo.isDir() && !( FmUtils::isDefaultFolder( formatFilePath ) ) ) ){
 //Move
 HbAction *moveAction = new HbAction();
 moveAction->setObjectName( "moveAction" );
 moveAction->setText( hbTrId( "txt_fmgr_menu_move" ) );
 contextMenu->addAction( moveAction );
 connect( moveAction, SIGNAL( triggered() ),
-this, SLOT( on_moveAction_triggered() ) );
+this, SLOT( on_moveAction_triggered() ), Qt::QueuedConnection );
 //Delete
 HbAction *deleteAction = new HbAction();
 deleteAction->setObjectName( "deleteAction" );
 deleteAction->setText( hbTrId( "txt_fmgr_menu_delete" ) );
 contextMenu->addAction( deleteAction );
 connect( deleteAction, SIGNAL( triggered() ),
-this, SLOT( on_deleteAction_triggered() ) );
+this, SLOT( on_deleteAction_triggered() ), Qt::QueuedConnection );
 //rename
 HbAction *renameAction = new HbAction();
 renameAction->setObjectName( "renameAction" );
 renameAction->setText( hbTrId( "txt_fmgr_menu_rename" ) );
 contextMenu->addAction( renameAction );
 connect( renameAction, SIGNAL( triggered() ),
-this, SLOT( on_renameAction_triggered() ) );
+this, SLOT( on_renameAction_triggered() ), Qt::QueuedConnection );
 }
 //    if( fileInfo.isFile() ){
 //        HbAction *sendAction = new HbAction();
 //        sendAction->setObjectName( "sendAction" );
 //
 //        connect( sendAction, SIGNAL( triggered() ),
 //        this, SLOT( on_sendAction_triggered() ) );
 //    }
-contextMenu->exec( coords );
+contextMenu->setPreferredPos( coords );
+contextMenu->open();
+}
+void FmFileBrowseWidget::on_list_pressed( const QModelIndex &  index )
+{
+mListLongPressed = false;
 }
 void FmFileBrowseWidget::on_tree_longPressed( HbAbstractViewItem *item, const QPointF &coords )
 {
 Q_UNUSED( item );
 mListView->setObjectName( "list" );
 mListView->setModel( mModel );
 connect( mListView, SIGNAL( activated( const QModelIndex& ) ),
 this, SLOT( on_list_activated( const QModelIndex& ) ) );
+connect( this, SIGNAL( listActivated() ),
+this, SLOT( on_listActivated() ), Qt::QueuedConnection );
+connect( mListView, SIGNAL( pressed( const QModelIndex & ) ),
+this, SLOT( on_list_pressed( const QModelIndex & ) ) );
 connect( mListView, SIGNAL( longPressed( HbAbstractViewItem *, const QPointF & ) ),
 this, SLOT( on_list_longPressed( HbAbstractViewItem *, const QPointF & ) ) );
 }
 void FmFileBrowseWidget::initTreeView()
 this, SLOT( on_tree_longPressed( HbAbstractViewItem *, const QPointF & ) ) );
 }
 void FmFileBrowseWidget::initFileModel()
 {
-mModel = new QDirModel( this );
+mModel = new QFileSystemModel( this );
 mModel->setReadOnly( false );
-disconnect( mModel, SIGNAL( rowsInserted( const QModelIndex &, int, int ) ), 0 ,0 );
+mFileIconProvider = new FmFileIconProvider();
+mModel->setIconProvider( mFileIconProvider );
 }
 void FmFileBrowseWidget::initLayout()
 {
 mLayout = new QGraphicsLinearLayout( this );
 mSearchPanel->setSearchOptionsEnabled( true );
 mSearchPanel->setProgressive( false );
 mSearchPanel->hide();
 connect( mSearchPanel, SIGNAL( searchOptionsClicked() ),
-this, SLOT( on_searchPanel_searchOptionsClicked() ) );
+this, SLOT( on_searchPanel_searchOptionsClicked() ), Qt::QueuedConnection );
 connect( mSearchPanel, SIGNAL( criteriaChanged( const QString & ) ),
 this, SLOT( on_searchPanel_criteriaChanged( const QString & ) ) );
 connect( mSearchPanel, SIGNAL( exitClicked() ),
 }
 void FmFileBrowseWidget::changeRootIndex( const QModelIndex &index )
 {
-QFileInfo oldFileInfo = mModel->fileInfo( mListView->rootIndex() );
+	QString filePath = mModel->fileInfo( index ).absoluteFilePath();
-FmViewManager::viewManager()->removeWatchPath( oldFileInfo.absoluteFilePath() );
+	setRootPath( filePath );
-mModel->refresh(index);
-if ( mStyle == ListStyle ) {
-mListView->setRootIndex( index );
-} else if ( mStyle == TreeStyle ) {
-mTreeView->setRootIndex( index );
-}
-QFileInfo fileInfo = mModel->fileInfo( mListView->rootIndex() );
-QString string = fileInfo.absoluteFilePath();
-emit currentPathChanged( string );
-FmViewManager::viewManager()->addWatchPath( string );
 }
 bool FmFileBrowseWidget::isDriver(const QModelIndex &index) const
 {
 QString path = mModel->filePath(index);
 void FmFileBrowseWidget::setModelFilter( QDir::Filters filters )
 {
 mModel->setFilter( filters );
 }
-void FmFileBrowseWidget::refreshModel( const QString& path )
+void FmFileBrowseWidget::on_driveChanged()
 {
+FM_LOG( "FmFileBrowseWidget::on_driveChanged start" );
 QString currPath( currentPath().absoluteFilePath() );
-QString refreshPath( path );
+if(style()==ListStyle) {
-if( !currPath.isEmpty() ) {
+// display normally, setRootPath again to check if drive is available
-if( refreshPath.isEmpty() ) {
+setRootPath( currPath );
-refreshPath = currPath;
+} else{
-}
+// display label style, setRootPath to drive root
-if(  !FmUtils::isPathEqual( refreshPath, currPath ) ) {
+setRootPath( mCurrentDrive );
-// no need refresh other path
+}
-return;
+emit setTitle( FmUtils::fillDriveVolume( mCurrentDrive, true ) );
-}
+FM_LOG( "FmFileBrowseWidget::on_driveChanged end" );
-if( checkPathAndSetStyle( refreshPath ) ) {
+}
-mModel->refresh( mModel->index( refreshPath ) );
-} else {
+int FmFileBrowseWidget::checkPathAndSetStyle( const QString& path )
-FmViewManager *viewManager = FmViewManager::viewManager();
+{
-if( viewManager ) {
+FM_LOG( "FmFileBrowseWidget::checkPathAndSetStyle start_" + path );
-viewManager->removeWatchPath( currentPath().absoluteFilePath() );
+int err = FmUtils::isPathAccessabel( path );
-}
+switch( err )
-}
+{
-} else {
+case FmErrNone:
-// current path is empty, so change root path to Drive root.
+{
-refreshPath = mCurrentDrive;
+setStyle( mFileBrowseStyle );
-setRootPath( refreshPath );
+emit setEmptyMenu( false );
-emit setTitle( FmUtils::fillDriveVolume( mCurrentDrive, true ) );
+break;
 }
-}
+case FmErrDriveNotAvailable:
+{
-bool FmFileBrowseWidget::checkPathAndSetStyle( const QString& path )
+QString driveName = FmUtils::getDriveNameFromPath( path );
-{
+FmDriverInfo::DriveState state = FmUtils::queryDriverInfo( driveName ).driveState();
-if( !FmUtils::isPathAccessabel( path ) ){
-QString driveName = FmUtils::getDriveNameFromPath( path );
+if( state & FmDriverInfo::EDriveLocked ) {
-FmDriverInfo::DriveState state = FmUtils::queryDriverInfo( driveName ).driveState();
+mEmptyTipLabel->setPlainText( hbTrId( "Drive is locked" ) );
+} else if( state & FmDriverInfo::EDriveNotPresent ) {
-if( state & FmDriverInfo::EDriveLocked ) {
+mEmptyTipLabel->setPlainText( hbTrId( "Drive is not present" ) );
-mEmptyTipLabel->setPlainText( hbTrId( "Memory Card is locked" ) );
+} else if( state & FmDriverInfo::EDriveCorrupted ) {
-} else if( state & FmDriverInfo::EDriveNotPresent ) {
+mEmptyTipLabel->setPlainText( hbTrId( "Drive is Corrupted" ) );
-mEmptyTipLabel->setPlainText( hbTrId( "Memory Card is not present" ) );
+} else {
-} else if( state & FmDriverInfo::EDriveCorrupted ) {
+mEmptyTipLabel->setPlainText( hbTrId( "Drive can not be opened " ) );
-mEmptyTipLabel->setPlainText( hbTrId( "Drive is Corrupted" ) );
+}
-} else {
+setStyle( LabelStyle );
-mEmptyTipLabel->setPlainText( hbTrId( "Drive can not be opened " ) );
+			//hide search panel when the drive is removed
-}
+if ( mSearchPanel->isVisible() ){
-setStyle( LabelStyle );
+mSearchPanel->hide();
-emit setEmptyMenu( true );
+mLayout->removeItem( mSearchPanel );
-return false;
+}
-} else {
+emit setEmptyMenu( true );
-setStyle( mFileBrowseStyle );
+break;
-emit setEmptyMenu( false );
+}
-return true;
+case FmErrPathNotExist:
-}
+case FmErrDriveDenied:
+case FmErrPathDenied:
+{
+// do not tack any action, error note shoule be shown by invoker.
+// checkPathAndSetStyle just check path and set style.
+break;
+}
+default:
+Q_ASSERT_X( false, "checkPathAndSetStyle", "please handle all error from isPathAccessabel" );
+break;
+}
+return err;
 }
 void FmFileBrowseWidget::sortFiles( TSortType sortType )
 {
 switch( sortType ){
 case ESortByName:{
-mModel->setSorting( QDir::Name );
+			mModel->sort( QFileSystemSortName );
 }
 break;
 case ESortByTime:{
-mModel->setSorting( QDir::Time );
+mModel->sort( QFileSystemSortTime );
 }
 break;
 case ESortBySize:{
-mModel->setSorting( QDir::Size );
+mModel->sort( QFileSystemSortSize );
 }
 break;
 case ESortByType:{
-mModel->setSorting( QDir::Type | QDir::DirsFirst );
+mModel->sort( QFileSystemSortType );
 }
 break;
 default:
 break;
 }
 mSearchPanel->show();
 }
 void FmFileBrowseWidget::on_searchPanel_searchOptionsClicked()
 {
-mFindTargetPath = FmFileDialog::getExistingDirectory( 0, hbTrId( "Look in:" ), QString(""),
+mFindTargetPath = FmUtils::fillPathWithSplash( FmFileDialog::getExistingDirectory( 0, hbTrId( "Look in:" ), QString(""),
-QStringList() );
+QStringList() ) );
 }
 void FmFileBrowseWidget::on_searchPanel_criteriaChanged( const QString &criteria )
 {
 if( mFindTargetPath.isEmpty() ){
 void FmFileBrowseWidget::on_deleteAction_triggered()
 {
 QStringList fileList;
 fileList.push_back( mModel->filePath( mCurrentItem->modelIndex() ) );
-if ( HbMessageBox::question( hbTrId("Confirm Deletion?" ) )) {
+if ( FmDlgUtils::question( hbTrId("Confirm Deletion?" ) )) {
 int ret = mOperationService->asyncRemove( fileList );
 switch( ret ) {
 case FmErrNone:
 // no error, do not show note to user
 break;
 case FmErrAlreadyStarted:
 // last operation have not finished
-HbMessageBox::information( hbTrId( "Operatin already started!" ) );
+FmDlgUtils::information( hbTrId( "Operatin already started!" ) );
 break;
 case FmErrWrongParam:
-HbMessageBox::information( hbTrId( "Wrong parameters!" ) );
+FmDlgUtils::information( hbTrId( "Wrong parameters!" ) );
 break;
 default:
-HbMessageBox::information( hbTrId( "Operation fail to start!" ) );
+FmDlgUtils::information( hbTrId( "Operation fail to start!" ) );
 }
 }
 }
 void FmFileBrowseWidget::on_copyAction_triggered()
 case FmErrNone:
 // no error, do not show note to user
 break;
 case FmErrAlreadyStarted:
 // last operation have not finished
-HbMessageBox::information( hbTrId( "Operatin already started!" ) );
+FmDlgUtils::information( hbTrId( "Operatin already started!" ) );
 break;
 case FmErrWrongParam:
-HbMessageBox::information( hbTrId( "Wrong parameters!" ) );
+FmDlgUtils::information( hbTrId( "Wrong parameters!" ) );
 break;
 default:
-HbMessageBox::information( hbTrId( "Operation fail to start!" ) );
+FmDlgUtils::information( hbTrId( "Operation fail to start!" ) );
 }
 }
 }
 void FmFileBrowseWidget::on_moveAction_triggered()
 {
 QStringList fileList;
 fileList.push_back( mModel->filePath( mCurrentItem->modelIndex() ) );
-QString targetPathName = FmFileDialog::getExistingDirectory( 0, tr( "move to" ),
+QString targetPathName = FmFileDialog::getExistingDirectory( 0, hbTrId( "move to" ),
 QString(""), QStringList() );
 if( !targetPathName.isEmpty() ) {
 targetPathName = FmUtils::fillPathWithSplash( targetPathName );
 case FmErrNone:
 // no error, do not show note to user
 break;
 case FmErrAlreadyStarted:
 // last operation have not finished
-HbMessageBox::information( hbTrId( "Operatin already started!" ) );
+FmDlgUtils::information( hbTrId( "Operatin already started!" ) );
 break;
 case FmErrWrongParam:
-HbMessageBox::information( hbTrId( "Wrong parameters!" ) );
+FmDlgUtils::information( hbTrId( "Wrong parameters!" ) );
 break;
 default:
-HbMessageBox::information( hbTrId( "Operation fail to start!" ) );
+FmDlgUtils::information( hbTrId( "Operation fail to start!" ) );
 }
 }
 }
 void FmFileBrowseWidget::on_renameAction_triggered()
 {
 QString filePath = mModel->filePath( mCurrentItem->modelIndex() );
 QFileInfo fileInfo = mModel->fileInfo( mCurrentItem->modelIndex() );
+int maxFileNameLength = FmUtils::getMaxFileNameLength();
+// regExpList used to disable primary action of text query dialog if input text is not match
+QStringList regExpList = (QStringList() << Regex_ValidFileFolderName << Regex_ValidNotEndWithDot );
+QString oldSuffix( fileInfo.suffix() );
 QString newName( fileInfo.fileName() );
+while( FmDlgUtils::showTextQuery( hbTrId( "Enter new name for %1" ).arg( newName ), newName, regExpList,
-while( FmDlgUtils::showTextQuery( hbTrId( "Enter new name for %1" ).arg( newName ), newName, true ) ){
+maxFileNameLength, QString() , true ) ){
+// remove whitespace from the start and the end.
+newName = newName.trimmed();
 QString newTargetPath = FmUtils::fillPathWithSplash(
 fileInfo.absolutePath() ) + newName;
 QFileInfo newFileInfo( newTargetPath );
-if( newFileInfo.exists() ) {
+QString errString;
-HbMessageBox::information( hbTrId( "%1 already exist!" ).arg( newName ) );
+// check if name/path is available for use
+// add new Name to check, in order to avoid problem of newName is empty
+if( !FmUtils::checkNewFolderOrFile( newName, newTargetPath, errString ) ) {
+FmDlgUtils::information( errString );
 continue;
 }
 if( !rename( fileInfo.absoluteFilePath(), newTargetPath ) ) {
-HbMessageBox::information( hbTrId("Rename failed!") );
+FmDlgUtils::information( hbTrId("Rename failed!") );
+}
+else {
+// Rename succeed
+if ( ( oldSuffix.compare( newFileInfo.suffix(), Qt::CaseInsensitive ) != 0 )
+&& newFileInfo.isFile() ) {
+// popup warning when the suffix of file is changed.
+FmDlgUtils::information( hbTrId( "File may become unusable when file name extension is changed" ) );
+}
 }
 break;
 }
 }

changeset 37	15bc28c9dd51
parent 16	ada7962b4308
child 46	d58987eac7e8