FCL/sf/app/rndtools: comparison filebrowser/ui/src/fbfileview.cpp

equal deleted inserted replaced

-:5db69f4c3d06
+:b048e15729d6
 * Description:
 *
 */
 #include "fbfileview.h"
-#include "settingsview.h"
+#include "fbsettingsview.h"
-#include "editorview.h"
+#include "fbeditorview.h"
-#include "searchview.h"
+#include "fbsearchview.h"
 #include "enginewrapper.h"
 #include "notifications.h"
+#include "fbfolderselectiondialog.h"
 #include "fbfilemodel.h"
 #include "filebrowsersortfilterproxymodel.h"
 //#include "fbfilelistviewitem.h"
 #include <HbMenu>
 mSortFilterProxyModel(0),
 mOptionMenuActions(),
 mContextMenuActions(),
 mContextMenu(0),
 mToolbarBackAction(0),
+mToolbarFilterAction(0),
+mToolbarPasteAction(0),
 mItemHighlighted(false),
 mLocationChanged(false),
 mRemoveFileAfterCopied(false),
 //    mClipBoardInUse(false),
 mFolderContentChanged(false),
 //    mListView->setScrollingStyle(HbScrollArea::PanWithFollowOn);
 connect(mListView, SIGNAL(activated(QModelIndex)), this, SLOT(activated(QModelIndex)));
 connect(mListView, SIGNAL(longPressed(HbAbstractViewItem*,QPointF)),
 this, SLOT(onLongPressed(HbAbstractViewItem*, QPointF)));
+connect(mEngineWrapper, SIGNAL(fileSystemDataChanged()), this, SLOT(refreshList()));
 mNaviPane = new HbLabel(this);
 mNaviPane->setPlainText(QString(" ")); // TODO get from settings or default
 //mNaviPane->setPlainText(QString(mEngineWrapper->currentPath()));
 HbFontSpec fontSpec(HbFontSpec::PrimarySmall);
 {
 mOptionMenuActions.mFileMenu = menu()->addMenu("File");
 mOptionMenuActions.mFileBackMoveUp = mOptionMenuActions.mFileMenu->addAction("Back/Move up", this, SLOT(fileBackMoveUp()));
 mOptionMenuActions.mFileSearch = mOptionMenuActions.mFileMenu->addAction("Search...", this, SLOT(fileSearch()));
-//mOptionMenuActions.mFileSearch->setVisible(false);
 mOptionMenuActions.mFileNewMenu = mOptionMenuActions.mFileMenu->addMenu("New");
 mOptionMenuActions.mFileNewFile = mOptionMenuActions.mFileNewMenu->addAction("File", this, SLOT(fileNewFile()));
 mOptionMenuActions.mFileNewDirectory = mOptionMenuActions.mFileNewMenu->addAction("Directory", this, SLOT(fileNewDirectory()));
 mOptionMenuActions.mFileDelete = mOptionMenuActions.mFileMenu->addAction("Delete", this, SLOT(fileDelete()));
 mOptionMenuActions.mFileRename = mOptionMenuActions.mFileMenu->addAction("Rename", this, SLOT(fileRename()));
 mOptionMenuActions.mFileTouch = mOptionMenuActions.mFileMenu->addAction("Touch", this, SLOT(fileTouch()));
-//    mOptionMenuActions.mFileChecksumsMenu = mOptionMenuActions.mFileMenu->addMenu("Checksums");
-//    mOptionMenuActions.mFileChecksumsMD5 = mOptionMenuActions.mFileChecksumsMenu->addAction("MD5", this, SLOT(fileChecksumsMD5()));
-//    mOptionMenuActions.mFileChecksumsMD2 = mOptionMenuActions.mFileChecksumsMenu->addAction("MD2", this, SLOT(fileChecksumsMD2()));
-//    mOptionMenuActions.mFileChecksumsSHA1 = mOptionMenuActions.mFileChecksumsMenu->addAction("SHA-1", this, SLOT(fileChecksumsSHA1()));
 mOptionMenuActions.mFileSetAttributes = mOptionMenuActions.mFileMenu->addAction("Set attributes...", this, SLOT(fileSetAttributes()));
-mOptionMenuActions.mFileSetAttributes->setVisible(false);
 }
 /**
 Initial setup for Edit submenu
 */
 void FbFileView::updateOptionMenu()
 {
 bool isFileItemListEmpty = mFbFileModel->rowCount() == 0;
 bool isNormalModeActive = true;       //iModel->FileUtils()->IsNormalModeActive();
 bool isCurrentDriveReadOnly = mEngineWrapper->isCurrentDriveReadOnly();   //iModel->FileUtils()->IsCurrentDriveReadOnly();
-bool isCurrentItemDirectory = mEngineWrapper->getFileEntry(currentItemIndex()).isDir();
+// bool isCurrentItemDirectory = mEngineWrapper->getFileEntry(currentItemIndex()).isDir();
 // bool currentSelected = true;    //iContainer->ListBox()->View()->ItemIsSelected(iContainer->ListBox()->View()->CurrentItemIndex());
 bool isAllSelected = mListView->selectionModel()->selection().count() == mFbFileModel->rowCount();
 //bool isNoneSelected = mListView->selectionModel()->selection().count() != 0;
 bool hasSelectedItems = mListView->selectionModel()->selection().count() != 0;
 bool isSelectionMode = mOptionMenuActions.mSelection && mOptionMenuActions.mSelection->isChecked();
 //aMenuPane->SetItemDimmed(EFileBrowserCmdFileEdit, isFileItemListEmpty || !hasSelectedItems || isCurrentItemDirectory);
 //aMenuPane->SetItemDimmed(EFileBrowserCmdFileSendTo, isFileItemListEmpty || driveListActive || isCurrentItemDirectory);
 mOptionMenuActions.mFileNewMenu->menuAction()->setVisible(!isCurrentDriveReadOnly);
 mOptionMenuActions.mFileDelete->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly && hasSelectedItems/*isSelectionMode*/);
