Improve handling of missing clips:

[kdenlive] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2bebce59a1a47c5a74151640106610f44fe6e46d..c96c644c6fe1ada14584612fdd2de188f23c39af 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -384,7 +384,7 @@ 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();
@@ -593,7 +593,7 @@ void MainWindow::slotConnectMonitors()
     connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &)));
     connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)));
 
-    connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &)));
+    connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &, bool)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &, bool)));
 
     connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &)));
 
@@ -668,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 *)));
@@ -689,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);
@@ -739,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);
@@ -1248,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;
@@ -1311,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);
 }
@@ -1345,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());
 }
@@ -1427,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);
     }
@@ -1493,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();
@@ -1699,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) {
@@ -2349,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"));
     }
@@ -2360,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));
     }
 }