X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectslistwidget.cpp;h=6b1a4212c394d17ff7a87a156a514d5c03c16727;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=d4459627e6110dac903d0a3ab876ea18614bec4d;hpb=c3e7b5a7e403bf2dfdce7b0fc1df512c4994fd9d;p=kdenlive

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index d4459627..6b1a4212 100644
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -41,8 +41,8 @@ const int IdRole = TypeRole + 1;
 
 
 EffectsListWidget::EffectsListWidget(QMenu *contextMenu, QWidget *parent) :
-        QTreeWidget(parent),
-        m_menu(contextMenu)
+    QTreeWidget(parent),
+    m_menu(contextMenu)
 {
     setColumnCount(1);
     setDragEnabled(true);
@@ -57,7 +57,7 @@ EffectsListWidget::EffectsListWidget(QMenu *contextMenu, QWidget *parent) :
     QPalette p = palette();
     p.setBrush(QPalette::Base, Qt::NoBrush);
     setPalette(p);
-    connect(this, SIGNAL(activated(const QModelIndex &)), this, SLOT(slotExpandItem(const QModelIndex &)));
+    connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(slotExpandItem(QModelIndex)));
 }
 
 EffectsListWidget::~EffectsListWidget()
@@ -93,19 +93,19 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi
     QList <QTreeWidgetItem *> folders;
     QStringList folderNames;
     QDomNodeList groups = doc.documentElement().elementsByTagName("group");
