* 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 "jogshuttle.h"
#include "clipproperties.h"
#include "wizard.h"
+#include "editclipcommand.h"
+#include "titlewidget.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, 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");
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);
}
m_customEffectsMenu = static_cast<QMenu*>(factory()->container("custom_effects_menu", this));
effects = customEffects.effectNames();
+ 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);
}
+ 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);
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_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);
}
}
+void MainWindow::configureNotifications() {
+ KNotifyConfigWidget::configure(this);
+}
+
void MainWindow::slotFullScreen() {
//KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked());
}
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"));
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);
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);
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);
+ 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);
+ 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);
+ 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);
+ 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);
- actionCollection()->addAction("paste_effects", pasteEffects);
+ 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());
+ collection);
m_saveAction = KStandardAction::save(this, SLOT(saveFile()),
- actionCollection());
+ 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);
KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()),
- actionCollection());
+ collection);
undo->setEnabled(false);
connect(m_commandStack, SIGNAL(canUndoChanged(bool)), undo, SLOT(setEnabled(bool)));
KAction *redo = KStandardAction::redo(m_commandStack, SLOT(redo()),
- actionCollection());
+ 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() ) );
}
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);
}
- delete w;
}
}
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;
}
- 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());
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::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->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) {
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."));
}
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);
}
}
m_activeDocument->backupMltPlaylist();
if (m_activeTimeline) {
disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int)));
+ disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, 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, 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(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
disconnect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
+ disconnect(trackView, SIGNAL(zoneMoved(int, int)), m_projectMonitor, SLOT(slotZoneMoved(int, int)));
effectStack->clear();
}
m_activeDocument->setRenderer(NULL);
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, 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(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)));
+
trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu);
m_activeTimeline = trackView;
if (m_renderWidget) m_renderWidget->setDocumentStandard(doc->getDocumentStandard());
doc->setRenderer(m_projectMonitor->render);
m_commandStack->setActiveStack(doc->commandStack());
KdenliveSettings::setProject_display_ratio(doc->dar());
- doc->updateAllProjectClips();
+ m_projectList->updateAllClips();
+ trackView->projectView()->updateAllThumbs();
//m_overView->setScene(trackView->projectScene());
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
void MainWindow::slotDeleteTimelineClip() {
- if (m_activeTimeline) {
+ if (projectListDock->isActiveWindow()) m_projectList->slotRemoveClip();
+ else if (m_activeTimeline) {
m_activeTimeline->projectView()->deleteSelectedClips();
}
}
void MainWindow::slotAddCustomEffect(QAction *result) {
if (!result) return;
+ if (result->data().toString().isEmpty()) return;
QDomElement effect = customEffects.getEffectByName(result->data().toString());
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();
}
}
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();
}
}
}
+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