-mOptionMenuActions.mFileRename->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly && hasSelectedItems/*&& isSelectionMode*/);
+mOptionMenuActions.mFileRename->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly && hasSelectedItems /*&& !isSelectionMode*/);
 mOptionMenuActions.mFileTouch->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly && hasSelectedItems);
-// TODO mOptionMenuActions.mFileChecksumsMenu->setVisible(!(isFileItemListEmpty || !hasSelectedItems || isCurrentItemDirectory));
+mOptionMenuActions.mFileSetAttributes->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly && hasSelectedItems);
-// TODO mOptionMenuActions.mFileSetAttributes->setVisible(!(isFileItemListEmpty || isCurrentDriveReadOnly));
 // TODO mOptionMenuActions.mFileCompress->setVisible(!(isCurrentDriveReadOnly || isFileItemListEmpty || !hasSelectedItems || isCurrentItemDirectory));
 // TODO mOptionMenuActions.mFileDecompress->setVisible(!(isCurrentDriveReadOnly || isFileItemListEmpty || !hasSelectedItems || isCurrentItemDirectory));
-mOptionMenuActions.mEditCut->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly && isSelectionMode);
+mOptionMenuActions.mEditMenu->menuAction()->setVisible( (!isSelectionMode && !isClipBoardEmpty && !isCurrentDriveReadOnly)
-mOptionMenuActions.mEditCopy->setVisible(!isFileItemListEmpty && isSelectionMode);
+|| (isSelectionMode));
-mOptionMenuActions.mEditPaste->setVisible(!(isClipBoardEmpty || isCurrentDriveReadOnly));
+mOptionMenuActions.mEditCut->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly && isSelectionMode && hasSelectedItems);
-mOptionMenuActions.mEditCopyToFolder->setVisible(!isFileItemListEmpty);
+mOptionMenuActions.mEditCopy->setVisible(!isFileItemListEmpty && isSelectionMode && hasSelectedItems);
-mOptionMenuActions.mEditMoveToFolder->setVisible(!(isCurrentDriveReadOnly || isFileItemListEmpty));
+mOptionMenuActions.mEditPaste->setVisible(!isClipBoardEmpty && !isCurrentDriveReadOnly);
+mOptionMenuActions.mEditCopyToFolder->setVisible(!isFileItemListEmpty && isSelectionMode && hasSelectedItems);
+mOptionMenuActions.mEditMoveToFolder->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly && isSelectionMode && hasSelectedItems);
 mOptionMenuActions.mEditSelect->setVisible(false/*!currentSelected && !isFileItemListEmpty*/);
 mOptionMenuActions.mEditUnselect->setVisible(false/*currentSelected && !isFileItemListEmpty*/);
