X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectslistview.cpp;h=9769ac355d36a61ffb7cebd0fa6b90b22e1e08d6;hb=5143c0fd6b774ee8a036427bb1630126270a6364;hp=90060c62cdbd0c21c44e0519f8001396497c231a;hpb=f9dbfa756b78f336576b42f041de325c98aa48e8;p=kdenlive

diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp
index 90060c62..9769ac35 100644
--- a/src/effectslistview.cpp
+++ b/src/effectslistview.cpp
@@ -17,95 +17,117 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QMenu>
-#include <QMenu>
-#include <QDir>
-
-#include <KDebug>
-#include <KLocale>
-#include <KStandardDirs>
 
 #include "effectslistview.h"
 #include "effectslistwidget.h"
 #include "effectslist.h"
 #include "kdenlivesettings.h"
 
-EffectsListView::EffectsListView(QWidget *parent)
-        : QWidget(parent) {
-    ui.setupUi(this);
+#include <KDebug>
+#include <KLocale>
+#include <KStandardDirs>
+
+#include <QMenu>
+#include <QDir>
+
+EffectsListView::EffectsListView(QWidget *parent) :
+        QWidget(parent)
+{
+    setupUi(this);
 
     QMenu *menu = new QMenu(this);
     m_effectsList = new EffectsListWidget(menu);
-    QVBoxLayout *lyr = new QVBoxLayout(ui.effectlistframe);
+    QVBoxLayout *lyr = new QVBoxLayout(effectlistframe);
     lyr->addWidget(m_effectsList);
     lyr->setContentsMargins(0, 0, 0, 0);
-    ui.search_effect->setListWidget(m_effectsList);
-    ui.buttonInfo->setIcon(KIcon("help-about"));
+    search_effect->setTreeWidget(m_effectsList);
+    buttonInfo->setIcon(KIcon("help-about"));
+    setFocusPolicy(Qt::StrongFocus);
 
     if (KdenliveSettings::showeffectinfo()) {
-        ui.buttonInfo->setDown(true);
-    } else ui.infopanel->hide();
+        buttonInfo->setDown(true);
+    } else infopanel->hide();
     menu->addAction(KIcon("edit-delete"), i18n("Delete effect"), this, SLOT(slotRemoveEffect()));
 
-    connect(ui.type_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(filterList(int)));
-    connect(ui.buttonInfo, SIGNAL(clicked()), this, SLOT(showInfoPanel()));
+    connect(type_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(filterList(int)));
+    connect(buttonInfo, SIGNAL(clicked()), this, SLOT(showInfoPanel()));
     connect(m_effectsList, SIGNAL(itemSelectionChanged()), this, SLOT(slotUpdateInfo()));
-    connect(m_effectsList, SIGNAL(doubleClicked(QListWidgetItem *, const QPoint &)), this, SLOT(slotEffectSelected()));
-
-    m_effectsList->setCurrentRow(0);
+    connect(m_effectsList, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(slotEffectSelected()));
+    connect(search_effect, SIGNAL(hiddenChanged(QTreeWidgetItem *, bool)), this, SLOT(slotUpdateSearch(QTreeWidgetItem *, bool)));
+    //m_effectsList->setCurrentRow(0);
 }
 
 
-void EffectsListView::filterList(int pos) {
-    QListWidgetItem *item;
-    for (int i = 0; i < m_effectsList->count(); i++) {
-        item = m_effectsList->item(i);
-        if (pos == 0) item->setHidden(false);
-        else if (item->data(Qt::UserRole).toInt() == pos) item->setHidden(false);
-        else item->setHidden(true);
+void EffectsListView::focusInEvent(QFocusEvent * /*event*/)
+{
+    search_effect->setFocus();
+}
+
+void EffectsListView::filterList(int pos)
+{
+    for (int i = 0; i < m_effectsList->topLevelItemCount(); i++) {
+        QTreeWidgetItem *folder = m_effectsList->topLevelItem(i);
+        bool hideFolder = true;
+        for (int j = 0; j < folder->childCount(); j++) {
+            QTreeWidgetItem *item = folder->child(j);
+            if (pos == 0 || pos == item->data(0, Qt::UserRole).toInt()) {
+                item->setHidden(false);
+                hideFolder = false;
+            } else {
+                item->setHidden(true);
+            }
+        }
+        // do not hide the folder if it's empty but "All" is selected
+        if (pos == 0)
+            hideFolder = false;
+        folder->setHidden(hideFolder);
     }
-    item = m_effectsList->currentItem();
+    // make sure we don't show anything not matching the search expression
+    search_effect->updateSearch();
+
+    /*item = m_effectsList->currentItem();
     if (item) {
         if (item->isHidden()) {
             int i;
-            for (i = 0; i < m_effectsList->count() && m_effectsList->item(i)->isHidden(); i++);
+            for (i = 0; i < m_effectsList->count() && m_effectsList->item(i)->isHidden(); i++); //do nothing
             m_effectsList->setCurrentRow(i);
         } else m_effectsList->scrollToItem(item);
-    }
+    }*/
 }
 
-void EffectsListView::showInfoPanel() {
-    if (ui.infopanel->isVisible()) {
-        ui.infopanel->setVisible(false);
-        ui.buttonInfo->setDown(false);
+void EffectsListView::showInfoPanel()
+{
+    if (infopanel->isVisible()) {
+        infopanel->setVisible(false);
+        buttonInfo->setDown(false);
         KdenliveSettings::setShoweffectinfo(false);
     } else {
-        ui.infopanel->setVisible(true);
-        ui.buttonInfo->setDown(true);
+        infopanel->setVisible(true);
+        buttonInfo->setDown(true);
         KdenliveSettings::setShoweffectinfo(true);
     }
 }
 
-void EffectsListView::slotEffectSelected() {
-    QDomElement effect = m_effectsList->currentEffect().cloneNode().toElement();
+void EffectsListView::slotEffectSelected()
+{
+    QDomElement effect = m_effectsList->currentEffect();
     if (!effect.isNull()) emit addEffect(effect);
 }
 
-void EffectsListView::slotUpdateInfo() {
-    ui.infopanel->setText(m_effectsList->currentInfo());
+void EffectsListView::slotUpdateInfo()
+{
+    infopanel->setText(m_effectsList->currentInfo());
 }
 
-KListWidget *EffectsListView::listView() {
-    return m_effectsList;
-}
-
-void EffectsListView::reloadEffectList() {
+void EffectsListView::reloadEffectList()
+{
     m_effectsList->initList();
 }
 
-void EffectsListView::slotRemoveEffect() {
-    QListWidgetItem *item = m_effectsList->currentItem();
-    QString effectId = item->text();
+void EffectsListView::slotRemoveEffect()
+{
+    QTreeWidgetItem *item = m_effectsList->currentItem();
+    QString effectId = item->text(0);
     QString path = KStandardDirs::locateLocal("appdata", "effects/", true);
 
     QDir directory = QDir(path);
@@ -133,4 +155,16 @@ void EffectsListView::slotRemoveEffect() {
     emit reloadEffects();
 }
 
+void EffectsListView::slotUpdateSearch(QTreeWidgetItem *item, bool hidden)
+{
+    if (!hidden) {
+        if (item->data(0, Qt::UserRole).toInt() == type_combo->currentIndex()) {
+            item->parent()->setHidden(false);
+        } else {
+            if (type_combo->currentIndex() != 0)
+                item->setHidden(true);
+        }
+    }
+}
+
 #include "effectslistview.moc"