overviewDock = new QDockWidget(i18n("Project Overview"), this);
overviewDock->setObjectName("project_overview");
- m_overView = new CustomTrackView(NULL, NULL, this);
- overviewDock->setWidget(m_overView);
+ //m_overView = new CustomTrackView(NULL, NULL, this);
+ //overviewDock->setWidget(m_overView);
addDockWidget(Qt::TopDockWidgetArea, overviewDock);
setupActions();
tabifyDockWidget(clipMonitorDock, projectMonitorDock);
setCentralWidget(m_timelineArea);
- m_timecodeFormat = new KComboBox(this);
- 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);
- statusLabel = new QLabel(this);
-
- QWidget *w = new QWidget;
- timeline_buttons_ui.setupUi(w);
- timeline_buttons_ui.buttonVideo->setDown(KdenliveSettings::videothumbnails());
- timeline_buttons_ui.buttonAudio->setDown(KdenliveSettings::audiothumbnails());
- connect(timeline_buttons_ui.buttonVideo, SIGNAL(clicked()), this, SLOT(slotSwitchVideoThumbs()));
- connect(timeline_buttons_ui.buttonAudio, SIGNAL(clicked()), this, SLOT(slotSwitchAudioThumbs()));
- connect(timeline_buttons_ui.buttonFitZoom, SIGNAL(clicked()), this, SLOT(slotFitZoom()));
-
- statusBar()->insertPermanentWidget(0, statusProgressBar, 1);
- statusBar()->insertPermanentWidget(1, statusLabel, 1);
- statusBar()->insertPermanentWidget(ID_TIMELINE_BUTTONS, w);
- statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS);
- statusBar()->insertPermanentWidget(ID_TIMELINE_FORMAT, m_timecodeFormat);
- statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4);
-
- timeline_buttons_ui.buttonVideo->setIcon(KIcon("video-mpeg"));
- timeline_buttons_ui.buttonVideo->setToolTip(i18n("Show video thumbnails"));
- timeline_buttons_ui.buttonAudio->setIcon(KIcon("audio-mpeg"));
- timeline_buttons_ui.buttonAudio->setToolTip(i18n("Show audio thumbnails"));
- timeline_buttons_ui.buttonFitZoom->setIcon(KIcon("zoom-fit-best"));
- timeline_buttons_ui.buttonFitZoom->setToolTip(i18n("Fit zoom to project"));
-
setupGUI(Default, NULL /*"kdenliveui.rc"*/);
kDebug() << factory() << " " << factory()->container("video_effects_menu", this);
QAction *action;
QMenu *videoEffectsMenu = (QMenu*)(factory()->container("video_effects_menu", this));
QStringList effects = videoEffects.effectNames();
- foreach(QString name, effects) {
+ foreach(const QString &name, effects) {
action = new QAction(name, this);
action->setData(name);
videoEffectsMenu->addAction(action);
}
QMenu *audioEffectsMenu = (QMenu*)(factory()->container("audio_effects_menu", this));
effects = audioEffects.effectNames();
- foreach(QString name, effects) {
+ foreach(const QString &name, effects) {
action = new QAction(name, this);
action->setData(name);
audioEffectsMenu->addAction(action);
}
QMenu *customEffectsMenu = (QMenu*)(factory()->container("custom_effects_menu", this));
effects = customEffects.effectNames();
- foreach(QString name, effects) {
+ foreach(const QString &name, effects) {
action = new QAction(name, this);
action->setData(name);
customEffectsMenu->addAction(action);
m_timelineContextClipMenu = new QMenu(this);
m_timelineContextTransitionMenu = new QMenu(this);
- action = actionCollection()->action("delete_timeline_clip");
- m_timelineContextClipMenu->addAction(action);
+
+ QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this);
+ effects = transitions.effectNames();
+ foreach(const QString &name, effects) {
+ action = new QAction(name, this);
+ action->setData(name);
+ transitionsMenu->addAction(action);
+ }
+ connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *)));
+
+ m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip"));
+ m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip"));
+
+ QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this));
+ m_timelineContextClipMenu->addMenu(markersMenu);
+ m_timelineContextClipMenu->addMenu(transitionsMenu);
m_timelineContextClipMenu->addMenu(videoEffectsMenu);
m_timelineContextClipMenu->addMenu(audioEffectsMenu);
m_timelineContextClipMenu->addMenu(customEffectsMenu);
+ m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip"));
+
connect(projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool)));
connect(clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool)));
//connect(m_monitorManager, SIGNAL(connectMonitors()), this, SLOT(slotConnectMonitors()));
void MainWindow::slotConnectMonitors() {
m_projectList->setRenderer(m_clipMonitor->render);
- connect(m_projectList, SIGNAL(clipSelected(const QDomElement &)), m_clipMonitor, SLOT(slotSetXml(const QDomElement &)));
connect(m_projectList, SIGNAL(receivedClipDuration(int, int)), this, SLOT(slotSetClipDuration(int, int)));
connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *)));
connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, int)), m_clipMonitor->render, SLOT(getFileProperties(const QDomElement &, int)));
}
void MainWindow::setupActions() {
- KAction* clearAction = new KAction(this);
- clearAction->setText(i18n("Clear"));
- clearAction->setIcon(KIcon("document-new"));
- clearAction->setShortcut(Qt::CTRL + Qt::Key_W);
- actionCollection()->addAction("clear", clearAction);
- /*connect(clearAction, SIGNAL(triggered(bool)),
- textArea, SLOT(clear()));*/
-
- KAction* profilesAction = new KAction(this);
- profilesAction->setText(i18n("Manage Profiles"));
- profilesAction->setIcon(KIcon("document-new"));
+
+ m_timecodeFormat = new KComboBox(this);
+ 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);
+
+ QWidget *w = new QWidget;
+
+ QHBoxLayout *layout = new QHBoxLayout;
+ w->setLayout(layout);
+ layout->setContentsMargins(5, 0, 5, 0);
+ QToolBar *toolbar = new QToolBar("statusToolBar", this);
+
+
+ m_toolGroup = new QActionGroup(this);
+
+ QString style1 = "QToolButton { background-color: rgba(230, 230, 230, 20); border-style: inset; border:1px solid #666666;border-radius: 3px;margin: 0px 3px} QToolButton:checked { background-color: rgba(224, 0, 0, 100); border-style: inset; border:1px solid #666666;border-radius: 3px;}";
+
+ m_buttonSelectTool = toolbar->addAction(KIcon("kdenlive-select-tool"), i18n("Selection tool"));
+ m_buttonSelectTool->setCheckable(true);
+ m_buttonSelectTool->setChecked(true);
+
+ m_buttonRazorTool = toolbar->addAction(KIcon("edit-cut"), i18n("Razor tool"));
+ m_buttonRazorTool->setCheckable(true);
+ m_buttonRazorTool->setChecked(false);
+
+ m_toolGroup->addAction(m_buttonSelectTool);
+ m_toolGroup->addAction(m_buttonRazorTool);
+ m_toolGroup->setExclusive(true);
+ toolbar->setStyleSheet(style1);
+ connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *)));
+
+ toolbar->addSeparator();
+ m_buttonFitZoom = toolbar->addAction(KIcon("zoom-fit-best"), i18n("Fit zoom to project"));
+ m_buttonFitZoom->setCheckable(false);
+ connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom()));
+
+ m_zoomSlider = new QSlider(Qt::Horizontal, this);
+ m_zoomSlider->setMaximum(13);
+
+ m_zoomSlider->setMaximumWidth(150);
+ m_zoomSlider->setMinimumWidth(100);
+
+ const int contentHeight = QFontMetrics(w->font()).height() + 8;
+ QString style = "QSlider::groove:horizontal { border: 1px solid #999999;height: 8px }";
+ style.append("QSlider::handle:horizontal { background-color: white; border: 1px solid #999999;width: 8px;margin: -2px 0;border-radius: 3px; }");
+ m_zoomSlider->setStyleSheet(style);
+
+ //m_zoomSlider->setMaximumHeight(contentHeight);
+ //m_zoomSlider->height() + 5;
+ statusBar()->setMinimumHeight(contentHeight);
+
+
+ toolbar->addWidget(m_zoomSlider);
+
+ m_buttonVideoThumbs = toolbar->addAction(KIcon("video-mpeg"), i18n("Show video thumbnails"));
+ m_buttonVideoThumbs->setCheckable(true);
+ m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
+ connect(m_buttonVideoThumbs, SIGNAL(triggered()), this, SLOT(slotSwitchVideoThumbs()));
+
+ m_buttonAudioThumbs = toolbar->addAction(KIcon("audio-mpeg"), i18n("Show audio thumbnails"));
+ m_buttonAudioThumbs->setCheckable(true);
+ m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
+ connect(m_buttonAudioThumbs, SIGNAL(triggered()), this, SLOT(slotSwitchAudioThumbs()));
+
+ m_buttonShowMarkers = toolbar->addAction(KIcon("audio-mpeg"), i18n("Show markers comments"));
+ m_buttonShowMarkers->setCheckable(true);
+ m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers());
+ connect(m_buttonShowMarkers, SIGNAL(triggered()), this, SLOT(slotSwitchMarkersComments()));
+ layout->addWidget(toolbar);
+
+ m_messageLabel = new StatusBarMessageLabel(this);
+ m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
+
+ statusBar()->addWidget(m_messageLabel, 10);
+ statusBar()->addWidget(statusProgressBar, 0);
+ statusBar()->insertPermanentWidget(ID_TIMELINE_BUTTONS, w);
+ statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS);
+ statusBar()->insertPermanentWidget(ID_TIMELINE_FORMAT, m_timecodeFormat);
+ statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4);
+ m_messageLabel->hide();
+
+ actionCollection()->addAction("select_tool", m_buttonSelectTool);
+ actionCollection()->addAction("razor_tool", m_buttonRazorTool);
+
+ KAction* profilesAction = new KAction(KIcon("document-new"), i18n("Manage Profiles"), this);
actionCollection()->addAction("manage_profiles", profilesAction);
connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles()));
- KAction* projectAction = new KAction(this);
- projectAction->setText(i18n("Project Settings"));
- projectAction->setIcon(KIcon("document-new"));
+ KAction* projectAction = new KAction(KIcon("configure"), i18n("Project Settings"), this);
actionCollection()->addAction("project_settings", projectAction);
connect(projectAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProjectSettings()));
- KAction* projectRender = new KAction(this);
- projectRender->setText(i18n("Render Project"));
- projectRender->setIcon(KIcon("document-new"));
+ KAction* projectRender = new KAction(KIcon("media-record"), i18n("Render"), this);
actionCollection()->addAction("project_render", projectRender);
connect(projectRender, SIGNAL(triggered(bool)), this, SLOT(slotRenderProject()));
- KAction* monitorPlay = new KAction(this);
- monitorPlay->setText(i18n("Play"));
- monitorPlay->setIcon(KIcon("media-playback-start"));
+ KAction* monitorPlay = new KAction(KIcon("media-playback-start"), i18n("Play"), this);
monitorPlay->setShortcut(Qt::Key_Space);
actionCollection()->addAction("monitor_play", monitorPlay);
connect(monitorPlay, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlay()));
- KAction* monitorSeekBackward = new KAction(this);
- monitorSeekBackward->setText(i18n("Rewind"));
- monitorSeekBackward->setIcon(KIcon("media-seek-backward"));
+ KAction* monitorSeekBackward = new KAction(KIcon("media-seek-backward"), i18n("Rewind"), this);
monitorSeekBackward->setShortcut(Qt::Key_J);
actionCollection()->addAction("monitor_seek_backward", monitorSeekBackward);
connect(monitorSeekBackward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewind()));
- KAction* monitorSeekBackwardOneFrame = new KAction(this);
- monitorSeekBackwardOneFrame->setText(i18n("Rewind 1 Frame"));
- monitorSeekBackwardOneFrame->setIcon(KIcon("media-skip-backward"));
+ KAction* monitorSeekBackwardOneFrame = new KAction(KIcon("media-skip-backward"), i18n("Rewind 1 Frame"), this);
monitorSeekBackwardOneFrame->setShortcut(Qt::Key_Left);
actionCollection()->addAction("monitor_seek_backward-one-frame", monitorSeekBackwardOneFrame);
connect(monitorSeekBackwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewindOneFrame()));
- KAction* monitorSeekForward = new KAction(this);
- monitorSeekForward->setText(i18n("Forward"));
- monitorSeekForward->setIcon(KIcon("media-seek-forward"));
+ KAction* monitorSeekSnapBackward = new KAction(KIcon("media-seek-backward"), i18n("Go to Previous Snap Point"), this);
+ monitorSeekSnapBackward->setShortcut(Qt::ALT + Qt::Key_Left);
+ actionCollection()->addAction("monitor_seek_snap_backward", monitorSeekSnapBackward);
+ connect(monitorSeekSnapBackward, SIGNAL(triggered(bool)), this, SLOT(slotSnapRewind()));
+
+ KAction* monitorSeekForward = new KAction(KIcon("media-seek-forward"), i18n("Forward"), this);
monitorSeekForward->setShortcut(Qt::Key_L);
actionCollection()->addAction("monitor_seek_forward", monitorSeekForward);
connect(monitorSeekForward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForward()));
- KAction* monitorSeekForwardOneFrame = new KAction(this);
- monitorSeekForwardOneFrame->setText(i18n("Forward 1 Frame"));
- monitorSeekForwardOneFrame->setIcon(KIcon("media-skip-forward"));
+ KAction* monitorSeekForwardOneFrame = new KAction(KIcon("media-skip-forward"), i18n("Forward 1 Frame"), this);
monitorSeekForwardOneFrame->setShortcut(Qt::Key_Right);
actionCollection()->addAction("monitor_seek_forward-one-frame", monitorSeekForwardOneFrame);
connect(monitorSeekForwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForwardOneFrame()));
- KAction* deleteTimelineClip = new KAction(this);
- deleteTimelineClip->setText(i18n("Delete Clip"));
+ KAction* monitorSeekSnapForward = new KAction(KIcon("media-seek-forward"), i18n("Go to Next Snap Point"), this);
+ monitorSeekSnapForward->setShortcut(Qt::ALT + Qt::Key_Right);
+ actionCollection()->addAction("monitor_seek_snap_forward", monitorSeekSnapForward);
+ connect(monitorSeekSnapForward, SIGNAL(triggered(bool)), this, SLOT(slotSnapForward()));
+
+ KAction* deleteTimelineClip = new KAction(KIcon("edit-delete"), i18n("Delete Selected Item"), this);
deleteTimelineClip->setShortcut(Qt::Key_Delete);
- deleteTimelineClip->setIcon(KIcon("edit-delete"));
actionCollection()->addAction("delete_timeline_clip", deleteTimelineClip);
connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip()));
+ KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this);
+ cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R);
+ actionCollection()->addAction("cut_timeline_clip", cutTimelineClip);
+ connect(cutTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotCutTimelineClip()));
+
+ KAction* addClipMarker = new KAction(KIcon("bookmark-new"), i18n("Add Marker to Clip"), this);
+ actionCollection()->addAction("add_clip_marker", addClipMarker);
+ connect(addClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotAddClipMarker()));
+
+ KAction* deleteClipMarker = new KAction(KIcon("edit-delete"), i18n("Delete Marker from Clip"), this);
+ actionCollection()->addAction("delete_clip_marker", deleteClipMarker);
+ connect(deleteClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotDeleteClipMarker()));
+
+ KAction* editClipMarker = new KAction(KIcon("document-properties"), i18n("Edit Marker"), this);
+ actionCollection()->addAction("edit_clip_marker", editClipMarker);
+ connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker()));
+
KStandardAction::quit(this, SLOT(queryQuit()),
actionCollection());
void MainWindow::newFile() {
QString profileName;
+ KUrl projectFolder;
if (m_timelineArea->count() == 0) profileName = KdenliveSettings::default_profile();
else {
ProjectSettings *w = new ProjectSettings;
- w->exec();
+ if (w->exec() != QDialog::Accepted) return;
profileName = w->selectedProfile();
+ projectFolder = w->selectedFolder();
delete w;
}
MltVideoProfile prof = ProfilesDialog::getVideoProfile(profileName);
if (prof.width == 0) prof = ProfilesDialog::getVideoProfile("dv_pal");
- KdenliveDoc *doc = new KdenliveDoc(KUrl(), prof, m_commandStack);
+ KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, prof, m_commandStack, this);
TrackView *trackView = new TrackView(doc, this);
m_timelineArea->addTab(trackView, KIcon("kdenlive"), i18n("Untitled") + " / " + prof.description);
- if (m_timelineArea->count() == 1)
+ if (m_timelineArea->count() == 1) {
+ connectDocumentInfo(doc);
connectDocument(trackView, doc);
- else m_timelineArea->setTabBarHidden(false);
+ } else m_timelineArea->setTabBarHidden(false);
}
void MainWindow::activateDocument() {
TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
KdenliveDoc *currentDoc = currentTab->document();
+ connectDocumentInfo(currentDoc);
connectDocument(currentTab, currentDoc);
}
}
void MainWindow::saveFileAs(const QString &outputFileName) {
- m_projectMonitor->saveSceneList(outputFileName, m_activeDocument->documentInfoXml());
+ m_projectMonitor->saveSceneList(outputFileName, m_activeDocument->documentInfoXml(m_activeTimeline->projectView()->xmlInfo()));
m_activeDocument->setUrl(KUrl(outputFileName));
setCaption(m_activeDocument->description());
m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description());
}
void MainWindow::saveFileAs() {
- QString outputFile = KFileDialog::getSaveFileName();
+ QString outputFile = KFileDialog::getSaveFileName(KUrl(), "*.kdenlive|Kdenlive project files (*.kdenlive)");
if (QFile::exists(outputFile)) {
if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return;
}
}
void MainWindow::openFile() { //changed
- KUrl url = KFileDialog::getOpenUrl(KUrl(), "application/vnd.kde.kdenlive;*.kdenlive");
+ KUrl url = KFileDialog::getOpenUrl(KUrl(), "*.kdenlive|Kdenlive project files (*.kdenlive)\n*.westley|MLT project files (*.westley)");
if (url.isEmpty()) return;
m_fileOpenRecent->addUrl(url);
openFile(url);
//TODO: get video profile from url before opening it
MltVideoProfile prof = ProfilesDialog::getVideoProfile(KdenliveSettings::default_profile());
if (prof.width == 0) prof = ProfilesDialog::getVideoProfile("dv_pal");
- KdenliveDoc *doc = new KdenliveDoc(url, prof, m_commandStack);
+ KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), prof, m_commandStack, this);
+ connectDocumentInfo(doc);
TrackView *trackView = new TrackView(doc, this);
m_timelineArea->setCurrentIndex(m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description()));
m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path());
if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false);
+ slotGotProgressInfo(QString(), -1);
//connectDocument(trackView, doc);
}
void MainWindow::parseProfiles() {
//kdDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <<endl;
+
+ //KdenliveSettings::setDefaulttmpfolder();
if (KdenliveSettings::mltpath().isEmpty()) {
KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/"));
}
getUrl->exec();
KUrl mltPath = getUrl->selectedUrl();
delete getUrl;
- if (mltPath.isEmpty()) exit(1);
+ if (mltPath.isEmpty()) kapp->quit();
KdenliveSettings::setMltpath(mltPath.path());
QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
}
getUrl->exec();
KUrl rendererPath = getUrl->selectedUrl();
delete getUrl;
- if (rendererPath.isEmpty()) exit(1);
+ if (rendererPath.isEmpty()) kapp->quit();
KdenliveSettings::setRendererpath(rendererPath.path());
}
}
}
+void MainWindow::connectDocumentInfo(KdenliveDoc *doc) {
+ if (m_activeDocument) {
+ if (m_activeDocument == doc) return;
+ disconnect(m_activeDocument, SIGNAL(progressInfo(const QString &, int)), this, SLOT(slotGotProgressInfo(const QString &, int)));
+ }
+ connect(doc, SIGNAL(progressInfo(const QString &, int)), this, SLOT(slotGotProgressInfo(const QString &, int)));
+}
+
void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //changed
//m_projectMonitor->stop();
kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////";
disconnect(m_activeDocument, SIGNAL(addProjectFolder(const QString, int, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, int, bool, bool)));
disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(int)), m_projectList, SLOT(slotDeleteClip(int)));
disconnect(m_activeDocument, SIGNAL(updateClipDisplay(int)), m_projectList, SLOT(slotUpdateClip(int)));
+ disconnect(m_activeDocument, SIGNAL(refreshClipThumbnail(int)), m_projectList, SLOT(slotRefreshClipThumbnail(int)));
disconnect(m_activeDocument, SIGNAL(deletTimelineClip(int)), m_activeTimeline, SLOT(slotDeleteClip(int)));
- disconnect(m_activeDocument, SIGNAL(thumbsProgress(KUrl, int)), this, SLOT(slotGotProgressInfo(KUrl, int)));
disconnect(m_activeTimeline, SIGNAL(clipItemSelected(ClipItem*)), effectStack, SLOT(slotClipItemSelected(ClipItem*)));
+ disconnect(trackView, SIGNAL(clipItemSelected(ClipItem*)), this, SLOT(slotActivateEffectStackView()));
disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*)));
- disconnect(timeline_buttons_ui.zoom_slider, SIGNAL(valueChanged(int)), m_activeTimeline, SLOT(slotChangeZoom(int)));
+ disconnect(trackView, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView()));
+ disconnect(m_zoomSlider, SIGNAL(valueChanged(int)), m_activeTimeline, SLOT(slotChangeZoom(int)));
+ disconnect(trackView->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
disconnect(m_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool)));
disconnect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement)));
disconnect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
disconnect(effectStack, SIGNAL(changeEffectState(ClipItem*, QDomElement, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, QDomElement, bool)));
+ disconnect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
disconnect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
connect(doc, SIGNAL(addProjectFolder(const QString, int, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, int, bool, bool)));
connect(doc, SIGNAL(signalDeleteProjectClip(int)), m_projectList, SLOT(slotDeleteClip(int)));
connect(doc, SIGNAL(updateClipDisplay(int)), m_projectList, SLOT(slotUpdateClip(int)));
+ connect(doc, SIGNAL(refreshClipThumbnail(int)), m_projectList, SLOT(slotRefreshClipThumbnail(int)));
+
connect(doc, SIGNAL(deletTimelineClip(int)), trackView, SLOT(slotDeleteClip(int)));
- connect(doc, SIGNAL(thumbsProgress(KUrl, int)), this, SLOT(slotGotProgressInfo(KUrl, int)));
connect(doc, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool)));
+
+
connect(trackView, SIGNAL(clipItemSelected(ClipItem*)), effectStack, SLOT(slotClipItemSelected(ClipItem*)));
+ connect(trackView, SIGNAL(clipItemSelected(ClipItem*)), this, SLOT(slotActivateEffectStackView()));
connect(trackView, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*)));
- timeline_buttons_ui.zoom_slider->setValue(trackView->currentZoom());
- connect(timeline_buttons_ui.zoom_slider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int)));
+ connect(trackView, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView()));
+ m_zoomSlider->setValue(trackView->currentZoom());
+ connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int)));
connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn()));
connect(trackView->projectView(), SIGNAL(zoomOut()), this, SLOT(slotZoomOut()));
+ connect(trackView->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
+
+
connect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement)));
connect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
connect(effectStack, SIGNAL(changeEffectState(ClipItem*, QDomElement, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, QDomElement, 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(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
if (m_commandStack->isClean()) kDebug() << "//////////// UNDO STACK IS CLEAN";
else kDebug() << "//////////// UNDO STACK IS NOT CLEAN*******************";
- m_overView->setScene(trackView->projectScene());
+ //m_overView->setScene(trackView->projectScene());
//m_overView->scale(m_overView->width() / trackView->duration(), m_overView->height() / (50 * trackView->tracksNumber()));
//m_overView->fitInView(m_overView->itemAt(0, 50), Qt::KeepAspectRatio);
currentTab->projectView()->checkTrackHeight();
if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs();
}
- timeline_buttons_ui.buttonAudio->setDown(KdenliveSettings::audiothumbnails());
- timeline_buttons_ui.buttonVideo->setDown(KdenliveSettings::videothumbnails());
+ m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
+ m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
activateShuttleDevice();
}
if (currentTab) {
currentTab->refresh();
}
- timeline_buttons_ui.buttonVideo->setDown(KdenliveSettings::videothumbnails());
+ m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
}
void MainWindow::slotSwitchAudioThumbs() {
currentTab->projectView()->checkAutoScroll();
if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs();
}
- timeline_buttons_ui.buttonAudio->setDown(KdenliveSettings::audiothumbnails());
+ m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
}
+void MainWindow::slotSwitchMarkersComments() {
+ KdenliveSettings::setShowmarkers(!KdenliveSettings::showmarkers());
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+ if (currentTab) {
+ currentTab->refresh();
+ }
+ m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers());
+}
+
+
+
+
void MainWindow::slotDeleteTimelineClip() {
TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
if (currentTab) {
}
}
+void MainWindow::slotAddClipMarker() {
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+ if (currentTab) {
+ currentTab->projectView()->slotAddClipMarker();
+ }
+}
+
+void MainWindow::slotDeleteClipMarker() {
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+ if (currentTab) {
+ currentTab->projectView()->slotDeleteClipMarker();
+ }
+}
+
+void MainWindow::slotEditClipMarker() {
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+ if (currentTab) {
+ currentTab->projectView()->slotEditClipMarker();
+ }
+}
+
+void MainWindow::slotCutTimelineClip() {
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+ if (currentTab) {
+ currentTab->projectView()->cutSelectedClips();
+ }
+}
+
void MainWindow::slotAddProjectClip(KUrl url) {
if (m_activeDocument)
m_activeDocument->slotAddClipFile(url, QString());
}
+void MainWindow::slotAddTransition(QAction *result) {
+ if (!result) return;
+ QDomElement effect = transitions.getEffectByName(result->data().toString());
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+ if (currentTab) {
+ currentTab->projectView()->slotAddTransitionToSelectedClips(effect);
+ }
+}
+
void MainWindow::slotAddVideoEffect(QAction *result) {
if (!result) return;
QDomElement effect = videoEffects.getEffectByName(result->data().toString());
}
void MainWindow::slotZoomIn() {
- timeline_buttons_ui.zoom_slider->setValue(timeline_buttons_ui.zoom_slider->value() - 1);
+ m_zoomSlider->setValue(m_zoomSlider->value() - 1);
}
void MainWindow::slotZoomOut() {
- timeline_buttons_ui.zoom_slider->setValue(timeline_buttons_ui.zoom_slider->value() + 1);
+ m_zoomSlider->setValue(m_zoomSlider->value() + 1);
}
void MainWindow::slotFitZoom() {
TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
if (currentTab) {
- timeline_buttons_ui.zoom_slider->setValue(currentTab->fitZoom());
+ m_zoomSlider->setValue(currentTab->fitZoom());
}
}
-void MainWindow::slotGotProgressInfo(KUrl url, int progress) {
+void MainWindow::slotGotProgressInfo(const QString &message, int progress) {
statusProgressBar->setValue(progress);
- if (progress > 0) {
- statusLabel->setText(tr("Creating Audio Thumbs"));
+ if (progress >= 0) {
+ if (!message.isEmpty()) m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message);
statusProgressBar->setVisible(true);
} else {
- statusLabel->setText("");
+ m_messageLabel->setMessage(QString(), DefaultMessage);
statusProgressBar->setVisible(false);
}
}
void MainWindow::slotShowClipProperties(DocClipBase *clip) {
+ if (clip->clipType() == TEXT) {
+ m_activeDocument->editTextClip(clip->getProperty("xml"), clip->getId());
+ return;
+ }
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this);
+ connect(&dia, SIGNAL(addMarker(int, GenTime, QString)), currentTab->projectView(), SLOT(slotAddClipMarker(int, GenTime, QString)));
if (dia.exec() == QDialog::Accepted) {
m_projectList->slotUpdateClipProperties(dia.clipId(), dia.properties());
+ if (dia.needsTimelineRefresh()) {
+ // update clip occurences in timeline
+
+ currentTab->projectView()->slotUpdateClip(dia.clipId());
+ }
}
}
kDebug() << "RECIEVED JOG EVEMNT!!!";
}
}
+void MainWindow::slotActivateEffectStackView() {
+ effectStack->raiseWindow(effectStackDock);
+}
+
+void MainWindow::slotActivateTransitionView() {
+ transitionConfig->raiseWindow(transitionConfigDock);
+}
+
+void MainWindow::slotSnapRewind() {
+ if (m_monitorManager->projectMonitorFocused()) {
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+ currentTab->projectView()->slotSeekToPreviousSnap();
+ }
+}
+void MainWindow::slotSnapForward() {
+ if (m_monitorManager->projectMonitorFocused()) {
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+ currentTab->projectView()->slotSeekToNextSnap();
+ }
+}
+
+void MainWindow::slotChangeTool(QAction * action) {
+ if (action == m_buttonSelectTool) slotSetTool(SELECTTOOL);
+ else if (action == m_buttonRazorTool) slotSetTool(RAZORTOOL);
+}
+
+void MainWindow::slotSetTool(PROJECTTOOL tool) {
+ if (m_activeDocument) {
+ //m_activeDocument->setTool(tool);
+ TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
+ currentTab->projectView()->setTool(tool);
+ }
+}
#include "mainwindow.moc"
projects / kdenlive / blobdiff