reindent + nice (working) progress bar for document loading

[kdenlive] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e50ab6b3892064235656941c28263fb2b1ff4a29..1d9267991dd3c0ddeb698fa36757e7a46ab86e2c 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -377,8 +377,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
         QTimer::singleShot(500, this, SLOT(openFile()));
     } else if (KdenliveSettings::openlastproject()) {
         QTimer::singleShot(500, this, SLOT(openLastFile()));
-    }
-    else { //if (m_timelineArea->count() == 0) {
+    } else { //if (m_timelineArea->count() == 0) {
         newFile(false);
     }
 
@@ -1790,7 +1789,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
             disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
             disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int)));
             disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs()));
-            disconnect(m_projectList, SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
+            disconnect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
             m_effectStack->clear();
         }
         //m_activeDocument->setRenderer(NULL);
@@ -1859,7 +1858,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
     connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int)));
     connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs()));
-    connect(m_projectList, SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
+    connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
 
 
     trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup);