Add a "full description" to effects. Will be shown when the parameter comments are...

http://kdenlive.org/mantis/view.php?id=1948

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

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 3bcfa52da7b0f9d61d7c31d513223efdfbf9f18e..f3184f298b20248bbd4e38b54a909b9ccdde7f4d 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -206,13 +206,13 @@ void EffectStackEdit::transferParamDesc(const QDomElement d, int pos, int in, in
 
     for (int i = 0; i < namenode.count() ; i++) {
         QDomElement pa = namenode.item(i).toElement();
-        QDomNode na = pa.firstChildElement("name");
-        QDomNode commentNode = pa.firstChildElement("comment");
+        QDomElement na = pa.firstChildElement("name");
+        QDomElement commentElem = pa.firstChildElement("comment");
         QString type = pa.attribute("type");
-        QString paramName = i18n(na.toElement().text().toUtf8().data());
+        QString paramName = i18n(na.text().toUtf8().data());
         QString comment;
-        if (!commentNode.isNull())
-            comment = i18n(commentNode.toElement().text().toUtf8().data());
+        if (!commentElem.isNull())
+            comment = i18n(commentElem.text().toUtf8().data());
         QWidget * toFillin = new QWidget(m_baseWidget);
         QString value = pa.attribute("value").isNull() ?
                         pa.attribute("default") : pa.attribute("value");

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index 50c1a4d909cdd9129ac4c6e416709d4aa90256cc..cd9a6b4de1012f2964967907c4e2b11d2460854f 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -74,6 +74,8 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) :
 
     m_ui.effectlist->setDragDropMode(QAbstractItemView::NoDragDrop); //use internal if drop is recognised right
 
+    m_ui.labelComment->setHidden(true);
+
     //connect(m_ui.region_url, SIGNAL(urlSelected(const KUrl &)), this , SLOT(slotRegionChanged()));
     //connect(m_ui.region_url, SIGNAL(returnPressed()), this , SLOT(slotRegionChanged()));
     connect(m_ui.effectlist, SIGNAL(itemSelectionChanged()), this , SLOT(slotItemSelectionChanged()));
@@ -84,7 +86,7 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) :
     connect(m_ui.buttonSave, SIGNAL(clicked()), this, SLOT(slotSaveEffect()));
     connect(m_ui.buttonReset, SIGNAL(clicked()), this, SLOT(slotResetEffect()));
     connect(m_ui.checkAll, SIGNAL(stateChanged(int)), this, SLOT(slotCheckAll(int)));
-    connect(m_ui.buttonShowComments, SIGNAL(clicked()), this, SIGNAL(showComments()));
+    connect(m_ui.buttonShowComments, SIGNAL(clicked()), this, SLOT(slotShowComments()));
     connect(m_effectedit, SIGNAL(parameterChanged(const QDomElement, const QDomElement)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement)));
     connect(m_effectedit, SIGNAL(seekTimeline(int)), this , SLOT(slotSeekTimeline(int)));
     connect(m_effectedit, SIGNAL(displayMessage(const QString&, int)), this, SIGNAL(displayMessage(const QString&, int)));
@@ -187,8 +189,9 @@ void EffectStackView::slotClipItemSelected(ClipItem* c, int ix)
             double factor = c->baseClip()->getProperty("aspect_ratio").toDouble();
             QPoint p((int)(size.section('x', 0, 0).toInt() * factor + 0.5), size.section('x', 1, 1).toInt());
             m_effectedit->setFrameSize(p);
-            m_effectedit->setFrameSize(p);
-        } else ix = 0;
+        } else {
+            ix = 0;
+        }
     }
     if (m_clipref == NULL) {
         m_ui.effectlist->blockSignals(true);
@@ -198,6 +201,7 @@ void EffectStackView::slotClipItemSelected(ClipItem* c, int ix)
         m_ui.effectlist->blockSignals(false);
         m_ui.checkAll->setToolTip(QString());
         m_ui.checkAll->setText(QString());
+        m_ui.labelComment->setText(QString());
         setEnabled(false);
         return;
     }
@@ -287,6 +291,8 @@ void EffectStackView::setupListView(int ix)
         m_ui.buttonUp->setEnabled(false);
         m_ui.buttonDown->setEnabled(false);
         m_ui.checkAll->setEnabled(false);
+        m_ui.buttonShowComments->setEnabled(false);
+        m_ui.labelComment->setHidden(true);
     } else {
         qMin(ix, 0);
         qMax(ix, m_ui.effectlist->count() - 1);
@@ -317,6 +323,7 @@ void EffectStackView::slotItemSelectionChanged(bool update)
                                                    m_clipref->cropStart().frames(KdenliveSettings::project_fps()),
                                                    (m_clipref->cropStart() + m_clipref->cropDuration()).frames(KdenliveSettings::project_fps()) - 1); //minx max frame
         //m_ui.region_url->setUrl(KUrl(eff.attribute("region")));
