Add crop end info to clip info dialog (based on a patch by Till Theato):

http://www.kdenlive.org/mantis/view.php?id=1371
and some minor fixes,.

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

diff --git a/src/clipdurationdialog.cpp b/src/clipdurationdialog.cpp
index 58243e9122c07e3a517e826b2c3296b8b807673c..f77aa2e46e2b56b6f4279eeebc2486e0346d7b4c 100644 (file)
--- a/src/clipdurationdialog.cpp
+++ b/src/clipdurationdialog.cpp
@@ -50,21 +50,46 @@ ClipDurationDialog::ClipDurationDialog(AbstractClipItem *clip, Timecode tc, GenT
         m_view.crop_down->hide();
         m_view.crop_position->hide();
         m_view.crop_label->hide();
+        m_view.end_up->hide();
+        m_view.end_down->hide();
+        m_view.end_position->hide();
+        m_view.end_label->hide();
     }
 
     m_crop = m_clip->cropStart().frames(m_fps);
-    m_view.clip_position->setText(tc.getTimecode(m_clip->startPos()));
-    m_view.crop_position->setText(tc.getTimecode(m_clip->cropStart()));
-    m_view.clip_duration->setText(tc.getTimecode(m_clip->cropDuration()));
+
+    if (KdenliveSettings::frametimecode()) {
+        QValidator *valid = new QIntValidator();
+        m_view.clip_position->setInputMask("");
+        m_view.clip_position->setValidator(valid);
+        m_view.clip_position->setText(QString::number(m_clip->startPos().frames(m_fps)));
+        m_view.crop_position->setInputMask("");
+        m_view.clip_position->setValidator(valid);
+        m_view.crop_position->setText(QString::number(m_clip->cropStart().frames(m_fps)));
+        m_view.clip_duration->setInputMask("");
+        m_view.clip_position->setValidator(valid);
+        m_view.clip_duration->setText(QString::number(m_clip->cropDuration().frames(m_fps)));
+        m_view.end_position->setInputMask("");
+        m_view.clip_position->setValidator(valid);
+        m_view.end_position->setText(QString::number((m_clip->maxDuration() - m_clip->cropDuration() - m_clip->cropStart()).frames(m_fps)));
+    } else {
+        m_view.clip_position->setText(tc.getTimecode(m_clip->startPos()));
+        m_view.crop_position->setText(tc.getTimecode(m_clip->cropStart()));
+        m_view.clip_duration->setText(tc.getTimecode(m_clip->cropDuration()));
+        m_view.end_position->setText(tc.getTimecode(m_clip->maxDuration() - m_clip->cropDuration() - m_clip->cropStart()));
+    }
     connect(m_view.position_up, SIGNAL(clicked()), this, SLOT(slotPosUp()));
     connect(m_view.position_down, SIGNAL(clicked()), this, SLOT(slotPosDown()));
     connect(m_view.crop_up, SIGNAL(clicked()), this, SLOT(slotCropUp()));
     connect(m_view.crop_down, SIGNAL(clicked()), this, SLOT(slotCropDown()));
     connect(m_view.duration_up, SIGNAL(clicked()), this, SLOT(slotDurUp()));
     connect(m_view.duration_down, SIGNAL(clicked()), this, SLOT(slotDurDown()));
+    connect(m_view.end_up, SIGNAL(clicked()), this, SLOT(slotEndUp()));
+    connect(m_view.end_down, SIGNAL(clicked()), this, SLOT(slotEndDown()));
     connect(m_view.crop_position, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckCrop()));
     connect(m_view.clip_duration, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckDuration()));
     connect(m_view.clip_position, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckStart()));
+    connect(m_view.end_position, SIGNAL(textChanged(const QString &)), this, SLOT(slotCheckEnd()));
     adjustSize();
 }
 
