Some improvements to loader

2 files changed, 12 insertions, 0 deletions

diff --git a/src/declarative/extra/qmlfolderlistmodel.cpp b/src/declarative/extra/qmlfolderlistmodel.cpp
index bdea03f..4a7c2f1 100644
--- a/src/declarative/extra/qmlfolderlistmodel.cpp
+++ b/src/declarative/extra/qmlfolderlistmodel.cpp
@@ -195,6 +195,15 @@ void QmlFolderListModel::setFolder(const QString &folder)
     }
 }
 
+QString QmlFolderListModel::parentFolder() const
+{
+    Q_D(const QmlFolderListModel);
+    int pos = d->folder.lastIndexOf('/');
+    if (pos == -1)
+        return QString();
+    return d->folder.left(pos);
+}
+
 /*!
     \qmlproperty list<string> FolderListModel::nameFilters
 
diff --git a/src/declarative/extra/qmlfolderlistmodel.h b/src/declarative/extra/qmlfolderlistmodel.h
index 24a3ac6..6bb1c4b 100644
--- a/src/declarative/extra/qmlfolderlistmodel.h
+++ b/src/declarative/extra/qmlfolderlistmodel.h
@@ -61,6 +61,7 @@ class Q_DECLARATIVE_EXPORT QmlFolderListModel : public QListModelInterface, publ
     Q_INTERFACES(QmlParserStatus)
 
     Q_PROPERTY(QString folder READ folder WRITE setFolder NOTIFY folderChanged)
+    Q_PROPERTY(QString parentFolder READ parentFolder NOTIFY folderChanged)
     Q_PROPERTY(QStringList nameFilters READ nameFilters WRITE setNameFilters)
     Q_PROPERTY(SortField sortField READ sortField WRITE setSortField)
     Q_PROPERTY(bool sortReversed READ sortReversed WRITE setSortReversed)
@@ -77,6 +78,8 @@ public:
     QString folder() const;
     void setFolder(const QString &folder);
 
+    QString parentFolder() const;
+
     QStringList nameFilters() const;
     void setNameFilters(const QStringList &filters);