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(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)));
KToolBar *toolbar = new KToolBar("statusToolBar", this, Qt::BottomToolBarArea);
toolbar->setMovable(false);
- m_toolGroup = new QActionGroup(this);
statusBar()->setStyleSheet(QString("QStatusBar QLabel {font-size:%1pt;} QStatusBar::item { border: 0px; font-size:%1pt;padding:0px; }").arg(statusBar()->font().pointSize()));
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
+ 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_insertEditTool->setEnabled(false);
+
+ QActionGroup *editGroup = new QActionGroup(this);
+ 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_overwriteEditTool, SIGNAL(toggled(bool)), this, SLOT(slotSetOverwriteMode(bool)));
+
+ toolbar->addSeparator();
+
+ // create tools buttons
m_buttonSelectTool = new KAction(KIcon("kdenlive-select-tool"), i18n("Selection tool"), this);
m_buttonSelectTool->setShortcut(i18nc("Selection tool shortcut", "s"));
toolbar->addAction(m_buttonSelectTool);
m_buttonSpacerTool->setCheckable(true);
m_buttonSpacerTool->setChecked(false);
- m_toolGroup->addAction(m_buttonSelectTool);
- m_toolGroup->addAction(m_buttonRazorTool);
- m_toolGroup->addAction(m_buttonSpacerTool);
- m_toolGroup->setExclusive(true);
+ QActionGroup *toolGroup = new QActionGroup(this);
+ toolGroup->addAction(m_buttonSelectTool);
+ toolGroup->addAction(m_buttonRazorTool);
+ toolGroup->addAction(m_buttonSpacerTool);
+ toolGroup->setExclusive(true);
toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly);
QWidget * actionWidget;
int max = toolbar->iconSizeDefault() + 2;
+ actionWidget = toolbar->widgetForAction(m_normalEditTool);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
+
+ actionWidget = toolbar->widgetForAction(m_insertEditTool);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
+
+ actionWidget = toolbar->widgetForAction(m_overwriteEditTool);
+ actionWidget->setMaximumWidth(max);
+ actionWidget->setMaximumHeight(max - 4);
+
actionWidget = toolbar->widgetForAction(m_buttonSelectTool);
actionWidget->setMaximumWidth(max);
actionWidget->setMaximumHeight(max - 4);
actionWidget->setMaximumHeight(max - 4);
toolbar->setStyleSheet(style1);
- connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *)));
+ connect(toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *)));
toolbar->addSeparator();
m_buttonFitZoom = new KAction(KIcon("zoom-fit-best"), i18n("Fit zoom to project"), this);
statusBar()->addPermanentWidget(m_timecodeFormat);
//statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 3);
+ 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);
connect(transcodeClip, SIGNAL(triggered(bool)), this, SLOT(slotTranscodeClip()));
KAction *markIn = collection->addAction("mark_in");
- markIn->setText(i18n("Set In Point"));
+ markIn->setText(i18n("Set Zone In"));
markIn->setShortcut(Qt::Key_I);
connect(markIn, SIGNAL(triggered(bool)), this, SLOT(slotSetInPoint()));
KAction *markOut = collection->addAction("mark_out");
- markOut->setText(i18n("Set Out Point"));
+ markOut->setText(i18n("Set Zone Out"));
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 *resizeStart = new KAction(KIcon(), i18n("Resize Item Start"), this);
+ collection->addAction("resize_timeline_clip_start", resizeStart);
+ resizeStart->setShortcut(Qt::Key_1);
+ connect(resizeStart, SIGNAL(triggered(bool)), this, SLOT(slotResizeItemStart()));
+
+ KAction *resizeEnd = new KAction(KIcon(), i18n("Resize Item End"), this);
+ collection->addAction("resize_timeline_clip_end", resizeEnd);
+ resizeEnd->setShortcut(Qt::Key_2);
+ connect(resizeEnd, SIGNAL(triggered(bool)), this, SLOT(slotResizeItemEnd()));
+
KAction* monitorSeekBackward = new KAction(KIcon("media-seek-backward"), i18n("Rewind"), this);
monitorSeekBackward->setShortcut(Qt::Key_J);
collection->addAction("monitor_seek_backward", monitorSeekBackward);
connect(monitorSeekBackward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewind()));
- KAction* trackUp = new KAction(KIcon(), i18n("Previous Track"), this);
- trackUp->setShortcut(Qt::Key_Up);
- collection->addAction("track_up", trackUp);
- connect(trackUp, SIGNAL(triggered(bool)), this, SLOT(slotTrackUp()));
-
- KAction* trackDown = new KAction(KIcon(), i18n("Next Track"), this);
- trackDown->setShortcut(Qt::Key_Down);
- collection->addAction("track_down", trackDown);
- connect(trackDown, SIGNAL(triggered(bool)), this, SLOT(slotTrackDown()));
-
KAction* monitorSeekBackwardOneFrame = new KAction(KIcon("media-skip-backward"), i18n("Rewind 1 Frame"), this);
monitorSeekBackwardOneFrame->setShortcut(Qt::Key_Left);
collection->addAction("monitor_seek_backward-one-frame", monitorSeekBackwardOneFrame);
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);
+ connect(selectTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotSelectTimelineClip()));
+
+ KAction* deselectTimelineClip = new KAction(KIcon("edit-select"), i18n("Deselect Clip"), this);
+ deselectTimelineClip->setShortcut(Qt::Key_Minus);
+ collection->addAction("deselect_timeline_clip", deselectTimelineClip);
+ connect(deselectTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeselectTimelineClip()));
+
+ KAction* selectAddTimelineClip = new KAction(KIcon("edit-select"), i18n("Add Clip To Selection"), this);
+ selectAddTimelineClip->setShortcut(Qt::ALT + Qt::Key_Plus);
+ collection->addAction("select_add_timeline_clip", selectAddTimelineClip);
+ connect(selectAddTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotSelectAddTimelineClip()));
+
+ KAction* selectTimelineTransition = new KAction(KIcon("edit-select"), i18n("Select Transition"), this);
+ selectTimelineTransition->setShortcut(Qt::SHIFT + Qt::Key_Plus);
+ collection->addAction("select_timeline_transition", selectTimelineTransition);
+ connect(selectTimelineTransition, SIGNAL(triggered(bool)), this, SLOT(slotSelectTimelineTransition()));
+
+ KAction* deselectTimelineTransition = new KAction(KIcon("edit-select"), i18n("Deselect Transition"), this);
+ deselectTimelineTransition->setShortcut(Qt::SHIFT + Qt::Key_Minus);
+ collection->addAction("deselect_timeline_transition", deselectTimelineTransition);
+ connect(deselectTimelineTransition, SIGNAL(triggered(bool)), this, SLOT(slotDeselectTimelineTransition()));
+
+ KAction* selectAddTimelineTransition = new KAction(KIcon("edit-select"), i18n("Add Transition To Selection"), this);
+ selectAddTimelineTransition->setShortcut(Qt::ALT + Qt::SHIFT + Qt::Key_Plus);
+ collection->addAction("select_add_timeline_transition", selectAddTimelineTransition);
+ connect(selectAddTimelineTransition, SIGNAL(triggered(bool)), this, SLOT(slotSelectAddTimelineTransition()));
+
KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this);
cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R);
collection->addAction("cut_timeline_clip", cutTimelineClip);
profileName = KdenliveSettings::default_profile();
projectFolder = KdenliveSettings::defaultprojectfolder();
} else {
- ProjectSettings *w = new ProjectSettings(NULL, projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this);
+ 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();
void MainWindow::slotEditProjectSettings()
{
QPoint p = m_activeDocument->getTracksCount();
- ProjectSettings *w = new ProjectSettings(m_projectList, p.x(), p.y(), m_activeDocument->projectFolder().path(), true, !m_activeDocument->isModified(), this);
+ ProjectSettings *w = new ProjectSettings(m_projectList, m_activeTimeline->projectView()->extractTransitionsLumas(), p.x(), p.y(), m_activeDocument->projectFolder().path(), true, !m_activeDocument->isModified(), this);
if (w->exec() == QDialog::Accepted) {
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) {
+ m_activeTimeline->projectView()->selectClip(true);
+ }
+}
+
+void MainWindow::slotSelectTimelineTransition()
+{
+ if (m_activeTimeline) {
+ m_activeTimeline->projectView()->selectTransition(true);
+ }
+}
+
+void MainWindow::slotDeselectTimelineClip()
+{
+ if (m_activeTimeline) {
+ m_activeTimeline->projectView()->selectClip(false, true);
+ }
+}
+
+void MainWindow::slotDeselectTimelineTransition()
+{
+ if (m_activeTimeline) {
+ m_activeTimeline->projectView()->selectTransition(false, true);
+ }
+}
+
+void MainWindow::slotSelectAddTimelineClip()
+{
+ if (m_activeTimeline) {
+ m_activeTimeline->projectView()->selectClip(true, true);
+ }
+}
+
+void MainWindow::slotSelectAddTimelineTransition()
+{
+ if (m_activeTimeline) {
+ m_activeTimeline->projectView()->selectTransition(true, true);
+ }
+}
+
void MainWindow::slotGroupClips()
{
if (m_activeTimeline) {
else if (action == m_buttonSpacerTool) slotSetTool(SPACERTOOL);
}
+void MainWindow::slotChangeEdit(QAction * action)
+{
+ if (!m_activeTimeline) return;
+ 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);
+}
+
void MainWindow::slotSetTool(PROJECTTOOL tool)
{
if (m_activeDocument && m_activeTimeline) {
{
if (m_clipMonitor->isActive()) {
m_clipMonitor->slotSetZoneStart();
- } else m_activeTimeline->projectView()->setInPoint();
+ } else m_projectMonitor->slotSetZoneStart();
+ //else m_activeTimeline->projectView()->setInPoint();
}
void MainWindow::slotSetOutPoint()
{
if (m_clipMonitor->isActive()) {
m_clipMonitor->slotSetZoneEnd();
- } else m_activeTimeline->projectView()->setOutPoint();
+ } else m_projectMonitor->slotSetZoneEnd();
+ // else m_activeTimeline->projectView()->setOutPoint();
+}
+
+void MainWindow::slotResizeItemStart()
+{
+ if (m_activeTimeline) m_activeTimeline->projectView()->setInPoint();
+}
+
+void MainWindow::slotResizeItemEnd()
+{
+ if (m_activeTimeline) m_activeTimeline->projectView()->setOutPoint();
}
void MainWindow::slotGetNewLumaStuff()
return pixmap;
}
-void MainWindow::slotTrackUp()
-{
- if (m_activeTimeline) m_activeTimeline->projectView()->slotTrackUp();
-}
-
-void MainWindow::slotTrackDown()
+void MainWindow::slotSwitchMonitors()
{
- if (m_activeTimeline) m_activeTimeline->projectView()->slotTrackDown();
+ m_monitorManager->slotSwitchMonitors();
+ if (m_projectMonitor->isActive()) m_activeTimeline->projectView()->setFocus();
+ else m_projectList->focusTree();
}
#include "mainwindow.moc"
projects / kdenlive / blobdiff