-mOptionMenuActions.mEditSelectAll->setVisible(isSelectionMode && !isAllSelected && !isFileItemListEmpty);
+mOptionMenuActions.mEditSelectAll->setVisible(!isFileItemListEmpty && isSelectionMode && !isAllSelected);
-mOptionMenuActions.mEditUnselectAll->setVisible(hasSelectedItems && !isFileItemListEmpty);
+mOptionMenuActions.mEditUnselectAll->setVisible(!isFileItemListEmpty && hasSelectedItems);
 // TODO mOptionMenuActions.mViewSort->setVisible(!(!isNormalModeActive || isFileItemListEmpty));
 // TODO mOptionMenuActions.mViewOrder->setVisible(!(!isNormalModeActive  || isFileItemListEmpty));
 mOptionMenuActions.mViewRefresh->setVisible(isNormalModeActive);
 mOptionMenuActions.mViewFilterEntries->setVisible(!isFileItemListEmpty);
 void FbFileView::createFileContextMenu()
 {
 mContextMenuActions.mFileMenu = mContextMenu->addMenu("File");
 //mContextMenuActions.mFileBackMoveUp = mContextMenuActions.mFileMenu->addAction("Back/Move up (<-)", this, SLOT(fileBackMoveUp()));
-mContextMenuActions.mFileOpenDirectory = mContextMenuActions.mFileMenu->addAction("Open directory (->)", this, SLOT(fileOpenDirectory()));
+//    mContextMenuActions.mFileOpenDirectory = mContextMenuActions.mFileMenu->addAction("Open directory (->)", this, SLOT(fileOpenDirectory()));
-//    mContextMenuActions.mFileSearch = mContextMenuActions.mFileMenu->addAction("Search...", this, SLOT(fileSearch()));
+mContextMenuActions.mFileOpenDirectory = mContextMenu->addAction("Open directory (->)", this, SLOT(fileOpenDirectory()));
-//mContextMenuActions.mFileSearch->setVisible(false);
+mContextMenuActions.mSearch = mContextMenu->addAction("Search...", this, SLOT(fileSearch()));
+mContextMenuActions.mFileSearch = mContextMenuActions.mFileMenu->addAction("Search...", this, SLOT(fileSearch()));
 mContextMenuActions.mFileDelete = mContextMenuActions.mFileMenu->addAction("Delete", this, SLOT(fileDelete()));
 mContextMenuActions.mFileRename = mContextMenuActions.mFileMenu->addAction("Rename", this, SLOT(fileRename()));
 mContextMenuActions.mFileTouch = mContextMenuActions.mFileMenu->addAction("Touch", this, SLOT(fileTouch()));
 mContextMenuActions.mFileProperties = mContextMenuActions.mFileMenu->addAction("Properties", this, SLOT(fileProperties()));
 mContextMenuActions.mFileChecksumsMenu = mContextMenuActions.mFileMenu->addMenu("Checksums");
 mContextMenuActions.mFileChecksumsMD5 = mContextMenuActions.mFileChecksumsMenu->addAction("MD5", this, SLOT(fileChecksumsMD5()));
 mContextMenuActions.mFileChecksumsMD2 = mContextMenuActions.mFileChecksumsMenu->addAction("MD2", this, SLOT(fileChecksumsMD2()));
 mContextMenuActions.mFileChecksumsSHA1 = mContextMenuActions.mFileChecksumsMenu->addAction("SHA-1", this, SLOT(fileChecksumsSHA1()));
-//    mContextMenuActions.mFileSetAttributes = mContextMenuActions.mFileMenu->addAction("Set attributes...", this, SLOT(fileSetAttributes()));
+mContextMenuActions.mFileSetAttributes = mContextMenuActions.mFileMenu->addAction("Set attributes...", this, SLOT(fileSetAttributes()));
-//    mContextMenuActions.mFileSetAttributes->setVisible(false);
 }
 void FbFileView::createEditContextMenu()
 {
 mContextMenuActions.mEditMenu = mContextMenu->addMenu("Edit");
 }
 void FbFileView::updateContextMenu()
 {
 bool isFileItemListEmpty = mFbFileModel->rowCount() == 0;
-bool isDriveListViewActive = mEngineWrapper->isDriveListViewActive();
 //    bool isNormalModeActive = true;       //iModel->FileUtils()->IsNormalModeActive();
 bool isCurrentDriveReadOnly = mEngineWrapper->isCurrentDriveReadOnly();
 bool isCurrentItemDirectory = mEngineWrapper->getFileEntry(currentItemIndex()).isDir();
 bool hasSelectedItems = mListView->selectionModel()->selection().count() != 0;
 bool isSelectionMode = mOptionMenuActions.mSelection && mOptionMenuActions.mSelection->isChecked();
 bool isClipBoardEmpty = !mEngineWrapper->isClipBoardListInUse();
+mContextMenuActions.mFileOpenDirectory->setVisible(!isFileItemListEmpty && isCurrentItemDirectory && isSelectionMode);
+mContextMenuActions.mSearch->setVisible(!isFileItemListEmpty && isSelectionMode && isCurrentItemDirectory);
+mContextMenuActions.mFileSearch->setVisible(!isFileItemListEmpty && !isSelectionMode && isCurrentItemDirectory);
 // File submenu
-//mContextMenuActions.mFileBackMoveUp->setVisible( !isDriveListViewActive);
+//mContextMenuActions.mFileBackMoveUp->setVisible();
-mContextMenuActions.mFileOpenDirectory->setVisible( !isFileItemListEmpty && !isDriveListViewActive && isCurrentItemDirectory);
+mContextMenuActions.mFileMenu->menuAction()->setVisible(!isSelectionMode);
-mContextMenuActions.mFileDelete->setVisible(!isFileItemListEmpty && !isDriveListViewActive && !isCurrentDriveReadOnly);
+mContextMenuActions.mFileDelete->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly);
-mContextMenuActions.mFileRename->setVisible(!isFileItemListEmpty && !isDriveListViewActive && !isCurrentDriveReadOnly);
+mContextMenuActions.mFileRename->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly && !isSelectionMode);
-mContextMenuActions.mFileTouch->setVisible(!isFileItemListEmpty && !isDriveListViewActive && !isCurrentDriveReadOnly);
+mContextMenuActions.mFileTouch->setVisible(!isFileItemListEmpty && !isCurrentDriveReadOnly);
 mContextMenuActions.mFileProperties->setVisible(!isFileItemListEmpty && !isSelectionMode);
