[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive/v0.8.2.1] src: Don't connect the project list twice
From: Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date: 2011-11-08 11:05:42
Message-ID: 20111108110542.52F43A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit 8b94a43aef0a8b33b4954cd7fb44d256d10fbae9 by Jean-Baptiste Mardelle.
Committed on 08/11/2011 at 12:00.
Pushed by mardelle into branch 'v0.8.2.1'.
Don't connect the project list twice
M +11 -17 src/mainwindow.cpp
http://commits.kde.org/kdenlive/8b94a43aef0a8b33b4954cd7fb44d256d10fbae9
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 829d116..edeb2e4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -209,9 +209,19 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, \
const QString & m_clipMonitorDock->setObjectName("clip_monitor");
m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), \
m_timelineArea); m_clipMonitorDock->setWidget(m_clipMonitor);
+
+ // Connect the project list
connect(m_projectList, SIGNAL(clipSelected(DocClipBase *, QPoint)), \
m_clipMonitor, SLOT(slotSetClipProducer(DocClipBase *, QPoint)));
connect(m_projectList, SIGNAL(raiseClipMonitor()), m_clipMonitor, \
SLOT(activateMonitor()));
-
+ connect(m_projectList, SIGNAL(loadingIsOver()), this, SLOT(slotElapsedTime()));
+ connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, \
SLOT(slotGotProgressInfo(const QString&, int))); + connect(m_projectList, \
SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus())); + \
connect(m_projectList, SIGNAL(clipNeedsReload(const QString&)),this, \
SLOT(slotUpdateClip(const QString &))); + connect(m_projectList, \
SIGNAL(updateProfile(const QString &)), this, SLOT(slotUpdateProjectProfile(const \
QString &))); + connect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), \
m_monitorManager, SLOT(slotRefreshCurrentMonitor())); + connect(m_projectList, \
SIGNAL(findInTimeline(const QString&)), this, SLOT(slotClipInTimeline(const \
QString&))); + connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_projectList, \
SLOT(slotUpdateClipCut(QPoint))); +
m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this);
m_projectMonitorDock->setObjectName("project_monitor");
m_projectMonitor = new Monitor("project", m_monitorManager, QString());
@@ -575,7 +585,6 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, \
const QString &
connect(m_projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, \
SLOT(refreshMonitor(bool)));
connect(m_clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, \
SLOT(refreshMonitor(bool)));
- //connect(m_monitorManager, SIGNAL(connectMonitors()), this, \
SLOT(slotConnectMonitors()));
connect(m_monitorManager, SIGNAL(checkColorScopes()), this, \
SLOT(slotUpdateColorScopes()));
connect(m_monitorManager, SIGNAL(clearScopes()), this, \
SLOT(slotClearColorScopes()));
connect(m_effectList, SIGNAL(addEffect(const QDomElement)), this, \
SLOT(slotAddEffect(const QDomElement))); @@ -2440,7 +2449,6 @@ void \
MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) \
//cha
disconnect(m_notesWidget, SIGNAL(textChanged()), m_activeDocument, \
SLOT(setModified()));
disconnect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeDocument, \
SLOT(setModified()));
disconnect(m_projectList, SIGNAL(projectModified()), m_activeDocument, \
SLOT(setModified()));
- disconnect(m_projectList, SIGNAL(updateProfile(const QString &)), this, \
SLOT(slotUpdateProjectProfile(const QString &)));
disconnect(m_projectMonitor->render, \
SIGNAL(refreshDocumentProducers(bool, bool)), m_activeDocument, \
SLOT(checkProjectClips(bool, bool)));
@@ -2476,14 +2484,10 @@ 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&, int)), \
this, SLOT(slotGotProgressInfo(const QString&, int)));
- disconnect(m_projectList, SIGNAL(updateRenderStatus()), this, \
SLOT(slotCheckRenderStatus()));
- disconnect(m_projectList, SIGNAL(clipNeedsReload(const QString&)), this, \
SLOT(slotUpdateClip(const QString &)));
disconnect(m_projectList, SIGNAL(refreshClip(const QString &)), \
m_activeTimeline->projectView(), SLOT(slotRefreshThumbs(const QString &))); \
m_effectStack->clear(); }
//m_activeDocument->setRenderer(NULL);
- disconnect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), \
m_monitorManager, SLOT(slotRefreshCurrentMonitor())); m_clipMonitor->stop();
}
KdenliveSettings::setCurrent_profile(doc->profilePath());
@@ -2493,17 +2497,11 @@ void MainWindow::connectDocument(TrackView *trackView, \
KdenliveDoc *doc) //cha m_projectList->setDocument(doc);
m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), \
doc->tracksList());
m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode());
- connect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), \
m_monitorManager, SLOT(slotRefreshCurrentMonitor()));
connect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), \
trackView->projectView(), SLOT(slotRefreshThumbs(const QString &, \
bool)));
- connect(m_projectList, SIGNAL(clipNeedsReload(const QString&)),this, \
SLOT(slotUpdateClip(const QString &)));
connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified()));
- connect(m_projectList, SIGNAL(updateProfile(const QString &)), this, \
SLOT(slotUpdateProjectProfile(const QString &)));
connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), \
trackView->projectView(), SLOT(clipNameChanged(const QString, const QString)));
- connect(m_projectList, SIGNAL(findInTimeline(const QString&)), this, \
SLOT(slotClipInTimeline(const QString&)));
-
-
//connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, \
SLOT(activateMonitor()));
connect(trackView, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int)));
connect(trackView, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int)));
@@ -2513,7 +2511,6 @@ void MainWindow::connectDocument(TrackView *trackView, \
KdenliveDoc *doc) //cha
connect(trackView->projectView(), SIGNAL(forceClipProcessing(const QString &)), \
m_projectList, SLOT(slotForceProcessing(const QString &)));
connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, \
SLOT(moveCursorPos(int)));
connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, \
SLOT(slotSetZone(QPoint)));
- connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_projectList, \
SLOT(slotUpdateClipCut(QPoint)));
connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), doc, \
SLOT(setModified()));
connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified()));
connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView, \
SLOT(setDuration(int))); @@ -2566,9 +2563,6 @@ 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(loadingIsOver()), this, SLOT(slotElapsedTime()));
- connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, \
SLOT(slotGotProgressInfo(const QString&, int)));
- connect(m_projectList, SIGNAL(updateRenderStatus()), this, \
SLOT(slotCheckRenderStatus()));
trackView->projectView()->setContextMenu(m_timelineContextMenu, \
m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup, \
(QMenu*)(factory()->container("marker_menu", this)));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic