Do not show the keyframe table if only one keyframe exists. Instead show a button...

[kdenlive] / src / keyframeedit.cpp

diff --git a/src/keyframeedit.cpp b/src/keyframeedit.cpp
index 1e4502198b81a9b6d1abd4b8408f3929f2e0ee6c..19dbcdd154fbd63cb460a30bee31a66d7db416bc 100644 (file)
--- a/src/keyframeedit.cpp
+++ b/src/keyframeedit.cpp
@@ -36,11 +36,19 @@ KeyframeEdit::KeyframeEdit(QDomElement e, int minFrame, int maxFrame, int minVal
 {
     kDebug() << " / / / /MODIFIED KFR: " << m_active_keyframe;
     setupUi(this);
+    if (m_max == -1) {
+        // special case: keyframe for tracks, do not allow keyframes
+        button_add->setEnabled(false);
+        button_delete->setEnabled(false);
+        keyframe_seek->setEnabled(false);
+        widgetTable->setHidden(true);
+    }
     m_params.append(e.cloneNode().toElement());
     keyframe_list->setFont(KGlobalSettings::generalFont());
     keyframe_seek->setChecked(KdenliveSettings::keyframeseek());
     connect(keyframe_seek, SIGNAL(stateChanged(int)), this, SLOT(slotSetSeeking(int)));
 
+    buttonKeyframes->setIcon(KIcon("list-add"));
     button_add->setIcon(KIcon("list-add"));
     button_add->setToolTip(i18n("Add keyframe"));
     button_delete->setIcon(KIcon("list-remove"));
@@ -54,6 +62,7 @@ KeyframeEdit::KeyframeEdit(QDomElement e, int minFrame, int maxFrame, int minVal
     //keyframe_list->horizontalHeader()->resizeSections(QHeaderView::ResizeToContents);
     connect(button_delete, SIGNAL(clicked()), this, SLOT(slotDeleteKeyframe()));
     connect(button_add, SIGNAL(clicked()), this, SLOT(slotAddKeyframe()));
+    connect(buttonKeyframes, SIGNAL(clicked()), this, SLOT(slotKeyframeMode()));
     //connect(keyframe_list, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(slotSaveCurrentParam(QTreeWidgetItem *, int)));
     connect(keyframe_pos, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframePos(int)));
     //connect(keyframe_val, SIGNAL(valueChanged(int)), this, SLOT(slotAdjustKeyframeValue(int)));
@@ -66,6 +75,12 @@ KeyframeEdit::KeyframeEdit(QDomElement e, int minFrame, int maxFrame, int minVal
     keyframe_list->setMinimumHeight(QFontInfo(keyframe_list->font()).pixelSize() * 9);
     /*m_delegate = new KeyItemDelegate(minVal, maxVal);
     keyframe_list->setItemDelegate(m_delegate);*/
+
+    // Do not show keyframe table if only one keyframe exists at the beginning
+    if (keyframe_list->rowCount() < 2 && getPos(0) == m_min && m_max != -1)
+        widgetTable->setHidden(true);
+    else
+        buttonKeyframes->setHidden(true);
 }
 
 KeyframeEdit::~KeyframeEdit()
@@ -147,6 +162,7 @@ void KeyframeEdit::setupParam()
     keyframe_list->setSelectionMode(QAbstractItemView::SingleSelection);
 
     QStringList frames = m_params.at(0).attribute("keyframes").split(";", QString::SkipEmptyParts);
+    setEnabled(frames.count() > 0);
     for (int i = 0; i < frames.count(); i++) {
         keyframe_list->insertRow(i);
         int currentpos = frames.at(i).section(':', 0, 0).toInt();
@@ -233,7 +249,7 @@ void KeyframeEdit::slotGenerateParams(int row, int column)
         int pos = getPos(row);
         if (pos <= m_min)
             pos = m_min;
-        if (pos > m_max)
+        if (m_max != -1 && pos > m_max)
             pos = m_max;
         QString val = getPosString(pos);
         if (val != keyframe_list->verticalHeaderItem(row)->text())
@@ -265,7 +281,7 @@ void KeyframeEdit::slotGenerateParams(int row, int column)
     int pos = getPos(row);
     if (pos <= m_min)
         pos = m_min;
-    if (pos > m_max)
+    if (m_max != -1 && pos > m_max)
         pos = m_max;
     /*QList<QTreeWidgetItem *> duplicates = keyframe_list->findItems(val, Qt::MatchExactly, 0);
     duplicates.removeAll(item);
@@ -311,7 +327,7 @@ const QString KeyframeEdit::getValue(const QString &name)
     for (int col = 0; col < keyframe_list->columnCount(); col++) {
         QDomNode na = m_params.at(col).firstChildElement("name");
         QString paramName = i18n(na.toElement().text().toUtf8().data());
-        kDebug() << paramName << " == " << name;
+        //kDebug() << paramName << " == " << name;
         if (paramName == name)
             return m_params.at(col).attribute("keyframes");
     }
@@ -409,6 +425,13 @@ void KeyframeEdit::updateTimecodeFormat()
     }
 }
 
+void KeyframeEdit::slotKeyframeMode()
+{
+    widgetTable->setHidden(false);
+    buttonKeyframes->setHidden(true);
+    slotAddKeyframe();
+}
+
 /*void KeyframeEdit::slotSaveCurrentParam(QTreeWidgetItem *item, int column)
 {
     if (item && column == 0) m_previousPos = m_timecode.getFrameCount(item->text(0));