Commit changes to projectlist (missing from my last commit)

svn path=/trunk/kdenlive/; revision=4529

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index 74535c3f2c1ae818fa473f6016824f1ce0a0f389..f9b8012333fa3f763d0a88c9aab6139d1521ca2d 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -47,7 +47,7 @@ EffectStackView::EffectStackView(QWidget *parent) :
     vbox1->setSpacing(0);
     vbox1->addWidget(m_effectedit);
     m_ui.frame->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
-    //m_ui.region_url->fileDialog()->setFilter(ProjectList::getExtensions());
+    m_ui.region_url->fileDialog()->setFilter(ProjectList::getExtensions());
     //m_ui.effectlist->horizontalHeader()->setVisible(false);
     //m_ui.effectlist->verticalHeader()->setVisible(false);
     m_clipref = NULL;

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index d6e13f76b446fa5a14a0e8d1b4fc51620f4003a7..eae3d599cc93bbe5a87dd8a5f08d7cefca397b86 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -996,6 +996,23 @@ void ProjectList::updateAllClips()
     if (m_infoQueue.isEmpty()) slotProcessNextThumbnail();
 }
 
+// static
+QString ProjectList::getExtensions()
+{
+    // Build list of mime types
+    QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mlt-playlist" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "application/ogg" << "video/mp4" << "video/quicktime" << "image/gif" << "image/jpeg" << "image/png" << "image/x-tga" << "image/x-bmp" << "image/svg+xml" << "image/tiff" << "image/x-xcf" << "image/x-xcf-gimp" << "image/x-vnd.adobe.photoshop" << "image/x-pcx" << "image/x-exr";
+
+    QString allExtensions;
+    foreach(const QString& mimeType, mimeTypes) {
+        KMimeType::Ptr mime(KMimeType::mimeType(mimeType));
+        if (mime) {
+            allExtensions.append(mime->patterns().join(" "));
+            allExtensions.append(' ');
+        }
+    }
+    return allExtensions.simplified();
+}
+
 void ProjectList::slotAddClip(const QList <QUrl> givenList, const QString &groupName, const QString &groupId)
 {
     if (!m_commandStack) {
@@ -1003,18 +1020,8 @@ void ProjectList::slotAddClip(const QList <QUrl> givenList, const QString &group
     }
     KUrl::List list;
     if (givenList.isEmpty()) {
-        // Build list of mime types
-        QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mlt-playlist" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "application/ogg" << "video/mp4" << "video/quicktime" << "image/gif" << "image/jpeg" << "image/png" << "image/x-tga" << "image/x-bmp" << "image/svg+xml" << "image/tiff" << "image/x-xcf" << "image/x-xcf-gimp" << "image/x-vnd.adobe.photoshop" << "image/x-pcx" << "image/x-exr";
-
-        QString allExtensions;
-        foreach(const QString& mimeType, mimeTypes) {
-            KMimeType::Ptr mime(KMimeType::mimeType(mimeType));
-            if (mime) {
-                allExtensions.append(mime->patterns().join(" "));
-                allExtensions.append(' ');
-            }
-        }
-        const QString dialogFilter = allExtensions.simplified() + ' ' + QLatin1Char('|') + i18n("All Supported Files") + "\n* " + QLatin1Char('|') + i18n("All Files");
+        QString allExtensions = getExtensions();
+        const QString dialogFilter = allExtensions + ' ' + QLatin1Char('|') + i18n("All Supported Files") + "\n* " + QLatin1Char('|') + i18n("All Files");
         list = KFileDialog::getOpenUrls(KUrl("kfiledialog:///clipfolder"), dialogFilter, this);
 
     } else {

diff --git a/src/projectlist.h b/src/projectlist.h
index 5d12e21aae2d41669f384932e18ba87d8fe02c7b..0d1501715df56f078385a6aea6f554a1f77cf7c0 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -158,6 +158,8 @@ public:
     bool hasMissingClips();
     void deleteProjectFolder(QMap <QString, QString> map);
     void selectItemById(const QString &clipId);
+    /** @brief Returns a string list of all supported mime extensions. */
+    static QString getExtensions();
 
 public slots:
     void setDocument(KdenliveDoc *doc);