Fixed Frensh spacing and a typo.

[kdenlive] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 382a7ce31be1034fde1e13be3b485079ded61807..a4667f0b0498cfaeda6b1952ad41329824dfd49d 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -384,11 +384,13 @@ bool MainWindow::queryClose()
     saveOptions();
     if (m_monitorManager) m_monitorManager->stopActiveMonitor();
     if (m_activeDocument && m_activeDocument->isModified()) {
-        switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) {
+        switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
         case KMessageBox::Yes :
             // save document here. If saving fails, return false;
             return saveFile();
         case KMessageBox::No :
+            // User does not want to save the changes, clear recovery files
+            m_activeDocument->m_autosave->resize(0);
             return true;
         default: // cancel
             return false;
@@ -566,8 +568,7 @@ void MainWindow::slotAddEffect(QDomElement effect, GenTime pos, int track)
         kDebug() << "--- ERROR, TRYING TO APPEND NULL EFFECT";
         return;
     }
-    TrackView *currentTimeLine = (TrackView *) m_timelineArea->currentWidget();
-    currentTimeLine->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track);
+    m_activeTimeline->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track);
 }
 
 void MainWindow::slotRaiseMonitor(bool clipMonitor)
@@ -576,17 +577,17 @@ void MainWindow::slotRaiseMonitor(bool clipMonitor)
     else m_projectMonitorDock->raise();
 }
 
-void MainWindow::slotSetClipDuration(const QString &id, int duration)
+void MainWindow::slotUpdateClip(const QString &id)
 {
     if (!m_activeDocument) return;
-    m_activeDocument->setProducerDuration(id, duration);
+    m_activeTimeline->projectView()->slotUpdateClip(id);
 }
 
 void MainWindow::slotConnectMonitors()
 {
 
     m_projectList->setRenderer(m_projectMonitor->render);
-    connect(m_projectList, SIGNAL(receivedClipDuration(const QString &, int)), this, SLOT(slotSetClipDuration(const QString &, int)));
+    connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &)));
     connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *)));
     connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, const QString &, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &, bool)));
     connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &)));
@@ -667,15 +668,15 @@ void MainWindow::setupActions()
     QWidget * actionWidget;
     actionWidget = toolbar->widgetForAction(m_buttonSelectTool);
     actionWidget->setMaximumWidth(24);
-    actionWidget->setMinimumHeight(17);
+    actionWidget->setMinimumHeight(18);
 
     actionWidget = toolbar->widgetForAction(m_buttonRazorTool);
     actionWidget->setMaximumWidth(24);
-    actionWidget->setMinimumHeight(17);
+    actionWidget->setMinimumHeight(18);
 
     actionWidget = toolbar->widgetForAction(m_buttonSpacerTool);
     actionWidget->setMaximumWidth(24);
-    actionWidget->setMinimumHeight(17);
+    actionWidget->setMinimumHeight(18);
 
     toolbar->setStyleSheet(style1);
     connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *)));
@@ -688,7 +689,7 @@ void MainWindow::setupActions()
 
     actionWidget = toolbar->widgetForAction(m_buttonFitZoom);
     actionWidget->setMaximumWidth(24);
-    actionWidget->setMinimumHeight(17);
+    actionWidget->setMinimumHeight(18);
 
     m_zoomSlider = new QSlider(Qt::Horizontal, this);
     m_zoomSlider->setMaximum(13);
@@ -738,19 +739,19 @@ void MainWindow::setupActions()
 
     actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs);
     actionWidget->setMaximumWidth(24);
-    actionWidget->setMinimumHeight(17);
+    actionWidget->setMinimumHeight(18);
 
     actionWidget = toolbar->widgetForAction(m_buttonAudioThumbs);
     actionWidget->setMaximumWidth(24);
-    actionWidget->setMinimumHeight(17);
+    actionWidget->setMinimumHeight(18);
 
     actionWidget = toolbar->widgetForAction(m_buttonShowMarkers);
     actionWidget->setMaximumWidth(24);
-    actionWidget->setMinimumHeight(17);
+    actionWidget->setMinimumHeight(18);
 
     actionWidget = toolbar->widgetForAction(m_buttonSnap);
     actionWidget->setMaximumWidth(24);