@@ -74,22 +99,42 @@ ClipDurationDialog::~ClipDurationDialog()
 
 void ClipDurationDialog::slotCheckStart()
 {
-    int pos = m_tc.getFrameCount(m_view.clip_position->text());
-    int dur = m_tc.getFrameCount(m_view.clip_duration->text());
+    int pos;
+    int dur;
+    if (KdenliveSettings::frametimecode()) {
+        pos = m_view.clip_position->text().toInt();
+        dur = m_view.clip_duration->text().toInt();
+    } else {
+        pos = m_tc.getFrameCount(m_view.clip_position->text());
+        dur = m_tc.getFrameCount(m_view.clip_duration->text());
+    }
+
     GenTime start(pos, m_fps);
     GenTime duration(dur, m_fps);
     if (m_min != GenTime() && start < m_min) {
-        m_view.clip_position->setText(m_tc.getTimecode(m_min));
+        if (KdenliveSettings::frametimecode()) m_view.clip_position->setText(QString::number(m_min.frames(m_fps)));
+        else m_view.clip_position->setText(m_tc.getTimecode(m_min));
     } else if (m_max != GenTime() && start + duration > m_max) {
-        m_view.clip_position->setText(m_tc.getTimecode(m_max - duration));
+        if (KdenliveSettings::frametimecode()) m_view.clip_position->setText(QString::number((m_max - duration).frames(m_fps)));
+        else m_view.clip_position->setText(m_tc.getTimecode(m_max - duration));
     }
 }
 
 void ClipDurationDialog::slotCheckDuration()
 {
-    int pos = m_tc.getFrameCount(m_view.clip_position->text());
-    int dur = m_tc.getFrameCount(m_view.clip_duration->text());
-    int crop = m_tc.getFrameCount(m_view.crop_position->text());
+    int pos;
+    int dur;
+    int crop;
+    if (KdenliveSettings::frametimecode()) {
+        pos = m_view.clip_position->text().toInt();
+        dur = m_view.clip_duration->text().toInt();
+        crop = m_view.crop_position->text().toInt();
+    } else {
+        pos = m_tc.getFrameCount(m_view.clip_position->text());
+        dur = m_tc.getFrameCount(m_view.clip_duration->text());
+        crop = m_tc.getFrameCount(m_view.crop_position->text());
+    }
+
     GenTime start(pos, m_fps);
     GenTime duration(dur, m_fps);
     GenTime cropStart(crop, m_fps);
@@ -98,100 +143,210 @@ void ClipDurationDialog::slotCheckDuration()
     else maxDuration = m_max == GenTime() ? start + m_clip->maxDuration() - cropStart : qMin(m_max, start + m_clip->maxDuration() - cropStart);
     if (maxDuration != GenTime() && start + duration > maxDuration) {
         m_view.clip_duration->blockSignals(true);
-        m_view.clip_duration->setText(m_tc.getTimecode(maxDuration - start));
+        if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number((maxDuration - start).frames(m_fps)));
+        else m_view.clip_duration->setText(m_tc.getTimecode(maxDuration - start));
         m_view.clip_duration->blockSignals(false);
     }
+
+    if (KdenliveSettings::frametimecode()) dur = m_view.clip_duration->text().toInt();
+    else dur = m_tc.getFrameCount(m_view.clip_duration->text());
+    GenTime durationUp(dur, m_fps);
+    m_view.end_position->blockSignals(true);
+    if (KdenliveSettings::frametimecode()) m_view.end_position->setText(QString::number((m_clip->maxDuration() - durationUp - cropStart).frames(m_fps)));
+    else m_view.end_position->setText(m_tc.getTimecode(m_clip->maxDuration() - durationUp - cropStart));
+    m_view.end_position->blockSignals(false);
 }
 
 void ClipDurationDialog::slotCheckCrop()
 {
-    int dur = m_tc.getFrameCount(m_view.clip_duration->text());
-    int crop = m_tc.getFrameCount(m_view.crop_position->text());
+    int dur;
+    int crop;
+    if (KdenliveSettings::frametimecode()) {
+        dur = m_view.clip_duration->text().toInt();
+        crop = m_view.crop_position->text().toInt();
+    } else {
+        dur = m_tc.getFrameCount(m_view.clip_duration->text());
+        crop = m_tc.getFrameCount(m_view.crop_position->text());
+    }
     int diff = crop - m_crop;
     if ((diff > 0 && diff < dur) || diff < 0) {
         dur -= diff;
     } else {
-        m_view.crop_position->setText(m_tc.getTimecode(GenTime(m_crop, m_fps)));
+        if (KdenliveSettings::frametimecode()) m_view.crop_position->setText(QString::number(m_crop));
+        else m_view.crop_position->setText(m_tc.getTimecode(GenTime(m_crop, m_fps)));
         return;
     }
     GenTime duration(dur, m_fps);
     GenTime cropStart(crop, m_fps);
     GenTime maxDuration = m_clip->maxDuration();
     if (maxDuration != GenTime() && cropStart + duration > maxDuration) {
-        m_view.crop_position->setText(m_tc.getTimecode(GenTime(m_crop, m_fps)));
+        if (KdenliveSettings::frametimecode()) m_view.crop_position->setText(QString::number(m_crop));
+        else m_view.crop_position->setText(m_tc.getTimecode(GenTime(m_crop, m_fps)));
     } else {
         m_crop = crop;
         m_view.clip_duration->blockSignals(true);
-        m_view.clip_duration->setText(m_tc.getTimecode(duration));
+        if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number(duration.frames(m_fps)));
+        else m_view.clip_duration->setText(m_tc.getTimecode(duration));
         m_view.clip_duration->blockSignals(false);
     }
 }
 
