- Replace seeking checkbox in keyframe widget with a checkable add-link button

- Add line on top of keyframe widget to make it clear where the add keyframe button belongs to

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

diff --git a/src/keyframeedit.cpp b/src/keyframeedit.cpp
index e93fd64167a4fb2fc2e8bfebbaca04a249b01266..e35236918191cbdef9c2b83b64c41e8ed0a27257 100644 (file)
--- a/src/keyframeedit.cpp
+++ b/src/keyframeedit.cpp
@@ -38,15 +38,12 @@ KeyframeEdit::KeyframeEdit(QDomElement e, int minFrame, int maxFrame, int minVal
     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)));
+    buttonSeek->setChecked(KdenliveSettings::keyframeseek());
+    connect(buttonSeek, SIGNAL(toggled(bool)), this, SLOT(slotSetSeeking(bool)));
 
     buttonKeyframes->setIcon(KIcon("list-add"));
     button_add->setIcon(KIcon("list-add"));
@@ -54,6 +51,7 @@ KeyframeEdit::KeyframeEdit(QDomElement e, int minFrame, int maxFrame, int minVal
     button_delete->setIcon(KIcon("list-remove"));
     button_delete->setToolTip(i18n("Delete keyframe"));
     buttonResetKeyframe->setIcon(KIcon("edit-undo"));
+    buttonSeek->setIcon(KIcon("insert-link"));
     connect(keyframe_list, SIGNAL(itemSelectionChanged()), this, SLOT(slotAdjustKeyframeInfo()));
     connect(keyframe_list, SIGNAL(cellChanged(int, int)), this, SLOT(slotGenerateParams(int, int)));
     setupParam();
@@ -411,9 +409,9 @@ QString KeyframeEdit::getPosString(int pos)
         return m_timecode.getTimecodeFromFrames(pos);
 }
 
-void KeyframeEdit::slotSetSeeking(int state)
+void KeyframeEdit::slotSetSeeking(bool seek)
 {
-    KdenliveSettings::setKeyframeseek(state == Qt::Checked);
+    KdenliveSettings::setKeyframeseek(seek);
 }
 
 void KeyframeEdit::updateTimecodeFormat()

diff --git a/src/keyframeedit.h b/src/keyframeedit.h
index 4df839d060ca785a0b2aa67baae8b67f19a49b54..3069dd99f18300f2f070f7fb1c4b2b001f4b34c8 100644 (file)
--- a/src/keyframeedit.h
+++ b/src/keyframeedit.h
@@ -116,7 +116,7 @@ private slots:
     void slotAdjustKeyframeValue(int value);
     /** @brief Turns the seek to keyframe position setting on/off.
     * @param state State of the associated checkbox */
-    void slotSetSeeking(int state);
+    void slotSetSeeking(bool seek);
 
     /** @brief Shows the keyframe table and adds a second keyframe. */
     void slotKeyframeMode();

diff --git a/src/widgets/keyframeeditor_ui.ui b/src/widgets/keyframeeditor_ui.ui
index f8d5d4ee5c2a4be216b9a8c12893aa7184908f18..976b143a3abae7f86b040f026b92a69945149be3 100644 (file)
--- a/src/widgets/keyframeeditor_ui.ui
+++ b/src/widgets/keyframeeditor_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>336</width>
-    <height>190</height>
+    <width>346</width>
+    <height>196</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
@@ -40,7 +40,7 @@
       <property name="margin">
        <number>0</number>
       </property>
-      <item row="3" column="0" colspan="4">
+      <item row="3" column="0" colspan="5">
        <widget class="QTableWidget" name="keyframe_list">
         <property name="alternatingRowColors">
          <bool>true</bool>
@@ -72,13 +72,6 @@
         </property>
        </widget>
       </item>
-      <item row="4" column="3">
-       <widget class="QCheckBox" name="keyframe_seek">
-        <property name="text">
-         <string>Seek to active keyframe</string>
-        </property>
-       </widget>
-      </item>
       <item row="5" column="0" colspan="2">
        <widget class="QLabel" name="label">
         <property name="text">
@@ -86,7 +79,7 @@
         </property>
        </widget>
       </item>
-      <item row="5" column="2" colspan="2">
+      <item row="5" column="2" colspan="3">
        <widget class="QSlider" name="keyframe_pos">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -113,6 +106,19 @@
         </property>
        </widget>
       </item>
+      <item row="4" column="3">
+       <widget class="QToolButton" name="buttonSeek">
+        <property name="toolTip">
+         <string>Seek to active keyframe</string>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -141,6 +147,13 @@
      </layout>
     </widget>
    </item>
+   <item row="0" column="0" colspan="3">
+    <widget class="Line" name="line_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>