FCL/sf/app/files: comparison filemanager/src/fmfiledialog/src/fmfilewidget.cpp

equal deleted inserted replaced

-:ada7962b4308
+:b7bfdea70ca2
 */
 #include "fmfilewidget.h"
 #include "fmutils.h"
 #include "fmdrivemodel.h"
 #include "fmdrivewatcher.h"
+#include "fmcommon.h"
+#include "fmfileiconprovider.h"
 #include "hbstyle.h"
 #include "hbabstractitemview.h"
 #include <hblistview.h>
 #include <QModelIndex>
 #include <QGraphicsLinearLayout>
-#include <QDirModel>
+#include <QFileSystemModel>
 #include <QTime>
 #include <QFileInfo>
 init();
 }
 FmFileWidget::~FmFileWidget()
 {
 setModel( 0 );
-delete mDirModel;
+delete mFileSystemModel;
+delete mFileIconProvider;
 delete mDriveModel;
 mDriveWatcher->cancelWatch();
 delete mDriveWatcher;
 mDriveWatcher = 0;
 {
 QModelIndex index( mListView->rootIndex() );
 if( !index.isValid() ) {
 return QFileInfo();
 }
-if( mCurrentModel == mDirModel ) {
+if( mCurrentModel == mFileSystemModel ) {
-return mDirModel->fileInfo( index );
+return mFileSystemModel->fileInfo( index );
 } else {
 return QFileInfo();
 }
 }
 void FmFileWidget::setRootPath( const QString &pathName )
 {
-if( pathName.isEmpty() || !FmUtils::isPathAccessabel( pathName ) ) {
+FmLogger::log( "FmFileWidget::setRootPath start" );
+	// If path is empty or can not access, set model as DriveModel
+	// Otherwise set model as FileSystemModel, means it will return to drive view if error occur.
+if( ( pathName.isEmpty() ) || ( FmErrNone != FmUtils::isPathAccessabel( pathName ) ) ) {
+FmLogger::log( "FmFileWidget::setRootPath set drive model" );
 setModel( mDriveModel );
+FmLogger::log( "FmFileWidget::setRootPath set drive model end" );
 emit pathChanged( QString() );
 } else {
-setModel( mDirModel );
+FmLogger::log( "FmFileWidget::setRootPath set dir model end" );
-mListView->setRootIndex( mDirModel->index( pathName ) );
+setModel( mFileSystemModel );
+FmLogger::log( "FmFileWidget::setRootPath set dir model end" );
+		mListView->setRootIndex( mFileSystemModel->setRootPath( pathName ) );
+FmLogger::log( "FmFileWidget::setRootPath set rootIndex" );
 emit pathChanged( pathName );
 }
-}
+FmLogger::log( "FmFileWidget::setRootPath end" );
+}
 void FmFileWidget::on_list_activated( const QModelIndex &index )
 {
+mActivatedModelIndex = index;
+emit listActivated();
+}
+void FmFileWidget::on_listActivated()
+{
+FmLogger::log("FmFileWidget::on_list_activated start" );
 if( mCurrentModel == mDriveModel ) {
-QString driveName = mDriveModel->driveName( index );
+//If currenty model is DriveModel, open drive and set path
+QString driveName = mDriveModel->driveName( mActivatedModelIndex );
 QString checkedPath = FmUtils::checkDriveToFolderFilter( driveName );
 if( checkedPath.isEmpty() ) {
+FmLogger::log("FmFileWidget::on_list_activated end becaise checkedpath empty" );
 return;
 }
-setModel( mDirModel );
+FmLogger::log("FmFileWidget::on_list_activated setModel dir start" );
-mListView->setRootIndex( mDirModel->index( checkedPath ) );
+setModel( mFileSystemModel );
+FmLogger::log("FmFileWidget::on_list_activated setModel dir end" );
+setRootPath( checkedPath );
+FmLogger::log("FmFileWidget::on_list_activated setRootIndex" );
 emit pathChanged( checkedPath );
-}
+FmLogger::log("FmFileWidget::on_list_activated finish emit pathChanged" );
-else if( mCurrentModel == mDirModel ) {
+}
-if ( mDirModel->isDir(index) ) {
+else if( mCurrentModel == mFileSystemModel ) {
-changeRootIndex( index );
+//If currenty model is FileSystemModel, open path or emit file activate signal.
+if ( mFileSystemModel->isDir( mActivatedModelIndex ) ) {
+FmLogger::log("FmFileWidget::on_list_activated start changeRootIndex" );
+changeRootIndex( mActivatedModelIndex );
+FmLogger::log("FmFileWidget::on_list_activated finish changeRootIndex" );
 } else {
-QFileInfo fileInfo( mDirModel->filePath( index ) );
+QFileInfo fileInfo( mFileSystemModel->filePath( mActivatedModelIndex ) );
 if( fileInfo.isFile() ) {
 emit fileActivated( fileInfo.fileName() );
+FmLogger::log("FmFileWidget::on_list_activated finish emit fileActivated" );
 }
 }
 } else {
 Q_ASSERT( false );
 }
+FmLogger::log("FmFileWidget::on_list_activated end" );
 }
 void FmFileWidget::setModelFilter( QDir::Filters filters )
 {
-mDirModel->setFilter( filters );
+mFileSystemModel->setFilter( filters );
 }
 void FmFileWidget::setNameFilters( const QStringList &nameFilters )
 {
-mDirModel->setNameFilters( nameFilters );
+mFileSystemModel->setNameFilters( nameFilters );
 }
 void FmFileWidget::changeRootIndex( const QModelIndex &index )
 {
-if( mCurrentModel != mDirModel ) {
+FmLogger::log("FmFileWidget::changeRootIndex start" );
+if( mCurrentModel != mFileSystemModel ) {
+FmLogger::log("FmFileWidget::changeRootIndex end because model not equal mFileSystemModel" );
 return;
 }
-mDirModel->fetchMore(index);
+mFileSystemModel->fetchMore(index);
-mListView->setRootIndex( index );
+	QString filePath = mFileSystemModel->fileInfo( index ).absoluteFilePath();
-QFileInfo fileInfo = mDirModel->fileInfo( mListView->rootIndex() );
+// pathChanged signal will be emitted in setRootPath
-QString string = fileInfo.absoluteFilePath();
+	setRootPath( filePath );
-emit pathChanged( string );
+FmLogger::log("FmFileWidget::changeRootIndex end" );
 }
 void FmFileWidget::init()
 {
 mLayout = new QGraphicsLinearLayout( this );
 mListView->setObjectName( "list" );
 mLayout->addItem( mListView );
 mDriveModel = new FmDriveModel( this,
 FmDriveModel::FillWithVolume | FmDriveModel::FillWithDefaultVolume | FmDriveModel::HideUnAvailableDrive );
-qDebug("constructed dirveModel");
 qDebug( QTime::currentTime().toString().toUtf8().data() );
-mDirModel = new QDirModel( this );
+mFileSystemModel = new QFileSystemModel( this );
-qDebug("constructed dirModel");
+mFileIconProvider = new FmFileIconProvider();
+mFileSystemModel->setIconProvider( mFileIconProvider );
+qDebug("constructed mFileSystemModel");
 qDebug( QTime::currentTime().toString().toUtf8().data() );
 setModel( mDriveModel );
 qDebug("setmodel");
 qDebug( QTime::currentTime().toString().toUtf8().data() );
 mDriveWatcher->startWatch();
 //    QMetaObject::connectSlotsByName( this );
 connect( mListView, SIGNAL( activated( QModelIndex ) ),
 this, SLOT( on_list_activated( QModelIndex ) ) );
+connect( this, SIGNAL( listActivated() ),
+this, SLOT( on_listActivated() ), Qt::QueuedConnection );
 connect( mDriveWatcher, SIGNAL( driveAddedOrChanged() ),
 this, SLOT( on_driveWatcher_driveAddedOrChanged() ) );
 }
 FmFileWidget::ViewType FmFileWidget::currentViewType()
 {
 ViewType viewType = DriveView;
 if( mCurrentModel == mDriveModel ) {
 viewType = DriveView;
-} else if( mCurrentModel == mDirModel ) {
+} else if( mCurrentModel == mFileSystemModel ) {
 viewType = DirView;
 } else {
 Q_ASSERT( false );
 }
 return viewType;
 bool FmFileWidget::cdUp()
 {
 QString path( FmUtils::checkFolderToDriveFilter( currentPath().absoluteFilePath() ) );
 QFileInfo fileInfo( path );
 QString cdUpPath;
+// path length>3 means currenty path is a sub folder, then get up level path and navigate to it
+// Otherwise means current path is a top level drive path, Should navigate to drive view. So setRootPath with empty path string.
 if( path.length() > 3 ) {
 cdUpPath = fileInfo.dir().absolutePath();
 }
 setRootPath( FmUtils::fillPathWithSplash( cdUpPath ) );
 return true;
 if( currentViewType() == DriveView ) {
 setModel( 0 );
 setModel( mDriveModel );
 emit pathChanged( QString() );
 } else if( currentViewType() == DirView ) {
-if( !FmUtils::isPathAccessabel( currentPath().absoluteFilePath() ) ) {
+if( FmErrNone != FmUtils::isPathAccessabel( currentPath().absoluteFilePath() ) ) {
 // path not available, set model to drive
 FmLogger::log( QString( "FmFileDialog_FmFileWidget::on_driveWatcher_driveAddedOrChanged path not availeable, set drivemodel:"
 + currentPath().absoluteFilePath() ) );
 setModel( mDriveModel );
 emit pathChanged( QString() );

changeset 25	b7bfdea70ca2
parent 16	ada7962b4308
child 32	39cf9ced4cc4