+void ClipDurationDialog::slotCheckEnd()
+{
+    int crop;
+    int end;
+    int dur;
+    if (KdenliveSettings::frametimecode()) {
+        crop = m_view.crop_position->text().toInt();
+        end = m_view.end_position->text().toInt();
+        dur = m_clip->maxDuration().frames(m_fps) - crop - end;
+    } else {
+        crop = m_tc.getFrameCount(m_view.crop_position->text());
+        end = m_tc.getFrameCount(m_view.end_position->text());
+        dur = m_tc.getFrameCount(m_tc.getTimecode(m_clip->maxDuration())) - crop - end;
+    }
+    if (dur >= 0) {
+        if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number(dur));
+        else m_view.clip_duration->setText(m_tc.getTimecode(GenTime(dur, m_fps)));
+    } else {
+        dur = m_tc.getFrameCount(m_view.clip_duration->text());
+        m_view.end_position->blockSignals(true);
+        if (KdenliveSettings::frametimecode()) m_view.end_position->setText(QString::number(m_clip->maxDuration().frames(m_fps) - (crop + dur)));
+        else m_view.end_position->setText(m_tc.getTimecode(m_clip->maxDuration() - GenTime(crop + dur, m_fps)));
+        m_view.end_position->blockSignals(false);
+    }
+}
+
 void ClipDurationDialog::slotPosUp()
 {
-    int position = m_tc.getFrameCount(m_view.clip_position->text());
+    int position;
+    if (KdenliveSettings::frametimecode()) position = m_view.clip_position->text().toInt();
+    else position = m_tc.getFrameCount(m_view.clip_position->text());
     //if (duration >= m_clip->duration().frames(m_fps)) return;
     position ++;
-    m_view.clip_position->setText(m_tc.getTimecode(GenTime(position, m_fps)));
+    if (KdenliveSettings::frametimecode()) m_view.clip_position->setText(QString::number(position));
+    else m_view.clip_position->setText(m_tc.getTimecode(GenTime(position, m_fps)));
 }
 
 void ClipDurationDialog::slotPosDown()
 {
-    int position = m_tc.getFrameCount(m_view.clip_position->text());
+    int position;
+    if (KdenliveSettings::frametimecode()) position = m_view.clip_position->text().toInt();
+    else position = m_tc.getFrameCount(m_view.clip_position->text());
     //if (duration >= m_clip->duration().frames(m_fps)) return;
     position --;
-    m_view.clip_position->setText(m_tc.getTimecode(GenTime(position, m_fps)));
+    if (KdenliveSettings::frametimecode()) m_view.clip_position->setText(QString::number(position));
+    else m_view.clip_position->setText(m_tc.getTimecode(GenTime(position, m_fps)));
 }
 
 void ClipDurationDialog::slotDurUp()
 {
-    int duration = m_tc.getFrameCount(m_view.clip_duration->text());
-    int crop = m_tc.getFrameCount(m_view.crop_position->text());
+    int duration;
+    int crop;
+    if (KdenliveSettings::frametimecode()) {
+        duration = m_view.clip_duration->text().toInt();
+        crop = m_view.crop_position->text().toInt();
+    } else {
+        duration = m_tc.getFrameCount(m_view.clip_duration->text());
+        crop = m_tc.getFrameCount(m_view.crop_position->text());
+    }
     if (m_clip->maxDuration() != GenTime() && duration + crop > m_clip->maxDuration().frames(m_fps)) return;
     duration ++;
-    m_view.clip_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
+    if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number(duration));
+    else m_view.clip_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
 }
 
 void ClipDurationDialog::slotDurDown()
 {
-    int duration = m_tc.getFrameCount(m_view.clip_duration->text());
+    int duration;
+    if (KdenliveSettings::frametimecode()) {
+        duration = m_view.clip_duration->text().toInt();
+    } else {
+        duration = m_tc.getFrameCount(m_view.clip_duration->text());
+    }
     if (duration <= 0) return;
     duration --;
-    m_view.clip_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
+    if (KdenliveSettings::frametimecode()) m_view.clip_duration->setText(QString::number(duration));
+    else m_view.clip_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps)));
 }
 
 void ClipDurationDialog::slotCropUp()
 {
-    int crop = m_tc.getFrameCount(m_view.crop_position->text());
-    int duration = m_tc.getFrameCount(m_view.clip_duration->text());
+    int duration;
+    int crop;
+    if (KdenliveSettings::frametimecode()) {
+        duration = m_view.clip_duration->text().toInt();
+        crop = m_view.crop_position->text().toInt();
+    } else {
+        duration = m_tc.getFrameCount(m_view.clip_duration->text());
+        crop = m_tc.getFrameCount(m_view.crop_position->text());
+    }
+
     if (m_clip->maxDuration() != GenTime() && duration + crop > m_clip->maxDuration().frames(m_fps)) return;
     crop ++;
-    m_view.crop_position->setText(m_tc.getTimecode(GenTime(crop, m_fps)));
+    if (KdenliveSettings::frametimecode()) m_view.crop_position->setText(QString::number(crop));
+    else m_view.crop_position->setText(m_tc.getTimecode(GenTime(crop, m_fps)));
 }
 
 void ClipDurationDialog::slotCropDown()
 {
-    int crop = m_tc.getFrameCount(m_view.crop_position->text());
+    int crop;
+    if (KdenliveSettings::frametimecode()) {
+        crop = m_view.crop_position->text().toInt();
+    } else {
+        crop = m_tc.getFrameCount(m_view.crop_position->text());
+    }
+
     if (crop <= 0) return;
     crop --;
-    m_view.crop_position->setText(m_tc.getTimecode(GenTime(crop, m_fps)));
+    if (KdenliveSettings::frametimecode()) m_view.crop_position->setText(QString::number(crop));
+    else m_view.crop_position->setText(m_tc.getTimecode(GenTime(crop, m_fps)));
+}
+
+void ClipDurationDialog::slotEndUp()
+{
+    int end;
+    if (KdenliveSettings::frametimecode()) end = m_view.end_position->text().toInt();
+    else end = m_tc.getFrameCount(m_view.end_position->text());
+    kDebug() << "/ / / / FIRST END: " << end;
+    end ++;
+    if (KdenliveSettings::frametimecode()) m_view.end_position->setText(QString::number(end));
+    else m_view.end_position->setText(m_tc.getTimecode(GenTime(end, m_fps)));
+    kDebug() << "/ / / / SEC END: " << end;
+}
+
+void ClipDurationDialog::slotEndDown()
+{
+    int end;
+    if (KdenliveSettings::frametimecode()) end = m_view.end_position->text().toInt();
+    else end = m_tc.getFrameCount(m_view.end_position->text());
+    if (end <= 0) return;
+    end --;
+    if (KdenliveSettings::frametimecode()) m_view.end_position->setText(QString::number(end));
+    else m_view.end_position->setText(m_tc.getTimecode(GenTime(end, m_fps)));
 }
 
 GenTime ClipDurationDialog::startPos() const
 {
-    int pos = m_tc.getFrameCount(m_view.clip_position->text());
+    int pos;
+    if (KdenliveSettings::frametimecode()) pos = m_view.clip_position->text().toInt();
+    else pos = m_tc.getFrameCount(m_view.clip_position->text());
     return GenTime(pos, m_fps);
 }
 
 GenTime ClipDurationDialog::cropStart() const
 {
-    int pos = m_tc.getFrameCount(m_view.crop_position->text());
+    int pos;
+    if (KdenliveSettings::frametimecode()) pos = m_view.crop_position->text().toInt();
+    else pos = m_tc.getFrameCount(m_view.crop_position->text());
     return GenTime(pos, m_fps);
 }
 
 GenTime ClipDurationDialog::duration() const
 {
-    int pos = m_tc.getFrameCount(m_view.clip_duration->text());
+    int pos;
+    if (KdenliveSettings::frametimecode()) pos = m_view.clip_duration->text().toInt();
+    else pos = m_tc.getFrameCount(m_view.clip_duration->text());
     return GenTime(pos, m_fps);
 }
 
