From 95ab9e941a5f2d3aafe59a3370836c5cc6522a8c Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Fri, 13 Apr 2012 01:02:30 +0200 Subject: [PATCH] Fix saved effect groups not showing in effects list --- src/effectslistwidget.cpp | 11 ++++++----- src/effectslistwidget.h | 2 +- src/initeffects.cpp | 15 +++++++++------ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index 96ab4c15..44a066b1 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -146,9 +146,9 @@ 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 *>(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 *>(0), EFFECT_CUSTOM, current, &found); if (!found && !currentFolder.isEmpty()) { // previously selected effect was removed, focus on its parent folder @@ -220,16 +220,17 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi } } -void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList *folders, const QString type, const QString current, bool *found) +void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList *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 ++) { effectInfo = effectlist->effectIdInfo(ix); - effectInfo.append(type); + effectInfo.append(QString::number(type)); parentItem = NULL; if (folders) { diff --git a/src/effectslistwidget.h b/src/effectslistwidget.h index 38288846..0e6ba5b8 100644 --- a/src/effectslistwidget.h +++ b/src/effectslistwidget.h @@ -61,7 +61,7 @@ private: * @param current name of selected effect before reload; if an effect name matches this one it will become selected * @param found will be set to true if an effect name matches current */ - void loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList *folders, const QString type, const QString current, bool *found); + void loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList *folders, int type, const QString current, bool *found); private slots: void slotExpandItem(const QModelIndex & index); diff --git a/src/initeffects.cpp b/src/initeffects.cpp index 6f0608fa..a145f4c1 100644 --- a/src/initeffects.cpp +++ b/src/initeffects.cpp @@ -268,7 +268,10 @@ void initEffects::parseEffectFiles() max = MainWindow::customEffects.count(); for (int i = 0; i < max; ++i) { effectInfo = MainWindow::customEffects.at(i); - effectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo); + if (effectInfo.tagName() == "effectgroup") { + effectsMap.insert(effectInfo.attribute("name").toLower().toUtf8().data(), effectInfo); + } + else effectsMap.insert(effectInfo.firstChildElement("name").text().toLower().toUtf8().data(), effectInfo); } MainWindow::customEffects.clearList(); foreach(const QDomElement & effect, effectsMap) @@ -426,11 +429,11 @@ void initEffects::parseEffectFile(EffectsList *customEffectList, EffectsList *au if (base.tagName() == "effectgroup") { QString type = base.attribute("type", QString()); if (type == "audio") - audioEffectList->append(base); - else if (type == "custom") - customEffectList->append(base); - else - videoEffectList->append(base); + audioEffectList->append(base); + else if (type == "custom") + customEffectList->append(base); + else + videoEffectList->append(base); } } -- 2.39.2