Merge lp:~ajalkane/ubuntu-filemanager-app/updates-to-carlos-model into lp:~carlos-mazieri/ubuntu-filemanager-app/model

[Arto Jalkanen]

Updating changes from upstream and ajalkane's branch. With these updates is usable with FileManager QML UI.

Updating changes from upstream and ajalkane's branch. With these updates is usable with FileManager QML UI.

[lp:~ajalkane/ubuntu-filemanager-app/updates-to-carlos-model]

9. By Arto Jalkanen on 2013-04-11

Upstream preferred parentPath to be property, so that's what it is now.

[Carlos Jose Mazieri (carlos-mazieri)]

Looks good. Merged into Carlos branch.

review: Approve

[David Planella (dpm)]

Has this already been merged into the plugin code in trunk? And if so, could someone change the status to Merged so that it doesn't appear in the list of branches to review? Thanks!

review: Needs Information

[Arto Jalkanen (ajalkane)]

Yeah this has been merged a long time ago. I fixed the status.

=== modified file 'folderlistmodel/dirmodel.cpp'
--- folderlistmodel/dirmodel.cpp	2013-04-10 23:27:08 +0000
+++ folderlistmodel/dirmodel.cpp	2013-04-11 15:19:40 +0000
@@ -50,6 +50,9 @@
 
 Q_GLOBAL_STATIC(IOWorkerThread, ioWorkerThread)
 
+namespace {
+    QHash<QByteArray, int> roleMapping;
+}
 
 class DirListWorker : public IORequest
 {
@@ -84,12 +87,13 @@
 
         // last batch
         emit itemsAdded(directoryContents);
-
+        emit workerFinished();
         //std::sort(directoryContents.begin(), directoryContents.end(), DirModel::fileCompare);
     }
 
 signals:
     void itemsAdded(const QVector<QFileInfo> &files);
+    void workerFinished();
 
 private:
     QString       mPathName;
@@ -106,18 +110,12 @@
     mNameFilters = QStringList() << "*";
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    // There's no virtual in Qt4.
-    setRoleNames(proxyRoleNames());
+    // There's no setRoleNames in Qt5.
+    setRoleNames(buildRoleNames());
 #else
     // In Qt5, the roleNames() is virtual and will work just fine.
 #endif
 
-    // populate reverse mapping
-    const QHash<int, QByteArray> &roles = roleNames();
-    QHash<int, QByteArray>::ConstIterator it = roles.constBegin();
-    for (;it != roles.constEnd(); ++it)
-        mRoleMapping.insert(it.value(), it.key());
-
     connect(m_fsAction, SIGNAL(progress(int,int,int)),
             this,     SIGNAL(progress(int,int,int)));
 
@@ -145,27 +143,43 @@
 {   
 }
 
-// roleNames has changed between Qt4 and Qt5. In Qt5 it is a virtual
-// function and you can not call setRoleNames. same code base. Oh well.
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-QHash<int, QByteArray> DirModel::proxyRoleNames() const
-#else
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+ // roleNames has changed between Qt4 and Qt5. In Qt5 it is a virtual
+ // function and setRoleNames should not be used.
 QHash<int, QByteArray> DirModel::roleNames() const
+{
+     static QHash<int, QByteArray> roles;
+     if (roles.isEmpty()) {
+        roles = buildRoleNames();
+    }
+
+    return roles;
+}
 #endif
