* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-
+#include <stdlib.h>
#include <QTextStream>
#include <QTimer>
#include <locale.h>
#include <ktogglefullscreenaction.h>
#include <KFileItem>
+#include <KNotification>
+#include <KNotifyConfigWidget>
#include <mlt++/Mlt.h>
#include "profilesdialog.h"
#include "projectsettings.h"
#include "events.h"
-#include "renderjob.h"
#include "clipmanager.h"
#include "projectlist.h"
#include "monitor.h"
#include "transitionsettings.h"
#include "renderwidget.h"
#include "renderer.h"
+#ifndef NO_JOGSHUTTLE
#include "jogshuttle.h"
+#endif /* NO_JOGSHUTTLE */
#include "clipproperties.h"
#include "wizard.h"
+#include "editclipcommand.h"
+#include "titlewidget.h"
+#include "markerdialog.h"
+#include "clipitem.h"
static const int ID_STATUS_MSG = 1;
static const int ID_EDITMODE_MSG = 2;
EffectsList MainWindow::customEffects;
EffectsList MainWindow::transitions;
-MainWindow::MainWindow(QWidget *parent)
+MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent)
: KXmlGuiWindow(parent),
- m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false), m_initialized(false) {
+ m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL),
+#ifndef NO_JOGSHUTTLE
+ m_jogProcess(NULL),
+#endif /* NO_JOGSHUTTLE */
+ m_findActivated(false), m_initialized(false) {
setlocale(LC_NUMERIC, "POSIX");
setFont(KGlobalSettings::toolBarFont());
- parseProfiles();
+ parseProfiles(MltPath);
m_commandStack = new QUndoGroup;
m_timelineArea = new KTabWidget(this);
m_timelineArea->setTabReorderingEnabled(true);
m_findTimer.setSingleShot(true);
initEffects::parseEffectFiles();
+ //initEffects::parseCustomEffectsFile();
+
m_monitorManager = new MonitorManager();
projectListDock = new QDockWidget(i18n("Project Tree"), this);
tabifyDockWidget(clipMonitorDock, recMonitorDock);
setCentralWidget(m_timelineArea);
- setupGUI(Default, NULL /*"kdenliveui.rc"*/);
- kDebug() << factory() << " " << factory()->container("video_effects_menu", this);
+ setupGUI();
+ //kDebug() << factory() << " " << factory()->container("video_effects_menu", this);
+
+ m_projectMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)));
+ m_clipMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)), static_cast<QMenu*>(factory()->container("marker_menu", this)));
// build effects menus
QAction *action;
QMenu *videoEffectsMenu = static_cast<QMenu*>(factory()->container("video_effects_menu", this));
- QStringList effects = videoEffects.effectNames();
- foreach(const QString &name, effects) {
- action = new QAction(name, this);
- action->setData(name);
+
+ QStringList effectInfo;
+ QMap<QString, QStringList> effectsList;
+ for (int ix = 0; ix < videoEffects.count(); ix++) {
+ effectInfo = videoEffects.effectIdInfo(ix);
+ effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
+ }
+
+ foreach(QStringList value, effectsList) {
+ action = new QAction(value.at(0), this);
+ action->setData(value);
videoEffectsMenu->addAction(action);
}
+
QMenu *audioEffectsMenu = static_cast<QMenu*>(factory()->container("audio_effects_menu", this));
- effects = audioEffects.effectNames();
- foreach(const QString &name, effects) {
- action = new QAction(name, this);
- action->setData(name);
+
+
+ effectsList.clear();
+ for (int ix = 0; ix < audioEffects.count(); ix++) {
+ effectInfo = audioEffects.effectIdInfo(ix);
+ effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
+ }
+
+ foreach(QStringList value, effectsList) {
+ action = new QAction(value.at(0), this);
+ action->setData(value);
audioEffectsMenu->addAction(action);
}
+
m_customEffectsMenu = static_cast<QMenu*>(factory()->container("custom_effects_menu", this));
- effects = customEffects.effectNames();
- foreach(const QString &name, effects) {
- action = new QAction(name, this);
- action->setData(name);
+
+ if (customEffects.isEmpty()) m_customEffectsMenu->setEnabled(false);
+ else m_customEffectsMenu->setEnabled(true);
+
+ effectsList.clear();
+ for (int ix = 0; ix < customEffects.count(); ix++) {
+ effectInfo = customEffects.effectIdInfo(ix);
+ effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
+ }
+
+ foreach(QStringList value, effectsList) {
+ action = new QAction(value.at(0), this);
+ action->setData(value);
m_customEffectsMenu->addAction(action);
}
+ QMenu *newEffect = new QMenu(this);
+ newEffect->addMenu(videoEffectsMenu);
+ newEffect->addMenu(audioEffectsMenu);
+ newEffect->addMenu(m_customEffectsMenu);
+ effectStack->setMenu(newEffect);
+
+
QMenu *viewMenu = static_cast<QMenu*>(factory()->container("dockwindows", this));
const QList<QAction *> viewActions = createPopupMenu()->actions();
viewMenu->insertActions(NULL, viewActions);
QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this);
- effects = transitions.effectNames();
- foreach(const QString &name, effects) {
- action = new QAction(name, this);
- action->setData(name);
+ QStringList effects = transitions.effectNames();
+
+ effectsList.clear();
+ for (int ix = 0; ix < transitions.count(); ix++) {
+ effectInfo = transitions.effectIdInfo(ix);
+ effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
+ }
+ foreach(QStringList value, effectsList) {
+ action = new QAction(value.at(0), this);
+ action->setData(value);
transitionsMenu->addAction(action);
}
connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *)));
+ m_timelineContextMenu->addAction(actionCollection()->action("insert_space"));
+ m_timelineContextMenu->addAction(actionCollection()->action("delete_space"));
m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste)));
m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip"));
m_timelineContextClipMenu->addMenu(transitionsMenu);
m_timelineContextClipMenu->addMenu(videoEffectsMenu);
m_timelineContextClipMenu->addMenu(audioEffectsMenu);
+ //TODO: re-enable custom effects menu when it is implemented
m_timelineContextClipMenu->addMenu(m_customEffectsMenu);
m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip"));
m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor);
slotConnectMonitors();
- setAutoSaveSettings();
-
- if (KdenliveSettings::openlastproject()) {
- openLastFile();
+ // Open or create a file. Command line argument passed in Url has
+ // precedence, then "openlastproject", then just a plain empty file.
+ // If opening Url fails, openlastproject will _not_ be used.
+ if (!Url.isEmpty()) {
+ openFile(Url);
} else {
- /*QList<KAutoSaveFile *> staleFiles = KAutoSaveFile::allStaleFiles();
- if (!staleFiles.isEmpty()) {
- if (KMessageBox::questionYesNo(this, i18n("Auto-saved files exist. Do you want to recover them now?"), i18n("File Recovery"), KGuiItem(i18n("Recover")), KGuiItem(i18n("Don't recover"))) == KMessageBox::Yes) {
- recoverFiles(staleFiles);
- }
- else newFile();
+ if (KdenliveSettings::openlastproject()) {
+ openLastFile();
}
- else*/
- newFile();
+ }
+ if (m_timelineArea->count() == 0) {
+ newFile(false);
}
+#ifndef NO_JOGSHUTTLE
activateShuttleDevice();
+#endif /* NO_JOGSHUTTLE */
projectListDock->raise();
}
//virtual
bool MainWindow::queryClose() {
saveOptions();
+ if (m_monitorManager) m_monitorManager->stopActiveMonitor();
if (m_activeDocument && m_activeDocument->isModified()) {
switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) {
case KMessageBox::Yes :
// save document here. If saving fails, return false;
- saveFile();
- return true;
+ return saveFile();
case KMessageBox::No :
return true;
default: // cancel
m_customEffectsMenu->clear();
const QStringList effects = customEffects.effectNames();
QAction *action;
+ if (effects.isEmpty()) m_customEffectsMenu->setEnabled(false);
+ else m_customEffectsMenu->setEnabled(true);
+
foreach(const QString &name, effects) {
action = new QAction(name, this);
action->setData(name);
m_effectList->reloadEffectList();
}
+#ifndef NO_JOGSHUTTLE
void MainWindow::activateShuttleDevice() {
if (m_jogProcess) delete m_jogProcess;
m_jogProcess = NULL;
break;
}
}
+#endif /* NO_JOGSHUTTLE */
+
+void MainWindow::configureNotifications() {
+ KNotifyConfigWidget::configure(this);
+}
void MainWindow::slotFullScreen() {
- //KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked());
+ KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked());
}
void MainWindow::slotAddEffect(QDomElement effect, GenTime pos, int track) {
return;
}
TrackView *currentTimeLine = (TrackView *) m_timelineArea->currentWidget();
- currentTimeLine->projectView()->slotAddEffect(effect, pos, track);
+ currentTimeLine->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track);
}
void MainWindow::slotRaiseMonitor(bool clipMonitor) {
connect(m_clipMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustClipMonitor()));
connect(m_projectMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustProjectMonitor()));
+
+ connect(m_clipMonitor, SIGNAL(saveZone(Render *, QPoint)), this, SLOT(slotSaveZone(Render *, QPoint)));
+ connect(m_projectMonitor, SIGNAL(saveZone(Render *, QPoint)), this, SLOT(slotSaveZone(Render *, QPoint)));
}
void MainWindow::slotAdjustClipMonitor() {
void MainWindow::setupActions() {
+ KActionCollection* collection = actionCollection();
m_timecodeFormat = new KComboBox(this);
m_timecodeFormat->addItem(i18n("hh:mm:ss::ff"));
m_timecodeFormat->addItem(i18n("Frames"));
QString style1 = "QToolButton {background-color: rgba(230, 230, 230, 220); 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;}";
- m_buttonSelectTool = toolbar->addAction(KIcon("kdenlive-select-tool"), i18n("Selection tool"));
+ m_buttonSelectTool = new KAction(KIcon("kdenlive-select-tool"), i18n("Selection tool"), this);
+ toolbar->addAction(m_buttonSelectTool);
m_buttonSelectTool->setCheckable(true);
m_buttonSelectTool->setChecked(true);
- m_buttonRazorTool = toolbar->addAction(KIcon("edit-cut"), i18n("Razor tool"));
+ m_buttonRazorTool = new KAction(KIcon("edit-cut"), i18n("Razor tool"), this);
+ toolbar->addAction(m_buttonRazorTool);
m_buttonRazorTool->setCheckable(true);
m_buttonRazorTool->setChecked(false);
+ m_buttonSpacerTool = new KAction(KIcon("kdenlive-spacer-tool"), i18n("Spacer tool"), this);
+ toolbar->addAction(m_buttonSpacerTool);
+ 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);
toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly);
actionWidget->setMaximumWidth(24);
actionWidget->setMinimumHeight(17);
+ actionWidget = toolbar->widgetForAction(m_buttonSpacerTool);
+ actionWidget->setMaximumWidth(24);
+ actionWidget->setMinimumHeight(17);
+
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 = new KAction(KIcon("zoom-fit-best"), i18n("Fit zoom to project"), this);
+ toolbar->addAction(m_buttonFitZoom);
m_buttonFitZoom->setCheckable(false);
connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom()));
m_zoomSlider->setMinimumWidth(100);
const int contentHeight = QFontMetrics(w->font()).height() + 8;
+
QString style = "QSlider::groove:horizontal { background-color: rgba(230, 230, 230, 220);border: 1px solid #999999;height: 8px;border-radius: 3px;margin-top:3px }";
style.append("QSlider::handle:horizontal { background-color: white; border: 1px solid #999999;width: 9px;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("kdenlive-show-videothumb"), i18n("Show video thumbnails"));
+ m_buttonVideoThumbs = new KAction(KIcon("kdenlive-show-videothumb"), i18n("Show video thumbnails"), this);
+ toolbar->addAction(m_buttonVideoThumbs);
m_buttonVideoThumbs->setCheckable(true);
m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
connect(m_buttonVideoThumbs, SIGNAL(triggered()), this, SLOT(slotSwitchVideoThumbs()));
- m_buttonAudioThumbs = toolbar->addAction(KIcon("kdenlive-show-audiothumb"), i18n("Show audio thumbnails"));
+ m_buttonAudioThumbs = new KAction(KIcon("kdenlive-show-audiothumb"), i18n("Show audio thumbnails"), this);
+ toolbar->addAction(m_buttonAudioThumbs);
m_buttonAudioThumbs->setCheckable(true);
m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
connect(m_buttonAudioThumbs, SIGNAL(triggered()), this, SLOT(slotSwitchAudioThumbs()));
- m_buttonShowMarkers = toolbar->addAction(KIcon("kdenlive-show-markers"), i18n("Show markers comments"));
+ m_buttonShowMarkers = new KAction(KIcon("kdenlive-show-markers"), i18n("Show markers comments"), this);
+ toolbar->addAction(m_buttonShowMarkers);
m_buttonShowMarkers->setCheckable(true);
m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers());
connect(m_buttonShowMarkers, SIGNAL(triggered()), this, SLOT(slotSwitchMarkersComments()));
- m_buttonSnap = toolbar->addAction(KIcon("kdenlive-snap"), i18n("Snap"));
+ m_buttonSnap = new KAction(KIcon("kdenlive-snap"), i18n("Snap"), this);
+ toolbar->addAction(m_buttonSnap);
m_buttonSnap->setCheckable(true);
m_buttonSnap->setChecked(KdenliveSettings::snaptopoints());
connect(m_buttonSnap, SIGNAL(triggered()), this, SLOT(slotSwitchSnap()));
statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4);
m_messageLabel->hide();
- actionCollection()->addAction("select_tool", m_buttonSelectTool);
- actionCollection()->addAction("razor_tool", m_buttonRazorTool);
+ collection->addAction("select_tool", m_buttonSelectTool);
+ collection->addAction("razor_tool", m_buttonRazorTool);
+ collection->addAction("spacer_tool", m_buttonSpacerTool);
+
+ collection->addAction("show_video_thumbs", m_buttonVideoThumbs);
+ collection->addAction("show_audio_thumbs", m_buttonAudioThumbs);
+ collection->addAction("show_markers", m_buttonShowMarkers);
+ collection->addAction("snap", m_buttonSnap);
+ collection->addAction("zoom_fit", m_buttonFitZoom);
+
+ KAction* zoomIn = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this);
+ collection->addAction("zoom_in", zoomIn);
+ connect(zoomIn, SIGNAL(triggered(bool)), this, SLOT(slotZoomIn()));
+ zoomIn->setShortcut(Qt::CTRL + Qt::Key_Plus);
- actionCollection()->addAction("show_video_thumbs", m_buttonVideoThumbs);
- actionCollection()->addAction("show_audio_thumbs", m_buttonAudioThumbs);
- actionCollection()->addAction("show_markers", m_buttonShowMarkers);
- actionCollection()->addAction("snap", m_buttonSnap);
- actionCollection()->addAction("zoom_fit", m_buttonFitZoom);
+ KAction* zoomOut = new KAction(KIcon("zoom-out"), i18n("Zoom Out"), this);
+ collection->addAction("zoom_out", zoomOut);
+ connect(zoomOut, SIGNAL(triggered(bool)), this, SLOT(slotZoomOut()));
+ zoomOut->setShortcut(Qt::CTRL + Qt::Key_Minus);
m_projectSearch = new KAction(KIcon("edit-find"), i18n("Find"), this);
- actionCollection()->addAction("project_find", m_projectSearch);
+ collection->addAction("project_find", m_projectSearch);
connect(m_projectSearch, SIGNAL(triggered(bool)), this, SLOT(slotFind()));
m_projectSearch->setShortcut(Qt::Key_Slash);
m_projectSearchNext = new KAction(KIcon("go-down-search"), i18n("Find Next"), this);
- actionCollection()->addAction("project_find_next", m_projectSearchNext);
+ collection->addAction("project_find_next", m_projectSearchNext);
connect(m_projectSearchNext, SIGNAL(triggered(bool)), this, SLOT(slotFindNext()));
m_projectSearchNext->setShortcut(Qt::Key_F3);
m_projectSearchNext->setEnabled(false);
KAction* profilesAction = new KAction(KIcon("document-new"), i18n("Manage Profiles"), this);
- actionCollection()->addAction("manage_profiles", profilesAction);
+ collection->addAction("manage_profiles", profilesAction);
connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles()));
KAction* projectAction = new KAction(KIcon("configure"), i18n("Project Settings"), this);
- actionCollection()->addAction("project_settings", projectAction);
+ collection->addAction("project_settings", projectAction);
connect(projectAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProjectSettings()));
KAction* projectRender = new KAction(KIcon("media-record"), i18n("Render"), this);
- actionCollection()->addAction("project_render", projectRender);
+ collection->addAction("project_render", projectRender);
+ projectRender->setShortcut(Qt::CTRL + Qt::Key_Return);
connect(projectRender, SIGNAL(triggered(bool)), this, SLOT(slotRenderProject()));
KAction* monitorPlay = new KAction(KIcon("media-playback-start"), i18n("Play"), this);
- monitorPlay->setShortcut(Qt::Key_Space);
- actionCollection()->addAction("monitor_play", monitorPlay);
+ KShortcut playShortcut;
+ playShortcut.setPrimary(Qt::Key_Space);
+ playShortcut.setAlternate(Qt::Key_K);
+ monitorPlay->setShortcut(playShortcut);
+ collection->addAction("monitor_play", monitorPlay);
connect(monitorPlay, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlay()));
+ KAction *markIn = collection->addAction("mark_in");
+ markIn->setText(i18n("Set In Point"));
+ 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->setShortcut(Qt::Key_O);
+ connect(markOut, SIGNAL(triggered(bool)), this, SLOT(slotSetOutPoint()));
+
KAction* monitorSeekBackward = new KAction(KIcon("media-seek-backward"), i18n("Rewind"), this);
monitorSeekBackward->setShortcut(Qt::Key_J);
- actionCollection()->addAction("monitor_seek_backward", monitorSeekBackward);
+ collection->addAction("monitor_seek_backward", monitorSeekBackward);
connect(monitorSeekBackward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewind()));
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);
+ collection->addAction("monitor_seek_backward-one-frame", monitorSeekBackwardOneFrame);
connect(monitorSeekBackwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewindOneFrame()));
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);
+ collection->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);
+ collection->addAction("monitor_seek_forward", monitorSeekForward);
connect(monitorSeekForward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForward()));
KAction* clipStart = new KAction(KIcon("media-seek-backward"), i18n("Go to Clip Start"), this);
clipStart->setShortcut(Qt::Key_Home);
- actionCollection()->addAction("seek_clip_start", clipStart);
+ collection->addAction("seek_clip_start", clipStart);
connect(clipStart, SIGNAL(triggered(bool)), this, SLOT(slotClipStart()));
KAction* clipEnd = new KAction(KIcon("media-seek-forward"), i18n("Go to Clip End"), this);
clipEnd->setShortcut(Qt::Key_End);
- actionCollection()->addAction("seek_clip_end", clipEnd);
+ collection->addAction("seek_clip_end", clipEnd);
connect(clipEnd, SIGNAL(triggered(bool)), this, SLOT(slotClipEnd()));
- KAction* projectStart = new KAction(KIcon("media-seek-backward"), i18n("Go to Project Start"), this);
+ KAction* projectStart = new KAction(KIcon("go-first"), i18n("Go to Project Start"), this);
projectStart->setShortcut(Qt::CTRL + Qt::Key_Home);
- actionCollection()->addAction("seek_start", projectStart);
+ collection->addAction("seek_start", projectStart);
connect(projectStart, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotStart()));
- KAction* projectEnd = new KAction(KIcon("media-seek-forward"), i18n("Go to Project End"), this);
+ KAction* projectEnd = new KAction(KIcon("go-last"), i18n("Go to Project End"), this);
projectEnd->setShortcut(Qt::CTRL + Qt::Key_End);
- actionCollection()->addAction("seek_end", projectEnd);
+ collection->addAction("seek_end", projectEnd);
connect(projectEnd, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotEnd()));
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);
+ collection->addAction("monitor_seek_forward-one-frame", monitorSeekForwardOneFrame);
connect(monitorSeekForwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForwardOneFrame()));
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);
+ collection->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);
- actionCollection()->addAction("delete_timeline_clip", deleteTimelineClip);
+ collection->addAction("delete_timeline_clip", deleteTimelineClip);
connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip()));
- KAction* editTimelineClipSpeed = new KAction(KIcon("edit-delete"), i18n("Change Clip Speed"), this);
- actionCollection()->addAction("change_clip_speed", editTimelineClipSpeed);
+ KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this);
+ collection->addAction("change_clip_speed", editTimelineClipSpeed);
connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));
KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this);
cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R);
- actionCollection()->addAction("cut_timeline_clip", cutTimelineClip);
+ collection->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);
+ KAction* addClipMarker = new KAction(KIcon("bookmark-new"), i18n("Add Marker"), this);
+ collection->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);
+ KAction* deleteClipMarker = new KAction(KIcon("edit-delete"), i18n("Delete Marker"), this);
+ collection->addAction("delete_clip_marker", deleteClipMarker);
connect(deleteClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotDeleteClipMarker()));
- KAction* deleteAllClipMarkers = new KAction(KIcon("edit-delete"), i18n("Delete All Markers from Clip"), this);
- actionCollection()->addAction("delete_all_clip_markers", deleteAllClipMarkers);
+ KAction* deleteAllClipMarkers = new KAction(KIcon("edit-delete"), i18n("Delete All Markers"), this);
+ collection->addAction("delete_all_clip_markers", deleteAllClipMarkers);
connect(deleteAllClipMarkers, SIGNAL(triggered(bool)), this, SLOT(slotDeleteAllClipMarkers()));
KAction* editClipMarker = new KAction(KIcon("document-properties"), i18n("Edit Marker"), this);
- actionCollection()->addAction("edit_clip_marker", editClipMarker);
+ collection->addAction("edit_clip_marker", editClipMarker);
connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker()));
+ KAction *insertSpace = new KAction(KIcon(), i18n("Insert Space"), this);
+ collection->addAction("insert_space", insertSpace);
+ connect(insertSpace, SIGNAL(triggered()), this, SLOT(slotInsertSpace()));
+
+ KAction *removeSpace = new KAction(KIcon(), i18n("Remove Space"), this);
+ collection->addAction("delete_space", removeSpace);
+ connect(removeSpace, SIGNAL(triggered()), this, SLOT(slotRemoveSpace()));
+
+ KAction *insertTrack = new KAction(KIcon(), i18n("Insert Track"), this);
+ collection->addAction("insert_track", insertTrack);
+ connect(insertTrack, SIGNAL(triggered()), this, SLOT(slotInsertTrack()));
+
+ KAction *deleteTrack = new KAction(KIcon(), i18n("Delete Track"), this);
+ collection->addAction("delete_track", deleteTrack);
+ connect(deleteTrack, SIGNAL(triggered()), this, SLOT(slotDeleteTrack()));
+
+ KAction *changeTrack = new KAction(KIcon(), i18n("Change Track"), this);
+ collection->addAction("change_track", changeTrack);
+ connect(changeTrack, SIGNAL(triggered()), this, SLOT(slotChangeTrack()));
+
KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this);
- actionCollection()->addAction("add_guide", addGuide);
+ collection->addAction("add_guide", addGuide);
connect(addGuide, SIGNAL(triggered()), this, SLOT(slotAddGuide()));
QAction *delGuide = new KAction(KIcon("edit-delete"), i18n("Delete Guide"), this);
- actionCollection()->addAction("delete_guide", delGuide);
+ collection->addAction("delete_guide", delGuide);
connect(delGuide, SIGNAL(triggered()), this, SLOT(slotDeleteGuide()));
QAction *editGuide = new KAction(KIcon("document-properties"), i18n("Edit Guide"), this);
- actionCollection()->addAction("edit_guide", editGuide);
+ collection->addAction("edit_guide", editGuide);
connect(editGuide, SIGNAL(triggered()), this, SLOT(slotEditGuide()));
QAction *delAllGuides = new KAction(KIcon("edit-delete"), i18n("Delete All Guides"), this);
- actionCollection()->addAction("delete_all_guides", delAllGuides);
+ collection->addAction("delete_all_guides", delAllGuides);
connect(delAllGuides, SIGNAL(triggered()), this, SLOT(slotDeleteAllGuides()));
QAction *pasteEffects = new KAction(KIcon("edit-paste"), i18n("Paste Effects"), this);
- actionCollection()->addAction("paste_effects", pasteEffects);
+ collection->addAction("paste_effects", pasteEffects);
connect(pasteEffects , SIGNAL(triggered()), this, SLOT(slotPasteEffects()));
- KStandardAction::quit(this, SLOT(queryQuit()),
- actionCollection());
+ m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection);
+
+ KStandardAction::quit(this, SLOT(queryQuit()), collection);
- KStandardAction::open(this, SLOT(openFile()),
- actionCollection());
+ KStandardAction::open(this, SLOT(openFile()), collection);
- m_saveAction = KStandardAction::save(this, SLOT(saveFile()),
- actionCollection());
+ m_saveAction = KStandardAction::save(this, SLOT(saveFile()), collection);
- KStandardAction::saveAs(this, SLOT(saveFileAs()),
- actionCollection());
+ KStandardAction::saveAs(this, SLOT(saveFileAs()), collection);
- KStandardAction::openNew(this, SLOT(newFile()),
- actionCollection());
+ KStandardAction::openNew(this, SLOT(newFile()), collection);
- KStandardAction::preferences(this, SLOT(slotPreferences()),
- actionCollection());
+ KStandardAction::preferences(this, SLOT(slotPreferences()), collection);
- KStandardAction::copy(this, SLOT(slotCopy()),
- actionCollection());
+ KStandardAction::configureNotifications(this , SLOT(configureNotifications()), collection);
- KStandardAction::paste(this, SLOT(slotPaste()),
- actionCollection());
+ KStandardAction::copy(this, SLOT(slotCopy()), collection);
- KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()),
- actionCollection());
+ KStandardAction::paste(this, SLOT(slotPaste()), collection);
+
+ KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()), collection);
undo->setEnabled(false);
connect(m_commandStack, SIGNAL(canUndoChanged(bool)), undo, SLOT(setEnabled(bool)));
- KAction *redo = KStandardAction::redo(m_commandStack, SLOT(redo()),
- actionCollection());
+ KAction *redo = KStandardAction::redo(m_commandStack, SLOT(redo()), collection);
redo->setEnabled(false);
connect(m_commandStack, SIGNAL(canRedoChanged(bool)), redo, SLOT(setEnabled(bool)));
- KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, actionCollection());
+ KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection);
- connect(actionCollection(), SIGNAL(actionHovered(QAction*)),
+ connect(collection, SIGNAL(actionHovered(QAction*)),
this, SLOT(slotDisplayActionMessage(QAction*)));
- //connect(actionCollection(), SIGNAL( clearStatusText() ),
+ //connect(collection, SIGNAL( clearStatusText() ),
//statusBar(), SLOT( clear() ) );
}
KdenliveSettings::self()->writeConfig();
KSharedConfigPtr config = KGlobal::config();
m_fileOpenRecent->saveEntries(KConfigGroup(config, "Recent Files"));
+ KConfigGroup treecolumns(config, "Project Tree");
+ treecolumns.writeEntry("columns", m_projectList->headerInfo());
config->sync();
}
if (!initialGroup.exists()) {
// this is our first run, show Wizard
Wizard *w = new Wizard(this);
- if (w->exec() == QDialog::Accepted) {
+ if (w->exec() == QDialog::Accepted && w->isOk()) {
w->adjustSettings();
initialGroup.writeEntry("version", "0.7");
+ delete w;
+ } else {
+ ::exit(1);
+ }
+ } else if (initialGroup.readEntry("version") == "0.7") {
+ //Add new settings from 0.7.1
+ if (KdenliveSettings::defaultprojectfolder().isEmpty()) {
+ QString path = QDir::homePath() + "/kdenlive";
+ if (KStandardDirs::makeDir(path) == false) kDebug() << "/// ERRORÂ CREATINGÂ PROJECTÂ FOLDER: " << path;
+ KdenliveSettings::setDefaultprojectfolder(path);
}
- delete w;
}
+ KConfigGroup treecolumns(config, "Project Tree");
+ const QByteArray state = treecolumns.readEntry("columns", QByteArray());
+ if (!state.isEmpty())
+ m_projectList->setHeaderInfo(state);
}
-void MainWindow::newFile() {
+void MainWindow::newFile(bool showProjectSettings) {
QString profileName;
KUrl projectFolder;
- if (m_timelineArea->count() == 0) profileName = KdenliveSettings::default_profile();
- else {
- ProjectSettings *w = new ProjectSettings;
+ QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
+ if (!showProjectSettings && m_timelineArea->count() == 0) {
+ if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
+ profileName = KdenliveSettings::default_profile();
+ } else {
+ ProjectSettings *w = new ProjectSettings(projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, this);
if (w->exec() != QDialog::Accepted) return;
+ if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
profileName = w->selectedProfile();
projectFolder = w->selectedFolder();
+ projectTracks = w->tracks();
delete w;
}
- KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, this);
+ KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, this);
doc->m_autosave = new KAutoSaveFile(KUrl(), doc);
TrackView *trackView = new TrackView(doc, this);
m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description());
connectDocumentInfo(doc);
connectDocument(trackView, doc);
} else m_timelineArea->setTabBarHidden(false);
+ m_closeAction->setEnabled(m_timelineArea->count() > 1);
}
void MainWindow::activateDocument() {
void MainWindow::closeCurrentDocument() {
QWidget *w = m_timelineArea->currentWidget();
+ if (!w) return;
// closing current document
int ix = m_timelineArea->currentIndex() + 1;
if (ix == m_timelineArea->count()) ix = 0;
}
}
m_timelineArea->removeTab(m_timelineArea->indexOf(w));
- if (m_timelineArea->count() == 1) m_timelineArea->setTabBarHidden(true);
+ if (m_timelineArea->count() == 1) {
+ m_timelineArea->setTabBarHidden(true);
+ m_closeAction->setEnabled(false);
+ }
delete docToClose;
delete w;
- if (m_timelineArea->count() == 0) m_activeDocument = NULL;
+ if (m_timelineArea->count() == 0) {
+ m_activeDocument = NULL;
+ effectStack->clear();
+ transitionConfig->slotTransitionItemSelected(NULL, false);
+ }
}
-void MainWindow::saveFileAs(const QString &outputFileName) {
- m_projectMonitor->saveSceneList(outputFileName, m_activeDocument->documentInfoXml());
+bool MainWindow::saveFileAs(const QString &outputFileName) {
+ QDomDocument currentSceneList = m_projectMonitor->sceneList();
+ if (m_activeDocument->saveSceneList(outputFileName, currentSceneList) == false)
+ return false;
m_activeDocument->setUrl(KUrl(outputFileName));
if (m_activeDocument->m_autosave == NULL) {
m_activeDocument->m_autosave = new KAutoSaveFile(KUrl(outputFileName), this);
m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), m_activeDocument->url().path());
m_activeDocument->setModified(false);
m_fileOpenRecent->addUrl(KUrl(outputFileName));
+ return true;
}
-void MainWindow::saveFileAs() {
- QString outputFile = KFileDialog::getSaveFileName(KUrl(), "*.kdenlive|Kdenlive project files (*.kdenlive)");
+bool MainWindow::saveFileAs() {
+ // Check that the Kdenlive mime type is correctly installed
+ QString mimetype = "application/x-kdenlive";
+ KMimeType::Ptr mime = KMimeType::mimeType(mimetype);
+ if (!mime) mimetype = "*.kdenlive";
+
+ 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;
+ if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return false;
}
- saveFileAs(outputFile);
+ return saveFileAs(outputFile);
}
-void MainWindow::saveFile() {
- if (!m_activeDocument) return;
+bool MainWindow::saveFile() {
+ if (!m_activeDocument) return true;
if (m_activeDocument->url().isEmpty()) {
- saveFileAs();
+ return saveFileAs();
} else {
- saveFileAs(m_activeDocument->url().path());
+ bool result = saveFileAs(m_activeDocument->url().path());
m_activeDocument->m_autosave->resize(0);
+ return result;
}
}
void MainWindow::openFile() {
- KUrl url = KFileDialog::getOpenUrl(KUrl(), "*.kdenlive|Kdenlive project files (*.kdenlive)\n*.westley|MLT project files (*.westley)");
+ // Check that the Kdenlive mime type is correctly installed
+ QString mimetype = "application/x-kdenlive";
+ KMimeType::Ptr mime = KMimeType::mimeType(mimetype);
+ if (!mime) mimetype = "*.kdenlive";
+
+ KUrl url = KFileDialog::getOpenUrl(KUrl(), mimetype);
if (url.isEmpty()) return;
m_fileOpenRecent->addUrl(url);
openFile(url);
void MainWindow::openLastFile() {
KSharedConfigPtr config = KGlobal::config();
KUrl::List urls = m_fileOpenRecent->urls();
- if (urls.isEmpty()) newFile();
+ if (urls.isEmpty()) newFile(false);
else openFile(urls.last());
}
void MainWindow::openFile(const KUrl &url) {
+ // Check if the document is already opened
+ const int ct = m_timelineArea->count();
+ bool isOpened = false;
+ int i;
+ for (i = 0; i < ct; i++) {
+ TrackView *tab = (TrackView *) m_timelineArea->widget(i);
+ KdenliveDoc *doc = tab->document();
+ if (doc->url() == url) {
+ isOpened = true;
+ break;
+ }
+ }
+ if (isOpened) {
+ m_timelineArea->setCurrentIndex(i);
+ return;
+ }
+
// Check for backup file
QList<KAutoSaveFile *> staleFiles = KAutoSaveFile::staleFiles(url);
if (!staleFiles.isEmpty()) {
void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) {
KdenliveDoc *doc;
- doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), this);
+ doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), this);
if (stale == NULL) {
stale = new KAutoSaveFile(url, doc);
doc->m_autosave = stale;
}
-void MainWindow::parseProfiles() {
+void MainWindow::parseProfiles(const QString &mltPath) {
//kdDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <<endl;
//KdenliveSettings::setDefaulttmpfolder();
+ if (!mltPath.isEmpty()) {
+ KdenliveSettings::setMltpath(mltPath + "/share/mlt/profiles/");
+ KdenliveSettings::setRendererpath(mltPath + "/bin/inigo");
+ }
+
if (KdenliveSettings::mltpath().isEmpty()) {
KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/"));
}
if (KdenliveSettings::rendererpath().isEmpty()) {
- KdenliveSettings::setRendererpath(KStandardDirs::findExe("inigo"));
+ QString inigoPath = QString(MLT_PREFIX) + QString("/bin/inigo");
+ if (!QFile::exists(inigoPath))
+ inigoPath = KStandardDirs::findExe("inigo");
+ else KdenliveSettings::setRendererpath(inigoPath);
}
QStringList profilesFilter;
profilesFilter << "*";
// Cannot find the MLT profiles, ask for location
KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find your Mlt profiles, please give the path"), this);
getUrl->fileDialog()->setMode(KFile::Directory);
- getUrl->exec();
+ if (getUrl->exec() == QDialog::Rejected) {
+ ::exit(0);
+ }
KUrl mltPath = getUrl->selectedUrl();
delete getUrl;
- if (mltPath.isEmpty()) kapp->quit();
+ if (mltPath.isEmpty()) ::exit(0);
KdenliveSettings::setMltpath(mltPath.path());
QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
}
if (KdenliveSettings::rendererpath().isEmpty()) {
// Cannot find the MLT inigo renderer, ask for location
- KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find the inigo program required for rendering (part of Mlt)"), this);
- getUrl->exec();
+ KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the inigo program required for rendering (part of Mlt)"), this);
+ if (getUrl->exec() == QDialog::Rejected) {
+ ::exit(0);
+ }
KUrl rendererPath = getUrl->selectedUrl();
delete getUrl;
- if (rendererPath.isEmpty()) kapp->quit();
+ if (rendererPath.isEmpty()) ::exit(0);
KdenliveSettings::setRendererpath(rendererPath.path());
}
}
void MainWindow::slotEditProjectSettings() {
- ProjectSettings *w = new ProjectSettings;
+ QPoint p = m_activeDocument->getTracksCount();
+ ProjectSettings *w = new ProjectSettings(p.x(), p.y(), m_activeDocument->projectFolder().path(), true, this);
+
if (w->exec() == QDialog::Accepted) {
QString profile = w->selectedProfile();
m_activeDocument->setProfilePath(profile);
KdenliveSettings::setProject_fps(m_activeDocument->fps());
setCaption(m_activeDocument->description(), m_activeDocument->isModified());
m_monitorManager->resetProfiles(m_activeDocument->timecode());
- if (m_renderWidget) m_renderWidget->setDocumentStandard(m_activeDocument->getDocumentStandard());
+ if (m_renderWidget) m_renderWidget->setProfile(m_activeDocument->mltProfile());
m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description());
// We need to desactivate & reactivate monitors to get a refresh
void MainWindow::slotRenderProject() {
if (!m_renderWidget) {
m_renderWidget = new RenderWidget(this);
- connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool)));
+ connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double)));
+ if (m_activeDocument) {
+ m_renderWidget->setProfile(m_activeDocument->mltProfile());
+ m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration());
+ }
}
/*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
if (currentTab) m_renderWidget->setTimeline(currentTab);
m_renderWidget->show();
}
-void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter) {
+void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter, double guideStart, double guideEnd) {
if (dest.isEmpty()) return;
int in;
int out;
QStringList args;
args << "-erase";
if (zoneOnly) args << "in=" + QString::number(in) << "out=" + QString::number(out);
+ else if (guideStart != -1) {
+ args << "in=" + QString::number(GenTime(guideStart).frames(m_activeDocument->fps())) << "out=" + QString::number(GenTime(guideEnd).frames(m_activeDocument->fps()));
+ }
if (!overlay_args.isEmpty()) args << "preargs=" + overlay_args.join(" ");
QString videoPlayer = "-";
if (playAfter) {
videoPlayer = KdenliveSettings::defaultplayerapp();
if (videoPlayer.isEmpty()) KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog."));
}
+ if (!QFile::exists(KdenliveSettings::rendererpath())) {
+ KMessageBox::sorry(this, i18n("Cannot find the inigo program required for rendering (part of Mlt)"));
+ return;
+ }
args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer << temp.fileName() << dest << avformat_args;
- QProcess::startDetached("kdenlive_render", args);
- kDebug() << "/// STARTING RENDER PROCESS\n\nARGS:\n" << args;
+ QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render");
+ if (!QFile::exists(renderer)) renderer = "kdenlive_render";
+ QProcess::startDetached(renderer, args);
+
+ KNotification::event("RenderStarted", i18n("Rendering <i>%1</i> started", dest), QPixmap(), this);
}
}
void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //changed
//m_projectMonitor->stop();
+ m_closeAction->setEnabled(m_timelineArea->count() > 1);
kDebug() << "/////////////////// CONNECTINGÂ DOC TOÂ PROJECTÂ VIEW ////////////////";
if (m_activeDocument) {
if (m_activeDocument == doc) return;
m_activeDocument->backupMltPlaylist();
if (m_activeTimeline) {
disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int)));
+ disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeTimeline, SLOT(slotSetZone(QPoint)));
disconnect(m_projectMonitor, SIGNAL(durationChanged(int)), m_activeTimeline, SLOT(setDuration(int)));
disconnect(m_projectList, SIGNAL(projectModified()), m_activeDocument, SLOT(setModified()));
- disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *)), m_projectList, SLOT(slotAddClip(DocClipBase *)));
+
+
+ disconnect(m_activeDocument, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated()));
+ disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool)));
disconnect(m_activeDocument, SIGNAL(addProjectFolder(const QString, const QString &, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, const QString &, bool, bool)));
disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &)));
disconnect(m_activeDocument, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &)));
- disconnect(m_activeDocument, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(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, SIGNAL(clipItemSelected(ClipItem*)), effectStack, SLOT(slotClipItemSelected(ClipItem*)));
- disconnect(m_activeTimeline, SIGNAL(clipItemSelected(ClipItem*)), this, SLOT(slotActivateEffectStackView()));
- disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*)));
- disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView()));
+ disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), 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)), this, SLOT(slotActivateTransitionView()));
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, 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)));
+ 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)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
+ 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)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
- disconnect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
+ disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
+ disconnect(transitionConfig, SIGNAL(transitionTrackUpdated(Transition *, int)), m_activeTimeline->projectView() , SLOT(slotTransitionTrackUpdated(Transition *, int)));
+ disconnect(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)), m_projectMonitor, SLOT(slotZoneMoved(int, int)));
+ disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs()));
effectStack->clear();
}
m_activeDocument->setRenderer(NULL);
KdenliveSettings::setProject_fps(doc->fps());
m_monitorManager->resetProfiles(doc->timecode());
m_projectList->setDocument(doc);
- transitionConfig->updateProjectFormat(doc->mltProfile());
+ transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber());
+ 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(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor()));
+ connect(trackView, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int)));
+ connect(trackView, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int)));
+ connect(trackView, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int)));
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_projectMonitor, SIGNAL(durationChanged(int)), trackView, SLOT(setDuration(int)));
- connect(doc, SIGNAL(addProjectClip(DocClipBase *)), m_projectList, SLOT(slotAddClip(DocClipBase *)));
+ connect(doc, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool)));
connect(doc, SIGNAL(addProjectFolder(const QString, const QString &, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, const QString &, bool, bool)));
connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &)));
connect(doc, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &)));
- connect(doc, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &)));
connect(doc, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &)));
connect(doc, SIGNAL(deleteTimelineClip(const QString &)), trackView, SLOT(slotDeleteClip(const QString &)));
connect(doc, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool)));
+ connect(doc, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated()));
-
- 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*)));
- connect(trackView, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView()));
+ connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), 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)), this, SLOT(slotActivateTransitionView()));
m_zoomSlider->setValue(doc->zoom());
connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int)));
connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn()));
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(transitionTrackUpdated(Transition *, int)), trackView->projectView() , SLOT(slotTransitionTrackUpdated(Transition *, int)));
connect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
connect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
+ connect(trackView, SIGNAL(zoneMoved(int, int)), m_projectMonitor, SLOT(slotZoneMoved(int, int)));
+ connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs()));
+
trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu);
m_activeTimeline = trackView;
- if (m_renderWidget) m_renderWidget->setDocumentStandard(doc->getDocumentStandard());
+ if (m_renderWidget) m_renderWidget->setProfile(doc->mltProfile());
doc->setRenderer(m_projectMonitor->render);
m_commandStack->setActiveStack(doc->commandStack());
KdenliveSettings::setProject_display_ratio(doc->dar());
- doc->updateAllProjectClips();
-
+ m_projectList->updateAllClips();
+ //doc->clipManager()->checkAudioThumbs();
//m_overView->setScene(trackView->projectScene());
//m_overView->scale(m_overView->width() / trackView->duration(), m_overView->height() / (50 * trackView->tracksNumber()));
m_activeDocument = doc;
}
+void MainWindow::slotGuidesUpdated() {
+ if (m_renderWidget) m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration());
+}
+
void MainWindow::slotPreferences(int page, int option) {
//An instance of your dialog could be already created and could be
// cached, in which case you want to display the cached dialog
// instead of creating another one
if (KConfigDialog::showDialog("settings")) {
- if (page != -1) static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"))->showPage(page, option);
+ KdenliveSettingsDialog* d = static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"));
+ if (page != -1) d->showPage(page, option);
+ d->checkProfile();
return;
}
}
m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
+#ifndef NO_JOGSHUTTLE
activateShuttleDevice();
+#endif /* NO_JOGSHUTTLE */
}
void MainWindow::slotSwitchSnap() {
KdenliveSettings::setSnaptopoints(!KdenliveSettings::snaptopoints());
- m_buttonShowMarkers->setChecked(KdenliveSettings::snaptopoints());
+ m_buttonSnap->setChecked(KdenliveSettings::snaptopoints());
}
void MainWindow::slotDeleteTimelineClip() {
- if (m_activeTimeline) {
+ if (QApplication::focusWidget()->parentWidget()->parentWidget() == projectListDock) m_projectList->slotRemoveClip();
+ else if (m_activeTimeline) {
m_activeTimeline->projectView()->deleteSelectedClips();
}
}
}
void MainWindow::slotAddClipMarker() {
- if (m_activeTimeline) {
- m_activeTimeline->projectView()->slotAddClipMarker();
+ DocClipBase *clip = NULL;
+ GenTime pos;
+ if (m_projectMonitor->isActive()) {
+ if (m_activeTimeline) {
+ ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor();
+ if (item) {
+ pos = m_projectMonitor->position() - item->startPos() + item->cropStart();
+ clip = item->baseClip();
+ }
+ }
+ } else {
+ clip = m_clipMonitor->activeClip();
+ pos = m_clipMonitor->position();
+ }
+ if (!clip) {
+ m_messageLabel->setMessage(i18n("Cannot find clip to add marker"), ErrorMessage);
+ return;
+ }
+ QString id = clip->getId();
+ CommentedTime marker(pos, i18n("Marker"));
+ MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Add Marker"), this);
+ if (d.exec() == QDialog::Accepted) {
+ m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment());
}
+ if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
}
void MainWindow::slotDeleteClipMarker() {
- if (m_activeTimeline) {
- m_activeTimeline->projectView()->slotDeleteClipMarker();
+ DocClipBase *clip = NULL;
+ GenTime pos;
+ if (m_projectMonitor->isActive()) {
+ if (m_activeTimeline) {
+ ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor();
+ if (item) {
+ pos = m_projectMonitor->position() - item->startPos() + item->cropStart();
+ clip = item->baseClip();
+ }
+ }
+ } else {
+ clip = m_clipMonitor->activeClip();
+ pos = m_clipMonitor->position();
+ }
+ if (!clip) {
+ m_messageLabel->setMessage(i18n("Cannot find clip to remove marker"), ErrorMessage);
+ return;
}
+
+ QString id = clip->getId();
+ QString comment = clip->markerComment(pos);
+ if (comment.isEmpty()) {
+ m_messageLabel->setMessage(i18n("No marker found at cursor time"), ErrorMessage);
+ return;
+ }
+ m_activeTimeline->projectView()->slotDeleteClipMarker(comment, id, pos);
+ if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
+
}
void MainWindow::slotDeleteAllClipMarkers() {
- if (m_activeTimeline) {
- m_activeTimeline->projectView()->slotDeleteAllClipMarkers();
+ DocClipBase *clip = NULL;
+ if (m_projectMonitor->isActive()) {
+ if (m_activeTimeline) {
+ ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor();
+ if (item) {
+ clip = item->baseClip();
+ }
+ }
+ } else {
+ clip = m_clipMonitor->activeClip();
}
+ if (!clip) {
+ m_messageLabel->setMessage(i18n("Cannot find clip to remove marker"), ErrorMessage);
+ return;
+ }
+ m_activeTimeline->projectView()->slotDeleteAllClipMarkers(clip->getId());
+ if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
}
void MainWindow::slotEditClipMarker() {
- if (m_activeTimeline) {
- m_activeTimeline->projectView()->slotEditClipMarker();
+ DocClipBase *clip = NULL;
+ GenTime pos;
+ if (m_projectMonitor->isActive()) {
+ if (m_activeTimeline) {
+ ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor();
+ if (item) {
+ pos = m_projectMonitor->position() - item->startPos() + item->cropStart();
+ clip = item->baseClip();
+ }
+ }
+ } else {
+ clip = m_clipMonitor->activeClip();
+ pos = m_clipMonitor->position();
+ }
+ if (!clip) {
+ m_messageLabel->setMessage(i18n("Cannot find clip to remove marker"), ErrorMessage);
+ return;
+ }
+
+ QString id = clip->getId();
+ QString oldcomment = clip->markerComment(pos);
+ if (oldcomment.isEmpty()) {
+ m_messageLabel->setMessage(i18n("No marker found at cursor time"), ErrorMessage);
+ return;
+ }
+
+ CommentedTime marker(pos, oldcomment);
+ MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Edit Marker"), this);
+ if (d.exec() == QDialog::Accepted) {
+ m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment());
+ if (d.newMarker().time() != pos) {
+ // remove old marker
+ m_activeTimeline->projectView()->slotAddClipMarker(id, pos, QString());
+ }
+ if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
}
}
m_activeTimeline->projectView()->slotAddGuide();
}
+void MainWindow::slotInsertSpace() {
+ if (m_activeTimeline)
+ m_activeTimeline->projectView()->slotInsertSpace();
+}
+
+void MainWindow::slotRemoveSpace() {
+ if (m_activeTimeline)
+ m_activeTimeline->projectView()->slotRemoveSpace();
+}
+
+void MainWindow::slotInsertTrack(int ix) {
+ m_projectMonitor->activateMonitor();
+ if (m_activeTimeline)
+ m_activeTimeline->projectView()->slotInsertTrack(ix);
+}
+
+void MainWindow::slotDeleteTrack(int ix) {
+ m_projectMonitor->activateMonitor();
+ if (m_activeTimeline)
+ m_activeTimeline->projectView()->slotDeleteTrack(ix);
+}
+
+void MainWindow::slotChangeTrack(int ix) {
+ m_projectMonitor->activateMonitor();
+ if (m_activeTimeline)
+ m_activeTimeline->projectView()->slotChangeTrack(ix);
+}
+
void MainWindow::slotEditGuide() {
if (m_activeTimeline)
m_activeTimeline->projectView()->slotEditGuide();
void MainWindow::slotAddTransition(QAction *result) {
if (!result) return;
- QDomElement effect = transitions.getEffectByName(result->data().toString());
- if (m_activeTimeline) {
- m_activeTimeline->projectView()->slotAddTransitionToSelectedClips(effect);
+ QStringList info = result->data().toStringList();
+ if (info.isEmpty()) return;
+ QDomElement transition = transitions.getEffectByTag(info.at(1), info.at(2));
+ if (m_activeTimeline && !transition.isNull()) {
+ m_activeTimeline->projectView()->slotAddTransitionToSelectedClips(transition.cloneNode().toElement());
}
}
void MainWindow::slotAddVideoEffect(QAction *result) {
if (!result) return;
- QDomElement effect = videoEffects.getEffectByName(result->data().toString());
+ QStringList info = result->data().toStringList();
+ if (info.isEmpty()) return;
+ QDomElement effect = videoEffects.getEffectByTag(info.at(1), info.at(2));
slotAddEffect(effect);
}
void MainWindow::slotAddAudioEffect(QAction *result) {
if (!result) return;
- QDomElement effect = audioEffects.getEffectByName(result->data().toString());
+ QStringList info = result->data().toStringList();
+ if (info.isEmpty()) return;
+ QDomElement effect = audioEffects.getEffectByTag(info.at(1), info.at(2));
slotAddEffect(effect);
}
void MainWindow::slotAddCustomEffect(QAction *result) {
if (!result) return;
- QDomElement effect = customEffects.getEffectByName(result->data().toString());
+ QStringList info = result->data().toStringList();
+ if (info.isEmpty()) return;
+ QDomElement effect = customEffects.getEffectByTag(info.at(1), info.at(2));
slotAddEffect(effect);
}
void MainWindow::slotShowClipProperties(DocClipBase *clip) {
if (clip->clipType() == TEXT) {
- m_activeDocument->editTextClip(clip->getProperty("xml"), clip->getId());
+ QString titlepath = m_activeDocument->projectFolder().path() + "/titles/";
+ QString path = clip->getProperty("resource");
+ TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_projectMonitor->render, this);
+ QDomDocument doc;
+ doc.setContent(clip->getProperty("xmldata"));
+ dia_ui->setXml(doc);
+ if (dia_ui->exec() == QDialog::Accepted) {
+ QPixmap pix = dia_ui->renderedPixmap();
+ pix.save(path);
+ //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1);
+ //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString());
+ QMap <QString, QString> newprops;
+ newprops.insert("xmldata", dia_ui->xml().toString());
+ EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
+ m_activeDocument->commandStack()->push(command);
+ m_clipMonitor->refreshMonitor(true);
+ m_activeDocument->setModified(true);
+ }
+ delete dia_ui;
+
+ //m_activeDocument->editTextClip(clip->getProperty("xml"), clip->getId());
return;
}
ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this);
connect(&dia, SIGNAL(addMarker(const QString &, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, GenTime, QString)));
if (dia.exec() == QDialog::Accepted) {
- m_projectList->slotUpdateClipProperties(dia.clipId(), dia.properties());
+ EditClipCommand *command = new EditClipCommand(m_projectList, dia.clipId(), clip->properties(), dia.properties(), true);
+ m_activeDocument->commandStack()->push(command);
+
+ //m_projectList->slotUpdateClipProperties(dia.clipId(), dia.properties());
if (dia.needsTimelineRefresh()) {
// update clip occurences in timeline
m_activeTimeline->projectView()->slotUpdateClip(dia.clipId());
}
void MainWindow::slotSnapRewind() {
- if (m_monitorManager->projectMonitorFocused()) {
+ if (m_projectMonitor->isActive()) {
if (m_activeTimeline)
m_activeTimeline->projectView()->slotSeekToPreviousSnap();
- }
+ } else m_clipMonitor->slotSeekToPreviousSnap();
}
void MainWindow::slotSnapForward() {
- if (m_monitorManager->projectMonitorFocused()) {
+ if (m_projectMonitor->isActive()) {
if (m_activeTimeline)
m_activeTimeline->projectView()->slotSeekToNextSnap();
- }
+ } else m_clipMonitor->slotSeekToNextSnap();
}
void MainWindow::slotClipStart() {
- if (m_monitorManager->projectMonitorFocused()) {
+ if (m_projectMonitor->isActive()) {
if (m_activeTimeline)
m_activeTimeline->projectView()->clipStart();
}
}
void MainWindow::slotClipEnd() {
- if (m_monitorManager->projectMonitorFocused()) {
+ if (m_projectMonitor->isActive()) {
if (m_activeTimeline)
m_activeTimeline->projectView()->clipEnd();
}
void MainWindow::slotChangeTool(QAction * action) {
if (action == m_buttonSelectTool) slotSetTool(SELECTTOOL);
else if (action == m_buttonRazorTool) slotSetTool(RAZORTOOL);
+ else if (action == m_buttonSpacerTool) slotSetTool(SPACERTOOL);
}
void MainWindow::slotSetTool(PROJECTTOOL tool) {
} else KXmlGuiWindow::keyPressEvent(ke);
}
+
+/** Gets called when the window gets hidden */
+void MainWindow::hideEvent(QHideEvent *event) {
+ // kDebug() << "I was hidden";
+ // issue http://www.kdenlive.org/mantis/view.php?id=231
+ if (this->isMinimized()) {
+ // kDebug() << "I am minimized";
+ if (m_monitorManager) m_monitorManager->stopActiveMonitor();
+ }
+}
+
bool MainWindow::eventFilter(QObject *obj, QEvent *event) {
if (m_findActivated) {
if (event->type() == QEvent::ShortcutOverride) {
}
}
+void MainWindow::slotSaveZone(Render *render, QPoint zone) {
+ KDialog *dialog = new KDialog(this);
+ dialog->setCaption("Save clip zone");
+ dialog->setButtons(KDialog::Ok | KDialog::Cancel);
+
+ QWidget *widget = new QWidget(dialog);
+ dialog->setMainWidget(widget);
+
+ QVBoxLayout *vbox = new QVBoxLayout(widget);
+ QLabel *label1 = new QLabel(i18n("Save clip zone as:"), this);
+ QString path = m_activeDocument->projectFolder().path();
+ path.append("/");
+ path.append("untitled.westley");
+ KUrlRequester *url = new KUrlRequester(KUrl(path), this);
+ url->setFilter("video/mlt-playlist");
+ QLabel *label2 = new QLabel(i18n("Description:"), this);
+ KLineEdit *edit = new KLineEdit(this);
+ vbox->addWidget(label1);
+ vbox->addWidget(url);
+ vbox->addWidget(label2);
+ vbox->addWidget(edit);
+ if (dialog->exec() == QDialog::Accepted) render->saveZone(url->url(), edit->text(), zone);
+
+}
+
+void MainWindow::slotSetInPoint() {
+ if (m_clipMonitor->isActive()) {
+ m_clipMonitor->slotSetZoneStart();
+ } else m_activeTimeline->projectView()->setInPoint();
+}
+
+void MainWindow::slotSetOutPoint() {
+ if (m_clipMonitor->isActive()) {
+ m_clipMonitor->slotSetZoneEnd();
+ } else m_activeTimeline->projectView()->setOutPoint();
+}
+
+
#include "mainwindow.moc"