Changing the timecode format in statur bar (from hh:mm:ss:ff to frames) now also...

[kdenlive] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 6fe15337650e5e536723d4ebde2c144d7995145d..8dde1eb817556b477f45f4872ce574051d78b8f5 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -328,7 +328,6 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste)));
 
     m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip"));
-    m_timelineContextClipMenu->addAction(actionCollection()->action("change_clip_speed"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip"));
@@ -381,8 +380,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
 
 void MainWindow::queryQuit()
 {
-    kDebug() << "----- SAVING CONFUIG";
     if (queryClose()) {
+        delete m_effectStack;
+        delete m_activeTimeline;
+        delete m_projectMonitor;
+        delete m_clipMonitor;
+        delete m_activeDocument;
         Mlt::Factory::close();
         kapp->quit();
     }
@@ -653,6 +656,8 @@ void MainWindow::setupActions()
     m_timecodeFormat = new KComboBox(this);
     m_timecodeFormat->addItem(i18n("hh:mm:ss::ff"));
     m_timecodeFormat->addItem(i18n("Frames"));
+    if (KdenliveSettings::frametimecode()) m_timecodeFormat->setCurrentIndex(1);
+    connect(m_timecodeFormat, SIGNAL(activated(int)), this, SLOT(slotUpdateTimecodeFormat(int)));
 
     m_statusProgressBar = new QProgressBar(this);
     m_statusProgressBar->setMinimum(0);
@@ -946,10 +951,10 @@ void MainWindow::setupActions()
     collection->addAction("delete_timeline_clip", deleteTimelineClip);
     connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip()));
 
-    KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this);
+    /*KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this);
     collection->addAction("change_clip_speed", editTimelineClipSpeed);
     editTimelineClipSpeed->setData("change_speed");
-    connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));
+    connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));*/
 
     KAction *stickTransition = collection->addAction("auto_transition");
     stickTransition->setData(QString("auto"));
@@ -1950,13 +1955,6 @@ void MainWindow::slotDeleteTimelineClip()
     }
 }
 
-void MainWindow::slotChangeClipSpeed()
-{
-    if (m_activeTimeline) {
-        m_activeTimeline->projectView()->changeClipSpeed();
-    }
-}
-
 void MainWindow::slotAddClipMarker()
 {
     DocClipBase *clip = NULL;
@@ -2291,7 +2289,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip)
             return;
         }
         QString path = clip->getProperty("resource");
-        TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_projectMonitor->render, this);
+        TitleWidget *dia_ui = new TitleWidget(KUrl(), m_activeDocument->timecode(), titlepath, m_projectMonitor->render, this);
         QDomDocument doc;
         doc.setContent(clip->getProperty("xmldata"));
         dia_ui->setXml(doc);
@@ -2299,6 +2297,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip)
             QRect rect = dia_ui->renderedRect();
             QMap <QString, QString> newprops;
             newprops.insert("xmldata", dia_ui->xml().toString());
+            newprops.insert("out", QString::number(dia_ui->duration()));
             newprops.insert("frame_size", QString::number(rect.width()) + 'x' + QString::number(rect.height()));
             EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
             m_activeDocument->commandStack()->push(command);
@@ -2694,7 +2693,7 @@ void MainWindow::slotTranscode(KUrl::List urls)
         params = action->data().toString();
     }
     if (urls.isEmpty()) return;
-    ClipTranscode *d = new ClipTranscode(urls, params, m_activeDocument->mltProfile());
+    ClipTranscode *d = new ClipTranscode(urls, params);
     connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
     d->show();
     //QProcess::startDetached("ffmpeg", parameters);
@@ -2798,4 +2797,14 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
     m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath);
 }
 
+void MainWindow::slotUpdateTimecodeFormat(int ix)
+{
+    KdenliveSettings::setFrametimecode(ix == 1);
+    m_clipMonitor->updateTimecodeFormat();
+    m_projectMonitor->updateTimecodeFormat();
+}
+
+
+
+
 #include "mainwindow.moc"