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

equal deleted inserted replaced

-:4167eb56f30d
+:12b82dc0e8db
 #include "fmfilebrowsewidget.h"
 #include "fmviewdetailsdialog.h"
 #include "fmviewmanager.h"
 #include "fmfiledialog.h"
 #include "fmdlgutils.h"
+#include "fmserviceutils.h"
 #include "fmfileiconprovider.h"
+#include "fmfilesystemproxymodel.h"
 #include <QFile>
 #include <QFileSystemModel>
 #include <QSizePolicy>
 #include <QGraphicsLinearLayout>
 #include <hbtreeview.h>
 #include <hbabstractviewitem.h>
 #include <hbaction.h>
 #include <hbsearchpanel.h>
 #include <hblabel.h>
-#include <shareui.h>
 // These define comes from implementation of QFileSystemModel
 #define QFileSystemSortName 0
 #define QFileSystemSortSize 1
 #define QFileSystemSortType 2
 //since there is a thread running in background
 //if the model destroy later, the thread might not quit properly.
 mTreeView->setModel( 0 );
 mListView->setModel( 0 );
+	delete mSourceModel;
 delete mModel;
 delete mFileIconProvider;
 }
 emit currentPathChanged( pathName );
 break;
 }
 case FmErrPathNotExist:
 {
-FmDlgUtils::information( hbTrId( "Path is not exist" ) );
+FmDlgUtils::warning( 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" ) );
+FmDlgUtils::warning( hbTrId( "Can not access" ) );
 break;
 }
 default:
 Q_ASSERT_X( false, "setRootPath", "please handle all error from isPathAccessabel" );
 break;
 HbMenu *contextMenu = new HbMenu();
 mCurrentItem = item;
 HbAction *viewAction = new HbAction();
 viewAction->setObjectName( "viewAction" );
-viewAction->setText( hbTrId( "txt_fmgr_menu_view_details_file" ) );
+viewAction->setText( hbTrId( "txt_fmgr_menu_view_details_memory" ) );
 contextMenu->addAction( viewAction );
 connect( viewAction, SIGNAL( triggered() ),
 this, SLOT( on_viewAction_triggered() ), Qt::QueuedConnection );
 //copy
 HbAction *copyAction = new HbAction();
 copyAction->setObjectName( "copyAction" );
-copyAction->setText( hbTrId( "txt_fmgr_menu_copy" ) );
+copyAction->setText( hbTrId( "txt_common_menu_copy_to_folder" ) );
 contextMenu->addAction( copyAction );
 connect( copyAction, SIGNAL( triggered() ),
 this, SLOT( on_copyAction_triggered() ), Qt::QueuedConnection );
 if( ( fileInfo.isFile() ) || ( fileInfo.isDir() && !( FmUtils::isDefaultFolder( formatFilePath ) ) ) ){
 //Move
 HbAction *moveAction = new HbAction();
 moveAction->setObjectName( "moveAction" );
-moveAction->setText( hbTrId( "txt_fmgr_menu_move" ) );
+moveAction->setText( hbTrId( "txt_common_menu_move_to_folder" ) );
 contextMenu->addAction( moveAction );
 connect( moveAction, SIGNAL( triggered() ),
 this, SLOT( on_moveAction_triggered() ), Qt::QueuedConnection );
 //Delete
 HbAction *deleteAction = new HbAction();
 deleteAction->setObjectName( "deleteAction" );
-deleteAction->setText( hbTrId( "txt_fmgr_menu_delete" ) );
+deleteAction->setText( hbTrId( "txt_common_menu_delete" ) );
 contextMenu->addAction( deleteAction );
 connect( deleteAction, SIGNAL( triggered() ),
 this, SLOT( on_deleteAction_triggered() ), Qt::QueuedConnection );
 //rename
 HbAction *renameAction = new HbAction();
 renameAction->setObjectName( "renameAction" );
-renameAction->setText( hbTrId( "txt_fmgr_menu_rename" ) );
+renameAction->setText( hbTrId( "txt_common_menu_rename_item" ) );
 contextMenu->addAction( renameAction );
 connect( renameAction, SIGNAL( triggered() ),
 this, SLOT( on_renameAction_triggered() ), Qt::QueuedConnection );
 }
 if( fileInfo.isFile() ){
 HbAction *sendAction = new HbAction();
 sendAction->setObjectName( "sendAction" );
-sendAction->setText( hbTrId( "txt_fmgr_menu_send" ) );
+sendAction->setText( hbTrId( "txt_common_menu_send_item" ) );
 contextMenu->addAction( sendAction );
 connect( sendAction, SIGNAL( triggered() ),
 this, SLOT( on_sendAction_triggered() ), Qt::QueuedConnection );
 }
 contextMenu->setAttribute(Qt::WA_DeleteOnClose);
 contextMenu->setPreferredPos( coords );
 contextMenu->open();
 }