-    actionWidget->setMinimumHeight(17);
+    actionWidget->setMinimumHeight(18);
 
     m_messageLabel = new StatusBarMessageLabel(this);
     m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
@@ -1247,7 +1248,7 @@ void MainWindow::closeCurrentDocument()
     TrackView *tabToClose = (TrackView *) w;
     KdenliveDoc *docToClose = tabToClose->document();
     if (docToClose && docToClose->isModified()) {
-        switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) {
+        switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
         case KMessageBox::Yes :
             // save document here. If saving fails, return false;
             if (saveFile() == false) return;
@@ -1310,7 +1311,7 @@ bool MainWindow::saveFileAs()
     QString outputFile = KFileDialog::getSaveFileName(KUrl(), mimetype);
     if (outputFile.isEmpty()) return false;
     if (QFile::exists(outputFile)) {
-        if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return false;
+        if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return false;
     }
     return saveFileAs(outputFile);
 }
@@ -1344,7 +1345,7 @@ void MainWindow::openLastFile()
 {
     KSharedConfigPtr config = KGlobal::config();
     KUrl::List urls = m_fileOpenRecent->urls();
-    //WARNING: this is buggy, we get a random url, not the last one. Bug in KRecentFileAction ?
+    //WARNING: this is buggy, we get a random url, not the last one. Bug in KRecentFileAction?
     if (urls.isEmpty()) newFile(false);
     else openFile(urls.last());
 }
@@ -1426,7 +1427,7 @@ void MainWindow::recoverFiles(QList<KAutoSaveFile *> staleFiles)
                   continue;
         }*/
         kDebug() << "// OPENING RECOVERY: " << stale->fileName() << "\nMANAGED: " << stale->managedFile().path();
-        // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile ?
+        // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile?
         if (!stale->fileName().endsWith(".lock")) doOpenFile(KUrl(stale->fileName()), stale);
         else KIO::NetAccess::del(KUrl(stale->fileName()), this);
     }
@@ -1492,7 +1493,7 @@ void MainWindow::parseProfiles(const QString &mltPath)
         KdenliveSettings::setRendererpath(rendererPath.path());
     }
 
-    kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath();
+    kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath();
 
     // Parse MLT profiles to build a list of available video formats
     if (profilesList.isEmpty()) parseProfiles();
@@ -1561,10 +1562,10 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const
     if (dest.isEmpty()) return;
     int in = 0;
     int out = 0;
-    TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
-    if (currentTab && zoneOnly) {
-        in = currentTab->inPoint();
-        out = currentTab->outPoint();
+
+    if (m_activeTimeline && zoneOnly) {
+        in = m_activeTimeline->inPoint();
+        out = m_activeTimeline->outPoint();
     }
     KTemporaryFile temp;
     temp.setAutoRemove(false);
@@ -1698,7 +1699,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
 {
     //m_projectMonitor->stop();
     m_closeAction->setEnabled(m_timelineArea->count() > 1);
-    kDebug() << "///////////////////   CONNECTING DOC TO PROJECT VIEW ////////////////";
+    kDebug() << "///////////////////   CONNECTING DOC TO PROJECT VIEW ////////////////";
     if (m_activeDocument) {
         if (m_activeDocument == doc) return;
         if (m_activeTimeline) {
@@ -2348,7 +2349,7 @@ void MainWindow::slotFind()
 void MainWindow::slotFindNext()
 {
     if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) {
-        statusBar()->showMessage(i18n("Found : %1", m_findString));
+        statusBar()->showMessage(i18n("Found: %1", m_findString));
     } else {
         statusBar()->showMessage(i18n("Reached end of project"));
     }
@@ -2359,10 +2360,10 @@ void MainWindow::findAhead()
 {
     if (m_activeTimeline && m_activeTimeline->projectView()->findString(m_findString)) {
         m_projectSearchNext->setEnabled(true);
-        statusBar()->showMessage(i18n("Found : %1", m_findString));
+        statusBar()->showMessage(i18n("Found: %1", m_findString));
     } else {
         m_projectSearchNext->setEnabled(false);
-        statusBar()->showMessage(i18n("Not found : %1", m_findString));
+        statusBar()->showMessage(i18n("Not found: %1", m_findString));
     }
 }