m_projectList->setRenderer(m_projectMonitor->render);
//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_projectList, SIGNAL(showClipProperties(QList <DocClipBase *>, QMap<QString, QString>)), this, SLOT(slotShowClipProperties(QList <DocClipBase *>, QMap<QString, QString>)));
+ connect(m_projectList, SIGNAL(getFileProperties(const QDomElement, const QString &, int, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement, const QString &, int, 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)));
QString style1 = "QToolBar { border: 0px } QToolButton { border-style: inset; border:1px solid #999999;border-radius: 3px;margin: 0px 3px;padding: 0px;} QToolButton:checked { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}";
// create edit mode buttons
- KAction *normaledit = new KAction(KIcon("kdenlive-normal-edit"), i18n("Normal mode"), this);
- normaledit->setShortcut(i18nc("Normal editing", "n"));
- toolbar->addAction(normaledit);
- normaledit->setCheckable(true);
- normaledit->setChecked(true);
-
- m_overwriteModeTool = new KAction(KIcon("kdenlive-overwrite-edit"), i18n("Overwrite mode"), this);
- m_overwriteModeTool->setShortcut(i18nc("Overwrite mode shortcut", "o"));
- toolbar->addAction(m_overwriteModeTool);
- m_overwriteModeTool->setCheckable(true);
- m_overwriteModeTool->setChecked(false);
-
- m_insertModeTool = new KAction(KIcon("kdenlive-insert-edit"), i18n("Insert mode"), this);
- m_insertModeTool->setShortcut(i18nc("Insert mode shortcut", "i"));
- toolbar->addAction(m_insertModeTool);
- m_insertModeTool->setCheckable(true);
- m_insertModeTool->setChecked(false);
+ m_normalEditTool = new KAction(KIcon("kdenlive-normal-edit"), i18n("Normal mode"), this);
+ m_normalEditTool->setShortcut(i18nc("Normal editing", "n"));
+ toolbar->addAction(m_normalEditTool);
+ m_normalEditTool->setCheckable(true);
+ m_normalEditTool->setChecked(true);
+
+ m_overwriteEditTool = new KAction(KIcon("kdenlive-overwrite-edit"), i18n("Overwrite mode"), this);
+ //m_overwriteEditTool->setShortcut(i18nc("Overwrite mode shortcut", "o"));
+ toolbar->addAction(m_overwriteEditTool);
+ m_overwriteEditTool->setCheckable(true);
+ m_overwriteEditTool->setChecked(false);
+
+ m_insertEditTool = new KAction(KIcon("kdenlive-insert-edit"), i18n("Insert mode"), this);
+ //m_insertEditTool->setShortcut(i18nc("Insert mode shortcut", "i"));
+ toolbar->addAction(m_insertEditTool);
+ m_insertEditTool->setCheckable(true);
+ m_insertEditTool->setChecked(false);
// not implemented yet
- m_insertModeTool->setEnabled(false);
+ m_insertEditTool->setEnabled(false);
QActionGroup *editGroup = new QActionGroup(this);
- editGroup->addAction(normaledit);
- editGroup->addAction(m_overwriteModeTool);
- editGroup->addAction(m_insertModeTool);
+ editGroup->addAction(m_normalEditTool);
+ editGroup->addAction(m_overwriteEditTool);
+ editGroup->addAction(m_insertEditTool);
editGroup->setExclusive(true);
connect(editGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeEdit(QAction *)));
- //connect(m_overwriteModeTool, SIGNAL(toggled(bool)), this, SLOT(slotSetOverwriteMode(bool)));
+ //connect(m_overwriteEditTool, SIGNAL(toggled(bool)), this, SLOT(slotSetOverwriteMode(bool)));
toolbar->addSeparator();
QWidget * actionWidget;
int max = toolbar->iconSizeDefault() + 2;
- actionWidget = toolbar->widgetForAction(normaledit);
+ actionWidget = toolbar->widgetForAction(m_normalEditTool);
actionWidget->setMaximumWidth(max);
actionWidget->setMaximumHeight(max - 4);
- actionWidget = toolbar->widgetForAction(m_insertModeTool);
+ actionWidget = toolbar->widgetForAction(m_insertEditTool);
actionWidget->setMaximumWidth(max);
actionWidget->setMaximumHeight(max - 4);
- actionWidget = toolbar->widgetForAction(m_overwriteModeTool);
+ actionWidget = toolbar->widgetForAction(m_overwriteEditTool);
actionWidget->setMaximumWidth(max);
actionWidget->setMaximumHeight(max - 4);
statusBar()->addPermanentWidget(m_timecodeFormat);
//statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 3);
- collection->addAction("normal_mode", normaledit);
- collection->addAction("overwrite_mode", m_overwriteModeTool);
- collection->addAction("insert_mode", m_insertModeTool);
+ collection->addAction("normal_mode", m_normalEditTool);
+ collection->addAction("overwrite_mode", m_overwriteEditTool);
+ collection->addAction("insert_mode", m_insertEditTool);
collection->addAction("select_tool", m_buttonSelectTool);
collection->addAction("razor_tool", m_buttonRazorTool);
collection->addAction("spacer_tool", m_buttonSpacerTool);
markOut->setShortcut(Qt::Key_O);
connect(markOut, SIGNAL(triggered(bool)), this, SLOT(slotSetOutPoint()));
+ KAction *switchMon = collection->addAction("switch_monitor");
+ switchMon->setText(i18n("Switch monitor"));
+ switchMon->setShortcut(Qt::Key_T);
+ connect(switchMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchMonitors()));
+
+ KAction *insertTree = collection->addAction("insert_project_tree");
+ insertTree->setText(i18n("Insert zone in project tree"));
+ insertTree->setShortcut(Qt::CTRL + Qt::Key_I);
+ connect(insertTree, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTree()));
+
+ KAction *insertTimeline = collection->addAction("insert_timeline");
+ insertTimeline->setText(i18n("Insert zone in timeline"));
+ insertTimeline->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_I);
+ connect(insertTimeline, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTimeline()));
+
KAction *resizeStart = new KAction(KIcon(), i18n("Resize Item Start"), this);
collection->addAction("resize_timeline_clip_start", resizeStart);
resizeStart->setShortcut(Qt::Key_1);
ungroupClip->setData("ungroup_clip");
connect(ungroupClip, SIGNAL(triggered(bool)), this, SLOT(slotUnGroupClips()));
+ KAction* insertOvertwrite = new KAction(KIcon(), i18n("Insert Clip Zone in Timeline (Overwrite)"), this);
+ insertOvertwrite->setShortcut(Qt::Key_V);
+ collection->addAction("overwrite_to_in_point", insertOvertwrite);
+ connect(insertOvertwrite, SIGNAL(triggered(bool)), this, SLOT(slotInsertClipOverwrite()));
+
KAction* selectTimelineClip = new KAction(KIcon("edit-select"), i18n("Select Clip"), this);
selectTimelineClip->setShortcut(Qt::Key_Plus);
collection->addAction("select_timeline_clip", selectTimelineClip);
delete w;
}
-void MainWindow::newFile(bool showProjectSettings)
+void MainWindow::newFile(bool showProjectSettings, bool force)
{
- if (!m_timelineArea->isEnabled()) return;
+ if (!m_timelineArea->isEnabled() && !force) return;
m_fileRevert->setEnabled(false);
QString profileName;
KUrl projectFolder;
QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
- if (!showProjectSettings && m_timelineArea->count() == 0) {
+ if (!showProjectSettings) {
if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
profileName = KdenliveSettings::default_profile();
projectFolder = KdenliveSettings::defaultprojectfolder();
ProjectSettings *w = new ProjectSettings(NULL, QStringList(), projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this);
if (w->exec() != QDialog::Accepted) return;
if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
- KdenliveSettings::setVideothumbnails(w->enableVideoThumbs());
- m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
- KdenliveSettings::setAudiothumbnails(w->enableAudioThumbs());
- m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
+ if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs();
+ if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs();
profileName = w->selectedProfile();
projectFolder = w->selectedFolder();
projectTracks = w->tracks();
delete w;
}
+ m_timelineArea->setEnabled(true);
+ m_projectList->setEnabled(true);
KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this);
doc->m_autosave = new KAutoSaveFile(KUrl(), doc);
bool ok;
if (!ok) {
m_timelineArea->setEnabled(false);
m_projectList->setEnabled(false);
- m_monitorManager->slotBlockMonitors();
- slotPreferences(6);
+ KMessageBox::sorry(this, i18n("Cannot open file %1.\nProject is corrupted.", url.path()));
+ slotGotProgressInfo(QString(), -1);
+ newFile(false, true);
return;
}
m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path());
QString profile = w->selectedProfile();
m_activeDocument->setProjectFolder(w->selectedFolder());
if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash));
+ if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs();
+ if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs();
if (m_activeDocument->profilePath() != profile) {
// Profile was changed
double dar = m_activeDocument->dar();
// Deselect current effect / transition
m_effectStack->slotClipItemSelected(NULL, 0);
m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
- m_clipMonitor->slotSetXml(NULL, 0);
+ m_clipMonitor->slotSetXml(NULL);
bool updateFps = m_activeDocument->setProfilePath(profile);
KdenliveSettings::setCurrent_profile(profile);
KdenliveSettings::setProject_fps(m_activeDocument->fps());
disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, 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->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int)));
+ disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int)));
disconnect(m_activeTimeline, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor()));
disconnect(m_activeTimeline, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int)));
disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int)));
m_projectList->setDocument(doc);
m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), doc->tracksList());
m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode());
- connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
+ connect(m_projectList, SIGNAL(clipSelected(DocClipBase *, QPoint)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint)));
connect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor()));
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(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int)));
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(durationChanged(int)), trackView, SLOT(setDuration(int)));
connect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), doc, SLOT(checkProjectClips()));
connect(trackView, SIGNAL(setZoom(int)), this, SLOT(slotSetZoom(int)));
connect(trackView->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
- connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int)));
+ connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int)));
connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
setCaption(doc->description(), doc->isModified());
m_saveAction->setEnabled(doc->isModified());
+ m_normalEditTool->setChecked(true);
m_activeDocument = doc;
m_activeTimeline->updateProjectFps();
m_activeDocument->checkProjectClips();
void MainWindow::slotUpdatePreviewSettings()
{
if (m_activeDocument) {
- m_clipMonitor->slotSetXml(NULL, 0);
+ m_clipMonitor->slotSetXml(NULL);
m_activeDocument->updatePreviewSettings();
}
}
}
}
+void MainWindow::slotInsertClipOverwrite()
+{
+ if (m_activeTimeline) {
+ QStringList data = m_clipMonitor->getZoneInfo();
+ m_activeTimeline->projectView()->insertZoneOverwrite(data, m_activeTimeline->inPoint());
+ }
+}
+
void MainWindow::slotSelectTimelineClip()
{
if (m_activeTimeline) {
}
}
+
+void MainWindow::slotShowClipProperties(QList <DocClipBase *> cliplist, QMap<QString, QString> commonproperties)
+{
+ ClipProperties dia(cliplist, commonproperties, this);
+ if (dia.exec() == QDialog::Accepted) {
+ QUndoCommand *command = new QUndoCommand();
+ command->setText(i18n("Edit clips"));
+ for (int i = 0; i < cliplist.count(); i++) {
+ DocClipBase *clip = cliplist.at(i);
+ new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true, command);
+ }
+ m_activeDocument->commandStack()->push(command);
+ for (int i = 0; i < cliplist.count(); i++) {
+ m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload());
+ }
+ }
+}
+
void MainWindow::customEvent(QEvent* e)
{
if (e->type() == QEvent::User) {
void MainWindow::slotChangeEdit(QAction * action)
{
if (!m_activeTimeline) return;
- if (action == m_overwriteModeTool) m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT);
- else if (action == m_insertModeTool) m_activeTimeline->projectView()->setEditMode(INSERTEDIT);
+ if (action == m_overwriteEditTool) m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT);
+ else if (action == m_insertEditTool) m_activeTimeline->projectView()->setEditMode(INSERTEDIT);
else m_activeTimeline->projectView()->setEditMode(NORMALEDIT);
}
return pixmap;
}
+void MainWindow::slotSwitchMonitors()
+{
+ m_monitorManager->slotSwitchMonitors();
+ if (m_projectMonitor->isActive()) m_activeTimeline->projectView()->setFocus();
+ else m_projectList->focusTree();
+}
+
+void MainWindow::slotInsertZoneToTree()
+{
+ if (!m_clipMonitor->isActive() || m_clipMonitor->activeClip() == NULL) return;
+ QStringList info = m_clipMonitor->getZoneInfo();
+ m_projectList->slotAddClipCut(info.at(0), info.at(1).toInt(), info.at(2).toInt());
+}
+
+void MainWindow::slotInsertZoneToTimeline()
+{
+ if (m_activeTimeline == NULL || m_clipMonitor->activeClip() == NULL) return;
+ QStringList info = m_clipMonitor->getZoneInfo();
+ m_activeTimeline->projectView()->insertClipCut(m_clipMonitor->activeClip(), info.at(1).toInt(), info.at(2).toInt());
+}
#include "mainwindow.moc"
projects / kdenlive / blobdiff