Geometry Widget:

- Fix previous keyframe button not going to beginning if no previous keyframe exists
- Remove experimental flag from "Use on-monitor effects" setting

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

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index e0c4fd25f1f9b0d86f8bc52cf9e5671339822f21..ef01e0fc76e280c32555d76139f0e23bae6b3be3 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -298,8 +298,9 @@ void GeometryWidget::slotPreviousKeyframe()
 {
     Mlt::GeometryItem item;
     // Go to start if no keyframe is found
+    int currentPos = m_timePos->getValue();
     int pos = 0;
-    if(!m_geometry->prev_key(&item, m_timeline->value() - 1))
+    if(!m_geometry->prev_key(&item, currentPos - 1) && item.frame() < currentPos)
         pos = item.frame();
 
     slotPositionChanged(pos);

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index ace2e0c266d63c0a8a51c2f0d5c44f6caaff5214..0b0713fc1494761915f7cf0cf464310fb2ac8102 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -41,7 +41,7 @@
     </entry>
     
     <entry name="on_monitor_effects" type="Bool">
-      <label>Use on-monitor effects (Warning: experimental).</label>
+      <label>Use on-monitor effects.</label>
       <default>false</default>
     </entry>
   </group>

diff --git a/src/widgets/configmisc_ui.ui b/src/widgets/configmisc_ui.ui
index 01f984c8f1723f3e4bc314f2172890019b172ec7..0d15588476567e4a6a360016e1770ffbff67d7c4 100644 (file)
--- a/src/widgets/configmisc_ui.ui
+++ b/src/widgets/configmisc_ui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>348</width>
-    <height>215</height>
+    <height>242</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
@@ -106,7 +106,7 @@
    <item row="4" column="0">
     <widget class="QCheckBox" name="kcfg_on_monitor_effects">
      <property name="text">
-      <string>Use on-monitor effects (Warning: experimental)</string>
+      <string>Use on-monitor effects</string>
      </property>
     </widget>
    </item>