@@ -212,6 +367,11 @@ void ClipDurationDialog::wheelEvent(QWheelEvent * event)
             slotCropUp();
         else
             slotCropDown();
+    } else if (m_view.end_position->underMouse()) {
+        if (event->delta() > 0)
+            slotEndUp();
+        else
+            slotEndDown();
     }
 }
 

diff --git a/src/clipdurationdialog.h b/src/clipdurationdialog.h
index 17a57d07577381261dbcb7e3f5872d041cf901b8..c53946041aad8474a67cc69a777f06af9813027a 100644 (file)
--- a/src/clipdurationdialog.h
+++ b/src/clipdurationdialog.h
@@ -48,9 +48,12 @@ private slots:
     void slotDurDown();
     void slotCropUp();
     void slotCropDown();
+    void slotEndUp();
+    void slotEndDown();
     void slotCheckDuration();
     void slotCheckStart();
     void slotCheckCrop();
+    void slotCheckEnd();
 
 private:
     Ui::ClipDurationDialog_UI m_view;

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index c437aa82d3505a0a88b98905999e795cea873ec7..01f922508b538786477ab8baa7d64d86b5f92910 100644 (file)
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -83,7 +83,9 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
     } else clip_thumb->setHidden(true);
 
     if (KdenliveSettings::frametimecode()) {
-        marker_position->setInputMask("000000000000");
+        QValidator *valid = new QIntValidator();
+        marker_position->setInputMask("");
+        marker_position->setValidator(valid);
         marker_position->setText(QString::number((int) t.time().frames(m_fps)));
     } else marker_position->setText(tc.getTimecode(t.time()));
 

