* 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 "renderer.h"
#include "jogshuttle.h"
#include "clipproperties.h"
+#include "wizard.h"
+#include "editclipcommand.h"
+#include "titlewidget.h"
-#define ID_STATUS_MSG 1
-#define ID_EDITMODE_MSG 2
-#define ID_TIMELINE_MSG 3
-#define ID_TIMELINE_BUTTONS 5
-#define ID_TIMELINE_POS 6
-#define ID_TIMELINE_FORMAT 7
+static const int ID_STATUS_MSG = 1;
+static const int ID_EDITMODE_MSG = 2;
+static const int ID_TIMELINE_MSG = 3;
+static const int ID_TIMELINE_BUTTONS = 5;
+static const int ID_TIMELINE_POS = 6;
+static const int ID_TIMELINE_FORMAT = 7;
namespace Mlt {
class Producer;
EffectsList MainWindow::customEffects;
EffectsList MainWindow::transitions;
-MainWindow::MainWindow(QWidget *parent)
+MainWindow::MainWindow(const QString &MltPath, QWidget *parent)
: KXmlGuiWindow(parent),
m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false), m_initialized(false) {
setlocale(LC_NUMERIC, "POSIX");
- parseProfiles();
setFont(KGlobalSettings::toolBarFont());
+ parseProfiles(MltPath);
m_commandStack = new QUndoGroup;
m_timelineArea = new KTabWidget(this);
m_timelineArea->setTabReorderingEnabled(true);
m_timelineArea->setTabBarHidden(true);
QToolButton *closeTabButton = new QToolButton;
- connect(closeTabButton, SIGNAL(clicked()), this, SLOT(slotRemoveTab()));
+ connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeCurrentDocument()));
closeTabButton->setIcon(KIcon("tab-close"));
closeTabButton->adjustSize();
closeTabButton->setToolTip(i18n("Close the current tab"));
m_findTimer.setSingleShot(true);
initEffects::parseEffectFiles();
+ //initEffects::parseCustomEffectsFile();
+
m_monitorManager = new MonitorManager();
projectListDock = new QDockWidget(i18n("Project Tree"), this);
transitionConfigDock->setWidget(transitionConfig);
addDockWidget(Qt::TopDockWidgetArea, transitionConfigDock);
+ KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile());
+ m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)),
+ actionCollection());
+ readOptions();
clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
clipMonitorDock->setObjectName("clip_monitor");
addDockWidget(Qt::TopDockWidgetArea, recMonitorDock);
connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
+ connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int)));
undoViewDock = new QDockWidget(i18n("Undo History"), this);
undoViewDock->setObjectName("undo_history");
tabifyDockWidget(projectListDock, effectStackDock);
tabifyDockWidget(projectListDock, transitionConfigDock);
//tabifyDockWidget(projectListDock, undoViewDock);
- projectListDock->raise();
+
tabifyDockWidget(clipMonitorDock, projectMonitorDock);
tabifyDockWidget(clipMonitorDock, recMonitorDock);
setCentralWidget(m_timelineArea);
setupGUI(Default, NULL /*"kdenliveui.rc"*/);
- kDebug() << factory() << " " << factory()->container("video_effects_menu", this);
+ //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)));
// 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);
}
- QMenu *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);
- customEffectsMenu->addAction(action);
+
+ m_customEffectsMenu = static_cast<QMenu*>(factory()->container("custom_effects_menu", this));
+
+ 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);
connect(videoEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *)));
connect(audioEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddAudioEffect(QAction *)));
- connect(customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *)));
+ connect(m_customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *)));
m_timelineContextMenu = new QMenu(this);
m_timelineContextClipMenu = new QMenu(this);
QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this);
- effects = transitions.effectNames();
+ QStringList effects = transitions.effectNames();
foreach(const QString &name, effects) {
action = new QAction(name, this);
action->setData(name);
m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste)));
m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip"));
+ m_timelineContextClipMenu->addAction(actionCollection()->action("change_clip_speed"));
m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip"));
m_timelineContextClipMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));
+ m_timelineContextClipMenu->addAction(actionCollection()->action("paste_effects"));
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);
+ //TODO: re-enable custom effects menu when it is implemented
+ m_timelineContextClipMenu->addMenu(m_customEffectsMenu);
m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip"));
m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));
//connect(m_monitorManager, SIGNAL(connectMonitors()), this, SLOT(slotConnectMonitors()));
connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), this, SLOT(slotRaiseMonitor(bool)));
connect(m_effectList, SIGNAL(addEffect(QDomElement)), this, SLOT(slotAddEffect(QDomElement)));
+ connect(m_effectList, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+
m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor);
slotConnectMonitors();
if (KdenliveSettings::openlastproject()) {
openLastFile();
- } else newFile();
+ } 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();
+ }
+ else*/
+ newFile();
+ }
activateShuttleDevice();
+ projectListDock->raise();
}
void MainWindow::queryQuit() {
//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 :
openFile(KUrl(Lastproject));
}
+void MainWindow::slotReloadEffects() {
+ initEffects::parseCustomEffectsFile();
+ 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_customEffectsMenu->addAction(action);
+ }
+ m_effectList->reloadEffectList();
+}
+
void MainWindow::activateShuttleDevice() {
if (m_jogProcess) delete m_jogProcess;
m_jogProcess = NULL;
}
}
+void MainWindow::configureNotifications() {
+ KNotifyConfigWidget::configure(this);
+}
+
void MainWindow::slotFullScreen() {
//KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked());
}
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) {
else projectMonitorDock->raise();
}
-void MainWindow::slotSetClipDuration(int id, int duration) {
+void MainWindow::slotSetClipDuration(const QString &id, int duration) {
if (!m_activeDocument) return;
m_activeDocument->setProducerDuration(id, duration);
}
void MainWindow::slotConnectMonitors() {
m_projectList->setRenderer(m_clipMonitor->render);
- connect(m_projectList, SIGNAL(receivedClipDuration(int, int)), this, SLOT(slotSetClipDuration(int, int)));
+ connect(m_projectList, SIGNAL(receivedClipDuration(const QString &, int)), this, SLOT(slotSetClipDuration(const QString &, 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)));
- connect(m_clipMonitor->render, SIGNAL(replyGetImage(int, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(int, int, const QPixmap &, int, int)));
- connect(m_clipMonitor->render, SIGNAL(replyGetFileProperties(int, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)), m_projectList, SLOT(slotReplyGetFileProperties(int, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)));
- connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(int)), m_projectList, SLOT(slotRefreshClipThumbnail(int)));
+ connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, const QString &)), m_clipMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &)));
+ connect(m_clipMonitor->render, SIGNAL(replyGetImage(const QString &, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(const QString &, int, const QPixmap &, int, int)));
+ connect(m_clipMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)));
+
+ connect(m_clipMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &)));
+
+ connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &)));
+
+ 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() {
+ clipMonitorDock->updateGeometry();
+ clipMonitorDock->adjustSize();
+ m_clipMonitor->resetSize();
+}
+
+void MainWindow::slotAdjustProjectMonitor() {
+ projectMonitorDock->updateGeometry();
+ projectMonitorDock->adjustSize();
+ m_projectMonitor->resetSize();
}
void MainWindow::setupActions() {
+ KActionCollection* collection = actionCollection();
m_timecodeFormat = new KComboBox(this);
m_timecodeFormat->addItem(i18n("hh:mm:ss::ff"));
m_timecodeFormat->addItem(i18n("Frames"));
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);
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);
- 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);
+ 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);
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);
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(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 *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);
+ collection->addAction("paste_effects", pasteEffects);
+ connect(pasteEffects , SIGNAL(triggered()), this, SLOT(slotPasteEffects()));
+
KStandardAction::quit(this, SLOT(queryQuit()),
- actionCollection());
+ collection);
KStandardAction::open(this, SLOT(openFile()),
- actionCollection());
-
- m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)),
- actionCollection());
+ collection);
- KStandardAction::save(this, SLOT(saveFile()),
- actionCollection());
+ m_saveAction = KStandardAction::save(this, SLOT(saveFile()),
+ collection);
KStandardAction::saveAs(this, SLOT(saveFileAs()),
- actionCollection());
+ collection);
KStandardAction::openNew(this, SLOT(newFile()),
- actionCollection());
+ collection);
KStandardAction::preferences(this, SLOT(slotPreferences()),
- actionCollection());
+ collection);
+
+ KStandardAction::configureNotifications(this , SLOT(configureNotifications()) , collection);
KStandardAction::copy(this, SLOT(slotCopy()),
- actionCollection());
+ collection);
KStandardAction::paste(this, SLOT(slotPaste()),
- actionCollection());
+ collection);
- KStandardAction::undo(this, SLOT(undo()),
- actionCollection());
+ KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()),
+ collection);
+ undo->setEnabled(false);
+ connect(m_commandStack, SIGNAL(canUndoChanged(bool)), undo, SLOT(setEnabled(bool)));
- KStandardAction::redo(this, 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() ) );
-
- readOptions();
-}
-
-void MainWindow::undo() {
- m_commandStack->undo();
-}
-
-void MainWindow::redo() {
- m_commandStack->redo();
}
void MainWindow::slotDisplayActionMessage(QAction *a) {
void MainWindow::readOptions() {
KSharedConfigPtr config = KGlobal::config();
m_fileOpenRecent->loadEntries(KConfigGroup(config, "Recent Files"));
+ KConfigGroup initialGroup(config, "version");
+ if (!initialGroup.exists()) {
+ // this is our first run, show Wizard
+ Wizard *w = new Wizard(this);
+ if (w->exec() == QDialog::Accepted && w->isOk()) {
+ w->adjustSettings();
+ initialGroup.writeEntry("version", "0.7");
+ delete w;
+ } else {
+ ::exit(1);
+ }
+ }
}
void MainWindow::newFile() {
QString profileName;
KUrl projectFolder;
+ QPoint projectTracks(3, 2);
if (m_timelineArea->count() == 0) profileName = KdenliveSettings::default_profile();
else {
ProjectSettings *w = new ProjectSettings;
if (w->exec() != QDialog::Accepted) return;
profileName = w->selectedProfile();
projectFolder = w->selectedFolder();
+ projectTracks = w->tracks();
delete w;
}
- MltVideoProfile prof;
- if (!profileName.isEmpty()) prof = ProfilesDialog::getVideoProfile(profileName);
- else prof = ProfilesDialog::getVideoProfile("dv_pal");
- if (prof.width == 0) prof = ProfilesDialog::getVideoProfile("dv_pal");
- KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, prof, m_commandStack, 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"), i18n("Untitled") + " / " + prof.description);
+ m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description());
if (m_timelineArea->count() == 1) {
connectDocumentInfo(doc);
connectDocument(trackView, doc);
}
void MainWindow::activateDocument() {
+ if (m_timelineArea->currentWidget() == NULL) return;
TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
KdenliveDoc *currentDoc = currentTab->document();
connectDocumentInfo(currentDoc);
connectDocument(currentTab, currentDoc);
}
-void MainWindow::slotRemoveTab() {
+void MainWindow::closeCurrentDocument() {
QWidget *w = m_timelineArea->currentWidget();
// closing current document
int ix = m_timelineArea->currentIndex() + 1;
m_timelineArea->setCurrentIndex(ix);
TrackView *tabToClose = (TrackView *) w;
KdenliveDoc *docToClose = tabToClose->document();
+ if (docToClose && docToClose->isModified()) {
+ switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) {
+ case KMessageBox::Yes :
+ // save document here. If saving fails, return false;
+ saveFile();
+ break;
+ case KMessageBox::Cancel :
+ return;
+ default:
+ break;
+ }
+ }
m_timelineArea->removeTab(m_timelineArea->indexOf(w));
if (m_timelineArea->count() == 1) m_timelineArea->setTabBarHidden(true);
delete docToClose;
delete w;
+ if (m_timelineArea->count() == 0) {
+ m_activeDocument = NULL;
+ effectStack->clear();
+ transitionConfig->slotTransitionItemSelected(NULL);
+ }
}
void MainWindow::saveFileAs(const QString &outputFileName) {
m_projectMonitor->saveSceneList(outputFileName, m_activeDocument->documentInfoXml());
m_activeDocument->setUrl(KUrl(outputFileName));
+ if (m_activeDocument->m_autosave == NULL) {
+ m_activeDocument->m_autosave = new KAutoSaveFile(KUrl(outputFileName), this);
+ } else m_activeDocument->m_autosave->setManagedFile(KUrl(outputFileName));
setCaption(m_activeDocument->description());
m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description());
m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), m_activeDocument->url().path());
saveFileAs();
} else {
saveFileAs(m_activeDocument->url().path());
+ m_activeDocument->m_autosave->resize(0);
}
}
void MainWindow::openLastFile() {
KSharedConfigPtr config = KGlobal::config();
- QString Lastproject = config->group("Recent Files").readPathEntry("File1", QString());
- openFile(KUrl(Lastproject));
+ KUrl::List urls = m_fileOpenRecent->urls();
+ if (urls.isEmpty()) newFile();
+ 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
- bool recovery = false;
- QString directory = url.directory();
- QString fileName = url.fileName();
- KUrl recoveryUrl;
- recoveryUrl.setDirectory(directory);
- recoveryUrl.setFileName("~" + fileName);
- if (KIO::NetAccess::exists(recoveryUrl, KIO::NetAccess::SourceSide, this)) {
- KFileItem bkup(KFileItem::Unknown, KFileItem::Unknown, recoveryUrl, true);
- KFileItem src(KFileItem::Unknown, KFileItem::Unknown, url, true);
- if (bkup.time(KFileItem::ModificationTime) > src.time(KFileItem::ModificationTime)) {
- // Backup file is more recent than source file, ask user for recovery
- if (KMessageBox::questionYesNo(this, i18n("A newer recovery file exists for <b>%1</b>\nOpen recovery file ?", url.fileName())) == KMessageBox::Yes) recovery = true;
+ QList<KAutoSaveFile *> staleFiles = KAutoSaveFile::staleFiles(url);
+ 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);
+ return;
+ } else {
+ // remove the stale files
+ foreach(KAutoSaveFile *stale, staleFiles) {
+ stale->open(QIODevice::ReadWrite);
+ delete stale;
+ }
}
}
+ if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
+ doOpenFile(url, NULL);
+}
- //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");
+void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) {
KdenliveDoc *doc;
- if (recovery) {
- doc = new KdenliveDoc(recoveryUrl, KUrl(), prof, m_commandStack, this);
- doc->setUrl(url);
+ doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), this);
+ if (stale == NULL) {
+ stale = new KAutoSaveFile(url, doc);
+ doc->m_autosave = stale;
+ } else {
+ doc->m_autosave = stale;
+ doc->setUrl(stale->managedFile());
doc->setModified(true);
- } else doc = new KdenliveDoc(url, KUrl(), prof, m_commandStack, this);
+ stale->setParent(doc);
+ }
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);
- m_projectMonitor->refreshMonitor(true);
- //connectDocument(trackView, doc);
+ m_clipMonitor->refreshMonitor(true);
+}
+
+void MainWindow::recoverFiles(QList<KAutoSaveFile *> staleFiles) {
+ if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
+ foreach(KAutoSaveFile *stale, staleFiles) {
+ /*if (!stale->open(QIODevice::QIODevice::ReadOnly)) {
+ // show an error message; we could not steal the lockfile
+ // maybe another application got to the file before us?
+ delete stale;
+ continue;
+ }*/
+ kDebug() << "// OPENING RECOVERY: " << stale->fileName() << "\nMANAGED: " << stale->managedFile().path();
+ // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile ?
+ if (!stale->fileName().endsWith(".lock")) doOpenFile(KUrl(stale->fileName()), stale);
+ else KIO::NetAccess::del(KUrl(stale->fileName()), this);
+ }
}
-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());
}
if (w->exec() == QDialog::Accepted) {
QString profile = w->selectedProfile();
m_activeDocument->setProfilePath(profile);
- m_monitorManager->resetProfiles(profile);
- setCaption(m_activeDocument->description());
- KdenliveSettings::setCurrent_profile(m_activeDocument->profilePath());
+ KdenliveSettings::setCurrent_profile(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());
- m_monitorManager->setTimecode(m_activeDocument->timecode());
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 &, bool, bool)), this, SLOT(slotDoRender(const QString&, const QString&, 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->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 &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);
+ 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::slotUpdateDocumentState(bool modified) {
setCaption(m_activeDocument->description(), modified);
+ m_saveAction->setEnabled(modified);
if (modified) {
m_timelineArea->setTabTextColor(m_timelineArea->currentIndex(), palette().color(QPalette::Link));
m_timelineArea->setTabIcon(m_timelineArea->currentIndex(), KIcon("document-save"));
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(guidesUpdated()), this, SLOT(slotGuidesUpdated()));
disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *)), m_projectList, SLOT(slotAddClip(DocClipBase *)));
- 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(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(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(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(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
+ disconnect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+ disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
+ disconnect(transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int)));
disconnect(m_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);
disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
m_clipMonitor->stop();
}
+ KdenliveSettings::setCurrent_profile(doc->profilePath());
KdenliveSettings::setProject_fps(doc->fps());
- m_monitorManager->resetProfiles(doc->profilePath());
+ m_monitorManager->resetProfiles(doc->timecode());
m_projectList->setDocument(doc);
+ transitionConfig->updateProjectFormat(doc->mltProfile());
+ effectStack->updateProjectFormat(doc->mltProfile());
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(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(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(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(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &)));
- connect(doc, SIGNAL(deletTimelineClip(int)), trackView, SLOT(slotDeleteClip(int)));
+ 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(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
connect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
connect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
+ connect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
+ connect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+
connect(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;
- KdenliveSettings::setCurrent_profile(doc->profilePath());
if (m_renderWidget) m_renderWidget->setDocumentStandard(doc->getDocumentStandard());
- m_monitorManager->setTimecode(doc->timecode());
doc->setRenderer(m_projectMonitor->render);
m_commandStack->setActiveStack(doc->commandStack());
-
- doc->updateAllProjectClips();
-
- if (m_commandStack->isClean()) kDebug() << "//////////// UNDO STACK IS CLEAN";
- else kDebug() << "//////////// UNDO STACK IS NOT CLEAN*******************";
+ KdenliveSettings::setProject_display_ratio(doc->dar());
+ 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_overView->fitInView(m_overView->itemAt(0, 50), Qt::KeepAspectRatio);
- setCaption(doc->description());
+ setCaption(doc->description(), doc->isModified());
+ m_saveAction->setEnabled(doc->isModified());
m_activeDocument = doc;
}
-void MainWindow::slotPreferences() {
+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 (KConfigDialog::showDialog("settings")) {
+ if (page != -1) static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"))->showPage(page, option);
return;
+ }
// KConfigDialog didn't find an instance of this dialog, so lets
// create it :
KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this);
connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration()));
+ connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles()));
dialog->show();
+ if (page != -1) dialog->showPage(page, option);
}
void MainWindow::updateConfiguration() {
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::slotChangeClipSpeed() {
+ if (m_activeTimeline) {
+ m_activeTimeline->projectView()->changeClipSpeed();
+ }
+}
+
void MainWindow::slotAddClipMarker() {
if (m_activeTimeline) {
m_activeTimeline->projectView()->slotAddClipMarker();
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(int, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(int, GenTime, QString)));
+ 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();
}
}
void MainWindow::slotSnapForward() {
- if (m_monitorManager->projectMonitorFocused()) {
+ if (m_projectMonitor->isActive()) {
if (m_activeTimeline)
m_activeTimeline->projectView()->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();
}
m_activeTimeline->projectView()->pasteClip();
}
+void MainWindow::slotPasteEffects() {
+ if (!m_activeDocument || !m_activeTimeline) return;
+ m_activeTimeline->projectView()->pasteClipEffects();
+}
+
void MainWindow::slotFind() {
if (!m_activeDocument || !m_activeTimeline) return;
m_projectSearch->setEnabled(false);
}
}
+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"
projects / kdenlive / blobdiff