#ifndef NO_JOGSHUTTLE
m_jogProcess(NULL),
#endif /* NO_JOGSHUTTLE */
- m_findActivated(false),
- m_initialized(false)
+ m_findActivated(false)
{
// Create DBus interface
connect(&m_findTimer, SIGNAL(timeout()), this, SLOT(findTimeout()));
m_findTimer.setSingleShot(true);
+ // FIXME: the next call returns a newly allocated object, which leaks
initEffects::parseEffectFiles();
//initEffects::parseCustomEffectsFile();
m_monitorManager = new MonitorManager();
- projectListDock = new QDockWidget(i18n("Project Tree"), this);
- projectListDock->setObjectName("project_tree");
+ m_projectListDock = new QDockWidget(i18n("Project Tree"), this);
+ m_projectListDock->setObjectName("project_tree");
m_projectList = new ProjectList(this);
- projectListDock->setWidget(m_projectList);
- addDockWidget(Qt::TopDockWidgetArea, projectListDock);
+ m_projectListDock->setWidget(m_projectList);
+ addDockWidget(Qt::TopDockWidgetArea, m_projectListDock);
- effectListDock = new QDockWidget(i18n("Effect List"), this);
- effectListDock->setObjectName("effect_list");
+ m_effectListDock = new QDockWidget(i18n("Effect List"), this);
+ m_effectListDock->setObjectName("effect_list");
m_effectList = new EffectsListView();
//m_effectList = new KListWidget(this);
- effectListDock->setWidget(m_effectList);
- addDockWidget(Qt::TopDockWidgetArea, effectListDock);
+ m_effectListDock->setWidget(m_effectList);
+ addDockWidget(Qt::TopDockWidgetArea, m_effectListDock);
- effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
- effectStackDock->setObjectName("effect_stack");
- effectStack = new EffectStackView(this);
- effectStackDock->setWidget(effectStack);
- addDockWidget(Qt::TopDockWidgetArea, effectStackDock);
+ m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
+ m_effectStackDock->setObjectName("effect_stack");
+ m_effectStack = new EffectStackView(this);
+ m_effectStackDock->setWidget(m_effectStack);
+ addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock);
- transitionConfigDock = new QDockWidget(i18n("Transition"), this);
- transitionConfigDock->setObjectName("transition");
- transitionConfig = new TransitionSettings(this);
- transitionConfigDock->setWidget(transitionConfig);
- addDockWidget(Qt::TopDockWidgetArea, transitionConfigDock);
+ m_transitionConfigDock = new QDockWidget(i18n("Transition"), this);
+ m_transitionConfigDock->setObjectName("transition");
+ m_transitionConfig = new TransitionSettings(this);
+ m_transitionConfigDock->setWidget(m_transitionConfig);
+ addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock);
KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile());
m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)),
actionCollection());
readOptions();
- clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
- clipMonitorDock->setObjectName("clip_monitor");
+ m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
+ m_clipMonitorDock->setObjectName("clip_monitor");
m_clipMonitor = new Monitor("clip", m_monitorManager, this);
- clipMonitorDock->setWidget(m_clipMonitor);
- addDockWidget(Qt::TopDockWidgetArea, clipMonitorDock);
+ m_clipMonitorDock->setWidget(m_clipMonitor);
+ addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock);
//m_clipMonitor->stop();
- projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this);
- projectMonitorDock->setObjectName("project_monitor");
+ m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this);
+ m_projectMonitorDock->setObjectName("project_monitor");
m_projectMonitor = new Monitor("project", m_monitorManager, this);
- projectMonitorDock->setWidget(m_projectMonitor);
- addDockWidget(Qt::TopDockWidgetArea, projectMonitorDock);
+ m_projectMonitorDock->setWidget(m_projectMonitor);
+ addDockWidget(Qt::TopDockWidgetArea, m_projectMonitorDock);
- recMonitorDock = new QDockWidget(i18n("Record Monitor"), this);
- recMonitorDock->setObjectName("record_monitor");
+ m_recMonitorDock = new QDockWidget(i18n("Record Monitor"), this);
+ m_recMonitorDock->setObjectName("record_monitor");
m_recMonitor = new RecMonitor("record", this);
- recMonitorDock->setWidget(m_recMonitor);
- addDockWidget(Qt::TopDockWidgetArea, recMonitorDock);
+ m_recMonitorDock->setWidget(m_recMonitor);
+ addDockWidget(Qt::TopDockWidgetArea, m_recMonitorDock);
connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int)));
- undoViewDock = new QDockWidget(i18n("Undo History"), this);
- undoViewDock->setObjectName("undo_history");
+ m_undoViewDock = new QDockWidget(i18n("Undo History"), this);
+ m_undoViewDock->setObjectName("undo_history");
m_undoView = new QUndoView(this);
m_undoView->setCleanIcon(KIcon("edit-clear"));
m_undoView->setEmptyLabel(i18n("Clean"));
- undoViewDock->setWidget(m_undoView);
+ m_undoViewDock->setWidget(m_undoView);
m_undoView->setGroup(m_commandStack);
- addDockWidget(Qt::TopDockWidgetArea, undoViewDock);
+ addDockWidget(Qt::TopDockWidgetArea, m_undoViewDock);
//overviewDock = new QDockWidget(i18n("Project Overview"), this);
//overviewDock->setObjectName("project_overview");
setupActions();
//tabifyDockWidget(projectListDock, effectListDock);
- tabifyDockWidget(projectListDock, effectStackDock);
- tabifyDockWidget(projectListDock, transitionConfigDock);
+ tabifyDockWidget(m_projectListDock, m_effectStackDock);
+ tabifyDockWidget(m_projectListDock, m_transitionConfigDock);
//tabifyDockWidget(projectListDock, undoViewDock);
- tabifyDockWidget(clipMonitorDock, projectMonitorDock);
- tabifyDockWidget(clipMonitorDock, recMonitorDock);
+ tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock);
+ tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock);
setCentralWidget(m_timelineArea);
newEffect->addMenu(videoEffectsMenu);
newEffect->addMenu(audioEffectsMenu);
newEffect->addMenu(m_customEffectsMenu);
- effectStack->setMenu(newEffect);
+ m_effectStack->setMenu(newEffect);
QMenu *viewMenu = static_cast<QMenu*>(factory()->container("dockwindows", this));
m_timelineContextTransitionMenu->addAction(actionCollection()->action("auto_transition"));
- connect(projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool)));
- connect(clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool)));
+ 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(raiseClipMonitor(bool)), this, SLOT(slotRaiseMonitor(bool)));
connect(m_effectList, SIGNAL(addEffect(QDomElement)), this, SLOT(slotAddEffect(QDomElement)));
#ifndef NO_JOGSHUTTLE
activateShuttleDevice();
#endif /* NO_JOGSHUTTLE */
- projectListDock->raise();
+ m_projectListDock->raise();
}
void MainWindow::queryQuit()
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;
QMenu *addMenu = static_cast<QMenu*>(factory()->container("generators", this));
ClipGenerator *iGenerator = qobject_cast<ClipGenerator *>(plugin);
if (iGenerator)
- addToMenu(plugin, iGenerator->generators(), addMenu, SLOT(generateClip()),
+ addToMenu(plugin, iGenerator->generators(KdenliveSettings::producerslist()), addMenu, SLOT(generateClip()),
NULL);
}
#ifndef NO_JOGSHUTTLE
void MainWindow::activateShuttleDevice()
{
- if (m_jogProcess) delete m_jogProcess;
+ delete m_jogProcess;
m_jogProcess = NULL;
if (KdenliveSettings::enableshuttle() == false) return;
m_jogProcess = new JogShuttle(KdenliveSettings::shuttledevice());
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)
{
- if (clipMonitor) clipMonitorDock->raise();
- else projectMonitorDock->raise();
+ if (clipMonitor) m_clipMonitorDock->raise();
+ 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 &)));
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 &)));
void MainWindow::slotAdjustClipMonitor()
{
- clipMonitorDock->updateGeometry();
- clipMonitorDock->adjustSize();
+ m_clipMonitorDock->updateGeometry();
+ m_clipMonitorDock->adjustSize();
m_clipMonitor->resetSize();
}
void MainWindow::slotAdjustProjectMonitor()
{
- projectMonitorDock->updateGeometry();
- projectMonitorDock->adjustSize();
+ m_projectMonitorDock->updateGeometry();
+ m_projectMonitorDock->adjustSize();
m_projectMonitor->resetSize();
}
m_timecodeFormat->addItem(i18n("hh:mm:ss::ff"));
m_timecodeFormat->addItem(i18n("Frames"));
- statusProgressBar = new QProgressBar(this);
- statusProgressBar->setMinimum(0);
- statusProgressBar->setMaximum(100);
- statusProgressBar->setMaximumWidth(150);
- statusProgressBar->setVisible(false);
+ m_statusProgressBar = new QProgressBar(this);
+ m_statusProgressBar->setMinimum(0);
+ m_statusProgressBar->setMaximum(100);
+ m_statusProgressBar->setMaximumWidth(150);
+ m_statusProgressBar->setVisible(false);
QWidget *w = new QWidget;
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 *)));
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);
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);
statusBar()->addWidget(m_messageLabel, 10);
- statusBar()->addWidget(statusProgressBar, 0);
+ statusBar()->addWidget(m_statusProgressBar, 0);
statusBar()->addPermanentWidget(w);
statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS);
statusBar()->addPermanentWidget(m_timecodeFormat);
void MainWindow::slotRunWizard()
{
- Wizard *w = new Wizard(this);
+ Wizard *w = new Wizard(false, this);
if (w->exec() == QDialog::Accepted && w->isOk()) {
w->adjustSettings();
}
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;
delete w;
if (m_timelineArea->count() == 0) {
m_activeDocument = NULL;
- effectStack->clear();
- transitionConfig->slotTransitionItemSelected(NULL, false);
+ m_effectStack->clear();
+ m_transitionConfig->slotTransitionItemSelected(NULL, false);
}
}
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);
}
{
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());
}
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);
}
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();
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);
{
//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) {
disconnect(m_activeDocument, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &)));
disconnect(m_activeDocument, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &)));
disconnect(m_activeDocument, SIGNAL(deleteTimelineClip(const QString &)), m_activeTimeline, SLOT(slotDeleteClip(const QString &)));
- disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
+ disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView()));
- disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool)));
+ disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool)));
disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *)));
disconnect(m_zoomSlider, SIGNAL(valueChanged(int)), m_activeTimeline, SLOT(slotChangeZoom(int)));
disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int)));
disconnect(m_activeTimeline, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int)));
disconnect(m_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool)));
- disconnect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
- disconnect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
- disconnect(effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool)));
- disconnect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
- disconnect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
- disconnect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
- disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
- disconnect(transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int)));
+ disconnect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
+ disconnect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
+ disconnect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool)));
+ disconnect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
+ disconnect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
+ disconnect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+ disconnect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
+ disconnect(m_transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int)));
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()));
- effectStack->clear();
+ m_effectStack->clear();
}
//m_activeDocument->setRenderer(NULL);
disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
KdenliveSettings::setProject_fps(doc->fps());
m_monitorManager->resetProfiles(doc->timecode());
m_projectList->setDocument(doc);
- transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber());
- effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode());
+ m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber());
+ m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode());
connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified()));
connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString)));
connect(doc, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated()));
- connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
+ connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView()));
- connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool)));
+ connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool)));
connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *)));
m_zoomSlider->setValue(doc->zoom());
connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int)));
connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int)));
- connect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
- connect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
- connect(effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool)));
- connect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
- connect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
- connect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
- connect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
- connect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+ connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
+ connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
+ connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool)));
+ connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
+ connect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
+ connect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
+ connect(m_transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
+ connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int)));
void MainWindow::slotDeleteTimelineClip()
{
- if (QApplication::focusWidget()->parentWidget()->parentWidget() == projectListDock) m_projectList->slotRemoveClip();
+ if (QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) m_projectList->slotRemoveClip();
else if (m_activeTimeline) {
m_activeTimeline->projectView()->deleteSelectedClips();
}
void MainWindow::slotGotProgressInfo(const QString &message, int progress)
{
- statusProgressBar->setValue(progress);
+ m_statusProgressBar->setValue(progress);
if (progress >= 0) {
if (!message.isEmpty()) m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message);
- statusProgressBar->setVisible(true);
+ m_statusProgressBar->setVisible(true);
} else {
m_messageLabel->setMessage(QString(), DefaultMessage);
- statusProgressBar->setVisible(false);
+ m_statusProgressBar->setVisible(false);
}
}
}
void MainWindow::slotActivateEffectStackView()
{
- effectStack->raiseWindow(effectStackDock);
+ m_effectStack->raiseWindow(m_effectStackDock);
}
void MainWindow::slotActivateTransitionView(Transition *t)
{
- if (t) transitionConfig->raiseWindow(transitionConfigDock);
+ if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock);
}
void MainWindow::slotSnapRewind()
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"));
}
{
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));
}
}