diff --git a/src/positionedit.cpp b/src/positionedit.cpp
index 7a8208bdaebfad4301f3c28b69a346060162fa65..7c27845b93afaaee85e459d8caa6ffb651c3f9e2 100644 (file)
--- a/src/positionedit.cpp
+++ b/src/positionedit.cpp
@@ -31,7 +31,9 @@ PositionEdit::PositionEdit(const QString name, int pos, int min, int max, const
     connect(m_ui.krestrictedline, SIGNAL(editingFinished()), this, SLOT(slotUpdatePosition()));
     m_ui.horizontalSlider->setValue(pos);
     if (KdenliveSettings::frametimecode()) {
-        m_ui.krestrictedline->setInputMask("000000000000");
+        QValidator *valid = new QIntValidator();
+        m_ui.krestrictedline->setInputMask("");
+        m_ui.krestrictedline->setValidator(valid);
         m_ui.krestrictedline->setText(QString::number(pos));
     } else m_ui.krestrictedline->setText(m_tc.getTimecodeFromFrames(pos));
 }

diff --git a/src/widgets/clipdurationdialog_ui.ui b/src/widgets/clipdurationdialog_ui.ui
index 0d1044688bed83efa0a737c8f15ae25791cc1777..67115dd2653e08e7e5c2d7722f736bbacbfa16be 100644 (file)
--- a/src/widgets/clipdurationdialog_ui.ui
+++ b/src/widgets/clipdurationdialog_ui.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>226</width>
-    <height>169</height>
+    <height>213</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -242,7 +242,82 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0" colspan="2">
+   <item row="4" column="0">
+    <widget class="QLabel" name="end_label">
+     <property name="text">
+      <string>Crop end</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <widget class="KRestrictedLine" name="end_position">
+       <property name="inputMask">
+        <string>99:99:99:99; </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QToolButton" name="end_up">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>18</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+         <property name="arrowType">
+          <enum>Qt::UpArrow</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QToolButton" name="end_down">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>16777215</width>
+           <height>18</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="autoRaise">
+          <bool>true</bool>
+         </property>
+         <property name="arrowType">
+          <enum>Qt::DownArrow</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item row="5" column="0" colspan="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -255,7 +330,7 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0" colspan="2">
+   <item row="6" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>