+        m_ui.labelComment->setText(i18n(eff.firstChildElement("description").firstChildElement("full").text().toUtf8().data()));
     }
     if (!m_trackMode && m_clipref && update) m_clipref->setSelectedEffect(activeRow);
     m_ui.buttonDel->setEnabled(hasItem);
@@ -325,9 +332,11 @@ void EffectStackView::slotItemSelectionChanged(bool update)
     m_ui.buttonUp->setEnabled(activeRow > 0);
     m_ui.buttonDown->setEnabled((activeRow < m_ui.effectlist->count() - 1) && hasItem);
     m_ui.frame->setEnabled(isChecked);
+    m_ui.buttonShowComments->setEnabled(hasItem);
 
     if (m_ui.buttonShowComments->isChecked())
         emit showComments();
+    m_ui.labelComment->setHidden(!m_ui.buttonShowComments->isChecked() || !m_ui.labelComment->text().count() || !hasItem);
 }
 
 void EffectStackView::slotItemUp()
@@ -389,6 +398,7 @@ void EffectStackView::slotResetEffect()
 
     if (m_ui.buttonShowComments->isChecked())
         emit showComments();
+    m_ui.labelComment->setHidden(!m_ui.buttonShowComments->isChecked() || !m_ui.labelComment->text().count());
 }
 
 
@@ -410,6 +420,8 @@ void EffectStackView::clear()
     m_ui.checkAll->setEnabled(false);
     m_effectedit->transferParamDesc(QDomElement(), 0, 0, 0);
     //m_ui.region_url->clear();
+    m_ui.buttonShowComments->setEnabled(false);
+    m_ui.labelComment->setText(QString());
     m_ui.effectlist->blockSignals(false);
 }
 
@@ -498,4 +510,10 @@ int EffectStackView::isTrackMode(bool *ok) const
     return m_trackindex;
 }
 
+void EffectStackView::slotShowComments()
+{
+    m_ui.labelComment->setHidden(!m_ui.buttonShowComments->isChecked() || !m_ui.labelComment->text().count());
+    emit showComments();
+}
+
 #include "effectstackview.moc"

diff --git a/src/effectstackview.h b/src/effectstackview.h
index 1336cbfda5a510c73459d533abe1fae36ef5a117..29ba056f0665d8ac923e0b79a396a4d6c4361022 100644 (file)
--- a/src/effectstackview.h
+++ b/src/effectstackview.h
@@ -139,6 +139,9 @@ private slots:
     /** @brief Pass position changes of the timeline cursor to the effects to keep their local timelines in sync. */
     void slotRenderPos(int pos);
 
+    /** @brief Shows/Hides the comment box and emits showComments to notify the parameter widgets to do the same. */
+    void slotShowComments();
+
 signals:
     void removeEffect(ClipItem*, int, QDomElement);
     /**  Parameters for an effect changed, update the filter in playlist */

diff --git a/src/keyframeedit.cpp b/src/keyframeedit.cpp
index a93bbfc70bffcc1fe0ae2ef30c329945e847d547..6dde054dafaea67c84e2bf2156120661865c3489 100644 (file)
--- a/src/keyframeedit.cpp
+++ b/src/keyframeedit.cpp
@@ -101,12 +101,12 @@ void KeyframeEdit::addParameter(QDomElement e, int activeKeyframe)
     keyframe_list->blockSignals(true);
     m_params.append(e.cloneNode().toElement());
 
-    QDomNode na = e.firstChildElement("name");
-    QString paramName = i18n(na.toElement().text().toUtf8().data());
-    QDomNode commentNode = e.firstChildElement("comment");
+    QDomElement na = e.firstChildElement("name");
+    QString paramName = i18n(na.text().toUtf8().data());
+    QDomElement commentElem = e.firstChildElement("comment");
     QString comment;
-    if (!commentNode.isNull())
-        comment = i18n(commentNode.toElement().text().toUtf8().data());
+    if (!commentElem.isNull())
+        comment = i18n(commentElem.text().toUtf8().data());
 
     int columnId = keyframe_list->columnCount();
     keyframe_list->insertColumn(columnId);

diff --git a/src/widgets/effectstack_ui.ui b/src/widgets/effectstack_ui.ui
index 4f0ba6210c122e924637486925a7f15249580957..d38805d30f70f2c9f527fd72167b1d0a210a4f90 100644 (file)
--- a/src/widgets/effectstack_ui.ui
+++ b/src/widgets/effectstack_ui.ui
@@ -163,12 +163,24 @@
        <item row="1" column="0" colspan="2">
         <widget class="QFrame" name="frame">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+          <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <zorder>toolButton</zorder>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QToolButton" name="buttonShowComments">
+         <property name="text">
+          <string/>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
        <item row="0" column="0">
@@ -184,15 +196,30 @@
          </property>
         </spacer>
        </item>
-       <item row="0" column="1">
-        <widget class="QToolButton" name="buttonShowComments">
+       <item row="2" column="0" colspan="2">
+        <widget class="QLabel" name="labelComment">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="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="checkable">
-          <bool>true</bool>
+         <property name="textFormat">
+          <enum>Qt::RichText</enum>
          </property>
-         <property name="autoRaise">
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>