-void FmFileBrowseWidget::on_list_pressed( const QModelIndex &  index )
+void FmFileBrowseWidget::on_list_pressed( const QModelIndex &index )
 {
+Q_UNUSED( index );
 mListLongPressed = false;
 }
 void FmFileBrowseWidget::on_tree_longPressed( HbAbstractViewItem *item, const QPointF &coords )
 {
 this, SLOT( on_tree_longPressed( HbAbstractViewItem *, const QPointF & ) ) );
 }
 void FmFileBrowseWidget::initFileModel()
 {
-mModel = new QFileSystemModel( this );
+mSourceModel = new QFileSystemModel( this );
-mModel->setReadOnly( false );
+mSourceModel->setReadOnly( false );
 mFileIconProvider = new FmFileIconProvider();
-mModel->setIconProvider( mFileIconProvider );
+mSourceModel->setIconProvider( mFileIconProvider );
+mModel = new FmFileSystemProxyModel( this );
+mModel->setSourceModel( mSourceModel );
 }
 void FmFileBrowseWidget::initLayout()
 {
 mLayout = new QGraphicsLinearLayout( this );
 void FmFileBrowseWidget::on_sendAction_triggered()
 {
 QString filePath = mModel->filePath( mCurrentItem->modelIndex() );
 QStringList list;
 list.append( filePath );
-FmViewManager::viewManager()->shareUi()->send( list, true );
+FmViewManager::viewManager()->serviceUtils()->sendFile( list );
 }
 void FmFileBrowseWidget::on_viewAction_triggered()
 {
 QString filePath = mModel->filePath( mCurrentItem->modelIndex() );
 case FmErrNone:
 // no error, do not show note to user
 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!" ) );
 }
 }
 }
 void FmFileBrowseWidget::on_copyAction_triggered()
 case FmErrNone:
 // no error, do not show note to user
 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!" ) );
 }
 }
 }
 case FmErrNone:
 // no error, do not show note to user
 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!" ) );
 }
 }
 }
 QFileInfo newFileInfo( newTargetPath );
 QString errString;
 // 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 );
+FmDlgUtils::warning( errString, HbMessageBox::Ok, true );
 continue;
 }
 if( !rename( fileInfo.absoluteFilePath(), newTargetPath ) ) {
-FmDlgUtils::information( hbTrId("Rename failed!") );
+FmDlgUtils::warning( hbTrId("Rename failed!") );
 }
 else {
 // Rename succeed
 if ( ( oldSuffix.compare( newFileInfo.suffix(), Qt::CaseInsensitive ) != 0 )
 && newFileInfo.isFile() ) {
 }
 break;
 }
 }
+/*!
+return BackWasNotConsumed if this view should be closed.
+	return BackWasConsumed if change to up level folder( back to up level folder )
+*/
+FmEventResponse FmFileBrowseWidget::offerBackEvent()
+{
+QString currentPath(
+FmUtils::fillPathWithSplash( this->currentPath().filePath() ) );
+// return BackWasNotConsumed to close current view if match root level path
+if( mRootLevelPath.length() != 0 &&
+mRootLevelPath.compare( currentPath, Qt::CaseInsensitive ) == 0  ) {
+return BackWasNotConsumed;
+} else if ( cdUp() ) {
+return BackWasConsumed;
+} else {
+return BackWasNotConsumed;
+}
+}
+/*!
+\a rootPath used to lock root level path.
+Root level path is the top leve path that user can view.
+*/
+void FmFileBrowseWidget::setRootLevelPath(const QString &rootPath)
+{
+mRootLevelPath = rootPath;
+}

changeset 47	12b82dc0e8db
parent 40	4167eb56f30d
child 49	81668a704644