- Auto expand folders in effect list when searching (1)

- cleanup
(1): http://kdenlive.org/mantis/view.php?id=1644

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

diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp
index f9293c5b9946e6177875f9f4ce6173fec5439de9..050029b666c1f8c1d02bfca40f60ffaddd16b70c 100644 (file)
--- a/src/effectslistview.cpp
+++ b/src/effectslistview.cpp
@@ -43,6 +43,7 @@ EffectsListView::EffectsListView(QWidget *parent) :
     search_effect->setTreeWidget(m_effectsList);
     buttonInfo->setIcon(KIcon("help-about"));
     setFocusPolicy(Qt::StrongFocus);
+    setFocusProxy(search_effect);
 
     if (KdenliveSettings::showeffectinfo()) {
         buttonInfo->setDown(true);
@@ -54,15 +55,10 @@ EffectsListView::EffectsListView(QWidget *parent) :
     connect(m_effectsList, SIGNAL(itemSelectionChanged()), this, SLOT(slotUpdateInfo()));
     connect(m_effectsList, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(slotEffectSelected()));
     connect(search_effect, SIGNAL(hiddenChanged(QTreeWidgetItem *, bool)), this, SLOT(slotUpdateSearch(QTreeWidgetItem *, bool)));
+    connect(search_effect, SIGNAL(textChanged(QString)), this, SLOT(slotAutoExpand(QString)));
     //m_effectsList->setCurrentRow(0);
 }
 
-
-void EffectsListView::focusInEvent(QFocusEvent * /*event*/)
-{
-    search_effect->setFocus();
-}
-
 void EffectsListView::filterList(int pos)
 {
     for (int i = 0; i < m_effectsList->topLevelItemCount(); i++) {
@@ -85,6 +81,7 @@ void EffectsListView::filterList(int pos)
     // make sure we don't show anything not matching the search expression
     search_effect->updateSearch();
 
+
     /*item = m_effectsList->currentItem();
     if (item) {
         if (item->isHidden()) {
@@ -97,15 +94,10 @@ void EffectsListView::filterList(int pos)
 
 void EffectsListView::showInfoPanel()
 {
-    if (infopanel->isVisible()) {
-        infopanel->setVisible(false);
-        buttonInfo->setDown(false);
-        KdenliveSettings::setShoweffectinfo(false);
-    } else {
-        infopanel->setVisible(true);
-        buttonInfo->setDown(true);
-        KdenliveSettings::setShoweffectinfo(true);
-    }
+    bool show = !infopanel->isVisible();
+    infopanel->setVisible(show);
+    buttonInfo->setDown(show);
+    KdenliveSettings::setShoweffectinfo(show);
 }
 
 void EffectsListView::slotEffectSelected()
@@ -168,4 +160,22 @@ void EffectsListView::slotUpdateSearch(QTreeWidgetItem *item, bool hidden)
     }
 }
 
+void EffectsListView::slotAutoExpand(QString text)
+{
+    for (int i = 0; i < m_effectsList->topLevelItemCount(); ++i) {
+        QTreeWidgetItem *folder = m_effectsList->topLevelItem(i);
+        bool expandFolder = false;
+        /*if (folder->isHidden())
+            continue;*/
+        if (!text.isEmpty()) {
+            for (int j = 0; j < folder->childCount(); j++) {
+                QTreeWidgetItem *item = folder->child(j);
+                if (!item->isHidden())
+                    expandFolder = true;
+            }
+        }
+        folder->setExpanded(expandFolder);
+    }
+}
+
 #include "effectslistview.moc"

diff --git a/src/effectslistview.h b/src/effectslistview.h
index 6f17209f75369cce4eb51a8196de8312a334f49f..e83fde871d2332d656dc4b362387c5dfe93fc323 100644 (file)
--- a/src/effectslistview.h
+++ b/src/effectslistview.h
@@ -33,30 +33,56 @@ class EffectsList;
 class EffectsListWidget;
 class QTreeWidget;
 
+/**
+ * @class EffectsListView
+ * @brief Manages the controls for the treewidget containing the effects.
+ * @author Jean-Baptiste Mardelle
+ */
+
 class EffectsListView : public QWidget, public Ui::EffectList_UI
 {
     Q_OBJECT
 
 public:
     EffectsListView(QWidget *parent = 0);
+
+    /** @brief Re-initializes the list of effets. */
     void reloadEffectList();
     //void slotAddEffect(GenTime pos, int track, QString name);
 
-protected:
-    virtual void focusInEvent(QFocusEvent * event);
-
 private:
     EffectsListWidget *m_effectsList;
 
 private slots:
+    /** @brief Applies the type filter to the effect list.
+    * @param pos Index of the combo box; where 0 = All, 1 = Video, 2 = Audio, 3 = Custom */
     void filterList(int pos);
+
+    /** @brief Updates the info panel to match the selected effect. */
     void slotUpdateInfo();
+
+    /** @brief Toggles the info panel's visibility. */
     void showInfoPanel();
+
+    /** @brief Emits addEffect signal for the selected effect. */
     void slotEffectSelected();
+
+    /** @brief Removes the XML file for the selected effect.
+    *
+    * Only used for custom effects */
     void slotRemoveEffect();
+
+    /** @brief Makes sure the item fits the type filter.
+    * @param item Current item
+    * @param hidden Hidden or not
+    *
+    * This is necessary to make the search obey to the type filter.
+    * Called when the visibility of this item was changed by searching */
     void slotUpdateSearch(QTreeWidgetItem *item, bool hidden);
 
-public slots:
+    /** @brief Expands folders that match our search.
+    * @param text Current search string */
+    void slotAutoExpand(QString text);
 
 signals:
     void addEffect(const QDomElement);