Fix "save zone" saving proxy instead of real clip:

[kdenlive] / src / effectslistwidget.cpp

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index 12643ed3a6e0f33da046cb05b2221024654ddabd..cdeb00b74f882b3a6c69dd5cc3d86e8f61c67f16 100644 (file)
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -24,6 +24,7 @@
 
 #include <KDebug>
 #include <KStandardDirs>
+#include <KAction>
 
 #include <QApplication>
 #include <QMouseEvent>
@@ -39,9 +40,9 @@ const int TypeRole = Qt::UserRole;
 const int IdRole = TypeRole + 1;
 
 
-EffectsListWidget::EffectsListWidget(QMenu *menu, QWidget *parent) :
+EffectsListWidget::EffectsListWidget(QMenu *contextMenu, QWidget *parent) :
         QTreeWidget(parent),
-        m_menu(menu)
+        m_menu(contextMenu)
 {
     setColumnCount(1);
     setDragEnabled(true);
@@ -55,7 +56,6 @@ EffectsListWidget::EffectsListWidget(QMenu *menu, QWidget *parent) :
     QPalette p = palette();
     p.setBrush(QPalette::Base, Qt::NoBrush);
     setPalette(p);
-    initList();
     connect(this, SIGNAL(activated(const QModelIndex &)), this, SLOT(slotExpandItem(const QModelIndex &)));
 }
 
@@ -68,14 +68,14 @@ void EffectsListWidget::slotExpandItem(const QModelIndex & index)
     setExpanded(index, !isExpanded(index));
 }
 
-void EffectsListWidget::initList()
+void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActions)
 {
     QString current;
     QString currentFolder;
     QTreeWidgetItem *item = NULL;
-    QTreeWidgetItem *parentItem;
     bool found = false;
-
+    effectsMenu->clear();
+    
     if (currentItem()) {
         current = currentItem()->text(0);
         if (currentItem()->parent())
@@ -95,7 +95,7 @@ void EffectsListWidget::initList()
     QStringList folderNames;
     QDomNodeList groups = doc.documentElement().elementsByTagName("group");
     for (int i = 0; i < groups.count(); i++) {
-        folderNames << groups.at(i).firstChild().firstChild().nodeValue();
+        folderNames << i18n(groups.at(i).firstChild().firstChild().nodeValue().toUtf8().constData());
     }
     for (int i = 0; i < topLevelItemCount(); i++) {
         topLevelItem(i)->takeChildren();
@@ -152,7 +152,7 @@ void EffectsListWidget::initList()
 
     loadEffects(&MainWindow::videoEffects, KIcon("kdenlive-show-video"), misc, &folders, QString::number((int) EFFECT_VIDEO), current, &found);
     loadEffects(&MainWindow::audioEffects, KIcon("kdenlive-show-audio"), audio, &folders, QString::number((int) EFFECT_AUDIO), current, &found);
-    loadEffects(&MainWindow::customEffects, KIcon("kdenlive-custom-effect"), custom, &QList<QTreeWidgetItem *>(), QString::number((int) EFFECT_CUSTOM), current, &found);
+    loadEffects(&MainWindow::customEffects, KIcon("kdenlive-custom-effect"), custom, static_cast<QList<QTreeWidgetItem *> *>(0), QString::number((int) EFFECT_CUSTOM), current, &found);
 
     if (!found && !currentFolder.isEmpty()) {
         // previously selected effect was removed, focus on its parent folder
@@ -166,6 +166,25 @@ void EffectsListWidget::initList()
     }
     setSortingEnabled(true);
     sortByColumn(0, Qt::AscendingOrder);
+
+    // populate effects menu
+    for (int i = 0; i < topLevelItemCount(); i++) {
+        if (!topLevelItem(i)->childCount())
+            continue;
+        QMenu *sub = new QMenu(topLevelItem(i)->text(0), effectsMenu);
+        effectsMenu->addMenu(sub);
+        for (int j = 0; j < topLevelItem(i)->childCount(); j++) {
+                QTreeWidgetItem *item = topLevelItem(i)->child(j);
+                KAction *a = new KAction(KIcon(item->icon(0)), item->text(0), sub);
+                QStringList data = item->data(0, IdRole).toStringList();
+                QString id = data.at(1);
+                if (id.isEmpty()) id = data.at(0);
+                a->setData(data);
+                a->setIconVisibleInMenu(false);
+                sub->addAction(a);
+                effectActions->addAction("video_effect_" + id, a);
+        }
+    }
 }
 
 void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList<QTreeWidgetItem *> *folders, const QString type, const QString current, bool *found)
@@ -177,13 +196,16 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q
 
     for (int ix = 0; ix < ct; ix ++) {
         effectInfo = effectlist->effectIdInfo(ix);
+        effectInfo.append(type);
         parentItem = NULL;
 
-        for (int i = 0; i < folders->count(); i++) {
-            l = folders->at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts);
-            if (l.contains(effectInfo.at(2))) {
-                parentItem = folders->at(i);
-                break;
+        if (folders) {
+            for (int i = 0; i < folders->count(); i++) {
+                l = folders->at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts);
+                if (l.contains(effectInfo.at(2))) {
+                    parentItem = folders->at(i);
+                    break;
+                }
             }
         }
         if (parentItem == NULL)
@@ -194,6 +216,7 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q
             item->setIcon(0, icon);
             item->setData(0, TypeRole, type);
             item->setData(0, IdRole, effectInfo);
+            item->setToolTip(0, effectlist->getInfo(effectInfo.at(0), effectInfo.at(1)));
             if (item->text(0) == current) {
                 setCurrentItem(item);
                 *found = true;