Effect Stack: Use a separate row for the search line

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

diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp
index 23cc00fe2c172fb95c16d5456ce4389f2d051a6b..9e1dd726cbc6e4709a02ef738bf357c107312bcc 100644 (file)
--- a/src/effectslistview.cpp
+++ b/src/effectslistview.cpp
@@ -41,14 +41,18 @@ EffectsListView::EffectsListView(QWidget *parent) :
     lyr->addWidget(m_effectsList);
     lyr->setContentsMargins(0, 0, 0, 0);
     search_effect->setTreeWidget(m_effectsList);
+    search_effect->setToolTip(i18n("Search in the effect list"));
     buttonInfo->setIcon(KIcon("help-about"));
+    buttonInfo->setToolTip(i18n("Show/Hide the effect description"));
     setFocusPolicy(Qt::StrongFocus);
     setFocusProxy(search_effect);
     m_effectsList->setFocusProxy(search_effect);
 
-    if (KdenliveSettings::showeffectinfo()) {
+    if (KdenliveSettings::showeffectinfo())
         buttonInfo->setDown(true);
-    } else infopanel->hide();
+    else
+        infopanel->hide();
+
     menu->addAction(KIcon("edit-delete"), i18n("Delete effect"), this, SLOT(slotRemoveEffect()));
 
     connect(type_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(filterList(int)));
@@ -104,7 +108,8 @@ void EffectsListView::showInfoPanel()
 void EffectsListView::slotEffectSelected()
 {
     QDomElement effect = m_effectsList->currentEffect();
-    if (!effect.isNull()) emit addEffect(effect);
+    if (!effect.isNull())
+        emit addEffect(effect);
 }
 
 void EffectsListView::slotUpdateInfo()

diff --git a/src/effectslistview.h b/src/effectslistview.h
index e83fde871d2332d656dc4b362387c5dfe93fc323..4970bb164d63fbac19820b78f10ea44619e9b383 100644 (file)
--- a/src/effectslistview.h
+++ b/src/effectslistview.h
@@ -46,7 +46,7 @@ class EffectsListView : public QWidget, public Ui::EffectList_UI
 public:
     EffectsListView(QWidget *parent = 0);
 
-    /** @brief Re-initializes the list of effets. */
+    /** @brief Re-initializes the list of effects. */
     void reloadEffectList();
     //void slotAddEffect(GenTime pos, int track, QString name);
 

diff --git a/src/widgets/effectlist_ui.ui b/src/widgets/effectlist_ui.ui
index c13611f2bcc887aa48d995fb13db113cd182a902..f1266646ee48234cd929d29ada1a63c7f5955b85 100644 (file)
--- a/src/widgets/effectlist_ui.ui
+++ b/src/widgets/effectlist_ui.ui
@@ -11,41 +11,7 @@
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="KComboBox" name="type_combo">
-     <item>
-      <property name="text">
-       <string>All</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Video</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Audio</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>Custom</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <widget class="QToolButton" name="buttonInfo">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="3">
+   <item row="3" column="0" colspan="4">
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -83,9 +49,56 @@
      </widget>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="1" column="0">
+    <widget class="KComboBox" name="type_combo">
+     <item>
+      <property name="text">
+       <string>All</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Video</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Audio</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Custom</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QToolButton" name="buttonInfo">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="4">
     <widget class="KTreeWidgetSearchLine" name="search_effect"/>
    </item>
+   <item row="1" column="1">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -105,10 +118,6 @@
    <header>kcombobox.h</header>
   </customwidget>
  </customwidgets>
- <tabstops>
-  <tabstop>type_combo</tabstop>
-  <tabstop>buttonInfo</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>