X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=8ce29546cdb344ef8ebab02f752969233383e854;hb=623c7ac1fac4f52a39f102649d062cc900e470d6;hp=ea63023225d9f0405374913db48afefcc62373e2;hpb=09d3c81cf2a582a71fd19cba534cca082e57d75a;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ea630232..8ce29546 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -50,6 +50,8 @@ #include "clipitem.h" #include "interfaces.h" #include "kdenlive-config.h" +#include "cliptranscode.h" +#include "ui_templateclip_ui.h" #include #include @@ -69,6 +71,7 @@ #include #include #include +#include #include #include #include @@ -83,19 +86,16 @@ #include #include #include +#include #include static const char version[] = VERSION; -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; +static const int ID_TIMELINE_POS = 0; -namespace Mlt { +namespace Mlt +{ class Producer; }; @@ -104,13 +104,16 @@ EffectsList MainWindow::audioEffects; EffectsList MainWindow::customEffects; EffectsList MainWindow::transitions; -MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent) - : KXmlGuiWindow(parent), - m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), +MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent) : + KXmlGuiWindow(parent), + m_activeDocument(NULL), + m_activeTimeline(NULL), + m_renderWidget(NULL), #ifndef NO_JOGSHUTTLE m_jogProcess(NULL), #endif /* NO_JOGSHUTTLE */ - m_findActivated(false), m_initialized(false) { + m_findActivated(false) +{ // Create DBus interface new MainWindowAdaptor(this); @@ -136,72 +139,78 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent connect(&m_findTimer, SIGNAL(timeout()), this, SLOT(findTimeout())); m_findTimer.setSingleShot(true); + // FIXME: the next call returns a newly allocated object, which leaks initEffects::parseEffectFiles(); //initEffects::parseCustomEffectsFile(); m_monitorManager = new MonitorManager(); - projectListDock = new QDockWidget(i18n("Project Tree"), this); - projectListDock->setObjectName("project_tree"); + m_projectListDock = new QDockWidget(i18n("Project Tree"), this); + m_projectListDock->setObjectName("project_tree"); m_projectList = new ProjectList(this); - projectListDock->setWidget(m_projectList); - addDockWidget(Qt::TopDockWidgetArea, projectListDock); + m_projectListDock->setWidget(m_projectList); + addDockWidget(Qt::TopDockWidgetArea, m_projectListDock); - effectListDock = new QDockWidget(i18n("Effect List"), this); - effectListDock->setObjectName("effect_list"); + m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this); + connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus())); + + m_effectListDock = new QDockWidget(i18n("Effect List"), this); + m_effectListDock->setObjectName("effect_list"); m_effectList = new EffectsListView(); //m_effectList = new KListWidget(this); - effectListDock->setWidget(m_effectList); - addDockWidget(Qt::TopDockWidgetArea, effectListDock); + m_effectListDock->setWidget(m_effectList); + addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); - effectStackDock = new QDockWidget(i18n("Effect Stack"), this); - effectStackDock->setObjectName("effect_stack"); - effectStack = new EffectStackView(this); - effectStackDock->setWidget(effectStack); - addDockWidget(Qt::TopDockWidgetArea, effectStackDock); + m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this); + m_effectStackDock->setObjectName("effect_stack"); + m_effectStack = new EffectStackView(this); + m_effectStackDock->setWidget(m_effectStack); + addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock); - transitionConfigDock = new QDockWidget(i18n("Transition"), this); - transitionConfigDock->setObjectName("transition"); - transitionConfig = new TransitionSettings(this); - transitionConfigDock->setWidget(transitionConfig); - addDockWidget(Qt::TopDockWidgetArea, transitionConfigDock); + m_transitionConfigDock = new QDockWidget(i18n("Transition"), this); + m_transitionConfigDock->setObjectName("transition"); + m_transitionConfig = new TransitionSettings(this); + m_transitionConfigDock->setWidget(m_transitionConfig); + addDockWidget(Qt::TopDockWidgetArea, m_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"); + //slotDetectAudioDriver(); + + m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); + m_clipMonitorDock->setObjectName("clip_monitor"); m_clipMonitor = new Monitor("clip", m_monitorManager, this); - clipMonitorDock->setWidget(m_clipMonitor); - addDockWidget(Qt::TopDockWidgetArea, clipMonitorDock); + m_clipMonitorDock->setWidget(m_clipMonitor); + addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock); //m_clipMonitor->stop(); - projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); - projectMonitorDock->setObjectName("project_monitor"); + m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); + m_projectMonitorDock->setObjectName("project_monitor"); m_projectMonitor = new Monitor("project", m_monitorManager, this); - projectMonitorDock->setWidget(m_projectMonitor); - addDockWidget(Qt::TopDockWidgetArea, projectMonitorDock); + m_projectMonitorDock->setWidget(m_projectMonitor); + addDockWidget(Qt::TopDockWidgetArea, m_projectMonitorDock); - recMonitorDock = new QDockWidget(i18n("Record Monitor"), this); - recMonitorDock->setObjectName("record_monitor"); + m_recMonitorDock = new QDockWidget(i18n("Record Monitor"), this); + m_recMonitorDock->setObjectName("record_monitor"); m_recMonitor = new RecMonitor("record", this); - recMonitorDock->setWidget(m_recMonitor); - addDockWidget(Qt::TopDockWidgetArea, recMonitorDock); + m_recMonitorDock->setWidget(m_recMonitor); + addDockWidget(Qt::TopDockWidgetArea, m_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"); + m_undoViewDock = new QDockWidget(i18n("Undo History"), this); + m_undoViewDock->setObjectName("undo_history"); m_undoView = new QUndoView(this); m_undoView->setCleanIcon(KIcon("edit-clear")); m_undoView->setEmptyLabel(i18n("Clean")); - undoViewDock->setWidget(m_undoView); + m_undoViewDock->setWidget(m_undoView); m_undoView->setGroup(m_commandStack); - addDockWidget(Qt::TopDockWidgetArea, undoViewDock); + addDockWidget(Qt::TopDockWidgetArea, m_undoViewDock); //overviewDock = new QDockWidget(i18n("Project Overview"), this); //overviewDock->setObjectName("project_overview"); @@ -211,13 +220,13 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent setupActions(); //tabifyDockWidget(projectListDock, effectListDock); - tabifyDockWidget(projectListDock, effectStackDock); - tabifyDockWidget(projectListDock, transitionConfigDock); + tabifyDockWidget(m_projectListDock, m_effectStackDock); + tabifyDockWidget(m_projectListDock, m_transitionConfigDock); //tabifyDockWidget(projectListDock, undoViewDock); - tabifyDockWidget(clipMonitorDock, projectMonitorDock); - tabifyDockWidget(clipMonitorDock, recMonitorDock); + tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock); + tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock); setCentralWidget(m_timelineArea); @@ -226,11 +235,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent guiFactory()->addClient(sp);*/ loadPlugins(); + loadTranscoders(); //kDebug() << factory() << " " << factory()->container("video_effects_menu", this); m_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone); m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast(factory()->container("marker_menu", this))); - m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this))); + m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this)), static_cast(factory()->container("transcoders", this))); // build effects menus QAction *action; @@ -285,7 +295,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent newEffect->addMenu(videoEffectsMenu); newEffect->addMenu(audioEffectsMenu); newEffect->addMenu(m_customEffectsMenu); - effectStack->setMenu(newEffect); + m_effectStack->setMenu(newEffect); QMenu *viewMenu = static_cast(factory()->container("dockwindows", this)); @@ -321,10 +331,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent 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("group_clip")); + m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); m_timelineContextClipMenu->addAction(actionCollection()->action("paste_effects")); + m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio")); QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this)); m_timelineContextClipMenu->addMenu(markersMenu); @@ -339,11 +351,11 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_timelineContextTransitionMenu->addAction(actionCollection()->action("auto_transition")); - connect(projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool))); - connect(clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); + connect(m_projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool))); + connect(m_clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); //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(addEffect(const QDomElement)), this, SLOT(slotAddEffect(const QDomElement))); connect(m_effectList, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor); @@ -366,24 +378,54 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent #ifndef NO_JOGSHUTTLE activateShuttleDevice(); #endif /* NO_JOGSHUTTLE */ - projectListDock->raise(); + m_projectListDock->raise(); } -void MainWindow::queryQuit() { - kDebug() << "----- SAVING CONFUIG"; - if (queryClose()) kapp->quit(); +void MainWindow::queryQuit() +{ + if (queryClose()) { + if (m_projectMonitor) m_projectMonitor->stop(); + if (m_clipMonitor) m_clipMonitor->stop(); + delete m_effectStack; + delete m_activeTimeline; + delete m_projectMonitor; + delete m_clipMonitor; + delete m_activeDocument; + delete m_shortcutRemoveFocus; + Mlt::Factory::close(); + kapp->quit(); + } } //virtual -bool MainWindow::queryClose() { +bool MainWindow::queryClose() +{ + if (m_renderWidget) { + int waitingJobs = m_renderWidget->waitingJobsCount(); + if (waitingJobs > 0) { + switch (KMessageBox::warningYesNoCancel(this, i18n("You have %1 rendering jobs waiting in the queue.\nWhat do you want to do with these jobs?", waitingJobs), QString(), KGuiItem(i18n("Start them now")), KGuiItem(i18n("Delete them")))) { + case KMessageBox::Yes : + // create script with waiting jobs and start it + if (m_renderWidget->startWaitingRenderJobs() == false) return false; + break; + case KMessageBox::No : + // Don't do anything, jobs will be deleted + break; + default: + return false; + } + } + } saveOptions(); if (m_monitorManager) m_monitorManager->stopActiveMonitor(); if (m_activeDocument && m_activeDocument->isModified()) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) { + switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { case KMessageBox::Yes : // save document here. If saving fails, return false; return saveFile(); case KMessageBox::No : + // User does not want to save the changes, clear recovery files + m_activeDocument->m_autosave->resize(0); return true; default: // cancel return false; @@ -393,7 +435,8 @@ bool MainWindow::queryClose() { } -void MainWindow::loadPlugins() { +void MainWindow::loadPlugins() +{ foreach(QObject *plugin, QPluginLoader::staticInstances()) populateMenus(plugin); @@ -416,17 +459,19 @@ void MainWindow::loadPlugins() { //exit(1); } -void MainWindow::populateMenus(QObject *plugin) { +void MainWindow::populateMenus(QObject *plugin) +{ QMenu *addMenu = static_cast(factory()->container("generators", this)); ClipGenerator *iGenerator = qobject_cast(plugin); if (iGenerator) - addToMenu(plugin, iGenerator->generators(), addMenu, SLOT(generateClip()), + addToMenu(plugin, iGenerator->generators(KdenliveSettings::producerslist()), addMenu, SLOT(generateClip()), NULL); } void MainWindow::addToMenu(QObject *plugin, const QStringList &texts, QMenu *menu, const char *member, - QActionGroup *actionGroup) { + QActionGroup *actionGroup) +{ kDebug() << "// ADD to MENU" << texts; foreach(const QString &text, texts) { QAction *action = new QAction(text, plugin); @@ -441,35 +486,42 @@ void MainWindow::addToMenu(QObject *plugin, const QStringList &texts, } } -void MainWindow::aboutPlugins() { +void MainWindow::aboutPlugins() +{ //PluginDialog dialog(pluginsDir.path(), m_pluginFileNames, this); //dialog.exec(); } -void MainWindow::generateClip() { +void MainWindow::generateClip() +{ QAction *action = qobject_cast(sender()); ClipGenerator *iGenerator = qobject_cast(action->parent()); KUrl clipUrl = iGenerator->generatedClip(action->data().toString(), m_activeDocument->projectFolder(), QStringList(), QStringList(), 25, 720, 576); if (!clipUrl.isEmpty()) { - m_projectList->slotAddClip(clipUrl); + m_projectList->slotAddClip(QList () << clipUrl); } } -void MainWindow::saveProperties(KConfig*) { +void MainWindow::saveProperties(KConfigGroup &config) +{ // save properties here,used by session management saveFile(); + KMainWindow::saveProperties(config); } -void MainWindow::readProperties(KConfig *config) { +void MainWindow::readProperties(const KConfigGroup &config) +{ // read properties here,used by session management - QString Lastproject = config->group("Recent Files").readPathEntry("File1", QString()); + KMainWindow::readProperties(config); + QString Lastproject = config.group("Recent Files").readPathEntry("File1", QString()); openFile(KUrl(Lastproject)); } -void MainWindow::slotReloadEffects() { +void MainWindow::slotReloadEffects() +{ initEffects::parseCustomEffectsFile(); m_customEffectsMenu->clear(); const QStringList effects = customEffects.effectNames(); @@ -486,8 +538,9 @@ void MainWindow::slotReloadEffects() { } #ifndef NO_JOGSHUTTLE -void MainWindow::activateShuttleDevice() { - if (m_jogProcess) delete m_jogProcess; +void MainWindow::activateShuttleDevice() +{ + delete m_jogProcess; m_jogProcess = NULL; if (KdenliveSettings::enableshuttle() == false) return; m_jogProcess = new JogShuttle(KdenliveSettings::shuttledevice()); @@ -499,7 +552,8 @@ void MainWindow::activateShuttleDevice() { connect(m_jogProcess, SIGNAL(button(int)), this, SLOT(slotShuttleButton(int))); } -void MainWindow::slotShuttleButton(int code) { +void MainWindow::slotShuttleButton(int code) +{ switch (code) { case 5: slotShuttleAction(KdenliveSettings::shuttle1()); @@ -519,7 +573,8 @@ void MainWindow::slotShuttleButton(int code) { } } -void MainWindow::slotShuttleAction(int code) { +void MainWindow::slotShuttleAction(int code) +{ switch (code) { case 0: return; @@ -533,44 +588,50 @@ void MainWindow::slotShuttleAction(int code) { } #endif /* NO_JOGSHUTTLE */ -void MainWindow::configureNotifications() { +void MainWindow::configureNotifications() +{ KNotifyConfigWidget::configure(this); } -void MainWindow::slotFullScreen() { +void MainWindow::slotFullScreen() +{ KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked()); } -void MainWindow::slotAddEffect(QDomElement effect, GenTime pos, int track) { +void MainWindow::slotAddEffect(const QDomElement effect, GenTime pos, int track) +{ if (!m_activeDocument) return; if (effect.isNull()) { kDebug() << "--- ERROR, TRYING TO APPEND NULL EFFECT"; return; } - TrackView *currentTimeLine = (TrackView *) m_timelineArea->currentWidget(); - currentTimeLine->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track); + QDomElement effectToAdd = effect.cloneNode().toElement(); + m_activeTimeline->projectView()->slotAddEffect(effectToAdd, pos, track); } -void MainWindow::slotRaiseMonitor(bool clipMonitor) { - if (clipMonitor) clipMonitorDock->raise(); - else projectMonitorDock->raise(); +void MainWindow::slotRaiseMonitor(bool clipMonitor) +{ + if (clipMonitor) m_clipMonitorDock->raise(); + else m_projectMonitorDock->raise(); } -void MainWindow::slotSetClipDuration(const QString &id, int duration) { +void MainWindow::slotUpdateClip(const QString &id) +{ if (!m_activeDocument) return; - m_activeDocument->setProducerDuration(id, duration); + m_activeTimeline->projectView()->slotUpdateClip(id); } -void MainWindow::slotConnectMonitors() { +void MainWindow::slotConnectMonitors() +{ m_projectList->setRenderer(m_projectMonitor->render); - connect(m_projectList, SIGNAL(receivedClipDuration(const QString &, int)), this, SLOT(slotSetClipDuration(const QString &, int))); + connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &))); connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *))); - connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, const QString &, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &, bool))); + connect(m_projectList, SIGNAL(getFileProperties(const QDomElement, const QString &, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement, const QString &, bool))); connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &))); connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool))); - connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &))); + connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &, bool)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &, bool))); connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &))); @@ -581,30 +642,35 @@ void MainWindow::slotConnectMonitors() { connect(m_projectMonitor, SIGNAL(saveZone(Render *, QPoint)), this, SLOT(slotSaveZone(Render *, QPoint))); } -void MainWindow::slotAdjustClipMonitor() { - clipMonitorDock->updateGeometry(); - clipMonitorDock->adjustSize(); +void MainWindow::slotAdjustClipMonitor() +{ + m_clipMonitorDock->updateGeometry(); + m_clipMonitorDock->adjustSize(); m_clipMonitor->resetSize(); } -void MainWindow::slotAdjustProjectMonitor() { - projectMonitorDock->updateGeometry(); - projectMonitorDock->adjustSize(); +void MainWindow::slotAdjustProjectMonitor() +{ + m_projectMonitorDock->updateGeometry(); + m_projectMonitorDock->adjustSize(); m_projectMonitor->resetSize(); } -void MainWindow::setupActions() { +void MainWindow::setupActions() +{ KActionCollection* collection = actionCollection(); m_timecodeFormat = new KComboBox(this); m_timecodeFormat->addItem(i18n("hh:mm:ss::ff")); m_timecodeFormat->addItem(i18n("Frames")); + if (KdenliveSettings::frametimecode()) m_timecodeFormat->setCurrentIndex(1); + connect(m_timecodeFormat, SIGNAL(activated(int)), this, SLOT(slotUpdateTimecodeFormat(int))); - statusProgressBar = new QProgressBar(this); - statusProgressBar->setMinimum(0); - statusProgressBar->setMaximum(100); - statusProgressBar->setMaximumWidth(150); - statusProgressBar->setVisible(false); + m_statusProgressBar = new QProgressBar(this); + m_statusProgressBar->setMinimum(0); + m_statusProgressBar->setMaximum(100); + m_statusProgressBar->setMaximumWidth(150); + m_statusProgressBar->setVisible(false); QWidget *w = new QWidget; @@ -619,16 +685,19 @@ void MainWindow::setupActions() { 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 = new KAction(KIcon("kdenlive-select-tool"), i18n("Selection tool"), this); + m_buttonSelectTool->setShortcut(i18nc("Selection tool shortcut", "s")); toolbar->addAction(m_buttonSelectTool); m_buttonSelectTool->setCheckable(true); m_buttonSelectTool->setChecked(true); m_buttonRazorTool = new KAction(KIcon("edit-cut"), i18n("Razor tool"), this); + m_buttonRazorTool->setShortcut(i18nc("Razor tool shortcut", "x")); toolbar->addAction(m_buttonRazorTool); m_buttonRazorTool->setCheckable(true); m_buttonRazorTool->setChecked(false); m_buttonSpacerTool = new KAction(KIcon("kdenlive-spacer-tool"), i18n("Spacer tool"), this); + m_buttonSpacerTool->setShortcut(i18nc("Spacer tool shortcut", "m")); toolbar->addAction(m_buttonSpacerTool); m_buttonSpacerTool->setCheckable(true); m_buttonSpacerTool->setChecked(false); @@ -642,15 +711,15 @@ void MainWindow::setupActions() { QWidget * actionWidget; actionWidget = toolbar->widgetForAction(m_buttonSelectTool); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonRazorTool); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonSpacerTool); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); toolbar->setStyleSheet(style1); connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *))); @@ -663,7 +732,7 @@ void MainWindow::setupActions() { actionWidget = toolbar->widgetForAction(m_buttonFitZoom); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); m_zoomSlider = new QSlider(Qt::Horizontal, this); m_zoomSlider->setMaximum(13); @@ -713,30 +782,29 @@ void MainWindow::setupActions() { actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonAudioThumbs); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonShowMarkers); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); actionWidget = toolbar->widgetForAction(m_buttonSnap); actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(17); + actionWidget->setMinimumHeight(18); m_messageLabel = new StatusBarMessageLabel(this); m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding); statusBar()->addWidget(m_messageLabel, 10); - statusBar()->addWidget(statusProgressBar, 0); - statusBar()->insertPermanentWidget(ID_TIMELINE_BUTTONS, w); + statusBar()->addWidget(m_statusProgressBar, 0); + statusBar()->addPermanentWidget(w); statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS); - statusBar()->insertPermanentWidget(ID_TIMELINE_FORMAT, m_timecodeFormat); + statusBar()->addPermanentWidget(m_timecodeFormat); statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4); - m_messageLabel->hide(); collection->addAction("select_tool", m_buttonSelectTool); collection->addAction("razor_tool", m_buttonRazorTool); @@ -773,7 +841,7 @@ void MainWindow::setupActions() { collection->addAction("manage_profiles", profilesAction); connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles())); - KNS::standardAction(i18n("Download New Lumas..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); + KNS::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); KNS::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles"); @@ -810,10 +878,14 @@ void MainWindow::setupActions() { collection->addAction("monitor_loop_zone", m_loopZone); connect(m_loopZone, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotLoopZone())); - KAction *dvdWizard = new KAction(KIcon("media-optical"), i18n("Dvd Wizard"), this); + KAction *dvdWizard = new KAction(KIcon("media-optical"), i18n("DVD Wizard"), this); collection->addAction("dvd_wizard", dvdWizard); connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard())); + KAction *transcodeClip = new KAction(KIcon("edit-copy"), i18n("Transcode Clip"), this); + collection->addAction("transcode_clip", transcodeClip); + connect(transcodeClip, SIGNAL(triggered(bool)), this, SLOT(slotTranscodeClip())); + KAction *markIn = collection->addAction("mark_in"); markIn->setText(i18n("Set In Point")); markIn->setShortcut(Qt::Key_I); @@ -889,10 +961,10 @@ void MainWindow::setupActions() { collection->addAction("delete_timeline_clip", deleteTimelineClip); connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip())); - KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this); + /*KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this); collection->addAction("change_clip_speed", editTimelineClipSpeed); editTimelineClipSpeed->setData("change_speed"); - connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed())); + connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));*/ KAction *stickTransition = collection->addAction("auto_transition"); stickTransition->setData(QString("auto")); @@ -901,6 +973,17 @@ void MainWindow::setupActions() { stickTransition->setText(i18n("Automatic Transition")); connect(stickTransition, SIGNAL(triggered(bool)), this, SLOT(slotAutoTransition())); + KAction* groupClip = new KAction(KIcon("object-group"), i18n("Group Clips"), this); + groupClip->setShortcut(Qt::CTRL + Qt::Key_G); + collection->addAction("group_clip", groupClip); + connect(groupClip, SIGNAL(triggered(bool)), this, SLOT(slotGroupClips())); + + KAction* ungroupClip = new KAction(KIcon("object-ungroup"), i18n("Ungroup Clips"), this); + collection->addAction("ungroup_clip", ungroupClip); + ungroupClip->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G); + ungroupClip->setData("ungroup_clip"); + connect(ungroupClip, SIGNAL(triggered(bool)), this, SLOT(slotUnGroupClips())); + KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this); cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R); collection->addAction("cut_timeline_clip", cutTimelineClip); @@ -922,6 +1005,32 @@ void MainWindow::setupActions() { collection->addAction("edit_clip_marker", editClipMarker); connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker())); + KAction* splitAudio = new KAction(KIcon("document-new"), i18n("Split Audio"), this); + collection->addAction("split_audio", splitAudio); + connect(splitAudio, SIGNAL(triggered(bool)), this, SLOT(slotSplitAudio())); + + KAction* audioOnly = new KAction(KIcon("document-new"), i18n("Audio Only"), this); + collection->addAction("clip_audio_only", audioOnly); + audioOnly->setData("clip_audio_only"); + audioOnly->setCheckable(true); + + KAction* videoOnly = new KAction(KIcon("document-new"), i18n("Video Only"), this); + collection->addAction("clip_video_only", videoOnly); + videoOnly->setData("clip_video_only"); + videoOnly->setCheckable(true); + + KAction* audioAndVideo = new KAction(KIcon("document-new"), i18n("Audio and Video"), this); + collection->addAction("clip_audio_and_video", audioAndVideo); + audioAndVideo->setData("clip_audio_and_video"); + audioAndVideo->setCheckable(true); + + m_clipTypeGroup = new QActionGroup(this); + m_clipTypeGroup->addAction(audioOnly); + m_clipTypeGroup->addAction(videoOnly); + m_clipTypeGroup->addAction(audioAndVideo); + connect(m_clipTypeGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotUpdateClipType(QAction *))); + m_clipTypeGroup->setEnabled(false); + KAction *insertSpace = new KAction(KIcon(), i18n("Insert Space"), this); collection->addAction("insert_space", insertSpace); connect(insertSpace, SIGNAL(triggered()), this, SLOT(slotInsertSpace())); @@ -963,6 +1072,19 @@ void MainWindow::setupActions() { pasteEffects->setData("paste_effects"); connect(pasteEffects , SIGNAL(triggered()), this, SLOT(slotPasteEffects())); + QAction *showTimeline = new KAction(i18n("Show Timeline"), this); + collection->addAction("show_timeline", showTimeline); + showTimeline->setCheckable(true); + showTimeline->setChecked(true); + connect(showTimeline, SIGNAL(triggered(bool)), this, SLOT(slotShowTimeline(bool))); + + /*QAction *maxCurrent = new KAction(i18n("Maximize Current Widget"), this); + collection->addAction("maximize_current", maxCurrent); + maxCurrent->setCheckable(true); + maxCurrent->setChecked(false); + connect(maxCurrent, SIGNAL(triggered(bool)), this, SLOT(slotMaximizeCurrent(bool)));*/ + + m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection); KStandardAction::quit(this, SLOT(queryQuit()), collection); @@ -993,8 +1115,10 @@ void MainWindow::setupActions() { KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection); + /* + //TODO: Add status tooltip to actions ? connect(collection, SIGNAL(actionHovered(QAction*)), - this, SLOT(slotDisplayActionMessage(QAction*))); + this, SLOT(slotDisplayActionMessage(QAction*)));*/ QAction *addClip = new KAction(KIcon("kdenlive-add-clip"), i18n("Add Clip"), this); @@ -1013,6 +1137,10 @@ void MainWindow::setupActions() { collection->addAction("add_text_clip", addTitleClip); connect(addTitleClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleClip())); + QAction *addTitleTemplateClip = new KAction(KIcon("kdenlive-add-text-clip"), i18n("Add Template Title"), this); + collection->addAction("add_text_template_clip", addTitleTemplateClip); + connect(addTitleTemplateClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleTemplateClip())); + QAction *addFolderButton = new KAction(KIcon("folder-new"), i18n("Create Folder"), this); collection->addAction("add_folder", addFolderButton); connect(addFolderButton , SIGNAL(triggered()), m_projectList, SLOT(slotAddFolder())); @@ -1046,6 +1174,7 @@ void MainWindow::setupActions() { addClips->addAction(addColorClip); addClips->addAction(addSlideClip); addClips->addAction(addTitleClip); + addClips->addAction(addTitleTemplateClip); addClips->addAction(addFolderButton); addClips->addAction(reloadClip); @@ -1058,11 +1187,13 @@ void MainWindow::setupActions() { //statusBar(), SLOT( clear() ) ); } -void MainWindow::slotDisplayActionMessage(QAction *a) { +void MainWindow::slotDisplayActionMessage(QAction *a) +{ statusBar()->showMessage(a->data().toString(), 3000); } -void MainWindow::saveOptions() { +void MainWindow::saveOptions() +{ KdenliveSettings::self()->writeConfig(); KSharedConfigPtr config = KGlobal::config(); m_fileOpenRecent->saveEntries(KConfigGroup(config, "Recent Files")); @@ -1071,21 +1202,24 @@ void MainWindow::saveOptions() { config->sync(); } -void MainWindow::readOptions() { +void MainWindow::readOptions() +{ KSharedConfigPtr config = KGlobal::config(); m_fileOpenRecent->loadEntries(KConfigGroup(config, "Recent Files")); KConfigGroup initialGroup(config, "version"); bool upgrade = false; if (initialGroup.exists()) { - if (initialGroup.readEntry("version", QString()).section(' ', 0, 0) != QString(version).section(' ', 0, 0)) + if (initialGroup.readEntry("version", QString()).section(' ', 0, 0) != QString(version).section(' ', 0, 0)) { upgrade = true; + } 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); + if (KStandardDirs::makeDir(path) == false) { + kDebug() << "/// ERROR CREATING PROJECT FOLDER: " << path; + } else KdenliveSettings::setDefaultprojectfolder(path); } } @@ -1108,25 +1242,33 @@ void MainWindow::readOptions() { m_projectList->setHeaderInfo(state); } -void MainWindow::slotRunWizard() { - Wizard *w = new Wizard(this); +void MainWindow::slotRunWizard() +{ + Wizard *w = new Wizard(false, this); if (w->exec() == QDialog::Accepted && w->isOk()) { w->adjustSettings(); } delete w; } -void MainWindow::newFile(bool showProjectSettings) { +void MainWindow::newFile(bool showProjectSettings) +{ + if (!m_timelineArea->isEnabled()) return; QString profileName; KUrl projectFolder; QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); if (!showProjectSettings && m_timelineArea->count() == 0) { if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); profileName = KdenliveSettings::default_profile(); + projectFolder = KdenliveSettings::defaultprojectfolder(); } else { ProjectSettings *w = new ProjectSettings(projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, this); if (w->exec() != QDialog::Accepted) return; if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); + KdenliveSettings::setVideothumbnails(w->enableVideoThumbs()); + m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); + KdenliveSettings::setAudiothumbnails(w->enableAudioThumbs()); + m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); profileName = w->selectedProfile(); projectFolder = w->selectedFolder(); projectTracks = w->tracks(); @@ -1134,8 +1276,17 @@ void MainWindow::newFile(bool showProjectSettings) { } KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this); doc->m_autosave = new KAutoSaveFile(KUrl(), doc); - TrackView *trackView = new TrackView(doc, this); + bool ok; + TrackView *trackView = new TrackView(doc, &ok, this); m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description()); + if (!ok) { + // MLT is broken + m_timelineArea->setEnabled(false); + m_projectList->setEnabled(false); + m_monitorManager->slotBlockMonitors(); + slotPreferences(6); + return; + } if (m_timelineArea->count() == 1) { connectDocumentInfo(doc); connectDocument(trackView, doc); @@ -1143,15 +1294,17 @@ void MainWindow::newFile(bool showProjectSettings) { m_closeAction->setEnabled(m_timelineArea->count() > 1); } -void MainWindow::activateDocument() { - if (m_timelineArea->currentWidget() == NULL) return; +void MainWindow::activateDocument() +{ + if (m_timelineArea->currentWidget() == NULL || !m_timelineArea->isEnabled()) return; TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); KdenliveDoc *currentDoc = currentTab->document(); connectDocumentInfo(currentDoc); connectDocument(currentTab, currentDoc); } -void MainWindow::closeCurrentDocument() { +void MainWindow::closeCurrentDocument() +{ QWidget *w = m_timelineArea->currentWidget(); if (!w) return; // closing current document @@ -1161,13 +1314,14 @@ void MainWindow::closeCurrentDocument() { TrackView *tabToClose = (TrackView *) w; KdenliveDoc *docToClose = tabToClose->document(); if (docToClose && docToClose->isModified()) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) { + switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { case KMessageBox::Yes : // save document here. If saving fails, return false; - saveFile(); + if (saveFile() == false) return; break; case KMessageBox::Cancel : return; + break; default: break; } @@ -1177,16 +1331,20 @@ void MainWindow::closeCurrentDocument() { m_timelineArea->setTabBarHidden(true); m_closeAction->setEnabled(false); } - delete docToClose; - delete w; - if (m_timelineArea->count() == 0) { + if (docToClose == m_activeDocument) { + delete m_activeDocument; m_activeDocument = NULL; - effectStack->clear(); - transitionConfig->slotTransitionItemSelected(NULL, false); - } + m_effectStack->clear(); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + } else delete docToClose; + if (w == m_activeTimeline) { + delete m_activeTimeline; + m_activeTimeline = NULL; + } else delete w; } -bool MainWindow::saveFileAs(const QString &outputFileName) { +bool MainWindow::saveFileAs(const QString &outputFileName) +{ QString currentSceneList; if (KdenliveSettings::dropbframes()) { KdenliveSettings::setDropbframes(false); @@ -1213,7 +1371,8 @@ bool MainWindow::saveFileAs(const QString &outputFileName) { return true; } -bool MainWindow::saveFileAs() { +bool MainWindow::saveFileAs() +{ // Check that the Kdenlive mime type is correctly installed QString mimetype = "application/x-kdenlive"; KMimeType::Ptr mime = KMimeType::mimeType(mimetype); @@ -1222,12 +1381,13 @@ bool MainWindow::saveFileAs() { 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 false; + if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return false; } return saveFileAs(outputFile); } -bool MainWindow::saveFile() { +bool MainWindow::saveFile() +{ if (!m_activeDocument) return true; if (m_activeDocument->url().isEmpty()) { return saveFileAs(); @@ -1238,7 +1398,8 @@ bool MainWindow::saveFile() { } } -void MainWindow::openFile() { +void MainWindow::openFile() +{ // Check that the Kdenlive mime type is correctly installed QString mimetype = "application/x-kdenlive"; KMimeType::Ptr mime = KMimeType::mimeType(mimetype); @@ -1250,15 +1411,17 @@ void MainWindow::openFile() { openFile(url); } -void MainWindow::openLastFile() { +void MainWindow::openLastFile() +{ KSharedConfigPtr config = KGlobal::config(); KUrl::List urls = m_fileOpenRecent->urls(); - //WARNING: this is buggy, we get a random url, not the last one. Bug in KRecentFileAction ? + //WARNING: this is buggy, we get a random url, not the last one. Bug in KRecentFileAction? if (urls.isEmpty()) newFile(false); else openFile(urls.last()); } -void MainWindow::openFile(const KUrl &url) { +void MainWindow::openFile(const KUrl &url) +{ // Check if the document is already opened const int ct = m_timelineArea->count(); bool isOpened = false; @@ -1297,8 +1460,10 @@ void MainWindow::openFile(const KUrl &url) { doOpenFile(url, NULL); } -void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { - KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), m_projectMonitor->render, this); +void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) +{ + if (!m_timelineArea->isEnabled()) return; + KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, this); if (stale == NULL) { stale = new KAutoSaveFile(url, doc); doc->m_autosave = stale; @@ -1309,8 +1474,16 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { stale->setParent(doc); } connectDocumentInfo(doc); - TrackView *trackView = new TrackView(doc, this); + bool ok; + TrackView *trackView = new TrackView(doc, &ok, this); m_timelineArea->setCurrentIndex(m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description())); + if (!ok) { + m_timelineArea->setEnabled(false); + m_projectList->setEnabled(false); + m_monitorManager->slotBlockMonitors(); + slotPreferences(6); + return; + } m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path()); trackView->setDuration(trackView->duration()); trackView->projectView()->initCursorPos(m_projectMonitor->render->seekPosition().frames(doc->fps())); @@ -1322,7 +1495,8 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { m_projectMonitor->slotZoneMoved(trackView->inPoint(), trackView->outPoint()); } -void MainWindow::recoverFiles(QList staleFiles) { +void MainWindow::recoverFiles(QList staleFiles) +{ if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); foreach(KAutoSaveFile *stale, staleFiles) { /*if (!stale->open(QIODevice::QIODevice::ReadOnly)) { @@ -1332,37 +1506,38 @@ void MainWindow::recoverFiles(QList staleFiles) { continue; }*/ kDebug() << "// OPENING RECOVERY: " << stale->fileName() << "\nMANAGED: " << stale->managedFile().path(); - // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile ? + // 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(const QString &mltPath) { - //kdDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <selectedUrl(); delete getUrl; if (mltPath.isEmpty()) ::exit(0); - KdenliveSettings::setMltpath(mltPath.path()); + KdenliveSettings::setMltpath(mltPath.path(KUrl::AddTrailingSlash)); 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(QString(), i18n("Cannot find the inigo program required for rendering (part of Mlt)"), this); + // Cannot find the MLT melt renderer, ask for location + KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the melt program required for rendering (part of Mlt)"), this); if (getUrl->exec() == QDialog::Rejected) { ::exit(0); } @@ -1397,14 +1572,15 @@ void MainWindow::parseProfiles(const QString &mltPath) { KdenliveSettings::setRendererpath(rendererPath.path()); } - kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath(); + kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath(); // Parse MLT profiles to build a list of available video formats if (profilesList.isEmpty()) parseProfiles(); } -void MainWindow::slotEditProfiles() { +void MainWindow::slotEditProfiles() +{ ProfilesDialog *w = new ProfilesDialog; if (w->exec() == QDialog::Accepted) { KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); @@ -1413,147 +1589,109 @@ void MainWindow::slotEditProfiles() { delete w; } -void MainWindow::slotEditProjectSettings() { +void MainWindow::slotDetectAudioDriver() +{ + /* WARNING: do not use this method because sometimes detects wrong driver (pulse instead of alsa), + leading to no audio output, see bug #934 */ + + //decide which audio driver is really best, in some cases SDL is wrong + if (KdenliveSettings::audiodrivername().isEmpty()) { + QString driver; + KProcess readProcess; + //PulseAudio needs to be selected if it exists, the ALSA pulse pcm device is not fast enough. + if (!KStandardDirs::findExe("pactl").isEmpty()) { + readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel); + readProcess.setProgram("pactl", QStringList() << "stat"); + readProcess.execute(2000); // Kill it after 2 seconds + + QString result = QString(readProcess.readAllStandardOutput()); + kDebug() << "// / / / / / READING PACTL: "; + kDebug() << result; + if (!result.isEmpty()) { + driver = "pulse"; + kDebug() << "// / / / / PULSEAUDIO DETECTED"; + } + } + //put others here + KdenliveSettings::setAutoaudiodrivername(driver); + } +} + +void MainWindow::slotEditProjectSettings() +{ 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->setProjectFolder(w->selectedFolder()); - if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path()); + if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash)); if (m_activeDocument->profilePath() != profile) { // Profile was changed + double dar = m_activeDocument->dar(); + + // Deselect current effect / transition + m_effectStack->slotClipItemSelected(NULL, 0); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + m_clipMonitor->slotSetXml(NULL, 0); m_activeDocument->setProfilePath(profile); KdenliveSettings::setCurrent_profile(profile); KdenliveSettings::setProject_fps(m_activeDocument->fps()); setCaption(m_activeDocument->description(), m_activeDocument->isModified()); + + m_activeDocument->clipManager()->clearUnusedProducers(); m_monitorManager->resetProfiles(m_activeDocument->timecode()); + + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeTimeline->tracksNumber()); + m_effectStack->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode()); if (m_renderWidget) m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); - m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList()); + //m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList()); + if (dar != m_activeDocument->dar()) m_projectList->reloadClipThumbnails(); + m_activeTimeline->updateProjectFps(); // We need to desactivate & reactivate monitors to get a refresh - m_monitorManager->switchMonitors(); + //m_monitorManager->switchMonitors(); } } delete w; } -void MainWindow::slotRenderProject() { +void MainWindow::slotRenderProject() +{ if (!m_renderWidget) { - QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path() : KdenliveSettings::defaultprojectfolder(); + QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder(); m_renderWidget = new RenderWidget(projectfolder, this); - connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &))); + connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &, const QString&)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString&))); + connect(m_renderWidget, SIGNAL(prepareRenderingData(bool, bool, const QString&)), this, SLOT(slotPrepareRendering(bool, bool, const QString&))); connect(m_renderWidget, SIGNAL(abortProcess(const QString &)), this, SIGNAL(abortRenderJob(const QString &))); connect(m_renderWidget, SIGNAL(openDvdWizard(const QString &, const QString &)), this, SLOT(slotDvdWizard(const QString &, const QString &))); if (m_activeDocument) { m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); + m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); + m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl")); } } /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); if (currentTab) m_renderWidget->setTimeline(currentTab); m_renderWidget->setDocument(m_activeDocument);*/ m_renderWidget->show(); + m_renderWidget->showNormal(); } -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, bool resizeProfile, const QString &scriptExport) { - kDebug() << "// SCRIPT EXPORT: " << scriptExport; - if (dest.isEmpty()) return; - int in = 0; - int out = 0; - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab && zoneOnly) { - in = currentTab->inPoint(); - out = currentTab->outPoint(); - } - KTemporaryFile temp; - temp.setAutoRemove(false); - temp.setSuffix(".westley"); - if (!scriptExport.isEmpty() || temp.open()) { - if (KdenliveSettings::dropbframes()) { - KdenliveSettings::setDropbframes(false); - m_activeDocument->clipManager()->updatePreviewSettings(); - if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".westley"); - else m_projectMonitor->saveSceneList(temp.fileName()); - KdenliveSettings::setDropbframes(true); - m_activeDocument->clipManager()->updatePreviewSettings(); - } else { - if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".westley"); - else m_projectMonitor->saveSceneList(temp.fileName()); - } - - QStringList args; - if (scriptExport.isEmpty()) args << "-erase"; - if (KdenliveSettings::usekuiserver()) args << "-kuiserver"; - 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)")); - setRenderingProgress(dest, -3); - return; - } - args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer; - - for (int i = 0; i < avformat_args.count(); i++) { - if (avformat_args.at(i).startsWith("profile=")) { - if (avformat_args.at(i).section('=', 1) != m_activeDocument->profilePath()) resizeProfile = true; - break; - } - } - - if (resizeProfile) { - // The rendering profile is different from project profile, so use MLT's special producer_consumer - if (scriptExport.isEmpty()) args << "consumer:" + temp.fileName(); - else args << "consumer:$SOURCE"; - } else { - if (scriptExport.isEmpty()) args << temp.fileName(); - else args << "$SOURCE"; - } - if (scriptExport.isEmpty()) args << dest; - else args << "$TARGET"; - args << avformat_args; - QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render"); - if (!QFile::exists(renderer)) renderer = "kdenlive_render"; - if (scriptExport.isEmpty()) { - QProcess::startDetached(renderer, args); - KNotification::event("RenderStarted", i18n("Rendering %1 started", dest), QPixmap(), this); - } else { - // Generate script file - QFile file(scriptExport); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - m_messageLabel->setMessage(i18n("Cannot write to file %1", scriptExport), ErrorMessage); - return; - } - - QTextStream out(&file); - out << "#! /bin/sh" << "\n" << "\n"; - out << "SOURCE=" << "\"" + scriptExport + ".westley\"" << "\n"; - out << "TARGET=" << "\"" + dest + "\"" << "\n"; - out << renderer << " " << args.join(" ") << "\n" << "\n"; - file.close(); - QFile::setPermissions(scriptExport, file.permissions() | QFile::ExeUser); - } - } -} - -void MainWindow::setRenderingProgress(const QString &url, int progress) { +void MainWindow::setRenderingProgress(const QString &url, int progress) +{ if (m_renderWidget) m_renderWidget->setRenderJob(url, progress); } -void MainWindow::setRenderingFinished(const QString &url, int status, const QString &error) { +void MainWindow::setRenderingFinished(const QString &url, int status, const QString &error) +{ if (m_renderWidget) m_renderWidget->setRenderStatus(url, status, error); } -void MainWindow::slotUpdateMousePosition(int pos) { +void MainWindow::slotUpdateMousePosition(int pos) +{ if (m_activeDocument) switch (m_timecodeFormat->currentIndex()) { case 0: @@ -1564,7 +1702,8 @@ void MainWindow::slotUpdateMousePosition(int pos) { } } -void MainWindow::slotUpdateDocumentState(bool modified) { +void MainWindow::slotUpdateDocumentState(bool modified) +{ if (!m_activeDocument) return; setCaption(m_activeDocument->description(), modified); m_saveAction->setEnabled(modified); @@ -1577,7 +1716,8 @@ void MainWindow::slotUpdateDocumentState(bool modified) { } } -void MainWindow::connectDocumentInfo(KdenliveDoc *doc) { +void MainWindow::connectDocumentInfo(KdenliveDoc *doc) +{ if (m_activeDocument) { if (m_activeDocument == doc) return; disconnect(m_activeDocument, SIGNAL(progressInfo(const QString &, int)), this, SLOT(slotGotProgressInfo(const QString &, int))); @@ -1585,10 +1725,11 @@ void MainWindow::connectDocumentInfo(KdenliveDoc *doc) { connect(doc, SIGNAL(progressInfo(const QString &, int)), this, SLOT(slotGotProgressInfo(const QString &, int))); } -void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //changed +void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //changed +{ //m_projectMonitor->stop(); m_closeAction->setEnabled(m_timelineArea->count() > 1); - kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////"; + kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////"; if (m_activeDocument) { if (m_activeDocument == doc) return; if (m_activeTimeline) { @@ -1596,7 +1737,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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_projectMonitor->render, SIGNAL(refreshDocumentProducers()), m_activeDocument, SLOT(checkProjectClips())); disconnect(m_activeDocument, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated())); disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); @@ -1605,10 +1746,10 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); + disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_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(Transition *))); + disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); + disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); disconnect(m_zoomSlider, SIGNAL(valueChanged(int)), m_activeTimeline, SLOT(slotChangeZoom(int))); disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); @@ -1617,30 +1758,32 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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)), 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)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); - disconnect(transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int))); + disconnect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); + disconnect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); + disconnect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); + disconnect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); + disconnect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*))); + disconnect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); + disconnect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); + disconnect(m_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)), this, SLOT(slotZoneMoved(int, int))); disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs())); - effectStack->clear(); + m_effectStack->clear(); } //m_activeDocument->setRenderer(NULL); disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); + disconnect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor())); m_clipMonitor->stop(); } KdenliveSettings::setCurrent_profile(doc->profilePath()); KdenliveSettings::setProject_fps(doc->fps()); m_monitorManager->resetProfiles(doc->timecode()); m_projectList->setDocument(doc); - transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber()); - effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode()); + m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber()); + m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode()); connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); + connect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor())); connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified())); connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString))); @@ -1653,6 +1796,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), doc, SLOT(checkProjectClips())); + connect(doc, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); connect(doc, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &))); @@ -1664,11 +1809,11 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha connect(doc, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated())); - connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); + connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_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(Transition *))); - m_zoomSlider->setValue(doc->zoom()); + connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); + connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); + m_zoomSlider->setValue(doc->zoom().x()); connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int))); connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); connect(trackView->projectView(), SIGNAL(zoomOut()), this, SLOT(slotZoomOut())); @@ -1677,29 +1822,30 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); - connect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); - connect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); - connect(effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); - connect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); - connect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*))); - connect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); - connect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); - connect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); + connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); + connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); + connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); + connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); + connect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*))); + connect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); + connect(m_transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); + connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs())); - trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu); + trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup); m_activeTimeline = trackView; if (m_renderWidget) { m_renderWidget->setProfile(doc->mltProfile()); - m_renderWidget->setDocumentPath(doc->projectFolder().path()); + m_renderWidget->setGuides(doc->guidesXml(), doc->projectDuration()); + m_renderWidget->setDocumentPath(doc->projectFolder().path(KUrl::AddTrailingSlash)); + m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl")); } //doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); KdenliveSettings::setProject_display_ratio(doc->dar()); - m_projectList->updateAllClips(); //doc->clipManager()->checkAudioThumbs(); //m_overView->setScene(trackView->projectScene()); @@ -1709,22 +1855,27 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha setCaption(doc->description(), doc->isModified()); m_saveAction->setEnabled(doc->isModified()); m_activeDocument = doc; + m_activeTimeline->updateProjectFps(); + m_projectList->updateAllClips(); if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings(); // set tool to select tool m_buttonSelectTool->setChecked(true); } -void MainWindow::slotZoneMoved(int start, int end) { +void MainWindow::slotZoneMoved(int start, int end) +{ m_activeDocument->setZone(start, end); m_projectMonitor->slotZoneMoved(start, end); } -void MainWindow::slotGuidesUpdated() { +void MainWindow::slotGuidesUpdated() +{ if (m_renderWidget) m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); } -void MainWindow::slotPreferences(int page, int option) { +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 @@ -1738,6 +1889,7 @@ void MainWindow::slotPreferences(int page, int option) { // create it : KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this); connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration())); + //connect(dialog, SIGNAL(doResetProfile()), this, SLOT(slotDetectAudioDriver())); connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles())); connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); connect(dialog, SIGNAL(updateCaptureFolder()), m_recMonitor, SLOT(slotUpdateCaptureFolder())); @@ -1746,14 +1898,16 @@ void MainWindow::slotPreferences(int page, int option) { if (page != -1) dialog->showPage(page, option); } -void MainWindow::slotUpdatePreviewSettings() { +void MainWindow::slotUpdatePreviewSettings() +{ if (m_activeDocument) { m_clipMonitor->slotSetXml(NULL, 0); m_activeDocument->updatePreviewSettings(); } } -void MainWindow::updateConfiguration() { +void MainWindow::updateConfiguration() +{ //TODO: we should apply settings to all projects, not only the current one if (m_activeTimeline) { m_activeTimeline->refresh(); @@ -1763,6 +1917,9 @@ void MainWindow::updateConfiguration() { } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); + + // Update list of transcoding profiles + loadTranscoders(); #ifndef NO_JOGSHUTTLE activateShuttleDevice(); #endif /* NO_JOGSHUTTLE */ @@ -1770,7 +1927,8 @@ void MainWindow::updateConfiguration() { } -void MainWindow::slotSwitchVideoThumbs() { +void MainWindow::slotSwitchVideoThumbs() +{ KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails()); if (m_activeTimeline) { m_activeTimeline->projectView()->slotUpdateAllThumbs(); @@ -1778,7 +1936,8 @@ void MainWindow::slotSwitchVideoThumbs() { m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); } -void MainWindow::slotSwitchAudioThumbs() { +void MainWindow::slotSwitchAudioThumbs() +{ KdenliveSettings::setAudiothumbnails(!KdenliveSettings::audiothumbnails()); if (m_activeTimeline) { m_activeTimeline->refresh(); @@ -1788,7 +1947,8 @@ void MainWindow::slotSwitchAudioThumbs() { m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); } -void MainWindow::slotSwitchMarkersComments() { +void MainWindow::slotSwitchMarkersComments() +{ KdenliveSettings::setShowmarkers(!KdenliveSettings::showmarkers()); if (m_activeTimeline) { m_activeTimeline->refresh(); @@ -1796,33 +1956,30 @@ void MainWindow::slotSwitchMarkersComments() { m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers()); } -void MainWindow::slotSwitchSnap() { +void MainWindow::slotSwitchSnap() +{ KdenliveSettings::setSnaptopoints(!KdenliveSettings::snaptopoints()); m_buttonSnap->setChecked(KdenliveSettings::snaptopoints()); } -void MainWindow::slotDeleteTimelineClip() { - if (QApplication::focusWidget()->parentWidget()->parentWidget() == projectListDock) m_projectList->slotRemoveClip(); +void MainWindow::slotDeleteTimelineClip() +{ + if (QApplication::focusWidget()->parentWidget()->parentWidget() == m_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() { +void MainWindow::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(); + pos = (m_projectMonitor->position() - item->startPos() + item->cropStart()) / item->speed(); clip = item->baseClip(); } } @@ -1843,14 +2000,15 @@ void MainWindow::slotAddClipMarker() { if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); } -void MainWindow::slotDeleteClipMarker() { +void MainWindow::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(); + pos = (m_projectMonitor->position() - item->startPos() + item->cropStart()) / item->speed(); clip = item->baseClip(); } } @@ -1874,7 +2032,8 @@ void MainWindow::slotDeleteClipMarker() { } -void MainWindow::slotDeleteAllClipMarkers() { +void MainWindow::slotDeleteAllClipMarkers() +{ DocClipBase *clip = NULL; if (m_projectMonitor->isActive()) { if (m_activeTimeline) { @@ -1894,14 +2053,15 @@ void MainWindow::slotDeleteAllClipMarkers() { if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); } -void MainWindow::slotEditClipMarker() { +void MainWindow::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(); + pos = (m_projectMonitor->position() - item->startPos() + item->cropStart()) / item->speed(); clip = item->baseClip(); } } @@ -1933,66 +2093,92 @@ void MainWindow::slotEditClipMarker() { } } -void MainWindow::slotAddGuide() { +void MainWindow::slotAddGuide() +{ if (m_activeTimeline) m_activeTimeline->projectView()->slotAddGuide(); } -void MainWindow::slotInsertSpace() { +void MainWindow::slotInsertSpace() +{ if (m_activeTimeline) m_activeTimeline->projectView()->slotInsertSpace(); } -void MainWindow::slotRemoveSpace() { +void MainWindow::slotRemoveSpace() +{ if (m_activeTimeline) m_activeTimeline->projectView()->slotRemoveSpace(); } -void MainWindow::slotInsertTrack(int ix) { +void MainWindow::slotInsertTrack(int ix) +{ m_projectMonitor->activateMonitor(); if (m_activeTimeline) m_activeTimeline->projectView()->slotInsertTrack(ix); } -void MainWindow::slotDeleteTrack(int ix) { +void MainWindow::slotDeleteTrack(int ix) +{ m_projectMonitor->activateMonitor(); if (m_activeTimeline) m_activeTimeline->projectView()->slotDeleteTrack(ix); } -void MainWindow::slotChangeTrack(int ix) { +void MainWindow::slotChangeTrack(int ix) +{ m_projectMonitor->activateMonitor(); if (m_activeTimeline) m_activeTimeline->projectView()->slotChangeTrack(ix); } -void MainWindow::slotEditGuide() { +void MainWindow::slotEditGuide() +{ if (m_activeTimeline) m_activeTimeline->projectView()->slotEditGuide(); } -void MainWindow::slotDeleteGuide() { +void MainWindow::slotDeleteGuide() +{ if (m_activeTimeline) m_activeTimeline->projectView()->slotDeleteGuide(); } -void MainWindow::slotDeleteAllGuides() { +void MainWindow::slotDeleteAllGuides() +{ if (m_activeTimeline) m_activeTimeline->projectView()->slotDeleteAllGuides(); } -void MainWindow::slotCutTimelineClip() { +void MainWindow::slotCutTimelineClip() +{ if (m_activeTimeline) { m_activeTimeline->projectView()->cutSelectedClips(); } } -void MainWindow::slotAddProjectClip(KUrl url) { +void MainWindow::slotGroupClips() +{ + if (m_activeTimeline) { + m_activeTimeline->projectView()->groupClips(); + } +} + +void MainWindow::slotUnGroupClips() +{ + if (m_activeTimeline) { + m_activeTimeline->projectView()->groupClips(false); + } +} + +void MainWindow::slotAddProjectClip(KUrl url) +{ if (m_activeDocument) m_activeDocument->slotAddClipFile(url, QString()); } -void MainWindow::slotAddTransition(QAction *result) { +void MainWindow::slotAddTransition(QAction *result) +{ if (!result) return; QStringList info = result->data().toStringList(); if (info.isEmpty()) return; @@ -2002,7 +2188,8 @@ void MainWindow::slotAddTransition(QAction *result) { } } -void MainWindow::slotAddVideoEffect(QAction *result) { +void MainWindow::slotAddVideoEffect(QAction *result) +{ if (!result) return; QStringList info = result->data().toStringList(); if (info.isEmpty()) return; @@ -2010,7 +2197,8 @@ void MainWindow::slotAddVideoEffect(QAction *result) { slotAddEffect(effect); } -void MainWindow::slotAddAudioEffect(QAction *result) { +void MainWindow::slotAddAudioEffect(QAction *result) +{ if (!result) return; QStringList info = result->data().toStringList(); if (info.isEmpty()) return; @@ -2018,7 +2206,8 @@ void MainWindow::slotAddAudioEffect(QAction *result) { slotAddEffect(effect); } -void MainWindow::slotAddCustomEffect(QAction *result) { +void MainWindow::slotAddCustomEffect(QAction *result) +{ if (!result) return; QStringList info = result->data().toStringList(); if (info.isEmpty()) return; @@ -2026,49 +2215,109 @@ void MainWindow::slotAddCustomEffect(QAction *result) { slotAddEffect(effect); } -void MainWindow::slotZoomIn() { +void MainWindow::slotZoomIn() +{ m_zoomSlider->setValue(m_zoomSlider->value() - 1); } -void MainWindow::slotZoomOut() { +void MainWindow::slotZoomOut() +{ m_zoomSlider->setValue(m_zoomSlider->value() + 1); } -void MainWindow::slotFitZoom() { +void MainWindow::slotFitZoom() +{ if (m_activeTimeline) { m_zoomSlider->setValue(m_activeTimeline->fitZoom()); } } -void MainWindow::slotGotProgressInfo(const QString &message, int progress) { - statusProgressBar->setValue(progress); +void MainWindow::slotGotProgressInfo(const QString &message, int progress) +{ + m_statusProgressBar->setValue(progress); if (progress >= 0) { if (!message.isEmpty()) m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message); - statusProgressBar->setVisible(true); + m_statusProgressBar->setVisible(true); } else { m_messageLabel->setMessage(QString(), DefaultMessage); - statusProgressBar->setVisible(false); + m_statusProgressBar->setVisible(false); } } -void MainWindow::slotShowClipProperties(DocClipBase *clip) { +void MainWindow::slotShowClipProperties(DocClipBase *clip) +{ if (clip->clipType() == TEXT) { - QString titlepath = m_activeDocument->projectFolder().path() + "/titles/"; + QString titlepath = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) + "titles/"; + if (!clip->getProperty("xmltemplate").isEmpty()) { + // template text clip + + // Get the list of existing templates + QStringList filter; + filter << "*.kdenlivetitle"; + QStringList templateFiles = QDir(titlepath).entryList(filter, QDir::Files); + + QDialog *dia = new QDialog(this); + Ui::TemplateClip_UI dia_ui; + dia_ui.setupUi(dia); + int ix = -1; + const QString templatePath = clip->getProperty("xmltemplate"); + for (int i = 0; i < templateFiles.size(); ++i) { + dia_ui.template_list->comboBox()->addItem(templateFiles.at(i), titlepath + templateFiles.at(i)); + if (templatePath == KUrl(titlepath + templateFiles.at(i)).path()) ix = i; + } + if (ix != -1) dia_ui.template_list->comboBox()->setCurrentIndex(ix); + else dia_ui.template_list->comboBox()->insertItem(0, templatePath); + dia_ui.template_list->fileDialog()->setFilter("*.kdenlivetitle"); + //warning: setting base directory doesn't work?? + KUrl startDir(titlepath); + dia_ui.template_list->fileDialog()->setUrl(startDir); + dia_ui.description->setText(clip->getProperty("description")); + dia_ui.clone_clip->setChecked(true); + if (dia->exec() == QDialog::Accepted) { + QString textTemplate = dia_ui.template_list->comboBox()->itemData(dia_ui.template_list->comboBox()->currentIndex()).toString(); + if (textTemplate.isEmpty()) textTemplate = dia_ui.template_list->comboBox()->currentText(); + + QMap newprops; + + if (KUrl(textTemplate).path() != templatePath) { + // The template was changed + newprops.insert("xmltemplate", textTemplate); + } + + if (dia_ui.description->toPlainText() != clip->getProperty("description")) { + newprops.insert("description", dia_ui.description->toPlainText()); + } + + QString newtemplate = newprops.value("xmltemplate"); + if (newtemplate.isEmpty()) newtemplate = templatePath; + + // template modified we need to update xmldata + QString description = newprops.value("description"); + if (description.isEmpty()) description = clip->getProperty("description"); + newprops.insert("xmldata", m_projectList->generateTemplateXml(newtemplate, description).toString()); + if (dia_ui.normal_clip->isChecked()) { + // Switch clip to normal clip + newprops.insert("xmltemplate", QString()); + } + EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); + m_activeDocument->commandStack()->push(command); + } + return; + } QString path = clip->getProperty("resource"); - TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_projectMonitor->render, this); + TitleWidget *dia_ui = new TitleWidget(KUrl(), m_activeDocument->timecode(), titlepath, m_projectMonitor->render, this); QDomDocument doc; doc.setContent(clip->getProperty("xmldata")); dia_ui->setXml(doc); if (dia_ui->exec() == QDialog::Accepted) { - QImage pix = dia_ui->renderedPixmap(); - pix.save(path); - //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1); - //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString()); + QRect rect = dia_ui->renderedRect(); QMap newprops; newprops.insert("xmldata", dia_ui->xml().toString()); + newprops.insert("out", QString::number(dia_ui->duration())); + newprops.insert("frame_size", QString::number(rect.width()) + 'x' + QString::number(rect.height())); EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); m_activeDocument->commandStack()->push(command); - m_clipMonitor->refreshMonitor(true); + m_activeTimeline->projectView()->slotUpdateClip(clip->getId()); m_activeDocument->setModified(true); } delete dia_ui; @@ -2079,88 +2328,100 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) { 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) { - EditClipCommand *command = new EditClipCommand(m_projectList, dia.clipId(), clip->properties(), dia.properties(), true); + EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), 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()); + m_activeTimeline->projectView()->slotUpdateClip(clip->getId()); } } } -void MainWindow::customEvent(QEvent* e) { +void MainWindow::customEvent(QEvent* e) +{ if (e->type() == QEvent::User) { - // The timeline playing position changed... - kDebug() << "RECEIVED JOG EVEMNT!!!"; + m_messageLabel->setMessage(static_cast (e)->message(), MltError); } } -void MainWindow::slotActivateEffectStackView() { - effectStack->raiseWindow(effectStackDock); +void MainWindow::slotActivateEffectStackView() +{ + m_effectStack->raiseWindow(m_effectStackDock); } -void MainWindow::slotActivateTransitionView(Transition *t) { - if (t) transitionConfig->raiseWindow(transitionConfigDock); +void MainWindow::slotActivateTransitionView(Transition *t) +{ + if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock); } -void MainWindow::slotSnapRewind() { +void MainWindow::slotSnapRewind() +{ if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToPreviousSnap(); } else m_clipMonitor->slotSeekToPreviousSnap(); } -void MainWindow::slotSnapForward() { +void MainWindow::slotSnapForward() +{ if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToNextSnap(); } else m_clipMonitor->slotSeekToNextSnap(); } -void MainWindow::slotClipStart() { +void MainWindow::slotClipStart() +{ if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->clipStart(); } } -void MainWindow::slotClipEnd() { +void MainWindow::slotClipEnd() +{ if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->clipEnd(); } } -void MainWindow::slotChangeTool(QAction * action) { +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) { +void MainWindow::slotSetTool(PROJECTTOOL tool) +{ if (m_activeDocument && m_activeTimeline) { //m_activeDocument->setTool(tool); m_activeTimeline->projectView()->setTool(tool); } } -void MainWindow::slotCopy() { +void MainWindow::slotCopy() +{ if (!m_activeDocument || !m_activeTimeline) return; m_activeTimeline->projectView()->copyClip(); } -void MainWindow::slotPaste() { +void MainWindow::slotPaste() +{ if (!m_activeDocument || !m_activeTimeline) return; m_activeTimeline->projectView()->pasteClip(); } -void MainWindow::slotPasteEffects() { +void MainWindow::slotPasteEffects() +{ if (!m_activeDocument || !m_activeTimeline) return; m_activeTimeline->projectView()->pasteClipEffects(); } -void MainWindow::slotFind() { +void MainWindow::slotFind() +{ if (!m_activeDocument || !m_activeTimeline) return; m_projectSearch->setEnabled(false); m_findActivated = true; @@ -2171,26 +2432,29 @@ void MainWindow::slotFind() { qApp->installEventFilter(this); } -void MainWindow::slotFindNext() { +void MainWindow::slotFindNext() +{ if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) { - statusBar()->showMessage(i18n("Found : %1", m_findString)); + statusBar()->showMessage(i18n("Found: %1", m_findString)); } else { statusBar()->showMessage(i18n("Reached end of project")); } m_findTimer.start(4000); } -void MainWindow::findAhead() { +void MainWindow::findAhead() +{ if (m_activeTimeline && m_activeTimeline->projectView()->findString(m_findString)) { m_projectSearchNext->setEnabled(true); - statusBar()->showMessage(i18n("Found : %1", m_findString)); + statusBar()->showMessage(i18n("Found: %1", m_findString)); } else { m_projectSearchNext->setEnabled(false); - statusBar()->showMessage(i18n("Not found : %1", m_findString)); + statusBar()->showMessage(i18n("Not found: %1", m_findString)); } } -void MainWindow::findTimeout() { +void MainWindow::findTimeout() +{ m_projectSearchNext->setEnabled(false); m_findActivated = false; m_findString.clear(); @@ -2200,7 +2464,8 @@ void MainWindow::findTimeout() { removeEventFilter(this); } -void MainWindow::keyPressEvent(QKeyEvent *ke) { +void MainWindow::keyPressEvent(QKeyEvent *ke) +{ if (m_findActivated) { if (ke->key() == Qt::Key_Backspace) { m_findString = m_findString.left(m_findString.length() - 1); @@ -2232,16 +2497,18 @@ void MainWindow::keyPressEvent(QKeyEvent *ke) { /** Gets called when the window gets hidden */ -void MainWindow::hideEvent(QHideEvent */*event*/) { +void MainWindow::hideEvent(QHideEvent */*event*/) +{ // kDebug() << "I was hidden"; // issue http://www.kdenlive.org/mantis/view.php?id=231 - if (this->isMinimized()) { + if (isMinimized()) { // kDebug() << "I am minimized"; if (m_monitorManager) m_monitorManager->stopActiveMonitor(); } } -bool MainWindow::eventFilter(QObject *obj, QEvent *event) { +bool MainWindow::eventFilter(QObject *obj, QEvent *event) +{ if (m_findActivated) { if (event->type() == QEvent::ShortcutOverride) { QKeyEvent* ke = (QKeyEvent*) event; @@ -2255,7 +2522,9 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) { } } -void MainWindow::slotSaveZone(Render *render, QPoint zone) { + +void MainWindow::slotSaveZone(Render *render, QPoint zone) +{ KDialog *dialog = new KDialog(this); dialog->setCaption("Save clip zone"); dialog->setButtons(KDialog::Ok | KDialog::Cancel); @@ -2267,7 +2536,7 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone) { QLabel *label1 = new QLabel(i18n("Save clip zone as:"), this); QString path = m_activeDocument->projectFolder().path(); path.append("/"); - path.append("untitled.westley"); + path.append("untitled.mlt"); KUrlRequester *url = new KUrlRequester(KUrl(path), this); url->setFilter("video/mlt-playlist"); QLabel *label2 = new QLabel(i18n("Description:"), this); @@ -2280,19 +2549,22 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone) { } -void MainWindow::slotSetInPoint() { +void MainWindow::slotSetInPoint() +{ if (m_clipMonitor->isActive()) { m_clipMonitor->slotSetZoneStart(); } else m_activeTimeline->projectView()->setInPoint(); } -void MainWindow::slotSetOutPoint() { +void MainWindow::slotSetOutPoint() +{ if (m_clipMonitor->isActive()) { m_clipMonitor->slotSetZoneEnd(); } else m_activeTimeline->projectView()->setOutPoint(); } -void MainWindow::slotGetNewLumaStuff() { +void MainWindow::slotGetNewLumaStuff() +{ //KNS::Entry::List download(); KNS::Entry::List entries = KNS::Engine::download(); // list of changed entries @@ -2307,9 +2579,11 @@ void MainWindow::slotGetNewLumaStuff() { } qDeleteAll(entries); initEffects::refreshLumas(); + m_activeTimeline->projectView()->reloadTransitionLumas(); } -void MainWindow::slotGetNewRenderStuff() { +void MainWindow::slotGetNewRenderStuff() +{ //KNS::Entry::List download(); KNS::Engine engine(0); @@ -2330,7 +2604,8 @@ void MainWindow::slotGetNewRenderStuff() { } } -void MainWindow::slotGetNewMltProfileStuff() { +void MainWindow::slotGetNewMltProfileStuff() +{ //KNS::Entry::List download(); KNS::Engine engine(0); @@ -2354,14 +2629,206 @@ void MainWindow::slotGetNewMltProfileStuff() { } } -void MainWindow::slotAutoTransition() { - m_activeTimeline->projectView()->autoTransition(); +void MainWindow::slotAutoTransition() +{ + if (m_activeTimeline) m_activeTimeline->projectView()->autoTransition(); } -void MainWindow::slotDvdWizard(const QString &url, const QString &profile) { +void MainWindow::slotSplitAudio() +{ + if (m_activeTimeline) m_activeTimeline->projectView()->splitAudio(); +} + +void MainWindow::slotUpdateClipType(QAction *action) +{ + if (m_activeTimeline) { + if (action->data().toString() == "clip_audio_only") m_activeTimeline->projectView()->setAudioOnly(); + else if (action->data().toString() == "clip_video_only") m_activeTimeline->projectView()->setVideoOnly(); + else m_activeTimeline->projectView()->setAudioAndVideo(); + } +} + +void MainWindow::slotDvdWizard(const QString &url, const QString &profile) +{ DvdWizard *w = new DvdWizard(url, profile, this); w->exec(); } +void MainWindow::slotShowTimeline(bool show) +{ + if (show == false) { + m_timelineState = saveState(); + centralWidget()->setHidden(true); + } else { + centralWidget()->setHidden(false); + restoreState(m_timelineState); + } +} + +void MainWindow::slotMaximizeCurrent(bool /*show*/) +{ + //TODO: is there a way to maximize current widget? + //if (show == true) + { + m_timelineState = saveState(); + QWidget *par = focusWidget()->parentWidget(); + while (par->parentWidget() && par->parentWidget() != this) { + par = par->parentWidget(); + } + kDebug() << "CURRENT WIDGET: " << par->objectName(); + } + /*else { + //centralWidget()->setHidden(false); + //restoreState(m_timelineState); + }*/ +} + +void MainWindow::loadTranscoders() +{ + QMenu *transMenu = static_cast(factory()->container("transcoders", this)); + transMenu->clear(); + + KSharedConfigPtr config = KSharedConfig::openConfig("kdenlivetranscodingrc"); + KConfigGroup transConfig(config, "Transcoding"); + // read the entries + QMap< QString, QString > profiles = transConfig.entryMap(); + QMapIterator i(profiles); + while (i.hasNext()) { + i.next(); + QAction *a = transMenu->addAction(i.key()); + a->setData(i.value()); + connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode())); + } +} + +void MainWindow::slotTranscode(KUrl::List urls) +{ + QString params; + if (urls.isEmpty()) { + urls.append(m_projectList->currentClipUrl()); + QAction *action = qobject_cast(sender()); + params = action->data().toString(); + } + if (urls.isEmpty()) return; + ClipTranscode *d = new ClipTranscode(urls, params); + connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); + d->show(); + //QProcess::startDetached("ffmpeg", parameters); +} + +void MainWindow::slotTranscodeClip() +{ + KUrl::List urls = KFileDialog::getOpenUrls(KUrl("kfiledialog:///projectfolder")); + if (urls.isEmpty()) return; + slotTranscode(urls); +} + +void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &name, const QString &file) +{ + if (m_activeDocument == NULL) return; + m_activeDocument->setDocumentProperty("renderdestination", dest); + m_activeDocument->setDocumentProperty("renderprofile", name); + m_activeDocument->setDocumentProperty("renderurl", file); + m_activeDocument->setModified(true); +} + + +void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QString &chapterFile) +{ + if (m_activeDocument == NULL || m_renderWidget == NULL) return; + QString scriptPath; + QString playlistPath; + if (scriptExport) { + bool ok; + QString scriptsFolder = m_activeDocument->projectFolder().path() + "/scripts/"; + QString path = m_renderWidget->getFreeScriptName(); + scriptPath = QInputDialog::getText(this, i18n("Create Render Script"), i18n("Script name (will be saved in: %1)", scriptsFolder), QLineEdit::Normal, KUrl(path).fileName(), &ok); + if (!ok || scriptPath.isEmpty()) return; + scriptPath.prepend(scriptsFolder); + QFile f(scriptPath); + if (f.exists()) { + if (KMessageBox::warningYesNo(this, i18n("Script file already exists. Do you want to overwrite it?")) != KMessageBox::Yes) + return; + } + playlistPath = scriptPath + ".mlt"; + m_projectMonitor->saveSceneList(playlistPath); + } else { + KTemporaryFile temp; + temp.setAutoRemove(false); + temp.setSuffix(".mlt"); + temp.open(); + playlistPath = temp.fileName(); + m_projectMonitor->saveSceneList(playlistPath); + } + + if (!chapterFile.isEmpty()) { + int in = 0; + int out; + if (!zoneOnly) out = (int) GenTime(m_activeDocument->projectDuration()).frames(m_activeDocument->fps()); + else { + in = m_activeTimeline->inPoint(); + out = m_activeTimeline->outPoint(); + } + QDomDocument doc; + QDomElement chapters = doc.createElement("chapters"); + chapters.setAttribute("fps", m_activeDocument->fps()); + doc.appendChild(chapters); + + QDomElement guidesxml = m_activeDocument->guidesXml(); + QDomNodeList nodes = guidesxml.elementsByTagName("guide"); + for (int i = 0; i < nodes.count(); i++) { + QDomElement e = nodes.item(i).toElement(); + if (!e.isNull()) { + QString comment = e.attribute("comment"); + int time = (int) GenTime(e.attribute("time").toDouble()).frames(m_activeDocument->fps()); + if (time >= in && time < out) { + if (zoneOnly) time = time - in; + QDomElement chapter = doc.createElement("chapter"); + chapters.appendChild(chapter); + chapter.setAttribute("title", comment); + chapter.setAttribute("time", time); + } + } + } + if (chapters.childNodes().count() > 0) { + if (m_activeTimeline->projectView()->hasGuide(out, 0) == -1) { + // Always insert a guide in pos 0 + QDomElement chapter = doc.createElement("chapter"); + chapters.insertBefore(chapter, QDomNode()); + chapter.setAttribute("title", i18n("Start")); + chapter.setAttribute("time", "0"); + } + // save chapters file + QFile file(chapterFile); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { + kWarning() << "////// ERROR writing DVD CHAPTER file: " << chapterFile; + } else { + file.write(doc.toString().toUtf8()); + if (file.error() != QFile::NoError) { + kWarning() << "////// ERROR writing DVD CHAPTER file: " << chapterFile; + } + file.close(); + } + } + } + + m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath); +} + +void MainWindow::slotUpdateTimecodeFormat(int ix) +{ + KdenliveSettings::setFrametimecode(ix == 1); + m_clipMonitor->updateTimecodeFormat(); + m_projectMonitor->updateTimecodeFormat(); +} + +void MainWindow::slotRemoveFocus() +{ + statusBar()->setFocus(); + statusBar()->clearFocus(); +} + + + #include "mainwindow.moc"