improve effects info widget (resizeable, remember state), related to:

http://www.kdenlive.org:80/mantis/view.php?id=238

svn path=/branches/KDE4/; revision=2550

diff --git a/src/effectslistview.cpp b/src/effectslistview.cpp
index b0aa78698a24a4fb9484a56c7fd00fb9711bb69e..d1b4abbe75dfb0ffbc9b078d5c0311bdd62aa16a 100644 (file)
--- a/src/effectslistview.cpp
+++ b/src/effectslistview.cpp
@@ -28,6 +28,7 @@
 #include "effectslistview.h"
 #include "effectslistwidget.h"
 #include "effectslist.h"
+#include "kdenlivesettings.h"
 
 EffectsListView::EffectsListView(QWidget *parent)
         : QWidget(parent) {
@@ -40,7 +41,10 @@ EffectsListView::EffectsListView(QWidget *parent)
     lyr->setContentsMargins(0, 0, 0, 0);
     ui.search_effect->setListWidget(m_effectsList);
     ui.buttonInfo->setIcon(KIcon("help-about"));
-    ui.infopanel->hide();
+
+    if (KdenliveSettings::showeffectinfo()) {
+        ui.buttonInfo->setDown(true);
+    } else ui.infopanel->hide();
     menu->addAction(KIcon("edit-delete"), i18n("Delete effect"), this, SLOT(slotRemoveEffect()));
 
     connect(ui.type_combo, SIGNAL(currentIndexChanged(int)), this, SLOT(filterList(int)));
@@ -74,9 +78,11 @@ void EffectsListView::showInfoPanel() {
     if (ui.infopanel->isVisible()) {
         ui.infopanel->setVisible(false);
         ui.buttonInfo->setDown(false);
+        KdenliveSettings::setShoweffectinfo(false);
     } else {
         ui.infopanel->setVisible(true);
         ui.buttonInfo->setDown(true);
+        KdenliveSettings::setShoweffectinfo(true);
     }
 }
 
@@ -86,8 +92,7 @@ void EffectsListView::slotEffectSelected() {
 }
 
 void EffectsListView::slotUpdateInfo() {
-    QString info = m_effectsList->currentInfo();
-    ui.infopanel->setText(info);
+    ui.infopanel->setText(m_effectsList->currentInfo());
 }
 
 KListWidget *EffectsListView::listView() {

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 9def02186c24d4e2fa02ac6b93e838e92ba5d044..f17946a4eb9f133e49adc31383569f6991d0e0a2 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -319,5 +319,10 @@
       <default>true</default>
     </entry>
 
+    <entry name="showeffectinfo" type="Bool">
+      <label>Show small effect description in effect list.</label>
+      <default>false</default>
+    </entry>
+
   </group>
 </kcfg>
\ No newline at end of file

diff --git a/src/widgets/effectlist_ui.ui b/src/widgets/effectlist_ui.ui
index 34e4ec1ad4c650de142c853d3368911712483857..7b9b8449fabe0dc0d5ea69cca0231ce73f4e3e2d 100644 (file)
--- a/src/widgets/effectlist_ui.ui
+++ b/src/widgets/effectlist_ui.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>257</width>
-    <height>280</height>
+    <width>314</width>
+    <height>296</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout" >
@@ -48,35 +48,51 @@
     </widget>
    </item>
    <item row="1" column="0" colspan="3" >
-    <widget class="QFrame" name="effectlistframe" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape" >
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow" >
-      <enum>QFrame::Raised</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="3" >
-    <widget class="QTextEdit" name="infopanel" >
-     <property name="frameShape" >
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow" >
-      <enum>QFrame::Sunken</enum>
-     </property>
-     <property name="readOnly" >
-      <bool>true</bool>
+    <widget class="QSplitter" name="splitter" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
      </property>
+     <widget class="QFrame" name="effectlistframe" >
+      <property name="frameShape" >
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow" >
+       <enum>QFrame::Raised</enum>
+      </property>
+     </widget>
+     <widget class="QLabel" name="infopanel" >
+      <property name="sizePolicy" >
+       <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="frameShape" >
+       <enum>QFrame::StyledPanel</enum>
+      </property>
+      <property name="frameShadow" >
+       <enum>QFrame::Raised</enum>
+      </property>
+      <property name="text" >
+       <string/>
+      </property>
+      <property name="alignment" >
+       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+      </property>
+      <property name="wordWrap" >
+       <bool>true</bool>
+      </property>
+     </widget>
     </widget>
    </item>
   </layout>
+  <zorder>type_combo</zorder>
+  <zorder>search_effect</zorder>
+  <zorder>buttonInfo</zorder>
+  <zorder>effectlistframe</zorder>
+  <zorder>infopanel</zorder>
+  <zorder>infopanel</zorder>
+  <zorder>splitter</zorder>
  </widget>
  <customwidgets>
   <customwidget>