X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=2bebce59a1a47c5a74151640106610f44fe6e46d;hb=9f76a9103088feb8ae3feef0343ddfdcf0685fe6;hp=a206254548b28e9adc9279624b70d902d2326b55;hpb=7caecc149e65907e4a57c8115c7cac12042e9308;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index a2062545..2bebce59 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -17,44 +17,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "mainwindow.h" +#include "mainwindowadaptor.h" #include "kdenlivesettings.h" #include "kdenlivesettingsdialog.h" #include "initeffects.h" @@ -83,15 +48,50 @@ #include "titlewidget.h" #include "markerdialog.h" #include "clipitem.h" +#include "interfaces.h" +#include "kdenlive-config.h" -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; +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include -namespace Mlt { +#include + +static const char version[] = VERSION; + +static const int ID_TIMELINE_POS = 0; + +namespace Mlt +{ class Producer; }; @@ -100,13 +100,22 @@ 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); + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/MainWindow", this); + setlocale(LC_NUMERIC, "POSIX"); setFont(KGlobalSettings::toolBarFont()); parseProfiles(MltPath); @@ -126,72 +135,73 @@ 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_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"); + 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"); @@ -201,20 +211,26 @@ 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); + setupGUI(); + /*ScriptingPart* sp = new ScriptingPart(this, QStringList()); + guiFactory()->addClient(sp);*/ + + loadPlugins(); //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))); // build effects menus QAction *action; @@ -227,7 +243,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent effectsList.insert(effectInfo.at(0).toLower(), effectInfo); } - foreach(QStringList value, effectsList) { + foreach(const QStringList &value, effectsList) { action = new QAction(value.at(0), this); action->setData(value); videoEffectsMenu->addAction(action); @@ -242,7 +258,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent effectsList.insert(effectInfo.at(0).toLower(), effectInfo); } - foreach(QStringList value, effectsList) { + foreach(const QStringList &value, effectsList) { action = new QAction(value.at(0), this); action->setData(value); audioEffectsMenu->addAction(action); @@ -259,7 +275,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent effectsList.insert(effectInfo.at(0).toLower(), effectInfo); } - foreach(QStringList value, effectsList) { + foreach(const QStringList &value, effectsList) { action = new QAction(value.at(0), this); action->setData(value); m_customEffectsMenu->addAction(action); @@ -269,7 +285,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)); @@ -293,7 +309,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent effectInfo = transitions.effectIdInfo(ix); effectsList.insert(effectInfo.at(0).toLower(), effectInfo); } - foreach(QStringList value, effectsList) { + foreach(const QStringList &value, effectsList) { action = new QAction(value.at(0), this); action->setData(value); transitionsMenu->addAction(action); @@ -306,9 +322,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent 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); @@ -323,8 +342,8 @@ 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))); @@ -350,16 +369,18 @@ 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() { +void MainWindow::queryQuit() +{ kDebug() << "----- SAVING CONFUIG"; if (queryClose()) kapp->quit(); } //virtual -bool MainWindow::queryClose() { +bool MainWindow::queryClose() +{ saveOptions(); if (m_monitorManager) m_monitorManager->stopActiveMonitor(); if (m_activeDocument && m_activeDocument->isModified()) { @@ -368,6 +389,8 @@ bool MainWindow::queryClose() { // 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; @@ -376,19 +399,92 @@ bool MainWindow::queryClose() { return true; } -void MainWindow::saveProperties(KConfig*) { + +void MainWindow::loadPlugins() +{ + foreach(QObject *plugin, QPluginLoader::staticInstances()) + populateMenus(plugin); + + QStringList directories = KGlobal::dirs()->findDirs("module", QString()); + QStringList filters; + filters << "libkdenlive*"; + foreach(const QString &folder, directories) { + kDebug() << "// PARSING FIOLER: " << folder; + QDir pluginsDir(folder); + foreach(const QString &fileName, pluginsDir.entryList(filters, QDir::Files)) { + kDebug() << "// FOUND PLUGIN: " << fileName << "= " << pluginsDir.absoluteFilePath(fileName); + QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); + QObject *plugin = loader.instance(); + if (plugin) { + populateMenus(plugin); + m_pluginFileNames += fileName; + } else kDebug() << "// ERROR LOADING PLUGIN: " << fileName << ", " << loader.errorString(); + } + } + //exit(1); +} + +void MainWindow::populateMenus(QObject *plugin) +{ + QMenu *addMenu = static_cast(factory()->container("generators", this)); + ClipGenerator *iGenerator = qobject_cast(plugin); + if (iGenerator) + 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) +{ + kDebug() << "// ADD to MENU" << texts; + foreach(const QString &text, texts) { + QAction *action = new QAction(text, plugin); + action->setData(text); + connect(action, SIGNAL(triggered()), this, member); + menu->addAction(action); + + if (actionGroup) { + action->setCheckable(true); + actionGroup->addAction(action); + } + } +} + +void MainWindow::aboutPlugins() +{ + //PluginDialog dialog(pluginsDir.path(), m_pluginFileNames, this); + //dialog.exec(); +} + + +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(QList () << clipUrl); + } +} + +void MainWindow::saveProperties(KConfig*) +{ // save properties here,used by session management saveFile(); } -void MainWindow::readProperties(KConfig *config) { +void MainWindow::readProperties(KConfig *config) +{ // read properties here,used by session management 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(); @@ -405,8 +501,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()); @@ -418,7 +515,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()); @@ -438,7 +536,8 @@ void MainWindow::slotShuttleButton(int code) { } } -void MainWindow::slotShuttleAction(int code) { +void MainWindow::slotShuttleAction(int code) +{ switch (code) { case 0: return; @@ -452,42 +551,47 @@ 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(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); + m_activeTimeline->projectView()->slotAddEffect(effect.cloneNode().toElement(), 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 &)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &))); - connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(const QString &, int, const QPixmap &, int, int))); - connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &))); + connect(m_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 &))); @@ -500,30 +604,33 @@ 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")); - 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; @@ -650,10 +757,10 @@ void MainWindow::setupActions() { 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(); @@ -688,11 +795,15 @@ void MainWindow::setupActions() { m_projectSearchNext->setShortcut(Qt::Key_F3); m_projectSearchNext->setEnabled(false); - KAction* profilesAction = new KAction(KIcon("document-new"), i18n("Manage Profiles"), this); + KAction* profilesAction = new KAction(KIcon("document-new"), i18n("Manage Project Profiles"), this); collection->addAction("manage_profiles", profilesAction); connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles())); - KAction* fileGHNS = KNS::standardAction(i18n("Download New Lumas..."), this, SLOT(slotGetNewStuff()), actionCollection(), "get_new_stuff"); + KNS::standardAction(i18n("Download New Lumas..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); + + KNS::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles"); + + KNS::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles"); KAction* wizAction = new KAction(KIcon("configure"), i18n("Run Config Wizard"), this); collection->addAction("run_wizard", wizAction); @@ -725,6 +836,10 @@ 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); + collection->addAction("dvd_wizard", dvdWizard); + connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard())); + KAction *markIn = collection->addAction("mark_in"); markIn->setText(i18n("Set In Point")); markIn->setShortcut(Qt::Key_I); @@ -802,6 +917,7 @@ void MainWindow::setupActions() { 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())); KAction *stickTransition = collection->addAction("auto_transition"); @@ -811,6 +927,15 @@ 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); + 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->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); @@ -832,6 +957,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())); @@ -870,8 +1021,22 @@ void MainWindow::setupActions() { QAction *pasteEffects = new KAction(KIcon("edit-paste"), i18n("Paste Effects"), this); collection->addAction("paste_effects", pasteEffects); + 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); @@ -902,17 +1067,80 @@ 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); + collection->addAction("add_clip", addClip); + connect(addClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddClip())); + + QAction *addColorClip = new KAction(KIcon("kdenlive-add-color-clip"), i18n("Add Color Clip"), this); + collection->addAction("add_color_clip", addColorClip); + connect(addColorClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddColorClip())); + + QAction *addSlideClip = new KAction(KIcon("kdenlive-add-slide-clip"), i18n("Add Slideshow Clip"), this); + collection->addAction("add_slide_clip", addSlideClip); + connect(addSlideClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddSlideshowClip())); + + QAction *addTitleClip = new KAction(KIcon("kdenlive-add-text-clip"), i18n("Add Title Clip"), this); + collection->addAction("add_text_clip", addTitleClip); + connect(addTitleClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleClip())); + + QAction *addFolderButton = new KAction(KIcon("folder-new"), i18n("Create Folder"), this); + collection->addAction("add_folder", addFolderButton); + connect(addFolderButton , SIGNAL(triggered()), m_projectList, SLOT(slotAddFolder())); + + QAction *clipProperties = new KAction(KIcon("document-edit"), i18n("Clip Properties"), this); + collection->addAction("clip_properties", clipProperties); + clipProperties->setData("clip_properties"); + connect(clipProperties , SIGNAL(triggered()), m_projectList, SLOT(slotEditClip())); + clipProperties->setEnabled(false); + + QAction *openClip = new KAction(KIcon("document-open"), i18n("Edit Clip"), this); + collection->addAction("edit_clip", openClip); + openClip->setData("edit_clip"); + connect(openClip , SIGNAL(triggered()), m_projectList, SLOT(slotOpenClip())); + openClip->setEnabled(false); + + QAction *deleteClip = new KAction(KIcon("edit-delete"), i18n("Delete Clip"), this); + collection->addAction("delete_clip", deleteClip); + deleteClip->setData("delete_clip"); + connect(deleteClip , SIGNAL(triggered()), m_projectList, SLOT(slotRemoveClip())); + deleteClip->setEnabled(false); + + QAction *reloadClip = new KAction(KIcon("view-refresh"), i18n("Reload Clip"), this); + collection->addAction("reload_clip", reloadClip); + reloadClip->setData("reload_clip"); + connect(reloadClip , SIGNAL(triggered()), m_projectList, SLOT(slotReloadClip())); + reloadClip->setEnabled(false); + + QMenu *addClips = new QMenu(); + addClips->addAction(addClip); + addClips->addAction(addColorClip); + addClips->addAction(addSlideClip); + addClips->addAction(addTitleClip); + addClips->addAction(addFolderButton); + + addClips->addAction(reloadClip); + addClips->addAction(clipProperties); + addClips->addAction(openClip); + addClips->addAction(deleteClip); + m_projectList->setupMenu(addClips, addClip); + //connect(collection, SIGNAL( clearStatusText() ), //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")); @@ -921,27 +1149,37 @@ 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"); - if (!initialGroup.exists()) { + bool upgrade = false; + if (initialGroup.exists()) { + 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 (!initialGroup.exists() || upgrade) { // this is our first run, show Wizard - Wizard *w = new Wizard(this); + Wizard *w = new Wizard(upgrade, this); if (w->exec() == QDialog::Accepted && w->isOk()) { w->adjustSettings(); - initialGroup.writeEntry("version", "0.7"); + initialGroup.writeEntry("version", version); delete w; } else { ::exit(1); } - } else if (initialGroup.readEntry("version") == "0.7") { - //Add new settings from 0.7.1 - if (KdenliveSettings::defaultprojectfolder().isEmpty()) { - QString path = QDir::homePath() + "/kdenlive"; - if (KStandardDirs::makeDir(path) == false) kDebug() << "/// ERROR CREATING PROJECT FOLDER: " << path; - KdenliveSettings::setDefaultprojectfolder(path); - } } KConfigGroup treecolumns(config, "Project Tree"); const QByteArray state = treecolumns.readEntry("columns", QByteArray()); @@ -949,15 +1187,17 @@ 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) +{ QString profileName; KUrl projectFolder; QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); @@ -968,6 +1208,10 @@ void MainWindow::newFile(bool showProjectSettings) { 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(); @@ -984,7 +1228,8 @@ void MainWindow::newFile(bool showProjectSettings) { m_closeAction->setEnabled(m_timelineArea->count() > 1); } -void MainWindow::activateDocument() { +void MainWindow::activateDocument() +{ if (m_timelineArea->currentWidget() == NULL) return; TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); KdenliveDoc *currentDoc = currentTab->document(); @@ -992,7 +1237,8 @@ void MainWindow::activateDocument() { connectDocument(currentTab, currentDoc); } -void MainWindow::closeCurrentDocument() { +void MainWindow::closeCurrentDocument() +{ QWidget *w = m_timelineArea->currentWidget(); if (!w) return; // closing current document @@ -1005,7 +1251,7 @@ void MainWindow::closeCurrentDocument() { 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; @@ -1022,13 +1268,22 @@ void MainWindow::closeCurrentDocument() { delete w; if (m_timelineArea->count() == 0) { m_activeDocument = NULL; - effectStack->clear(); - transitionConfig->slotTransitionItemSelected(NULL, false); + m_effectStack->clear(); + m_transitionConfig->slotTransitionItemSelected(NULL, false); } } -bool MainWindow::saveFileAs(const QString &outputFileName) { - QDomDocument currentSceneList = m_projectMonitor->sceneList(); +bool MainWindow::saveFileAs(const QString &outputFileName) +{ + QString currentSceneList; + if (KdenliveSettings::dropbframes()) { + KdenliveSettings::setDropbframes(false); + m_activeDocument->clipManager()->updatePreviewSettings(); + currentSceneList = m_projectMonitor->sceneList(); + KdenliveSettings::setDropbframes(true); + m_activeDocument->clipManager()->updatePreviewSettings(); + } else currentSceneList = m_projectMonitor->sceneList(); + if (m_activeDocument->saveSceneList(outputFileName, currentSceneList) == false) return false; @@ -1046,7 +1301,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); @@ -1060,7 +1316,8 @@ bool MainWindow::saveFileAs() { return saveFileAs(outputFile); } -bool MainWindow::saveFile() { +bool MainWindow::saveFile() +{ if (!m_activeDocument) return true; if (m_activeDocument->url().isEmpty()) { return saveFileAs(); @@ -1071,19 +1328,21 @@ 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); if (!mime) mimetype = "*.kdenlive"; - KUrl url = KFileDialog::getOpenUrl(KUrl(), mimetype); + KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), mimetype); if (url.isEmpty()) return; m_fileOpenRecent->addUrl(url); 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 ? @@ -1091,7 +1350,8 @@ void MainWindow::openLastFile() { 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; @@ -1130,9 +1390,9 @@ void MainWindow::openFile(const KUrl &url) { doOpenFile(url, NULL); } -void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { - KdenliveDoc *doc; - doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), m_projectMonitor->render, this); +void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) +{ + KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), m_projectMonitor->render, this); if (stale == NULL) { stale = new KAutoSaveFile(url, doc); doc->m_autosave = stale; @@ -1152,9 +1412,12 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false); slotGotProgressInfo(QString(), -1); m_clipMonitor->refreshMonitor(true); + m_projectMonitor->adjustRulerSize(trackView->duration()); + 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)) { @@ -1171,7 +1434,8 @@ void MainWindow::recoverFiles(QList staleFiles) { } -void MainWindow::parseProfiles(const QString &mltPath) { +void MainWindow::parseProfiles(const QString &mltPath) +{ //kdDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <exec(); + if (w->exec() == QDialog::Accepted) { + KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); + if (d) d->checkProfile(); + } delete w; } -void MainWindow::slotEditProjectSettings() { +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_activeDocument->profilePath() != profile) { // Profile was changed m_activeDocument->setProfilePath(profile); @@ -1258,6 +1528,7 @@ void MainWindow::slotEditProjectSettings() { m_monitorManager->resetProfiles(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()); // We need to desactivate & reactivate monitors to get a refresh m_monitorManager->switchMonitors(); @@ -1266,10 +1537,14 @@ void MainWindow::slotEditProjectSettings() { delete w; } -void MainWindow::slotRenderProject() { +void MainWindow::slotRenderProject() +{ if (!m_renderWidget) { - m_renderWidget = new RenderWidget(this); - connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double))); + QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path() : 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(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()); @@ -1281,22 +1556,36 @@ void MainWindow::slotRenderProject() { m_renderWidget->show(); } -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) { +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; - int out; - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab && zoneOnly) { - in = currentTab->inPoint(); - out = currentTab->outPoint(); + int in = 0; + int out = 0; + + if (m_activeTimeline && zoneOnly) { + in = m_activeTimeline->inPoint(); + out = m_activeTimeline->outPoint(); } KTemporaryFile temp; temp.setAutoRemove(false); temp.setSuffix(".westley"); - if (temp.open()) { - m_projectMonitor->saveSceneList(temp.fileName()); + 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; - args << "-erase"; + 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())); @@ -1309,18 +1598,70 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const } 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 << temp.fileName() << dest << avformat_args; + 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"; - QProcess::startDetached(renderer, args); + 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)) { + KMessageBox::error(this, i18n("Cannot write to file %1", scriptExport)); + return; + } - KNotification::event("RenderStarted", i18n("Rendering %1 started", dest), QPixmap(), this); + QTextStream out(&file); + out << "#! /bin/sh" << "\n" << "\n"; + out << "SOURCE=" << "\"" + scriptExport + ".westley\"" << "\n"; + out << "TARGET=" << "\"" + dest + "\"" << "\n"; + out << renderer << " " << args.join(" ") << "\n" << "\n"; + if (file.error() != QFile::NoError) { + KMessageBox::error(this, i18n("Cannot write to file %1", scriptExport)); + file.close(); + return; + } + file.close(); + QFile::setPermissions(scriptExport, file.permissions() | QFile::ExeUser); + } } } -void MainWindow::slotUpdateMousePosition(int pos) { +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) +{ + if (m_renderWidget) m_renderWidget->setRenderStatus(url, status, error); +} + +void MainWindow::slotUpdateMousePosition(int pos) +{ if (m_activeDocument) switch (m_timecodeFormat->currentIndex()) { case 0: @@ -1331,7 +1672,9 @@ 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); if (modified) { @@ -1343,7 +1686,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))); @@ -1351,31 +1695,32 @@ 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 ////////////////"; if (m_activeDocument) { if (m_activeDocument == doc) return; - m_activeDocument->backupMltPlaylist(); if (m_activeTimeline) { disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int))); disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeTimeline, SLOT(slotSetZone(QPoint))); disconnect(m_projectMonitor, SIGNAL(durationChanged(int)), m_activeTimeline, SLOT(setDuration(int))); disconnect(m_projectList, SIGNAL(projectModified()), m_activeDocument, SLOT(setModified())); + disconnect(m_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))); - disconnect(m_activeDocument, SIGNAL(addProjectFolder(const QString, const QString &, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, const QString &, bool, bool))); + disconnect(m_activeDocument, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &))); disconnect(m_activeDocument, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &))); disconnect(m_activeDocument, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &))); disconnect(m_activeDocument, SIGNAL(deleteTimelineClip(const QString &)), m_activeTimeline, SLOT(slotDeleteClip(const QString &))); - disconnect(m_activeTimeline->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())); + disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool))); + disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, 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))); @@ -1384,19 +1729,18 @@ 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(transitionTrackUpdated(Transition *, int)), m_activeTimeline->projectView() , SLOT(slotTransitionTrackUpdated(Transition *, int))); - 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)), m_projectMonitor, SLOT(slotZoneMoved(int, int))); + 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 *))); @@ -1406,10 +1750,13 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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(projectModified()), doc, SLOT(setModified())); + connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString))); + + connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); connect(trackView, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); @@ -1418,8 +1765,9 @@ 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(addProjectFolder(const QString, const QString &, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, const QString &, bool, bool))); + connect(doc, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &))); connect(doc, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &))); connect(doc, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &))); @@ -1429,10 +1777,10 @@ 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())); + connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool))); + connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *))); m_zoomSlider->setValue(doc->zoom()); connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int))); connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); @@ -1442,23 +1790,25 @@ 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(transitionTrackUpdated(Transition *, int)), trackView->projectView() , SLOT(slotTransitionTrackUpdated(Transition *, int))); - connect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); - connect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); + connect(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)), m_projectMonitor, SLOT(slotZoneMoved(int, int))); + 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()); + if (m_renderWidget) { + m_renderWidget->setProfile(doc->mltProfile()); + m_renderWidget->setDocumentPath(doc->projectFolder().path()); + } //doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); KdenliveSettings::setProject_display_ratio(doc->dar()); @@ -1472,23 +1822,31 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha setCaption(doc->description(), doc->isModified()); m_saveAction->setEnabled(doc->isModified()); m_activeDocument = doc; + if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings(); // set tool to select tool m_buttonSelectTool->setChecked(true); } -void MainWindow::slotGuidesUpdated() { +void MainWindow::slotZoneMoved(int start, int end) +{ + m_activeDocument->setZone(start, end); + m_projectMonitor->slotZoneMoved(start, end); +} + +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 if (KConfigDialog::showDialog("settings")) { KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); if (page != -1) d->showPage(page, option); - d->checkProfile(); return; } @@ -1497,11 +1855,23 @@ void MainWindow::slotPreferences(int page, int option) { KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this); connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration())); connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles())); + connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); + connect(dialog, SIGNAL(updateCaptureFolder()), m_recMonitor, SLOT(slotUpdateCaptureFolder())); + //connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); dialog->show(); if (page != -1) dialog->showPage(page, option); } -void MainWindow::updateConfiguration() { +void MainWindow::slotUpdatePreviewSettings() +{ + if (m_activeDocument) { + m_clipMonitor->slotSetXml(NULL, 0); + m_activeDocument->updatePreviewSettings(); + } +} + +void MainWindow::updateConfiguration() +{ //TODO: we should apply settings to all projects, not only the current one if (m_activeTimeline) { m_activeTimeline->refresh(); @@ -1517,15 +1887,18 @@ void MainWindow::updateConfiguration() { } -void MainWindow::slotSwitchVideoThumbs() { + +void MainWindow::slotSwitchVideoThumbs() +{ KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails()); if (m_activeTimeline) { - m_activeTimeline->refresh(); + m_activeTimeline->projectView()->slotUpdateAllThumbs(); } m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); } -void MainWindow::slotSwitchAudioThumbs() { +void MainWindow::slotSwitchAudioThumbs() +{ KdenliveSettings::setAudiothumbnails(!KdenliveSettings::audiothumbnails()); if (m_activeTimeline) { m_activeTimeline->refresh(); @@ -1535,7 +1908,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(); @@ -1543,26 +1917,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() { +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()) { @@ -1590,7 +1968,8 @@ 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()) { @@ -1621,7 +2000,8 @@ void MainWindow::slotDeleteClipMarker() { } -void MainWindow::slotDeleteAllClipMarkers() { +void MainWindow::slotDeleteAllClipMarkers() +{ DocClipBase *clip = NULL; if (m_projectMonitor->isActive()) { if (m_activeTimeline) { @@ -1641,7 +2021,8 @@ 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()) { @@ -1680,66 +2061,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; @@ -1749,7 +2156,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; @@ -1757,7 +2165,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; @@ -1765,7 +2174,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; @@ -1773,32 +2183,37 @@ 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 path = clip->getProperty("resource"); @@ -1807,7 +2222,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) { doc.setContent(clip->getProperty("xmldata")); dia_ui->setXml(doc); if (dia_ui->exec() == QDialog::Accepted) { - QPixmap pix = dia_ui->renderedPixmap(); + QImage pix = dia_ui->renderedPixmap(); pix.save(path); //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1); //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString()); @@ -1837,88 +2252,102 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) { } } -void MainWindow::customEvent(QEvent* e) { +void MainWindow::customEvent(QEvent* e) +{ if (e->type() == QEvent::User) { // The timeline playing position changed... - kDebug() << "RECIEVED JOG EVEMNT!!!"; + kDebug() << "RECEIVED JOG EVEMNT!!!"; } } -void MainWindow::slotActivateEffectStackView() { - effectStack->raiseWindow(effectStackDock); +void MainWindow::slotActivateEffectStackView() +{ + m_effectStack->raiseWindow(m_effectStackDock); } -void MainWindow::slotActivateTransitionView() { - 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; - m_findString = QString(); + m_findString.clear(); m_activeTimeline->projectView()->initSearchStrings(); statusBar()->showMessage(i18n("Starting -- find text as you type")); m_findTimer.start(5000); 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)); } else { @@ -1927,7 +2356,8 @@ void MainWindow::slotFindNext() { 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)); @@ -1937,17 +2367,19 @@ void MainWindow::findAhead() { } } -void MainWindow::findTimeout() { +void MainWindow::findTimeout() +{ m_projectSearchNext->setEnabled(false); m_findActivated = false; - m_findString = QString(); + m_findString.clear(); statusBar()->showMessage(i18n("Find stopped"), 3000); if (m_activeTimeline) m_activeTimeline->projectView()->clearSearchStrings(); m_projectSearch->setEnabled(true); 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); @@ -1979,16 +2411,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; @@ -2002,7 +2436,8 @@ 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); @@ -2027,22 +2462,24 @@ 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::slotGetNewStuff() { +void MainWindow::slotGetNewLumaStuff() +{ //KNS::Entry::List download(); KNS::Entry::List entries = KNS::Engine::download(); - int numberInstalled = 0; // list of changed entries kDebug() << "// PARSING KNS"; foreach(KNS::Entry* entry, entries) { @@ -2057,8 +2494,105 @@ void MainWindow::slotGetNewStuff() { initEffects::refreshLumas(); } -void MainWindow::slotAutoTransition() { - m_activeTimeline->projectView()->autoTransition(); +void MainWindow::slotGetNewRenderStuff() +{ + //KNS::Entry::List download(); + + KNS::Engine engine(0); + if (engine.init("kdenlive_render.knsrc")) { + KNS::Entry::List entries = engine.downloadDialogModal(this); + + if (entries.size() > 0) { + foreach(KNS::Entry* entry, entries) { + // care only about installed ones + if (entry->status() == KNS::Entry::Installed) { + foreach(const QString &file, entry->installedFiles()) { + kDebug() << "// CURRENTLY INSTALLED: " << file; + } + } + } + } + if (m_renderWidget) m_renderWidget->reloadProfiles(); + } +} + +void MainWindow::slotGetNewMltProfileStuff() +{ + //KNS::Entry::List download(); + + KNS::Engine engine(0); + if (engine.init("kdenlive_mltprofiles.knsrc")) { + KNS::Entry::List entries = engine.downloadDialogModal(this); + + if (entries.size() > 0) { + foreach(KNS::Entry* entry, entries) { + // care only about installed ones + if (entry->status() == KNS::Entry::Installed) { + foreach(const QString &file, entry->installedFiles()) { + kDebug() << "// CURRENTLY INSTALLED: " << file; + } + } + } + + // update the list of profiles in settings dialog + KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); + if (d) d->checkProfile(); + } + } +} + +void MainWindow::slotAutoTransition() +{ + if (m_activeTimeline) m_activeTimeline->projectView()->autoTransition(); +} + +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); + }*/ } #include "mainwindow.moc"