-    for (int i = 0; i < groups.count(); i++) {
+    for (int i = 0; i < groups.count(); ++i) {
         folderNames << i18n(groups.at(i).firstChild().firstChild().nodeValue().toUtf8().constData());
     }
-    for (int i = 0; i < topLevelItemCount(); i++) {
+    for (int i = 0; i < topLevelItemCount(); ++i) {
         topLevelItem(i)->takeChildren();
         QString currentName = topLevelItem(i)->text(0);
         if (currentName != i18n("Misc") && currentName != i18n("Audio") && currentName != i18nc("Folder Name", "Custom") && !folderNames.contains(currentName)) {
             takeTopLevelItem(i);
-            i--;
+            --i;
         }
     }
 
-    for (int i = 0; i < groups.count(); i++) {
+    for (int i = 0; i < groups.count(); ++i) {
         item = findFolder(folderNames.at(i));
         if (item) {
             item->setData(0, IdRole, groups.at(i).toElement().attribute("list"));
@@ -146,13 +146,13 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi
 
     //insertTopLevelItems(0, folders);
 
-    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, static_cast<QList<QTreeWidgetItem *> *>(0), QString::number((int) EFFECT_CUSTOM), current, &found);
+    loadEffects(&MainWindow::videoEffects, KIcon("kdenlive-show-video"), misc, &folders, EFFECT_VIDEO, current, &found);
+    loadEffects(&MainWindow::audioEffects, KIcon("kdenlive-show-audio"), audio, &folders, EFFECT_AUDIO, current, &found);
+    loadEffects(&MainWindow::customEffects, KIcon("kdenlive-custom-effect"), custom, static_cast<QList<QTreeWidgetItem *> *>(0), EFFECT_CUSTOM, current, &found);
 
     if (!found && !currentFolder.isEmpty()) {
         // previously selected effect was removed, focus on its parent folder
-        for (int i = 0; i < topLevelItemCount(); i++) {
+        for (int i = 0; i < topLevelItemCount(); ++i) {
             if (topLevelItem(i)->text(0) == currentFolder) {
                 setCurrentItem(topLevelItem(i));
                 break;
@@ -168,7 +168,7 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi
     QMenu *sub2 = NULL;
     QMenu *sub3 = NULL;
     QMenu *sub4 = NULL;
-    for (int i = 0; i < topLevelItemCount(); i++) {
+    for (int i = 0; i < topLevelItemCount(); ++i) {
         if (!topLevelItem(i)->childCount())
             continue;
         QMenu *sub = new QMenu(topLevelItem(i)->text(0), effectsMenu);
@@ -188,53 +188,54 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi
             sub->addMenu(sub4);
         }
         for (int j = 0; j < effectsInCategory; 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);
-                if (hasSubCategories) {
-                    // put action in sub category
-                    QRegExp rx("^[s-z].+");
+            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);
+            if (hasSubCategories) {
+                // put action in sub category
+                QRegExp rx("^[s-z].+");
+                if (rx.exactMatch(item->text(0).toLower())) {
+                    sub4->addAction(a);
+                } else {
+                    rx.setPattern("^[m-r].+");
                     if (rx.exactMatch(item->text(0).toLower())) {
-                        sub4->addAction(a);
-                    } else {
-                        rx.setPattern("^[m-r].+");
+                        sub3->addAction(a);
+                    }
+                    else {
+                        rx.setPattern("^[g-l].+");
                         if (rx.exactMatch(item->text(0).toLower())) {
-                            sub3->addAction(a);
-                        }
-                        else {
-                            rx.setPattern("^[g-l].+");
-                            if (rx.exactMatch(item->text(0).toLower())) {
-                                sub2->addAction(a);
-                            }
-                            else sub1->addAction(a);
+                            sub2->addAction(a);
                         }
+                        else sub1->addAction(a);
                     }
                 }
-                else sub->addAction(a);
-                effectActions->addAction("video_effect_" + id, a);
+            }
+            else 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)
+void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList<QTreeWidgetItem *> *folders, int type, const QString &current, bool *found)
 {
     QStringList effectInfo, l;
     QTreeWidgetItem *parentItem;
     QTreeWidgetItem *item;
     int ct = effectlist->count();
 
-    for (int ix = 0; ix < ct; ix ++) {
+    
+    for (int ix = 0; ix < ct; ++ix) {
         effectInfo = effectlist->effectIdInfo(ix);
-        effectInfo.append(type);
+        effectInfo.append(QString::number(type));
         parentItem = NULL;
 
         if (folders) {
-            for (int i = 0; i < folders->count(); i++) {
-                l = folders->at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts);
+            for (int i = 0; i < folders->count(); ++i) {
+                l = folders->at(i)->data(0, IdRole).toString().split(QLatin1Char(','), QString::SkipEmptyParts);
                 if (l.contains(effectInfo.at(2))) {
                     parentItem = folders->at(i);
                     break;
@@ -246,7 +247,8 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q
 
         if (!effectInfo.isEmpty()) {
             item = new QTreeWidgetItem(parentItem, QStringList(effectInfo.takeFirst()));
-            item->setIcon(0, icon);
+            if (effectInfo.count() == 4) item->setIcon(0, KIcon("folder"));
+            else 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)));
@@ -258,12 +260,12 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q
     }
 }
 
-QTreeWidgetItem *EffectsListWidget::findFolder(const QString name)
+QTreeWidgetItem *EffectsListWidget::findFolder(const QString &name)
 {
     QTreeWidgetItem *item = NULL;
     QList<QTreeWidgetItem *> result = findItems(name, Qt::MatchExactly);
     if (!result.isEmpty()) {
-        for (int j = 0; j < result.count(); j++) {
+        for (int j = 0; j < result.count(); ++j) {
             if (result.at(j)->data(0, TypeRole) ==  EFFECT_FOLDER) {
                 item = result.at(j);
                 break;
@@ -283,7 +285,6 @@ const QDomElement EffectsListWidget::itemEffect(QTreeWidgetItem *item) const
     QDomElement effect;
     if (!item || item->data(0, TypeRole).toInt() == (int)EFFECT_FOLDER) return effect;
     QStringList effectInfo = item->data(0, IdRole).toStringList();
-    kDebug() << "// EFFECT SELECTED: " << effectInfo;
     switch (item->data(0, TypeRole).toInt()) {
     case 1:
         effect =  MainWindow::videoEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1)).cloneNode().toElement();
@@ -299,7 +300,7 @@ const QDomElement EffectsListWidget::itemEffect(QTreeWidgetItem *item) const
 }
 
 
-QString EffectsListWidget::currentInfo()
+QString EffectsListWidget::currentInfo() const
 {
     QTreeWidgetItem *item = currentItem();
     if (!item || item->data(0, TypeRole).toInt() == (int)EFFECT_FOLDER) return QString();
@@ -319,6 +320,17 @@ QString EffectsListWidget::currentInfo()
     return info;
 }
 
+//virtual
+void EffectsListWidget::keyPressEvent(QKeyEvent *e)
+{
+    if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
+        emit applyEffect(currentEffect());
+        e->accept();
+        return;
+    }
+    QTreeWidget::keyPressEvent(e);
+}
+
 //virtual
 QMimeData * EffectsListWidget::mimeData(const QList<QTreeWidgetItem *> list) const
 {
@@ -326,7 +338,8 @@ QMimeData * EffectsListWidget::mimeData(const QList<QTreeWidgetItem *> list) con
     foreach(QTreeWidgetItem *item, list) {
         if (item->flags() & Qt::ItemIsDragEnabled) {
             const QDomElement e = itemEffect(item);
-            if (!e.isNull()) doc.appendChild(doc.importNode(e, true));
+            if (!e.isNull())
+                doc.appendChild(doc.importNode(e, true));
         }
     }
     QMimeData *mime = new QMimeData;
@@ -351,7 +364,8 @@ void EffectsListWidget::dragMoveEvent(QDragMoveEvent *event)
 void EffectsListWidget::contextMenuEvent(QContextMenuEvent * event)
 {
     QTreeWidgetItem *item = itemAt(event->pos());
-    if (item && item->data(0, TypeRole).toInt() == EFFECT_CUSTOM) m_menu->popup(event->globalPos());
+    if (item && item->data(0, TypeRole).toInt() == EFFECT_CUSTOM)
+        m_menu->popup(event->globalPos());
 }
 
 #include "effectslistwidget.moc"