diff -r 5db69f4c3d06 -r b048e15729d6 filebrowser/ui/src/enginewrapper.cpp --- a/filebrowser/ui/src/enginewrapper.cpp Mon Aug 23 15:50:54 2010 +0300 +++ b/filebrowser/ui/src/enginewrapper.cpp Fri Sep 03 17:11:21 2010 +0300 @@ -20,9 +20,9 @@ #include "FBFileUtils.h" #include "notifications.h" #include "fbfileview.h" -#include "searchview.h" +#include "fbsearchview.h" #include "filebrowsersettings.h" -#include "settingsview.h" +//#include "fbsettingsview.h" #include @@ -97,6 +97,7 @@ attributes.mMinSize = tAttributes.iMinSize; attributes.mMaxSize = tAttributes.iMaxSize; attributes.mRecurse = tAttributes.iRecurse; + attributes.mDefaultWildCard = tAttributes.iDefaultWildCard; // TTime to QDate TBuf<20> timeString; @@ -130,6 +131,7 @@ tAttributes.iMinSize = attributes.mMinSize; tAttributes.iMaxSize = attributes.mMaxSize; tAttributes.iRecurse = attributes.mRecurse; + tAttributes.iDefaultWildCard = attributes.mDefaultWildCard; // QDate to TTime for both min- and max Date QString temp = attributes.mMinDate.toString("yyyy-MM-dd"); @@ -403,6 +405,18 @@ delete entryLines; } } + +// --------------------------------------------------------------------------- + +void EngineWrapper::setAttributes(quint32 &setAttributesMask, quint32 &clearAttributesMask, bool &recurse) +{ + if (mEngine->FileUtils()) { + TBool tRecurse = recurse ? ETrue : EFalse; + TRAPD(err, mEngine->FileUtils()->SetAttributesL(setAttributesMask, clearAttributesMask, tRecurse)); + Q_UNUSED(err); //TODO + } +} + // --------------------------------------------------------------------------- bool EngineWrapper::openAppArc(QString fileName) @@ -449,24 +463,24 @@ // --------------------------------------------------------------------------- -DriveEntry EngineWrapper::getDriveEntry(const QModelIndex& aIndex) const +FbDriveEntry EngineWrapper::getDriveEntry(const QModelIndex& aIndex) const { TDriveEntry driveEntry; if (mEngine->FileUtils()->DriveEntries()->Count() > aIndex.row() && aIndex.row() >= 0) { driveEntry = mEngine->FileUtils()->DriveEntries()->At(aIndex.row()); } - return DriveEntry(driveEntry); + return FbDriveEntry(driveEntry); } // --------------------------------------------------------------------------- -FileEntry EngineWrapper::getFileEntry(const QModelIndex& aIndex) const +FbFileEntry EngineWrapper::getFileEntry(const QModelIndex& aIndex) const { TFileEntry fileEntry; if (mEngine->FileUtils()->FileEntries()->Count() > aIndex.row() && aIndex.row() >= 0) { fileEntry = mEngine->FileUtils()->FileEntries()->At(aIndex.row()); } - return FileEntry(fileEntry); + return FbFileEntry(fileEntry); } // --------------------------------------------------------------------------- @@ -501,7 +515,8 @@ bool EngineWrapper::isDestinationEntriesExists(const QModelIndexList &aSelectionIndices, QString aTargetDir) { TFileName targetDir = TFileName(aTargetDir.utf16()); - setCurrentSelection(aSelectionIndices); + //setCurrentSelection(aSelectionIndices); + Q_UNUSED(aSelectionIndices); TBool someEntryExists = mEngine->FileUtils()->IsDestinationEntriesExists(targetDir); return someEntryExists; @@ -805,4 +820,9 @@ return Notifications::showConfirmationQuery(qText); } +void EngineWrapper::NotifyModelHasChanged() +{ + emit fileSystemDataChanged(); +} + // ---------------------------------------------------------------------------