+
+QHash<int, QByteArray> DirModel::buildRoleNames() const
 {
-    static QHash<int, QByteArray> roles;
-    if (roles.isEmpty()) {
-        roles.insert(FileNameRole, QByteArray("fileName"));
-        roles.insert(CreationDateRole, QByteArray("creationDate"));
-        roles.insert(ModifiedDateRole, QByteArray("modifiedDate"));
-        roles.insert(FileSizeRole, QByteArray("fileSize"));
-        roles.insert(IconSourceRole, QByteArray("iconSource"));
-        roles.insert(FilePathRole, QByteArray("filePath"));
-        roles.insert(IsDirRole, QByteArray("isDir"));
-        roles.insert(IsFileRole, QByteArray("isFile"));
-        roles.insert(IsReadableRole, QByteArray("isReadable"));
-        roles.insert(IsWritableRole, QByteArray("isWritable"));
-        roles.insert(IsExecutableRole, QByteArray("isExecutable"));
+    QHash<int, QByteArray> roles;
+    roles.insert(FileNameRole, QByteArray("fileName"));
+    roles.insert(CreationDateRole, QByteArray("creationDate"));
+    roles.insert(ModifiedDateRole, QByteArray("modifiedDate"));
+    roles.insert(FileSizeRole, QByteArray("fileSize"));
+    roles.insert(IconSourceRole, QByteArray("iconSource"));
+    roles.insert(FilePathRole, QByteArray("filePath"));
+    roles.insert(IsDirRole, QByteArray("isDir"));
+    roles.insert(IsFileRole, QByteArray("isFile"));
+    roles.insert(IsReadableRole, QByteArray("isReadable"));
+    roles.insert(IsWritableRole, QByteArray("isWritable"));
+    roles.insert(IsExecutableRole, QByteArray("isExecutable"));
+
+    // populate reverse mapping
+    if (roleMapping.isEmpty()) {
+        QHash<int, QByteArray>::ConstIterator it = roles.constBegin();
+        for (;it != roles.constEnd(); ++it)
+            roleMapping.insert(it.value(), it.key());
+
+        // make sure we cover all roles
+        //    Q_ASSERT(roles.count() == IsFileRole - FileNameRole);
     }
 
     return roles;
@@ -173,9 +187,9 @@
 
 QVariant DirModel::data(int row, const QByteArray &stringRole) const
 {
-    QHash<QByteArray, int>::ConstIterator it = mRoleMapping.constFind(stringRole);
+    QHash<QByteArray, int>::ConstIterator it = roleMapping.constFind(stringRole);
 
-    if (it == mRoleMapping.constEnd())
+    if (it == roleMapping.constEnd())
         return QVariant();
 
     return data(index(row, 0), *it);
@@ -293,6 +307,7 @@
     // TODO: we need to set a spinner active before we start getting results from DirListWorker
     DirListWorker *dlw = new DirListWorker(pathName, dirFilter);
     connect(dlw, SIGNAL(itemsAdded(QVector<QFileInfo>)), SLOT(onItemsAdded(QVector<QFileInfo>)));
+    connect(dlw, SIGNAL(workerFinished()), SLOT(onResultsFetched()));
     ioWorkerThread()->addRequest(dlw);
 
     mCurrentDir = pathName;
@@ -310,20 +325,20 @@
     return QString::localeAwareCompare(a.fileName(), b.fileName()) < 0;
 }
 
+void DirModel::onResultsFetched() {
+     if (mAwaitingResults) {
+         qDebug() << Q_FUNC_INFO << "No longer awaiting results";
+         mAwaitingResults = false;
+         emit awaitingResultsChanged();
+     }
+}
+
 void DirModel::onItemsAdded(const QVector<QFileInfo> &newFiles)
 {
 #if DEBUG_MESSAGES
     qDebug() << Q_FUNC_INFO << "Got new files: " << newFiles.count();
 #endif
 
-    if (mAwaitingResults) {
-#if DEBUG_MESSAGES
-        qDebug() << Q_FUNC_INFO << "No longer awaiting results";
-#endif
-        mAwaitingResults = false;
-        emit awaitingResultsChanged();
-    }
-
     foreach (const QFileInfo &fi, newFiles) {
 
         bool doAdd = true;

=== modified file 'folderlistmodel/dirmodel.h'
--- folderlistmodel/dirmodel.h	2013-04-10 23:27:08 +0000
+++ folderlistmodel/dirmodel.h	2013-04-11 15:19:40 +0000
@@ -103,6 +103,7 @@
 
 public slots:
     void onItemsAdded(const QVector<QFileInfo> &newFiles);
+    void onResultsFetched();
 
 signals:
     void awaitingResultsChanged();
@@ -112,24 +113,20 @@
     void error(const QString &errorTitle, const QString &errorMessage);
 
 private:
+    QHash<int, QByteArray> buildRoleNames() const;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+    // In Qt5, the roleNames() is virtual and will work just fine. On qt4 setRoleNames must be used with buildRoleNames.
+    QHash<int, QByteArray> roleNames() const;
+#endif
+
     QStringList mNameFilters;
     bool mShowDirectories;
     bool mAwaitingResults;
     QString mCurrentDir;
     QVector<QFileInfo> mDirectoryContents;
-    QHash<QByteArray, int> mRoleMapping;
 
-//[0] new stuff Ubuntu File Manager
 public:
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    // There's no virtual roleNames in Qt4. Proxy returns the role names
-    // that are initialized in constructor.
-    QHash<int, QByteArray> proxyRoleNames() const;
-#else
-    // In Qt5, the roleNames() is virtual and will work just fine.
-    QHash<int, QByteArray> roleNames() const;
-#endif
-
+    //[0] new stuff Ubuntu File Manager
 #if defined(REGRESSION_TEST_FOLDERLISTMODEL)
     //make this work with tables
     virtual int columnCount(const QModelIndex &) const
@@ -140,7 +137,7 @@
 #endif
 
     Q_PROPERTY(QString parentPath READ parentPath NOTIFY pathChanged)
-    Q_INVOKABLE QString parentPath() const;
+    QString parentPath() const;
 
     Q_PROPERTY(bool showHiddenFiles READ showHiddenFiles WRITE setShowHiddenFiles NOTIFY showHiddenFilesChanged)
     bool showHiddenFiles() const;    

=== modified file 'folderlistmodel/plugin.cpp'
--- folderlistmodel/plugin.cpp	2013-04-02 22:57:23 +0000
+++ folderlistmodel/plugin.cpp	2013-04-11 15:19:40 +0000
@@ -29,21 +29,20 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
  */
 
+#include <QVector>
+#include <QFileInfo>
+
 #include "plugin.h"
 
 NemoFolderListModelPlugin::NemoFolderListModelPlugin() { }
 
 NemoFolderListModelPlugin::~NemoFolderListModelPlugin() { }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-void NemoFolderListModelPlugin::initializeEngine(QDeclarativeEngine *engine, const char *uri)
-#else
-void NemoFolderListModelPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
+void NemoFolderListModelPlugin::initializeEngine(QmlEngine *engine, const char *uri)
 {
     Q_UNUSED(engine)
     Q_ASSERT(uri == QLatin1String(QUOTES(PLUGIN_URI)));
 }
-#endif
 
 void NemoFolderListModelPlugin::registerTypes(const char *uri)
 {
@@ -52,7 +51,3 @@
     qmlRegisterType<DirModel>(uri, 1, 0, "FolderListModel");
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(nemofolderlistmodel, NemoFolderListModelPlugin);
-#endif
-

=== modified file 'folderlistmodel/plugin.h'
--- folderlistmodel/plugin.h	2013-04-02 22:57:23 +0000
+++ folderlistmodel/plugin.h	2013-04-11 15:19:40 +0000
@@ -37,11 +37,29 @@
 #include <QtDeclarative>
 #include <QDeclarativeEngine>
 #include <QDeclarativeExtensionPlugin>
+#include <QVector>
+#include <QFileInfo>
+
+#define PLUGIN_CLASS_EXPORT
+#define PLUGIN_CLASS_EXTERNAL_EXPORT Q_EXPORT_PLUGIN2(nemofolderlistmodel, NemoFolderListModelPlugin);
+#define PLUGIN_CLASS_EXTEND
+typedef QDeclarativeExtensionPlugin QmlPluginParent;
+typedef QDeclarativeEngine QmlEngine;
+Q_DECLARE_METATYPE(QVector<QFileInfo>)
+
 #else
 #include <QQmlComponent>
 #include <QQmlEngine>
 #include <QQmlContext>
 #include <QQmlExtensionPlugin>
+
+#define PLUGIN_CLASS_EXPORT Q_DECL_EXPORT
+#define PLUGIN_CLASS_EXTERNAL_EXPORT
+#define PLUGIN_CLASS_EXTEND \
+    Q_OBJECT \
+    Q_PLUGIN_METADATA(IID "org.nemomobile.folderlistmodel")
+typedef QQmlExtensionPlugin QmlPluginParent;
+typedef QQmlEngine QmlEngine;
 #endif
 
 #include "dirmodel.h"
@@ -49,33 +67,18 @@
 #define QUOTES(x)  #x
 
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-class Q_DECL_EXPORT NemoFolderListModelPlugin 
-    : public QDeclarativeExtensionPlugin
-#else
-class NemoFolderListModelPlugin 
-    : public QQmlExtensionPlugin
-#endif
+class PLUGIN_CLASS_EXPORT NemoFolderListModelPlugin  : public QmlPluginParent
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID QUOTES(PLUGIN_URI))
-#endif
+    PLUGIN_CLASS_EXTEND
 
 public:
     NemoFolderListModelPlugin();
     virtual ~NemoFolderListModelPlugin();
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    void initializeEngine(QDeclarativeEngine *engine, const char *uri);
-#else
-    void initializeEngine(QQmlEngine *engine, const char *uri);
-#endif
+    void initializeEngine(QmlEngine *engine, const char *uri);
     void registerTypes(const char *uri);
 };
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-Q_EXPORT_PLUGIN2(nemofolderlistmodel, NemoFolderListModelPlugin);
-#endif
+PLUGIN_CLASS_EXTERNAL_EXPORT
 
 #endif // NEMO_QML_PLUGINS_FOLDERLISTMODEL