-mContextMenuActions.mFileChecksumsMenu->menuAction()->setVisible(!(isFileItemListEmpty || isSelectionMode /*|| !hasSelectedItems*/ || isCurrentItemDirectory || isDriveListViewActive));
+mContextMenuActions.mFileChecksumsMenu->menuAction()->setVisible(!isFileItemListEmpty && !isSelectionMode && !isCurrentItemDirectory);
 // Edit submenu
-mContextMenuActions.mEditMenu->menuAction()->setVisible(!isDriveListViewActive);
+mContextMenuActions.mEditMenu->menuAction()->setVisible(!isSelectionMode);
-mContextMenuActions.mEditCut->setVisible(!(isDriveListViewActive || isCurrentDriveReadOnly || isFileItemListEmpty));
+mContextMenuActions.mEditCut->setVisible(!(isCurrentDriveReadOnly || isFileItemListEmpty));
-mContextMenuActions.mEditCopy->setVisible(!(isDriveListViewActive || isFileItemListEmpty));
+mContextMenuActions.mEditCopy->setVisible(!(isFileItemListEmpty));
-mContextMenuActions.mEditPaste->setVisible(!isDriveListViewActive && !isClipBoardEmpty && !isCurrentDriveReadOnly);
+mContextMenuActions.mEditPaste->setVisible(!isClipBoardEmpty && !isCurrentDriveReadOnly);
-mContextMenuActions.mEditCopyToFolder->setVisible(!(isDriveListViewActive || isFileItemListEmpty));
+mContextMenuActions.mEditCopyToFolder->setVisible(!isFileItemListEmpty);
-mContextMenuActions.mEditMoveToFolder->setVisible(!(isDriveListViewActive || isCurrentDriveReadOnly || isFileItemListEmpty));
+mContextMenuActions.mEditMoveToFolder->setVisible(!(isCurrentDriveReadOnly || isFileItemListEmpty));
 }
 // ---------------------------------------------------------------------------
 void FbFileView::onLongPressed(HbAbstractViewItem *listViewItem, QPointF coords)
 connect(mSearchPanel, SIGNAL(criteriaChanged(const QString &)), this, SLOT(filterCriteriaChanged(const QString &)));
 connect(mSearchPanel, SIGNAL(exitClicked()), filterExtension, SLOT(close()));
 connect(mSearchPanel, SIGNAL(exitClicked()), this, SLOT(clearFilterCriteria()));
 filterExtension->setContentWidget(mSearchPanel);
-HbAction* mToolbarFilterAction = mToolBar->addExtension(filterExtension);
+mToolbarFilterAction = mToolBar->addExtension(filterExtension);
-//    mToolbarFilterAction->setText("Filter");
 mToolbarFilterAction->setToolTip("Filter");
 mToolbarFilterAction->setIcon(HbIcon(QString(":/qgn_indi_tb_filebrowser_find.svg")));
 //connect(mToolbarFilterAction, SIGNAL(triggered()), this, SLOT(viewFilterEntries()));
 if (mOptionMenuActions.mSelection) {
+// TODO Selection mode icon to be added
 //mOptionMenuActions.mSelection->setIcon(HbIcon(QString(":/qgn_indi_tb_filebrowser_selection_active.svg")));
 mToolBar->addAction(mOptionMenuActions.mSelection);
 }
