X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fspacerdialog.cpp;h=19ff4f8596ec23957e374ff5fb8f8c36f8ca07cb;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=9427cf312050c988814fdf3331f3543042feafea;hpb=c42a026234a44a2d766e57bc64a6ac7bbd094000;p=kdenlive

diff --git a/src/spacerdialog.cpp b/src/spacerdialog.cpp
index 9427cf31..19ff4f85 100644
--- a/src/spacerdialog.cpp
+++ b/src/spacerdialog.cpp
@@ -26,63 +26,37 @@
 #include <KDebug>
 
 
-SpacerDialog::SpacerDialog(const GenTime duration, Timecode tc, int track, int trackNumber, QWidget * parent): QDialog(parent), m_tc(tc)
+SpacerDialog::SpacerDialog(const GenTime &duration, const Timecode &tc, int track, const QList<TrackInfo> &tracks, QWidget * parent) :
+    QDialog(parent),
+    m_in(tc)
 {
     setFont(KGlobalSettings::toolBarFont());
-    m_fps = m_tc.fps();
-    m_view.setupUi(this);
-    m_view.space_duration->setText(tc.getTimecode(duration, m_fps));
-    QStringList tracks;
-    tracks << i18n("All tracks");
-    for (int i = 0; i < trackNumber - 1; i++) {
-        tracks << QString::number(i);
+    setupUi(this);
+    inputLayout->addWidget(&m_in);
+    m_in.setValue(duration);
+
+    QStringList trackItems;
+    trackItems << i18n("All tracks");
+    for (int i = tracks.count() - 1; i >= 0; --i) {
+        if (!tracks.at(i).trackName.isEmpty())
+            trackItems << tracks.at(i).trackName + " (" + QString::number(i) + ')';
+        else
+            trackItems << QString::number(i);
     }
-    m_view.track_number->addItems(tracks);
-    m_view.track_number->setCurrentIndex(track);
-
-    connect(m_view.position_up, SIGNAL(clicked()), this, SLOT(slotTimeUp()));
-    connect(m_view.position_down, SIGNAL(clicked()), this, SLOT(slotTimeDown()));
+    track_number->addItems(trackItems);
+    track_number->setCurrentIndex(track);
 
     adjustSize();
 }
 
-SpacerDialog::~SpacerDialog()
-{
-}
-
-void SpacerDialog::slotTimeUp()
-{
-    int duration = m_tc.getFrameCount(m_view.space_duration->text(), m_fps);
-    duration ++;
-    m_view.space_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
-}
-
-void SpacerDialog::slotTimeDown()
+GenTime SpacerDialog::selectedDuration() const
 {
-    int duration = m_tc.getFrameCount(m_view.space_duration->text(), m_fps);
-    if (duration <= 0) return;
-    duration --;
-    m_view.space_duration->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
-}
-
-GenTime SpacerDialog::selectedDuration()
-{
-    return GenTime(m_tc.getFrameCount(m_view.space_duration->text(), m_fps), m_fps);
-}
-
-void SpacerDialog::wheelEvent(QWheelEvent * event)
-{
-    if (m_view.space_duration->underMouse()) {
-        if (event->delta() > 0)
-            slotTimeUp();
-        else
-            slotTimeDown();
-    }
+    return m_in.gentime();
 }
 
-int SpacerDialog::selectedTrack()
+int SpacerDialog::selectedTrack() const
 {
-    return m_view.track_number->currentIndex() - 1;
+    return track_number->currentIndex() - 1;
 }
 
 #include "spacerdialog.moc"