X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectslistview.cpp;h=90d9dd96d2e80d92e335a03510552c3dcd7e48f2;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=d7d9c0a201f2c8aae912b062e6d1205bf1a5c760;hpb=290ad96d0c2765f5b1955165a47e07c3e328cae3;p=kdenlive

diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp
index d7d9c0a2..90d9dd96 100644
--- a/src/effectslistview.cpp
+++ b/src/effectslistview.cpp
@@ -19,25 +19,25 @@
 
 
 #include "effectslistview.h"
-#include "effectslistwidget.h"
+#include "widgets/effectslistwidget.h"
 #include "effectslist.h"
 #include "kdenlivesettings.h"
 
 #include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KStandardDirs>
 
 #include <QMenu>
 #include <QDir>
 
+
 EffectsListView::EffectsListView(QWidget *parent) :
         QWidget(parent)
 {
     setupUi(this);
-
-    QString style = "QTreeView::branch:has-siblings:!adjoins-item{border-image: none 0;} \
-    QTreeView::branch:has-siblings:adjoins-item {border-image: none 0;}      \
-    QTreeView::branch:!has-children:!has-siblings:adjoins-item {border-image: none 0;} \
+    QString styleSheet = "QTreeView::branch:has-siblings:!adjoins-item{border-image:none;border:0px} \
+    QTreeView::branch:has-siblings:adjoins-item {border-image: none;border:0px}      \
+    QTreeView::branch:!has-children:!has-siblings:adjoins-item {border-image: none;border:0px} \
     QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings {   \
          border-image: none;image: url(:/images/stylesheet-branch-closed.png);}      \
     QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings  {    \
@@ -45,14 +45,18 @@ EffectsListView::EffectsListView(QWidget *parent) :
 
     QMenu *contextMenu = new QMenu(this);
     m_effectsList = new EffectsListWidget(contextMenu);
-    m_effectsList->setStyleSheet(style);
+    m_effectsList->setStyleSheet(styleSheet);
     QVBoxLayout *lyr = new QVBoxLayout(effectlistframe);
     lyr->addWidget(m_effectsList);
     lyr->setContentsMargins(0, 0, 0, 0);
     search_effect->setTreeWidget(m_effectsList);
     search_effect->setToolTip(i18n("Search in the effect list"));
+    
+    int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
+    QSize iconSize(size, size);
     buttonInfo->setIcon(KIcon("help-about"));
     buttonInfo->setToolTip(i18n("Show/Hide the effect description"));
+    buttonInfo->setIconSize(iconSize);
     setFocusPolicy(Qt::StrongFocus);
     setFocusProxy(search_effect);
     m_effectsList->setFocusProxy(search_effect);
@@ -67,15 +71,16 @@ EffectsListView::EffectsListView(QWidget *parent) :
     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(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(slotEffectSelected()));
-    connect(search_effect, SIGNAL(hiddenChanged(QTreeWidgetItem *, bool)), this, SLOT(slotUpdateSearch(QTreeWidgetItem *, bool)));
+    connect(m_effectsList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(slotEffectSelected()));
+    connect(search_effect, SIGNAL(hiddenChanged(QTreeWidgetItem*,bool)), this, SLOT(slotUpdateSearch(QTreeWidgetItem*,bool)));
+    connect(m_effectsList, SIGNAL(applyEffect(QDomElement)), this, SIGNAL(addEffect(QDomElement)));
     connect(search_effect, SIGNAL(textChanged(QString)), this, SLOT(slotAutoExpand(QString)));
     //m_effectsList->setCurrentRow(0);
 }
 
 void EffectsListView::filterList(int pos)
 {
-    for (int i = 0; i < m_effectsList->topLevelItemCount(); i++) {
+    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++) {
@@ -100,7 +105,7 @@ void EffectsListView::filterList(int pos)
     if (item) {
         if (item->isHidden()) {
             int i;
-            for (i = 0; i < m_effectsList->count() && m_effectsList->item(i)->isHidden(); i++); //do nothing
+            for (i = 0; i < m_effectsList->count() && m_effectsList->item(i)->isHidden(); ++i); //do nothing
             m_effectsList->setCurrentRow(i);
         } else m_effectsList->scrollToItem(item);
     }*/
@@ -117,10 +122,10 @@ void EffectsListView::showInfoPanel()
 void EffectsListView::slotEffectSelected()
 {
     QDomElement effect = m_effectsList->currentEffect();
-	QTreeWidgetItem* item=m_effectsList->currentItem();
-	if (item &&  m_effectsList->indexOfTopLevelItem(item)!=-1){
-		item->setExpanded(!item->isExpanded());		
-	}
+    QTreeWidgetItem* item=m_effectsList->currentItem();
+    if (item &&  m_effectsList->indexOfTopLevelItem(item)!=-1){
+	item->setExpanded(!item->isExpanded());		
+    }
     if (!effect.isNull())
         emit addEffect(effect);
 }
@@ -179,10 +184,10 @@ void EffectsListView::slotUpdateSearch(QTreeWidgetItem *item, bool hidden)
     }
 }
 
-void EffectsListView::slotAutoExpand(QString text)
+void EffectsListView::slotAutoExpand(const QString &text)
 {
     search_effect->updateSearch();
-
+    bool selected = false;
     for (int i = 0; i < m_effectsList->topLevelItemCount(); ++i) {
         QTreeWidgetItem *folder = m_effectsList->topLevelItem(i);
         bool expandFolder = false;
@@ -191,12 +196,23 @@ void EffectsListView::slotAutoExpand(QString text)
         if (!text.isEmpty()) {
             for (int j = 0; j < folder->childCount(); j++) {
                 QTreeWidgetItem *item = folder->child(j);
-                if (!item->isHidden())
+                if (!item->isHidden()) {
                     expandFolder = true;
+		    if (!selected) {
+			m_effectsList->setCurrentItem(item);
+			selected = true;
+		    }
+		}
             }
         }
         folder->setExpanded(expandFolder);
     }
+    if (!selected) m_effectsList->setCurrentItem(NULL);
+}
+
+void EffectsListView::updatePalette()
+{
+    m_effectsList->setStyleSheet(m_effectsList->styleSheet());
 }
 
 #include "effectslistview.moc"