-//    // TODO Paste to be added
+mToolbarPasteAction = new HbAction(mToolBar);
-//    if (mOptionMenuActions.mEditPaste) {
+mToolbarPasteAction->setText("Paste");
-//        //mOptionMenuActions.mEditPaste->setIcon(HbIcon(QString(":/qgn_indi_tb_filebrowser_selection_active.svg")));
+mToolbarPasteAction->setToolTip("Paste");
-//        mToolBar->addAction(mOptionMenuActions.mEditPaste);
+// TODO Paste icon to be added
-//    }
+//mToolbarPasteAction->setIcon(HbIcon(QString(":/qgn_indi_tb_filebrowser_folder_parent.svg")));
+connect(mToolbarPasteAction, SIGNAL(triggered()), this, SLOT(editPaste()));
+mToolBar->addAction(mToolbarPasteAction);
+mToolbarPasteAction->setEnabled(false);
 }
 /**
 Refresh FileBrowser view
 */
 void FbFileView::refreshList()
 {
 editUnselectAll();
 mEngineWrapper->refreshView();
 mSearchPanel->setCriteria(QString(""));
-mListView->model()->revert();
 mListView->reset();
 if (mListView->model() && mListView->model()->rowCount() > 0) {
 QModelIndex firstIndex = mListView->model()->index(0, 0);
 mListView->scrollTo(firstIndex);
 }
+mToolbarPasteAction->setEnabled(mEngineWrapper->isClipBoardListInUse());
 TListingMode listingMode = mEngineWrapper->listingMode();
 if (listingMode == ENormalEntries)
 mNaviPane->setPlainText(QString(mEngineWrapper->currentPath()));
 else if (listingMode == ESearchResults)
 HbSelectionDialog *dlg = static_cast<HbSelectionDialog*>(sender());
 if(!action && dlg && dlg->selectedItems().count()) {
 mOverwriteOptions.queryIndex = dlg->selectedItems().at(0).toInt();
 if (mOverwriteOptions.queryIndex == EFileActionQueryPostFix) {
 QString heading = QString("Postfix");
-HbInputDialog::getText(heading, this, SLOT(fileOverwritePostfix(HbAction *)), QString(), scene());
+HbInputDialog::queryText(heading, this, SLOT(fileOverwritePostfix(HbAction *)), QString(), scene());
 } else if (mOverwriteOptions.queryIndex == EFileActionSkipAllExisting) {
 mOverwriteOptions.overWriteFlags = 0;
 }
 } else {
 mOverwriteOptions.doFileOperations = false;
 {
 QItemSelectionModel *selectionIndexes = mListView->selectionModel();
 // by default use selected items
 if (selectionIndexes) {
-if (selectionIndexes->hasSelection()) {
+bool isSelectionMode = mOptionMenuActions.mSelection && mOptionMenuActions.mSelection->isChecked();
-QItemSelection proxyItemSelection = mListView->selectionModel()->selection();
+if (isSelectionMode) {
-QItemSelection itemSelection = mSortFilterProxyModel->mapSelectionToSource(proxyItemSelection);
+if (selectionIndexes->hasSelection()) {
-mSelectionIndexes = itemSelection.indexes();
+QItemSelection proxyItemSelection = mListView->selectionModel()->selection();
+QItemSelection itemSelection = mSortFilterProxyModel->mapSelectionToSource(proxyItemSelection);
+mSelectionIndexes = itemSelection.indexes();
+} else { // or if none selected, clear selection
+mSelectionIndexes.clear();
+}
 } else { // or if none selected, use the current item index
 mSelectionIndexes.clear();
 QModelIndex currentIndex = currentItemIndex();  //alreade mapped to source model
 mSelectionIndexes.append(currentIndex);
 }
 }
 void FbFileView::fileSearch()
 {
 QString searchPath;
-//    if (mEngineWrapper->currentPath() != mInitDirPath.path()) {
+HbAction *contextrMenuAction = static_cast<HbAction *>(sender());
-//        searchPath = mDirectory;
+if (contextrMenuAction
-//        searchPath.replace("/", "\\");
+&& (contextrMenuAction == mContextMenuActions.mSearch
-//        searchPath+="\\";
+|| contextrMenuAction == mContextMenuActions.mFileSearch)
-//    }
+&& mEngineWrapper->getFileEntry(currentItemIndex()).isDir()) {
-searchPath = mEngineWrapper->currentPath();
+searchPath = mEngineWrapper->currentPath()
-//    mSearch->open(searchPath);
++ mEngineWrapper->getFileEntry(currentItemIndex()).name()
++ QString("\\");
+} else {
+searchPath = mEngineWrapper->currentPath();
+}
 emit aboutToShowSearchView(searchPath);
 }
 /**
 Open new file dialog
 */
 void FbFileView::fileNewFile()
 {
 QString heading = QString("Enter filename");
-HbInputDialog::getText(heading, this, SLOT(doFileNewFile(HbAction*)), QString(), scene());
+HbInputDialog::queryText(heading, this, SLOT(doFileNewFile(HbAction*)), QString(), scene());
 }
 /**
 Create a new file in current directory with a name queried from user
 */
 Open new directory dialog
 */
 void FbFileView::fileNewDirectory()
 {
 QString heading = QString("Enter directory name");
-HbInputDialog::getText(heading, this, SLOT(doFileNewDirectory(HbAction*)), QString(), scene());
+HbInputDialog::queryText(heading, this, SLOT(doFileNewDirectory(HbAction*)), QString(), scene());
 }
 /**
 Create a new directory in current directory with a name queried from user
 */
 void FbFileView::fileDelete()
 {
 storeSelectedItemsOrCurrentItem();
 const QString messageFormat = "Delete %1 entries?";
 QString message = messageFormat.arg(mSelectionIndexes.count());
-HbMessageBox::question(message, this, SLOT(doFileDelete(HbAction*)));
+HbMessageBox::question(message, this, SLOT(doFileDelete(int)), HbMessageBox::Yes | HbMessageBox::No);
 }
 /**
 Delete actually selected files
 */
-void FbFileView::doFileDelete(HbAction* action)
+void FbFileView::doFileDelete(int action)
 {
-if (action && action->text().compare(QString("Yes"), Qt::CaseInsensitive) == 0) {
+if (action == HbMessageBox::Yes) {
-//storeSelectedItemsOrCurrentItem();
 mEngineWrapper->deleteItems(mSelectionIndexes);
-refreshList();
+mEngineWrapper->startExecutingCommands(QString("Deleting"));
 }
 }
 /**
 Open rename dialog for actually selected files
 mEngineWrapper->setCurrentSelection(mSelectionIndexes);
 for (int i(0), ie(mSelectionIndexes.count()); i < ie; ++i ) {
 mProceed = (i == ie-1); // if the last item
 mModelIndex = mSelectionIndexes.at(i);
-FileEntry entry = mEngineWrapper->getFileEntry(mModelIndex);
+FbFileEntry entry = mEngineWrapper->getFileEntry(mModelIndex);
 QString heading = QString("Enter new name");
-HbInputDialog::getText(heading, this, SLOT(doFileRename(HbAction*)), entry.name(), scene());
+HbInputDialog::queryText(heading, this, SLOT(doFileRename(HbAction*)), entry.name(), scene());
 }
 }
 /**
 Rename actually selected files
 mNewFileName = dlg->value().toString();
 if (mEngineWrapper->targetExists(mModelIndex, mNewFileName)) {
 const QString messageTemplate = QString("%1 already exists, overwrite?");
 QString message = messageTemplate.arg(mNewFileName);
-HbMessageBox::question(message, this, SLOT(doFileRenameFileExist(HbAction *)));
+HbMessageBox::question(message, this, SLOT(doFileRenameFileExist(int)), HbMessageBox::Yes | HbMessageBox::No);
 } else {
-mEngineWrapper->rename(mModelIndex, mNewFileName);
+proceedFileRename();
-if (mProceed) {
-mEngineWrapper->startExecutingCommands(QString("Renaming"));
-refreshList();
-}
 }
 }
 }
 /**
 Rename actually selected files
 */
-void FbFileView::doFileRenameFileExist(HbAction *action)
+void FbFileView::doFileRenameFileExist(int action)
 {
-if (action && action->text().compare(QString("Yes"), Qt::CaseInsensitive) == 0) {
+if (action == HbMessageBox::Yes) {
-mEngineWrapper->rename(mModelIndex, mNewFileName);
+proceedFileRename();
-if (mProceed) {
+}
-mEngineWrapper->startExecutingCommands(QString("Renaming"));
+}
-refreshList();
-}
+void FbFileView::proceedFileRename()
+{
+mEngineWrapper->rename(mModelIndex, mNewFileName);
+if (mProceed) {
+mEngineWrapper->startExecutingCommands(QString("Renaming"));
+refreshList();
 }
 }
 /**
 Touch actually selected files
 storeSelectedItemsOrCurrentItem();
 mEngineWrapper->setCurrentSelection(mSelectionIndexes);
 if (mEngineWrapper->selectionHasDirs()) {
 const QString message = "Recurse touch for all selected dirs?";
-HbMessageBox::question(message, this, SLOT(doFileTouch(HbAction*)));
+HbMessageBox::question(message, this, SLOT(doFileTouch(int)), HbMessageBox::Yes | HbMessageBox::No);
-}
+} else {
-else{
+proceedFileTouch(false);
-mEngineWrapper->touch(false);
-refreshList();
 }
 }
 /**
 Touch actually selected files
 */
-void FbFileView::doFileTouch(HbAction* action)
+void FbFileView::doFileTouch(int action)
 {
 bool recurse = false;
-if (action && action->text().compare(QString("Yes"), Qt::CaseInsensitive) == 0) {
+if (action == HbMessageBox::Yes) {
 recurse = true;
 }
+proceedFileTouch(recurse);
+}
+void FbFileView::proceedFileTouch(bool recurse)
+{
 mEngineWrapper->touch(recurse);
+mEngineWrapper->startExecutingCommands(QString("Touching"));
 refreshList();
 }
 void FbFileView::fileChecksumsMD5()
 {
 openPropertyDialog(propertyList, titleText);
 }
 void FbFileView::fileSetAttributes()
 {
+storeSelectedItemsOrCurrentItem();
+mEngineWrapper->setCurrentSelection(mSelectionIndexes);
+QString attributesViewTitle("Multiple entries");
+quint32 setAttributesMask(0);
+quint32 clearAttributesMask(0);
+bool recurse(false);
+// set default masks if only one file selected
+if (mSelectionIndexes.count() == 1)
+{
+mModelIndex = mSelectionIndexes.at(0);
+FbFileEntry fileEntry = mEngineWrapper->getFileEntry(mModelIndex);
+attributesViewTitle = fileEntry.name();
+if (fileEntry.isArchive())
+setAttributesMask |= KEntryAttArchive;
+else
+clearAttributesMask |= KEntryAttArchive;
+if (fileEntry.isHidden())
+setAttributesMask |= KEntryAttHidden;
+else
+clearAttributesMask |= KEntryAttHidden;
+if (fileEntry.isReadOnly())
+setAttributesMask |= KEntryAttReadOnly;
+else
+clearAttributesMask |= KEntryAttReadOnly;
+if (fileEntry.isSystem())
+setAttributesMask |= KEntryAttSystem;
+else
+clearAttributesMask |= KEntryAttSystem;
+}
+emit aboutToShowAttributesView(attributesViewTitle, setAttributesMask, clearAttributesMask, recurse);
 }
 // edit menu
 void FbFileView::editSnapShotToE()
 {
 for (int i = 0; i < mSelectionIndexes.size(); ++i) {
 mClipboardIndexes.append(mSelectionIndexes.at(i));
 }
 mEngineWrapper->clipboardCut(mClipboardIndexes);
+mEngineWrapper->setCurrentSelection(mClipboardIndexes);
 int operations = mClipboardIndexes.count();
 const QString message = QString ("%1 entries cut to clipboard");
 QString noteMsg = message.arg(operations);
+mToolbarPasteAction->setEnabled(true);
 Notifications::showInformationNote(noteMsg);
 }
 /**
 Set selected files into clipboard.
 for (int i = 0; i < mSelectionIndexes.size(); ++i) {
 mClipboardIndexes.append(mSelectionIndexes.at(i));
 }
 mEngineWrapper->clipboardCopy(mClipboardIndexes);
+mEngineWrapper->setCurrentSelection(mClipboardIndexes);
 int operations = mClipboardIndexes.count();
 const QString message = QString ("%1 entries copied to clipboard");
 QString noteMsg = message.arg(operations);
+mToolbarPasteAction->setEnabled(true);
 Notifications::showInformationNote(noteMsg);
 }
 /**
 Moves or copies file selection stored in clipboard to a actual directory.
 Removing files depend on previous operation, i.e. Cut or Copy
 */
 void FbFileView::editPaste()
 {
 bool someEntryExists(false);
-// TODO Set entry items here
 someEntryExists = mEngineWrapper->isDestinationEntriesExists(mClipboardIndexes, mEngineWrapper->currentPath());
 if (someEntryExists) {
 fileOverwriteDialog();
 }
 mEngineWrapper->clipboardPaste(mOverwriteOptions);
+mEngineWrapper->startExecutingCommands(mEngineWrapper->getClipBoardMode() == EClipBoardModeCut ?
+QString("Moving") : QString("Copying") );
 }
 /**
 Open copy to folder new filename dialog
 */
 void FbFileView::editCopyToFolder()
 {
 QString heading = QString("Enter new name");
-HbInputDialog::getText(heading, this, SLOT(doEditCopyToFolder(HbAction*)), mEngineWrapper->currentPath(), scene());
+FbCopyToFolderSelectionDialog *folderSelectionDialog = new FbCopyToFolderSelectionDialog();
+folderSelectionDialog->open(this, SLOT(doEditCopyToFolder(int)));
 }
 /**
 Copies current file selection to a queried directory.
 */
-void FbFileView::doEditCopyToFolder(HbAction *action)
+void FbFileView::doEditCopyToFolder(int action)
 {
-HbInputDialog *dlg = static_cast<HbInputDialog*>(sender());
+FbCopyToFolderSelectionDialog *dlg = qobject_cast<FbCopyToFolderSelectionDialog*>(sender());
-if (dlg && action && action->text().compare(QString("Ok"), Qt::CaseInsensitive) == 0) {
+if (dlg && action == HbDialog::Accepted) {
-QString targetDir = dlg->value().toString();
+QString targetDir = dlg->selectedFolder();
 bool someEntryExists(false);
 // TODO Set entry items here
 storeSelectedItemsOrCurrentItem();
 mEngineWrapper->setCurrentSelection(mSelectionIndexes);
 someEntryExists = mEngineWrapper->isDestinationEntriesExists(mSelectionIndexes, targetDir);
 if (someEntryExists) {
 fileOverwriteDialog();
 }
 mEngineWrapper->copyToFolder(targetDir, mOverwriteOptions, false);
-refreshList();
+mEngineWrapper->startExecutingCommands(QString("Copying"));
 }
 }
 /**
 Open move to folder new filename dialog.
 */
 void FbFileView::editMoveToFolder()
 {
 QString heading = QString("Enter new name");
-HbInputDialog::getText(heading, this, SLOT(doEditMoveToFolder(HbAction*)), mEngineWrapper->currentPath(), scene());
+FbMoveToFolderSelectionDialog *folderSelectionDialog = new FbMoveToFolderSelectionDialog();
+folderSelectionDialog->open(this, SLOT(doEditMoveToFolder(int)));
 }
 /**
 Moves current file selection to a queried directory.
 */
-void FbFileView::doEditMoveToFolder(HbAction *action)
+void FbFileView::doEditMoveToFolder(int action)
 {
-HbInputDialog *dlg = static_cast<HbInputDialog*>(sender());
+FbMoveToFolderSelectionDialog *dlg = qobject_cast<FbMoveToFolderSelectionDialog*>(sender());
-if (dlg && action && action->text().compare(QString("Ok"), Qt::CaseInsensitive) == 0) {
+if (dlg && action == HbDialog::Accepted) {
-QString targetDir = dlg->value().toString();
+QString targetDir = dlg->selectedFolder();
 bool someEntryExists(false);
 // TODO Set entry items here
 storeSelectedItemsOrCurrentItem();
 mEngineWrapper->setCurrentSelection(mSelectionIndexes);
 someEntryExists = mEngineWrapper->isDestinationEntriesExists(mSelectionIndexes, targetDir);
 if (someEntryExists) {
 fileOverwriteDialog();
 }
 mEngineWrapper->copyToFolder(targetDir, mOverwriteOptions, true);
-refreshList();
+mEngineWrapper->startExecutingCommands(QString("Moving"));
 }
 }
 /**
 Select current file
 {
 QItemSelectionModel *selectionModel = mListView->selectionModel();
 if (selectionModel) {
 selectionModel->select(selectionModel->currentIndex(), QItemSelectionModel::SelectCurrent);
 selectionModel->select(selectionModel->currentIndex(), QItemSelectionModel::Select);
-//        itemHighlighted(selectionModel->currentIndex());
 refreshList();
 }
 }
 /**
 // view menu
 // ---------------------------------------------------------------------------
 void FbFileView::viewFilterEntries()
 {
 if (mToolBar && mToolBar->actions().count() > 1 && mToolBar->actions().at(1)) {
-HbAction* tbeFilterAction = qobject_cast<HbAction*>(mToolBar->actions().at(1));
+if (mToolbarFilterAction && mToolbarFilterAction->toolBarExtension()) {
-if (tbeFilterAction && tbeFilterAction->toolBarExtension()) {
+HbToolBarExtension *tbeFilter = mToolbarFilterAction->toolBarExtension();
-HbToolBarExtension *tbeFilter = tbeFilterAction->toolBarExtension();
 tbeFilter->open();
 }
 }
 }
 */
 void FbFileView::toolsErrorSimulateLeave()
 {
 int leaveCode = -6;
 QString heading = QString("Leave code");
-//HbInputDialog::getInteger(heading, this, SLOT(doToolsErrorSimulateLeave(HbAction*)), leaveCode, scene());
+//HbInputDialog::queryInt(heading, this, SLOT(doToolsErrorSimulateLeave(HbAction*)), leaveCode, scene());
-HbInputDialog::getText(heading, this, SLOT(doToolsErrorSimulateLeave(HbAction*)), QString::number(leaveCode), scene());
+HbInputDialog::queryText(heading, this, SLOT(doToolsErrorSimulateLeave(HbAction*)), QString::number(leaveCode), scene());
 }
 /**
 Simulate leave.
 */
 void FbFileView::toolsErrorSimulatePanic()
 {
 mPanicCategory = QString ("Test Category");
 QString heading = QString("Panic category");
-HbInputDialog::getText(heading, this, SLOT(doToolsErrorSimulatePanicCode(HbAction*)), mPanicCategory, scene());
+HbInputDialog::queryText(heading, this, SLOT(doToolsErrorSimulatePanicCode(HbAction*)), mPanicCategory, scene());
 }
 /**
 Simulate panic.
 */
 HbInputDialog *dlg = static_cast<HbInputDialog*>(sender());
 if (dlg && action && action->text().compare(QString("Ok"), Qt::CaseInsensitive) == 0) {
 mPanicCategory = dlg->value().toString();
 int panicCode(555);
 QString heading = QString("Panic code");
-HbInputDialog::getInteger(heading, this, SLOT(doToolsErrorSimulatePanic(HbAction*)), panicCode, scene());
+HbInputDialog::queryInt(heading, this, SLOT(doToolsErrorSimulatePanic(HbAction*)), panicCode, scene());
 }
 }
 /**
 Simulate panic.
 */
 void FbFileView::toolsErrorSimulateException()
 {
 int exceptionCode = 0;
 QString heading = QString("Exception code");
-HbInputDialog::getInteger(heading, this, SLOT(doToolsErrorSimulateException(HbAction*)), exceptionCode, scene());
+HbInputDialog::queryInt(heading, this, SLOT(doToolsErrorSimulateException(HbAction*)), exceptionCode, scene());
 }
 /**
 Simulate exception.
 */
 void FbFileView::toolsSetDebugMaskQuestion()
 {
 quint32 dbgMask = mEngineWrapper->getDebugMask();
 QString dbgMaskText = QString("0x").append(QString::number(dbgMask, 16));
 QString heading = QString("Kernel debug mask in hex format");
-HbInputDialog::getText(heading, this, SLOT(toolsSetDebugMask(HbAction*)), dbgMaskText, scene());
+HbInputDialog::queryText(heading, this, SLOT(toolsSetDebugMask(HbAction*)), dbgMaskText, scene());
 }
 /**
 Set debug mask
 */
 // mDirectory = filePath;
 mEngineWrapper->moveDownToDirectory(activatedIndex);
 refreshList();
 } else {  // file item
 // mSelectedFilePath = filePath;
-FileEntry fileEntry = mEngineWrapper->getFileEntry(activatedIndex);
+FbFileEntry fileEntry = mEngineWrapper->getFileEntry(activatedIndex);
 mAbsoluteFilePath = fileEntry.path() + fileEntry.name();
 // open user-dialog to select: view as text/hex,  open w/AppArc or open w/DocH. embed
 QStringList list;
 list << QString("View as text/hex") << QString("Open w/ AppArc") << QString("Open w/ DocH. embed");

changeset 51	b048e15729d6
parent 31	e7a04a6385be