- Make it possible to add comments to list parameters

- Make it easier to distinguish which parameter a bool comment belongs to

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

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 37c17c75fc668ec4267f010fcb6533a0af62b6b8..929db2346aebab0d59fbd5baed6277c04e25f772 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -267,8 +267,12 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
             }
             if (!value.isEmpty()) lsval->list->setCurrentIndex(listitems.indexOf(value));
             lsval->name->setText(paramName);
+            lsval->labelComment->setText(comment);
+            lsval->widgetComment->setHidden(true);
             m_valueItems[paramName] = lsval;
             connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters()));
+            if (!comment.isEmpty())
+                connect(this, SIGNAL(showComments(bool)), lsval->widgetComment, SLOT(setVisible(bool)));
             m_uiItems.append(lsval);
         } else if (type == "bool") {
             Boolval *bval = new Boolval;
@@ -276,11 +280,11 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
             bval->checkBox->setCheckState(value == "0" ? Qt::Unchecked : Qt::Checked);
             bval->name->setText(paramName);
             bval->labelComment->setText(comment);
-            bval->labelComment->setHidden(true);
+            bval->widgetComment->setHidden(true);
             m_valueItems[paramName] = bval;
             connect(bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT(collectAllParameters()));
             if (!comment.isEmpty())
-                connect(this, SIGNAL(showComments(bool)), bval->labelComment, SLOT(setVisible(bool)));
+                connect(this, SIGNAL(showComments(bool)), bval->widgetComment, SLOT(setVisible(bool)));
             m_uiItems.append(bval);
         } else if (type == "complex") {
             ComplexParameter *pl = new ComplexParameter;

diff --git a/src/widgets/boolval_ui.ui b/src/widgets/boolval_ui.ui
index 6405d1ea3927156c929140996eb7adb54cfc3f54..953c57270a1ce9d9859ee435d51a357c05224137 100644 (file)
--- a/src/widgets/boolval_ui.ui
+++ b/src/widgets/boolval_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>329</width>
-    <height>43</height>
+    <width>155</width>
+    <height>58</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -32,16 +32,34 @@
     </widget>
    </item>
    <item row="1" column="0" colspan="2">
-    <widget class="QLabel" name="labelComment">
-     <property name="frameShape">
-      <enum>QFrame::StyledPanel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
+    <widget class="QWidget" name="widgetComment" native="true">
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>15</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelComment">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::RichText</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>

diff --git a/src/widgets/listval_ui.ui b/src/widgets/listval_ui.ui
index b978dd1bc98c11de45775aa27b70494b6d924910..ed8e9b97712a2d0ca16590fdfb656115ac680ca6 100644 (file)
--- a/src/widgets/listval_ui.ui
+++ b/src/widgets/listval_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>215</width>
-    <height>32</height>
+    <width>200</width>
+    <height>60</height>
    </rect>
   </property>
   <layout class="QGridLayout">
@@ -27,6 +27,37 @@
    <item row="0" column="1">
     <widget class="KComboBox" name="list"/>
    </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QWidget" name="widgetComment" native="true">
+     <layout class="QGridLayout" name="_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>15</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelComment">
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Raised</enum>
+        </property>
+        <property name="textFormat">
+         <enum>Qt::RichText</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>