X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=48242bc4fbde8b0f5c1581d3f13df96706fe3e4c;hb=7f38e95b0391823d624c0c85dd22ee324484e4ce;hp=15adae1b9ecb1080bd11df7b7b06e02539f25a21;hpb=1dd4e9ce2f4ad2b7b7b5ab42f6c01ad414bc41ea;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 15adae1b..48242bc4 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -39,6 +39,7 @@ #include "transitionsettings.h" #include "renderwidget.h" #include "renderer.h" +#include "audiosignal.h" #ifndef NO_JOGSHUTTLE #include "jogshuttle.h" #endif /* NO_JOGSHUTTLE */ @@ -50,13 +51,22 @@ #include "clipitem.h" #include "interfaces.h" #include "kdenlive-config.h" +#include "cliptranscode.h" +#include "ui_templateclip_ui.h" +#include "vectorscope.h" +#include "waveform.h" +#include "rgbparade.h" +#include "histogram.h" +#include "audiospectrum.h" #include #include #include #include #include +#include #include +#include #include #include #include @@ -69,6 +79,7 @@ #include #include #include +#include #include #include #include @@ -76,53 +87,71 @@ #include #include #include +#if KDE_IS_VERSION(4,3,80) +#include +#include +#else #include #include +#define KNS3 KNS +#endif /* KDE_IS_VERSION(4,3,80) */ +#include +#include +#include #include #include #include #include +#include +#include +#include #include static const char version[] = VERSION; static const int ID_TIMELINE_POS = 0; - namespace Mlt { class Producer; }; +Q_DECLARE_METATYPE(QVector) + EffectsList MainWindow::videoEffects; 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, const QString & clipsToLoad, QWidget *parent) : + KXmlGuiWindow(parent), + m_activeDocument(NULL), + m_activeTimeline(NULL), + m_renderWidget(NULL), #ifndef NO_JOGSHUTTLE - m_jogProcess(NULL), + m_jogProcess(NULL), #endif /* NO_JOGSHUTTLE */ - m_findActivated(false) + m_findActivated(false), + m_stopmotion(NULL) { - + qRegisterMetaType > (); // Create DBus interface new MainWindowAdaptor(this); QDBusConnection dbus = QDBusConnection::sessionBus(); dbus.registerObject("/MainWindow", this); setlocale(LC_NUMERIC, "POSIX"); + if (!KdenliveSettings::colortheme().isEmpty()) slotChangePalette(NULL, KdenliveSettings::colortheme()); setFont(KGlobalSettings::toolBarFont()); parseProfiles(MltPath); m_commandStack = new QUndoGroup; + setDockNestingEnabled(true); m_timelineArea = new KTabWidget(this); m_timelineArea->setTabReorderingEnabled(true); m_timelineArea->setTabBarHidden(true); + m_timelineArea->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); + m_timelineArea->setMinimumHeight(200); QToolButton *closeTabButton = new QToolButton; connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeCurrentDocument())); @@ -141,62 +170,150 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_monitorManager = new MonitorManager(); + m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this); + connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus())); + + + /// Add Widgets /// + m_projectListDock = new QDockWidget(i18n("Project Tree"), this); m_projectListDock->setObjectName("project_tree"); - m_projectList = new ProjectList(this); + m_projectList = new ProjectList(); m_projectListDock->setWidget(m_projectList); addDockWidget(Qt::TopDockWidgetArea, m_projectListDock); - m_effectListDock = new QDockWidget(i18n("Effect List"), this); - m_effectListDock->setObjectName("effect_list"); - m_effectList = new EffectsListView(); - - //m_effectList = new KListWidget(this); - m_effectListDock->setWidget(m_effectList); - addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); - - 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); - - 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(); - m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); m_clipMonitorDock->setObjectName("clip_monitor"); - m_clipMonitor = new Monitor("clip", m_monitorManager, this); + m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), m_timelineArea); m_clipMonitorDock->setWidget(m_clipMonitor); addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock); - //m_clipMonitor->stop(); m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); m_projectMonitorDock->setObjectName("project_monitor"); - m_projectMonitor = new Monitor("project", m_monitorManager, this); + m_projectMonitor = new Monitor("project", m_monitorManager, QString()); m_projectMonitorDock->setWidget(m_projectMonitor); addDockWidget(Qt::TopDockWidgetArea, m_projectMonitorDock); +#ifndef Q_WS_MAC m_recMonitorDock = new QDockWidget(i18n("Record Monitor"), this); m_recMonitorDock->setObjectName("record_monitor"); - m_recMonitor = new RecMonitor("record", this); + m_recMonitor = new RecMonitor("record"); 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))); +#endif + + m_notesDock = new QDockWidget(i18n("Project Notes"), this); + m_notesDock->setObjectName("notes_widget"); + m_notesWidget = new KTextEdit(); + m_notesWidget->setTabChangesFocus(true); +#if KDE_IS_VERSION(4,4,0) + m_notesWidget->setClickMessage(i18n("Enter your project notes here...")); +#endif + m_notesDock->setWidget(m_notesWidget); + addDockWidget(Qt::TopDockWidgetArea, m_notesDock); + + m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this); + m_effectStackDock->setObjectName("effect_stack"); + m_effectStack = new EffectStackView(m_projectMonitor); + m_effectStackDock->setWidget(m_effectStack); + addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock); + + m_transitionConfigDock = new QDockWidget(i18n("Transition"), this); + m_transitionConfigDock->setObjectName("transition"); + m_transitionConfig = new TransitionSettings(m_projectMonitor); + m_transitionConfigDock->setWidget(m_transitionConfig); + addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock); + + m_effectListDock = new QDockWidget(i18n("Effect List"), this); + m_effectListDock->setObjectName("effect_list"); + m_effectList = new EffectsListView(); + m_effectListDock->setWidget(m_effectList); + addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); + + m_vectorscope = new Vectorscope(m_projectMonitor, m_clipMonitor); + m_vectorscopeDock = new QDockWidget(i18n("Vectorscope"), this); + m_vectorscopeDock->setObjectName(m_vectorscope->widgetName()); + m_vectorscopeDock->setWidget(m_vectorscope); + addDockWidget(Qt::TopDockWidgetArea, m_vectorscopeDock); + connect(m_vectorscopeDock, SIGNAL(visibilityChanged(bool)), m_vectorscope, SLOT(forceUpdate(bool))); + connect(m_vectorscopeDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + connect(m_vectorscope, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + m_scopesList.append(m_vectorscopeDock); + + m_waveform = new Waveform(m_projectMonitor, m_clipMonitor); + m_waveformDock = new QDockWidget(i18n("Waveform"), this); + m_waveformDock->setObjectName(m_waveform->widgetName()); + m_waveformDock->setWidget(m_waveform); + addDockWidget(Qt::TopDockWidgetArea, m_waveformDock); + connect(m_waveformDock, SIGNAL(visibilityChanged(bool)), m_waveform, SLOT(forceUpdate(bool))); + connect(m_waveformDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + connect(m_waveform, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + m_scopesList.append(m_waveformDock); + + m_RGBParade = new RGBParade(m_projectMonitor, m_clipMonitor); + m_RGBParadeDock = new QDockWidget(i18n("RGB Parade"), this); + m_RGBParadeDock->setObjectName(m_RGBParade->widgetName()); + m_RGBParadeDock->setWidget(m_RGBParade); + addDockWidget(Qt::TopDockWidgetArea, m_RGBParadeDock); + connect(m_RGBParadeDock, SIGNAL(visibilityChanged(bool)), m_RGBParade, SLOT(forceUpdate(bool))); + connect(m_RGBParadeDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + connect(m_RGBParade, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + m_scopesList.append(m_RGBParadeDock); + + m_histogram = new Histogram(m_projectMonitor, m_clipMonitor); + m_histogramDock = new QDockWidget(i18n("Histogram"), this); + m_histogramDock->setObjectName(m_histogram->widgetName()); + m_histogramDock->setWidget(m_histogram); + addDockWidget(Qt::TopDockWidgetArea, m_histogramDock); + connect(m_histogramDock, SIGNAL(visibilityChanged(bool)), m_histogram, SLOT(forceUpdate(bool))); + connect(m_histogramDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + connect(m_histogram, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + m_scopesList.append(m_histogramDock); + + + m_audiosignal = new AudioSignal; + m_audiosignalDock = new QDockWidget(i18n("Audio Signal"), this); + m_audiosignalDock->setObjectName("audiosignal"); + m_audiosignalDock->setWidget(m_audiosignal); + addDockWidget(Qt::TopDockWidgetArea, m_audiosignalDock); + connect(m_audiosignal, SIGNAL(updateAudioMonitoring()), m_monitorManager, SLOT(slotUpdateAudioMonitoring())); + /*if (m_projectMonitor) { + connect(m_projectMonitor->render, SIGNAL(showAudioSignal(const QByteArray&)), m_audiosignal, SLOT(showAudio(const QByteArray&))); + } + if (m_clipMonitor) { + connect(m_clipMonitor->render, SIGNAL(showAudioSignal(const QByteArray&)), m_audiosignal, SLOT(showAudio(const QByteArray&))); + }*/ + + m_audioSpectrum = new AudioSpectrum(m_projectMonitor, m_clipMonitor); + m_audioSpectrumDock = new QDockWidget(i18n("AudioSpectrum"), this); + m_audioSpectrumDock->setObjectName(m_audioSpectrum->widgetName()); + m_audioSpectrumDock->setWidget(m_audioSpectrum); + addDockWidget(Qt::TopDockWidgetArea, m_audioSpectrumDock); + + // Connect the audio signal to the audio scope slots + bool b = true; + if (m_projectMonitor) { + qDebug() << "project monitor connected"; + b &= connect(m_projectMonitor->render, SIGNAL(audioSamplesSignal(QVector, int, int, int)), + m_audioSpectrum, SLOT(slotReceiveAudio(QVector, int, int, int))); + b &= connect(m_projectMonitor->render, SIGNAL(audioSamplesSignal(const QVector&, const int&, const int&, const int&)), + m_audiosignal, SLOT(slotReceiveAudio(const QVector&, const int&, const int&, const int&))); + } + if (m_clipMonitor) { + qDebug() << "clip monitor connected"; + b &= connect(m_clipMonitor->render, SIGNAL(audioSamplesSignal(QVector, int, int, int)), + m_audioSpectrum, SLOT(slotReceiveAudio(QVector, int, int, int))); + b &= connect(m_clipMonitor->render, SIGNAL(audioSamplesSignal(const QVector&, int, int, int)), + m_audiosignal, SLOT(slotReceiveAudio(const QVector&, int, int, int))); + } + // Ensure connection was set up correctly + Q_ASSERT(b); m_undoViewDock = new QDockWidget(i18n("Undo History"), this); m_undoViewDock->setObjectName("undo_history"); - m_undoView = new QUndoView(this); + m_undoView = new QUndoView(); m_undoView->setCleanIcon(KIcon("edit-clear")); m_undoView->setEmptyLabel(i18n("Clean")); m_undoViewDock->setWidget(m_undoView); @@ -209,136 +326,207 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent //overviewDock->setWidget(m_overView); //addDockWidget(Qt::TopDockWidgetArea, overviewDock); + setupActions(); - //tabifyDockWidget(projectListDock, effectListDock); + + /// Tabify Widgets /// tabifyDockWidget(m_projectListDock, m_effectStackDock); tabifyDockWidget(m_projectListDock, m_transitionConfigDock); - //tabifyDockWidget(projectListDock, undoViewDock); + tabifyDockWidget(m_projectListDock, m_notesDock); tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock); +#ifndef Q_WS_MAC tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock); - setCentralWidget(m_timelineArea); +#endif + tabifyDockWidget(m_vectorscopeDock, m_waveformDock); + tabifyDockWidget(m_vectorscopeDock, m_RGBParadeDock); + tabifyDockWidget(m_vectorscopeDock, m_histogramDock); + tabifyDockWidget(m_vectorscopeDock, m_undoViewDock); + tabifyDockWidget(m_vectorscopeDock, m_effectListDock); - setupGUI(); - /*ScriptingPart* sp = new ScriptingPart(this, QStringList()); - guiFactory()->addClient(sp);*/ - loadPlugins(); - loadTranscoders(); - //kDebug() << factory() << " " << factory()->container("video_effects_menu", this); + setCentralWidget(m_timelineArea); - 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)), static_cast(factory()->container("transcoders", this))); - // build effects menus - QAction *action; - QMenu *videoEffectsMenu = static_cast(factory()->container("video_effects_menu", this)); + KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); + m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection()); + readOptions(); + m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection()); + m_fileRevert->setEnabled(false); + + // Prepare layout actions + KActionCategory *layoutActions = new KActionCategory(i18n("Layouts"), actionCollection()); + for (int i = 1; i < 5; i++) { + KAction *load = new KAction(KIcon(), i18n("Load Layout %1").arg(i), this); + load->setData("_" + QString::number(i)); + layoutActions->addAction("load_layout" + QString::number(i), load); + KAction *save = new KAction(KIcon(), i18n("Save As Layout %1").arg(i), this); + save->setData("_" + QString::number(i)); + layoutActions->addAction("save_layout" + QString::number(i), save); + } + + KAction *action; + // Stop motion actions. Beware of the order, we MUST use the same order in stopmotion/stopmotion.cpp + m_stopmotion_actions = new KActionCategory(i18n("Stop Motion"), actionCollection()); + action = new KAction(KIcon("media-record"), i18n("Capture frame"), this); + action->setShortcut(Qt::Key_Space); + //action->setShortcutContext(Qt::WidgetWithChildrenShortcut); + m_stopmotion_actions->addAction("stopmotion_capture", action); + action = new KAction(i18n("Switch live / captured frame"), this); + //action->setShortcutContext(Qt::WidgetWithChildrenShortcut); + m_stopmotion_actions->addAction("stopmotion_switch", action); + action = new KAction(KIcon("edit-paste"), i18n("Show last frame over video"), this); + action->setCheckable(true); + action->setChecked(false); + m_stopmotion_actions->addAction("stopmotion_overlay", action); + setupGUI(); - QStringList effectInfo; - QMap effectsList; - for (int ix = 0; ix < videoEffects.count(); ix++) { - effectInfo = videoEffects.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - videoEffectsMenu->addAction(action); + // Find QDockWidget tab bars and show / hide widget title bars on right click + QList tabs = findChildren(); + for (int i = 0; i < tabs.count(); i++) { + tabs.at(i)->setContextMenuPolicy(Qt::CustomContextMenu); + connect(tabs.at(i), SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(slotSwitchTitles())); } - QMenu *audioEffectsMenu = static_cast(factory()->container("audio_effects_menu", this)); + /*ScriptingPart* sp = new ScriptingPart(this, QStringList()); + guiFactory()->addClient(sp);*/ - effectsList.clear(); - for (int ix = 0; ix < audioEffects.count(); ix++) { - effectInfo = audioEffects.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } + QMenu *loadLayout = (QMenu*)(factory()->container("layout_load", this)); + if (loadLayout) + connect(loadLayout, SIGNAL(triggered(QAction*)), this, SLOT(slotLoadLayout(QAction*))); + QMenu *saveLayout = (QMenu*)(factory()->container("layout_save_as", this)); + if (saveLayout) + connect(saveLayout, SIGNAL(triggered(QAction*)), this, SLOT(slotSaveLayout(QAction*))); - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - audioEffectsMenu->addAction(action); - } - m_customEffectsMenu = static_cast(factory()->container("custom_effects_menu", this)); + // Load layout names from config file + loadLayouts(); - if (customEffects.isEmpty()) m_customEffectsMenu->setEnabled(false); - else m_customEffectsMenu->setEnabled(true); + loadPlugins(); + loadTranscoders(); + //kDebug() << factory() << " " << factory()->container("video_effects_menu", this); - effectsList.clear(); - for (int ix = 0; ix < customEffects.count(); ix++) { - effectInfo = customEffects.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } + m_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, NULL, m_loopClip); + m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast(factory()->container("marker_menu", this))); - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - m_customEffectsMenu->addAction(action); - } + QMenu *clipInTimeline = static_cast(factory()->container("clip_in_timeline", this)); + clipInTimeline->setIcon(KIcon("go-jump")); + m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this)), + static_cast(factory()->container("transcoders", this)), + clipInTimeline); + + // build themes menus + QMenu *themesMenu = static_cast(factory()->container("themes_menu", this)); + QActionGroup *themegroup = new QActionGroup(this); + themegroup->setExclusive(true); + action = new KAction(i18n("Default"), this); + action->setCheckable(true); + themegroup->addAction(action); + if (KdenliveSettings::colortheme().isEmpty()) action->setChecked(true); + + const QStringList schemeFiles = KGlobal::dirs()->findAllResources("data", "color-schemes/*.colors", KStandardDirs::NoDuplicates); + + for (int i = 0; i < schemeFiles.size(); ++i) { + // get the file name + const QString filename = schemeFiles.at(i); + const QFileInfo info(filename); + + // add the entry + KSharedConfigPtr config = KSharedConfig::openConfig(filename); + QIcon icon = createSchemePreviewIcon(config); + KConfigGroup group(config, "General"); + const QString name = group.readEntry("Name", info.baseName()); + action = new KAction(name, this); + action->setData(filename); + action->setIcon(icon); + action->setCheckable(true); + themegroup->addAction(action); + if (KdenliveSettings::colortheme() == filename) action->setChecked(true); + } + + /*KGlobal::dirs()->addResourceDir("themes", KStandardDirs::installPath("data") + QString("kdenlive/themes")); + QStringList themes = KGlobal::dirs()->findAllResources("themes", QString(), KStandardDirs::Recursive | KStandardDirs::NoDuplicates); + for (QStringList::const_iterator it = themes.constBegin(); it != themes.constEnd(); ++it) + { + QFileInfo fi(*it); + action = new QAction(fi.fileName(), this); + action->setData(*it); + action->setCheckable(true); + themegroup->addAction(action); + if (KdenliveSettings::colortheme() == *it) action->setChecked(true); + }*/ + themesMenu->addActions(themegroup->actions()); + connect(themesMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotChangePalette(QAction*))); + + // Setup and fill effects and transitions menus. + m_videoEffectsMenu = static_cast(factory()->container("video_effects_menu", this)); + for (int i = 0; i < videoEffects.count(); ++i) + m_videoEffectsMenu->addAction(m_videoEffects[i]); + m_audioEffectsMenu = static_cast(factory()->container("audio_effects_menu", this)); + for (int i = 0; i < audioEffects.count(); ++i) + m_audioEffectsMenu->addAction(m_audioEffects[i]); + m_customEffectsMenu = static_cast(factory()->container("custom_effects_menu", this)); + if (customEffects.isEmpty()) + m_customEffectsMenu->setEnabled(false); + else + m_customEffectsMenu->setEnabled(true); + for (int i = 0; i < customEffects.count(); ++i) + m_customEffectsMenu->addAction(m_customEffects[i]); + m_transitionsMenu = new QMenu(i18n("Add Transition"), this); + for (int i = 0; i < transitions.count(); ++i) + m_transitionsMenu->addAction(m_transitions[i]); + + connect(m_videoEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *))); + connect(m_audioEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddAudioEffect(QAction *))); + connect(m_customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *))); + connect(m_transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *))); QMenu *newEffect = new QMenu(this); - newEffect->addMenu(videoEffectsMenu); - newEffect->addMenu(audioEffectsMenu); + newEffect->addMenu(m_videoEffectsMenu); + newEffect->addMenu(m_audioEffectsMenu); newEffect->addMenu(m_customEffectsMenu); m_effectStack->setMenu(newEffect); - QMenu *viewMenu = static_cast(factory()->container("dockwindows", this)); const QList viewActions = createPopupMenu()->actions(); viewMenu->insertActions(NULL, viewActions); - connect(videoEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *))); - connect(audioEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddAudioEffect(QAction *))); - connect(m_customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *))); - m_timelineContextMenu = new QMenu(this); m_timelineContextClipMenu = new QMenu(this); m_timelineContextTransitionMenu = new QMenu(this); - - QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this); - QStringList effects = transitions.effectNames(); - - effectsList.clear(); - for (int ix = 0; ix < transitions.count(); ix++) { - effectInfo = transitions.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - transitionsMenu->addAction(action); - } - connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *))); - m_timelineContextMenu->addAction(actionCollection()->action("insert_space")); m_timelineContextMenu->addAction(actionCollection()->action("delete_space")); m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste))); - m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip")); - m_timelineContextClipMenu->addAction(actionCollection()->action("change_clip_speed")); + m_timelineContextClipMenu->addAction(actionCollection()->action("clip_in_project_tree")); + //m_timelineContextClipMenu->addAction(actionCollection()->action("clip_to_project_tree")); + m_timelineContextClipMenu->addAction(actionCollection()->action("edit_item_duration")); + m_timelineContextClipMenu->addAction(actionCollection()->action("delete_item")); + m_timelineContextClipMenu->addSeparator(); m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip")); + m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio")); + m_timelineContextClipMenu->addSeparator(); 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")); + m_timelineContextClipMenu->addSeparator(); QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this)); m_timelineContextClipMenu->addMenu(markersMenu); - m_timelineContextClipMenu->addMenu(transitionsMenu); - m_timelineContextClipMenu->addMenu(videoEffectsMenu); - m_timelineContextClipMenu->addMenu(audioEffectsMenu); - //TODO: re-enable custom effects menu when it is implemented + m_timelineContextClipMenu->addSeparator(); + m_timelineContextClipMenu->addMenu(m_transitionsMenu); + m_timelineContextClipMenu->addMenu(m_videoEffectsMenu); + m_timelineContextClipMenu->addMenu(m_audioEffectsMenu); m_timelineContextClipMenu->addMenu(m_customEffectsMenu); - m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip")); + m_timelineContextTransitionMenu->addAction(actionCollection()->action("edit_item_duration")); + m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_item")); m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); m_timelineContextTransitionMenu->addAction(actionCollection()->action("auto_transition")); @@ -347,7 +535,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent 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_monitorManager, SIGNAL(checkColorScopes()), this, SLOT(slotUpdateColorScopes())); + 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); @@ -357,35 +546,95 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent // precedence, then "openlastproject", then just a plain empty file. // If opening Url fails, openlastproject will _not_ be used. if (!Url.isEmpty()) { - openFile(Url); - } else { - if (KdenliveSettings::openlastproject()) { - openLastFile(); - } - } - if (m_timelineArea->count() == 0) { + // delay loading so that the window shows up + m_startUrl = Url; + QTimer::singleShot(500, this, SLOT(openFile())); + } else if (KdenliveSettings::openlastproject()) { + QTimer::singleShot(500, this, SLOT(openLastFile())); + } else { //if (m_timelineArea->count() == 0) { newFile(false); } + if (!clipsToLoad.isEmpty() && m_activeDocument) { + QStringList list = clipsToLoad.split(','); + QList urls; + foreach(QString path, list) { + kDebug() << QDir::current().absoluteFilePath(path); + urls << QUrl::fromLocalFile(QDir::current().absoluteFilePath(path)); + } + m_projectList->slotAddClip(urls); + } + #ifndef NO_JOGSHUTTLE activateShuttleDevice(); #endif /* NO_JOGSHUTTLE */ m_projectListDock->raise(); + + actionCollection()->addAssociatedWidget(m_clipMonitor->container()); + actionCollection()->addAssociatedWidget(m_projectMonitor->container()); +} + +MainWindow::~MainWindow() +{ + if (m_stopmotion) { + delete m_stopmotion; + } + m_effectStack->slotClipItemSelected(NULL, 0); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + + if (m_projectMonitor) m_projectMonitor->stop(); + if (m_clipMonitor) m_clipMonitor->stop(); + + delete m_activeTimeline; + delete m_effectStack; + delete m_transitionConfig; + delete m_activeDocument; + delete m_projectMonitor; + delete m_clipMonitor; + delete m_shortcutRemoveFocus; + Mlt::Factory::close(); } void MainWindow::queryQuit() { - kDebug() << "----- SAVING CONFUIG"; - if (queryClose()) kapp->quit(); + if (queryClose()) { + close(); + } } //virtual bool MainWindow::queryClose() { + if (m_renderWidget) { + int waitingJobs = m_renderWidget->waitingJobsCount(); + if (waitingJobs > 0) { + switch (KMessageBox::warningYesNoCancel(this, i18np("You have 1 rendering job waiting in the queue.\nWhat do you want to do with this job?", "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?"))) { + // warn the user to save if document is modified and we have clips in our project list + if (m_activeDocument && m_activeDocument->isModified() && + ((m_projectList->documentClipList().isEmpty() && !m_activeDocument->url().isEmpty()) || + !m_projectList->documentClipList().isEmpty())) { + raise(); + activateWindow(); + QString message; + if (m_activeDocument->url().fileName().isEmpty()) + message = i18n("Save changes to document?"); + else + message = i18n("The project \"%1\" has been changed.\nDo you want to save your changes?").arg(m_activeDocument->url().fileName()); + switch (KMessageBox::warningYesNoCancel(this, message)) { case KMessageBox::Yes : // save document here. If saving fails, return false; return saveFile(); @@ -400,29 +649,36 @@ bool MainWindow::queryClose() return true; } - void MainWindow::loadPlugins() { - foreach(QObject *plugin, QPluginLoader::staticInstances()) - populateMenus(plugin); + 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; + foreach(const QString & folder, directories) { + kDebug() << "Parsing plugin folder: " << 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(); + foreach(const QString & fileName, + pluginsDir.entryList(filters, QDir::Files)) { + /* + * Avoid loading the same plugin twice when there is more than one + * installation. + */ + if (!m_pluginFileNames.contains(fileName)) { + kDebug() << "Found plugin: " << 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) @@ -439,7 +695,7 @@ void MainWindow::addToMenu(QObject *plugin, const QStringList &texts, QActionGroup *actionGroup) { kDebug() << "// ADD to MENU" << texts; - foreach(const QString &text, texts) { + foreach(const QString & text, texts) { QAction *action = new QAction(text, plugin); action->setData(text); connect(action, SIGNAL(triggered()), this, member); @@ -464,38 +720,48 @@ 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); + KUrl clipUrl = iGenerator->generatedClip(action->data().toString(), m_activeDocument->projectFolder(), + QStringList(), QStringList(), m_activeDocument->fps(), m_activeDocument->width(), m_activeDocument->height()); if (!clipUrl.isEmpty()) { 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() { - initEffects::parseCustomEffectsFile(); m_customEffectsMenu->clear(); - const QStringList effects = customEffects.effectNames(); + initEffects::parseCustomEffectsFile(); QAction *action; - if (effects.isEmpty()) m_customEffectsMenu->setEnabled(false); - else m_customEffectsMenu->setEnabled(true); + QStringList effectInfo; + QMap effectsList; + for (int ix = 0; ix < customEffects.count(); ix++) { + effectInfo = customEffects.effectIdInfo(ix); + effectsList.insert(effectInfo.at(0).toLower(), effectInfo); + } + if (effectsList.isEmpty()) + m_customEffectsMenu->setEnabled(false); + else + m_customEffectsMenu->setEnabled(true); - foreach(const QString &name, effects) { - action = new QAction(name, this); - action->setData(name); + foreach(const QStringList & value, effectsList) { + action = new QAction(value.at(0), this); + action->setData(value); m_customEffectsMenu->addAction(action); } m_effectList->reloadEffectList(); @@ -512,7 +778,6 @@ void MainWindow::activateShuttleDevice() connect(m_jogProcess, SIGNAL(forward1()), m_monitorManager, SLOT(slotForwardOneFrame())); connect(m_jogProcess, SIGNAL(rewind(double)), m_monitorManager, SLOT(slotRewind(double))); connect(m_jogProcess, SIGNAL(forward(double)), m_monitorManager, SLOT(slotForward(double))); - connect(m_jogProcess, SIGNAL(stop()), m_monitorManager, SLOT(slotPlay())); connect(m_jogProcess, SIGNAL(button(int)), this, SLOT(slotShuttleButton(int))); } @@ -562,14 +827,18 @@ 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) { if (!m_activeDocument) return; if (effect.isNull()) { kDebug() << "--- ERROR, TRYING TO APPEND NULL EFFECT"; return; } - m_activeTimeline->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track); + QDomElement effectToAdd = effect.cloneNode().toElement(); + bool ok; + int ix = m_effectStack->isTrackMode(&ok); + if (ok) m_activeTimeline->projectView()->slotAddTrackEffect(effectToAdd, m_activeDocument->tracksCount() - ix); + else m_activeTimeline->projectView()->slotAddEffect(effectToAdd, GenTime(), -1); } void MainWindow::slotRaiseMonitor(bool clipMonitor) @@ -586,11 +855,12 @@ void MainWindow::slotUpdateClip(const QString &id) void MainWindow::slotConnectMonitors() { - m_projectList->setRenderer(m_projectMonitor->render); - connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &))); + //connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &))); + connect(m_projectList, SIGNAL(deleteProjectClips(QStringList, QMap)), this, SLOT(slotDeleteProjectClips(QStringList, QMap))); 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(showClipProperties(QList , QMap)), this, SLOT(slotShowClipProperties(QList , QMap))); + connect(m_projectList, SIGNAL(getFileProperties(const QDomElement, const QString &, int, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement, const QString &, int, 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))); @@ -601,6 +871,8 @@ void MainWindow::slotConnectMonitors() connect(m_clipMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustClipMonitor())); connect(m_projectMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustProjectMonitor())); + connect(m_projectMonitor, SIGNAL(requestFrameForAnalysis(bool)), this, SLOT(slotMonitorRequestRenderFrame(bool))); + connect(m_clipMonitor, SIGNAL(saveZone(Render *, QPoint)), this, SLOT(slotSaveZone(Render *, QPoint))); connect(m_projectMonitor, SIGNAL(saveZone(Render *, QPoint)), this, SLOT(slotSaveZone(Render *, QPoint))); } @@ -624,8 +896,10 @@ void MainWindow::setupActions() KActionCollection* collection = actionCollection(); m_timecodeFormat = new KComboBox(this); - m_timecodeFormat->addItem(i18n("hh:mm:ss::ff")); + 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))); m_statusProgressBar = new QProgressBar(this); m_statusProgressBar->setMinimum(0); @@ -633,84 +907,153 @@ void MainWindow::setupActions() m_statusProgressBar->setMaximumWidth(150); m_statusProgressBar->setVisible(false); - QWidget *w = new QWidget; - - QHBoxLayout *layout = new QHBoxLayout; - w->setLayout(layout); - layout->setContentsMargins(5, 0, 5, 0); - QToolBar *toolbar = new QToolBar("statusToolBar", this); + KToolBar *toolbar = new KToolBar("statusToolBar", this, Qt::BottomToolBarArea); + toolbar->setMovable(false); + KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor buttonBg = scheme.background(KColorScheme::LinkBackground).color(); + QColor buttonBord = scheme.foreground(KColorScheme::LinkText).color(); + QColor buttonBord2 = scheme.shade(KColorScheme::LightShade); + statusBar()->setStyleSheet(QString("QStatusBar QLabel {font-size:%1pt;} QStatusBar::item { border: 0px; font-size:%1pt;padding:0px; }").arg(statusBar()->font().pointSize())); + QString style1 = QString("QToolBar { border: 0px } QToolButton { border-style: inset; border:1px solid transparent;border-radius: 3px;margin: 0px 3px;padding: 0px;} QToolButton:hover { background: rgb(%7, %8, %9);border-style: inset; border:1px solid rgb(%7, %8, %9);border-radius: 3px;} QToolButton:checked { background-color: rgb(%1, %2, %3); border-style: inset; border:1px solid rgb(%4, %5, %6);border-radius: 3px;}").arg(buttonBg.red()).arg(buttonBg.green()).arg(buttonBg.blue()).arg(buttonBord.red()).arg(buttonBord.green()).arg(buttonBord.blue()).arg(buttonBord2.red()).arg(buttonBord2.green()).arg(buttonBord2.blue()); + QString styleBorderless = "QToolButton { border-width: 0px;margin: 1px 3px 0px;padding: 0px;}"; + + //create edit mode buttons + m_normalEditTool = new KAction(KIcon("kdenlive-normal-edit"), i18n("Normal mode"), this); + m_normalEditTool->setShortcut(i18nc("Normal editing", "n")); + toolbar->addAction(m_normalEditTool); + m_normalEditTool->setCheckable(true); + m_normalEditTool->setChecked(true); + + m_overwriteEditTool = new KAction(KIcon("kdenlive-overwrite-edit"), i18n("Overwrite mode"), this); + //m_overwriteEditTool->setShortcut(i18nc("Overwrite mode shortcut", "o")); + toolbar->addAction(m_overwriteEditTool); + m_overwriteEditTool->setCheckable(true); + m_overwriteEditTool->setChecked(false); + + m_insertEditTool = new KAction(KIcon("kdenlive-insert-edit"), i18n("Insert mode"), this); + //m_insertEditTool->setShortcut(i18nc("Insert mode shortcut", "i")); + toolbar->addAction(m_insertEditTool); + m_insertEditTool->setCheckable(true); + m_insertEditTool->setChecked(false); + // not implemented yet + m_insertEditTool->setEnabled(false); + + QActionGroup *editGroup = new QActionGroup(this); + editGroup->addAction(m_normalEditTool); + editGroup->addAction(m_overwriteEditTool); + editGroup->addAction(m_insertEditTool); + editGroup->setExclusive(true); + connect(editGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeEdit(QAction *))); + //connect(m_overwriteEditTool, SIGNAL(toggled(bool)), this, SLOT(slotSetOverwriteMode(bool))); + toolbar->addSeparator(); - m_toolGroup = new QActionGroup(this); - - 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;}"; - + // create tools buttons 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); - m_toolGroup->addAction(m_buttonSelectTool); - m_toolGroup->addAction(m_buttonRazorTool); - m_toolGroup->addAction(m_buttonSpacerTool); - m_toolGroup->setExclusive(true); + QActionGroup *toolGroup = new QActionGroup(this); + toolGroup->addAction(m_buttonSelectTool); + toolGroup->addAction(m_buttonRazorTool); + toolGroup->addAction(m_buttonSpacerTool); + toolGroup->setExclusive(true); toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly); QWidget * actionWidget; + int max = toolbar->iconSizeDefault() + 2; + actionWidget = toolbar->widgetForAction(m_normalEditTool); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + + actionWidget = toolbar->widgetForAction(m_insertEditTool); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + + actionWidget = toolbar->widgetForAction(m_overwriteEditTool); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget = toolbar->widgetForAction(m_buttonSelectTool); - actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(18); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); actionWidget = toolbar->widgetForAction(m_buttonRazorTool); - actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(18); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); actionWidget = toolbar->widgetForAction(m_buttonSpacerTool); - actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(18); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); toolbar->setStyleSheet(style1); - connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *))); + connect(toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *))); toolbar->addSeparator(); m_buttonFitZoom = new KAction(KIcon("zoom-fit-best"), i18n("Fit zoom to project"), this); toolbar->addAction(m_buttonFitZoom); m_buttonFitZoom->setCheckable(false); - connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom())); - actionWidget = toolbar->widgetForAction(m_buttonFitZoom); - actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(18); + m_zoomOut = new KAction(KIcon("zoom-out"), i18n("Zoom Out"), this); + toolbar->addAction(m_zoomOut); + m_zoomOut->setShortcut(Qt::CTRL + Qt::Key_Minus); m_zoomSlider = new QSlider(Qt::Horizontal, this); m_zoomSlider->setMaximum(13); m_zoomSlider->setPageStep(1); + m_zoomSlider->setInvertedAppearance(true); m_zoomSlider->setMaximumWidth(150); m_zoomSlider->setMinimumWidth(100); + toolbar->addWidget(m_zoomSlider); - const int contentHeight = QFontMetrics(w->font()).height() + 8; - - QString style = "QSlider::groove:horizontal { background-color: rgba(230, 230, 230, 220);border: 1px solid #999999;height: 8px;border-radius: 3px;margin-top:3px }"; - style.append("QSlider::handle:horizontal { background-color: white; border: 1px solid #999999;width: 9px;margin: -2px 0;border-radius: 3px; }"); - - m_zoomSlider->setStyleSheet(style); + m_zoomIn = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this); + toolbar->addAction(m_zoomIn); + m_zoomIn->setShortcut(Qt::CTRL + Qt::Key_Plus); - //m_zoomSlider->height() + 5; - statusBar()->setMinimumHeight(contentHeight); + actionWidget = toolbar->widgetForAction(m_buttonFitZoom); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget->setStyleSheet(styleBorderless); + + actionWidget = toolbar->widgetForAction(m_zoomIn); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget->setStyleSheet(styleBorderless); + + actionWidget = toolbar->widgetForAction(m_zoomOut); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget->setStyleSheet(styleBorderless); + + connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetZoom(int))); + connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(slotShowZoomSliderToolTip(int))); + connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom())); + connect(m_zoomIn, SIGNAL(triggered(bool)), this, SLOT(slotZoomIn())); + connect(m_zoomOut, SIGNAL(triggered(bool)), this, SLOT(slotZoomOut())); + toolbar->addSeparator(); - toolbar->addWidget(m_zoomSlider); + //create automatic audio split button + m_buttonAutomaticSplitAudio = new KAction(KIcon("kdenlive-split-audio"), i18n("Split audio and video automatically"), this); + toolbar->addAction(m_buttonAutomaticSplitAudio); + m_buttonAutomaticSplitAudio->setCheckable(true); + m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio()); + connect(m_buttonAutomaticSplitAudio, SIGNAL(triggered()), this, SLOT(slotSwitchSplitAudio())); m_buttonVideoThumbs = new KAction(KIcon("kdenlive-show-videothumb"), i18n("Show video thumbnails"), this); toolbar->addAction(m_buttonVideoThumbs); @@ -735,55 +1078,52 @@ void MainWindow::setupActions() m_buttonSnap->setCheckable(true); m_buttonSnap->setChecked(KdenliveSettings::snaptopoints()); connect(m_buttonSnap, SIGNAL(triggered()), this, SLOT(slotSwitchSnap())); - layout->addWidget(toolbar); + actionWidget = toolbar->widgetForAction(m_buttonAutomaticSplitAudio); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs); - actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(18); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); actionWidget = toolbar->widgetForAction(m_buttonAudioThumbs); - actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(18); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); actionWidget = toolbar->widgetForAction(m_buttonShowMarkers); - actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(18); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); actionWidget = toolbar->widgetForAction(m_buttonSnap); - actionWidget->setMaximumWidth(24); - actionWidget->setMinimumHeight(18); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); m_messageLabel = new StatusBarMessageLabel(this); m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding); statusBar()->addWidget(m_messageLabel, 10); statusBar()->addWidget(m_statusProgressBar, 0); - statusBar()->addPermanentWidget(w); + statusBar()->addPermanentWidget(toolbar); statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS); statusBar()->addPermanentWidget(m_timecodeFormat); - statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4); - m_messageLabel->hide(); + //statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 3); + collection->addAction("normal_mode", m_normalEditTool); + collection->addAction("overwrite_mode", m_overwriteEditTool); + collection->addAction("insert_mode", m_insertEditTool); collection->addAction("select_tool", m_buttonSelectTool); collection->addAction("razor_tool", m_buttonRazorTool); collection->addAction("spacer_tool", m_buttonSpacerTool); + collection->addAction("automatic_split_audio", m_buttonAutomaticSplitAudio); collection->addAction("show_video_thumbs", m_buttonVideoThumbs); collection->addAction("show_audio_thumbs", m_buttonAudioThumbs); collection->addAction("show_markers", m_buttonShowMarkers); collection->addAction("snap", m_buttonSnap); collection->addAction("zoom_fit", m_buttonFitZoom); - - KAction* zoomIn = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this); - collection->addAction("zoom_in", zoomIn); - connect(zoomIn, SIGNAL(triggered(bool)), this, SLOT(slotZoomIn())); - zoomIn->setShortcut(Qt::CTRL + Qt::Key_Plus); - - KAction* zoomOut = new KAction(KIcon("zoom-out"), i18n("Zoom Out"), this); - collection->addAction("zoom_out", zoomOut); - connect(zoomOut, SIGNAL(triggered(bool)), this, SLOT(slotZoomOut())); - zoomOut->setShortcut(Qt::CTRL + Qt::Key_Minus); + collection->addAction("zoom_in", m_zoomIn); + collection->addAction("zoom_out", m_zoomOut); m_projectSearch = new KAction(KIcon("edit-find"), i18n("Find"), this); collection->addAction("project_find", m_projectSearch); @@ -800,11 +1140,10 @@ 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 Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles"); - - KNS::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles"); + KNS3::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas"); + KNS3::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles"); + KNS3::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles"); + KNS3::standardAction(i18n("Download New Title Templates..."), this, SLOT(slotGetNewTitleStuff()), actionCollection(), "get_new_titles"); KAction* wizAction = new KAction(KIcon("configure"), i18n("Run Config Wizard"), this); collection->addAction("run_wizard", wizAction); @@ -819,6 +1158,14 @@ void MainWindow::setupActions() projectRender->setShortcut(Qt::CTRL + Qt::Key_Return); connect(projectRender, SIGNAL(triggered(bool)), this, SLOT(slotRenderProject())); + KAction* projectClean = new KAction(KIcon("edit-clear"), i18n("Clean Project"), this); + collection->addAction("project_clean", projectClean); + connect(projectClean, SIGNAL(triggered(bool)), this, SLOT(slotCleanProject())); + + KAction* projectAdjust = new KAction(KIcon(), i18n("Adjust Profile to Current Clip"), this); + collection->addAction("project_adjust_profile", projectAdjust); + connect(projectAdjust, SIGNAL(triggered(bool)), m_projectList, SLOT(adjustProjectProfileToItem())); + KAction* monitorPlay = new KAction(KIcon("media-playback-start"), i18n("Play"), this); KShortcut playShortcut; playShortcut.setPrimary(Qt::Key_Space); @@ -837,20 +1184,59 @@ void MainWindow::setupActions() collection->addAction("monitor_loop_zone", m_loopZone); connect(m_loopZone, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotLoopZone())); + m_loopClip = new KAction(KIcon("media-playback-start"), i18n("Loop selected clip"), this); + m_loopClip->setEnabled(false); + collection->addAction("monitor_loop_clip", m_loopClip); + connect(m_loopClip, SIGNAL(triggered(bool)), m_projectMonitor, SLOT(slotLoopClip())); + 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 Clips"), 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->setText(i18n("Set Zone In")); markIn->setShortcut(Qt::Key_I); connect(markIn, SIGNAL(triggered(bool)), this, SLOT(slotSetInPoint())); KAction *markOut = collection->addAction("mark_out"); - markOut->setText(i18n("Set Out Point")); + markOut->setText(i18n("Set Zone Out")); markOut->setShortcut(Qt::Key_O); connect(markOut, SIGNAL(triggered(bool)), this, SLOT(slotSetOutPoint())); + KAction *switchMon = collection->addAction("switch_monitor"); + switchMon->setText(i18n("Switch monitor")); + switchMon->setShortcut(Qt::Key_T); + connect(switchMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchMonitors())); + + KAction *fullMon = collection->addAction("monitor_fullscreen"); + fullMon->setText(i18n("Switch monitor fullscreen")); + fullMon->setIcon(KIcon("view-fullscreen")); + connect(fullMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchFullscreen())); + + KAction *insertTree = collection->addAction("insert_project_tree"); + insertTree->setText(i18n("Insert zone in project tree")); + insertTree->setShortcut(Qt::CTRL + Qt::Key_I); + connect(insertTree, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTree())); + + KAction *insertTimeline = collection->addAction("insert_timeline"); + insertTimeline->setText(i18n("Insert zone in timeline")); + insertTimeline->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_I); + connect(insertTimeline, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTimeline())); + + KAction *resizeStart = new KAction(KIcon(), i18n("Resize Item Start"), this); + collection->addAction("resize_timeline_clip_start", resizeStart); + resizeStart->setShortcut(Qt::Key_1); + connect(resizeStart, SIGNAL(triggered(bool)), this, SLOT(slotResizeItemStart())); + + KAction *resizeEnd = new KAction(KIcon(), i18n("Resize Item End"), this); + collection->addAction("resize_timeline_clip_end", resizeEnd); + resizeEnd->setShortcut(Qt::Key_2); + connect(resizeEnd, SIGNAL(triggered(bool)), this, SLOT(slotResizeItemEnd())); + KAction* monitorSeekBackward = new KAction(KIcon("media-seek-backward"), i18n("Rewind"), this); monitorSeekBackward->setShortcut(Qt::Key_J); collection->addAction("monitor_seek_backward", monitorSeekBackward); @@ -886,6 +1272,16 @@ void MainWindow::setupActions() collection->addAction("seek_clip_end", clipEnd); connect(clipEnd, SIGNAL(triggered(bool)), this, SLOT(slotClipEnd())); + KAction* zoneStart = new KAction(KIcon("media-seek-backward"), i18n("Go to Zone Start"), this); + zoneStart->setShortcut(Qt::SHIFT + Qt::Key_I); + collection->addAction("seek_zone_start", zoneStart); + connect(zoneStart, SIGNAL(triggered(bool)), this, SLOT(slotZoneStart())); + + KAction* zoneEnd = new KAction(KIcon("media-seek-forward"), i18n("Go to Zone End"), this); + zoneEnd->setShortcut(Qt::SHIFT + Qt::Key_O); + collection->addAction("seek_zone_end", zoneEnd); + connect(zoneEnd, SIGNAL(triggered(bool)), this, SLOT(slotZoneEnd())); + KAction* projectStart = new KAction(KIcon("go-first"), i18n("Go to Project Start"), this); projectStart->setShortcut(Qt::CTRL + Qt::Key_Home); collection->addAction("seek_start", projectStart); @@ -911,15 +1307,15 @@ void MainWindow::setupActions() collection->addAction("monitor_seek_snap_forward", monitorSeekSnapForward); connect(monitorSeekSnapForward, SIGNAL(triggered(bool)), this, SLOT(slotSnapForward())); - KAction* deleteTimelineClip = new KAction(KIcon("edit-delete"), i18n("Delete Selected Item"), this); - deleteTimelineClip->setShortcut(Qt::Key_Delete); - collection->addAction("delete_timeline_clip", deleteTimelineClip); - connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip())); + KAction* deleteItem = new KAction(KIcon("edit-delete"), i18n("Delete Selected Item"), this); + deleteItem->setShortcut(Qt::Key_Delete); + collection->addAction("delete_timeline_clip", deleteItem); + connect(deleteItem, SIGNAL(triggered(bool)), this, SLOT(slotDeleteItem())); - 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")); @@ -929,14 +1325,63 @@ void MainWindow::setupActions() 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* editItemDuration = new KAction(KIcon("measure"), i18n("Edit Duration"), this); + collection->addAction("edit_item_duration", editItemDuration); + connect(editItemDuration, SIGNAL(triggered(bool)), this, SLOT(slotEditItemDuration())); + + KAction* clipInProjectTree = new KAction(KIcon("go-jump-definition"), i18n("Clip in Project Tree"), this); + collection->addAction("clip_in_project_tree", clipInProjectTree); + connect(clipInProjectTree, SIGNAL(triggered(bool)), this, SLOT(slotClipInProjectTree())); + + /*KAction* clipToProjectTree = new KAction(KIcon("go-jump-definition"), i18n("Add Clip to Project Tree"), this); + collection->addAction("clip_to_project_tree", clipToProjectTree); + connect(clipToProjectTree, SIGNAL(triggered(bool)), this, SLOT(slotClipToProjectTree()));*/ + + KAction* insertOvertwrite = new KAction(KIcon(), i18n("Insert Clip Zone in Timeline (Overwrite)"), this); + insertOvertwrite->setShortcut(Qt::Key_V); + collection->addAction("overwrite_to_in_point", insertOvertwrite); + connect(insertOvertwrite, SIGNAL(triggered(bool)), this, SLOT(slotInsertClipOverwrite())); + + KAction* selectTimelineClip = new KAction(KIcon("edit-select"), i18n("Select Clip"), this); + selectTimelineClip->setShortcut(Qt::Key_Plus); + collection->addAction("select_timeline_clip", selectTimelineClip); + connect(selectTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotSelectTimelineClip())); + + KAction* deselectTimelineClip = new KAction(KIcon("edit-select"), i18n("Deselect Clip"), this); + deselectTimelineClip->setShortcut(Qt::Key_Minus); + collection->addAction("deselect_timeline_clip", deselectTimelineClip); + connect(deselectTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeselectTimelineClip())); + + KAction* selectAddTimelineClip = new KAction(KIcon("edit-select"), i18n("Add Clip To Selection"), this); + selectAddTimelineClip->setShortcut(Qt::ALT + Qt::Key_Plus); + collection->addAction("select_add_timeline_clip", selectAddTimelineClip); + connect(selectAddTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotSelectAddTimelineClip())); + + KAction* selectTimelineTransition = new KAction(KIcon("edit-select"), i18n("Select Transition"), this); + selectTimelineTransition->setShortcut(Qt::SHIFT + Qt::Key_Plus); + collection->addAction("select_timeline_transition", selectTimelineTransition); + connect(selectTimelineTransition, SIGNAL(triggered(bool)), this, SLOT(slotSelectTimelineTransition())); + + KAction* deselectTimelineTransition = new KAction(KIcon("edit-select"), i18n("Deselect Transition"), this); + deselectTimelineTransition->setShortcut(Qt::SHIFT + Qt::Key_Minus); + collection->addAction("deselect_timeline_transition", deselectTimelineTransition); + connect(deselectTimelineTransition, SIGNAL(triggered(bool)), this, SLOT(slotDeselectTimelineTransition())); + + KAction* selectAddTimelineTransition = new KAction(KIcon("edit-select"), i18n("Add Transition To Selection"), this); + selectAddTimelineTransition->setShortcut(Qt::ALT + Qt::SHIFT + Qt::Key_Plus); + collection->addAction("select_add_timeline_transition", selectAddTimelineTransition); + connect(selectAddTimelineTransition, SIGNAL(triggered(bool)), this, SLOT(slotSelectAddTimelineTransition())); + KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this); cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R); collection->addAction("cut_timeline_clip", cutTimelineClip); @@ -958,6 +1403,11 @@ void MainWindow::setupActions() collection->addAction("edit_clip_marker", editClipMarker); connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker())); + KAction *addMarkerGuideQuickly = new KAction(KIcon("bookmark-new"), i18n("Add Marker/Guide quickly"), this); + addMarkerGuideQuickly->setShortcut(Qt::Key_Asterisk); + collection->addAction("add_marker_guide_quickly", addMarkerGuideQuickly); + connect(addMarkerGuideQuickly, SIGNAL(triggered(bool)), this, SLOT(slotAddMarkerGuideQuickly())); + KAction* splitAudio = new KAction(KIcon("document-new"), i18n("Split Audio"), this); collection->addAction("split_audio", splitAudio); connect(splitAudio, SIGNAL(triggered(bool)), this, SLOT(slotSplitAudio())); @@ -1000,9 +1450,9 @@ void MainWindow::setupActions() collection->addAction("delete_track", deleteTrack); connect(deleteTrack, SIGNAL(triggered()), this, SLOT(slotDeleteTrack())); - KAction *changeTrack = new KAction(KIcon(), i18n("Change Track"), this); - collection->addAction("change_track", changeTrack); - connect(changeTrack, SIGNAL(triggered()), this, SLOT(slotChangeTrack())); + KAction *configTracks = new KAction(KIcon("configure"), i18n("Configure Tracks"), this); + collection->addAction("config_tracks", configTracks); + connect(configTracks, SIGNAL(triggered()), this, SLOT(slotConfigTrack())); KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this); collection->addAction("add_guide", addGuide); @@ -1031,32 +1481,35 @@ void MainWindow::setupActions() showTimeline->setChecked(true); connect(showTimeline, SIGNAL(triggered(bool)), this, SLOT(slotShowTimeline(bool))); + QAction *showTitleBar = new KAction(i18n("Show Title Bars"), this); + collection->addAction("show_titlebars", showTitleBar); + showTitleBar->setCheckable(true); + connect(showTitleBar, SIGNAL(triggered(bool)), this, SLOT(slotShowTitleBars(bool))); + showTitleBar->setChecked(KdenliveSettings::showtitlebars()); + slotShowTitleBars(KdenliveSettings::showtitlebars()); + + + //const QByteArray state = layoutGroup.readEntry("layout1", QByteArray()); + /*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); - - KStandardAction::open(this, SLOT(openFile()), collection); - - m_saveAction = KStandardAction::save(this, SLOT(saveFile()), collection); - - KStandardAction::saveAs(this, SLOT(saveFileAs()), collection); - - KStandardAction::openNew(this, SLOT(newFile()), collection); - - KStandardAction::preferences(this, SLOT(slotPreferences()), collection); - - KStandardAction::configureNotifications(this , SLOT(configureNotifications()), collection); - - KStandardAction::copy(this, SLOT(slotCopy()), collection); - - KStandardAction::paste(this, SLOT(slotPaste()), collection); + m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection); + KStandardAction::quit(this, SLOT(queryQuit()), collection); + KStandardAction::open(this, SLOT(openFile()), collection); + m_saveAction = KStandardAction::save(this, SLOT(saveFile()), collection); + KStandardAction::saveAs(this, SLOT(saveFileAs()), collection); + KStandardAction::openNew(this, SLOT(newFile()), collection); + // TODO: make the following connection to slotEditKeys work + KStandardAction::keyBindings(this, SLOT(slotEditKeys()), collection); + KStandardAction::preferences(this, SLOT(slotPreferences()), collection); + KStandardAction::configureNotifications(this, SLOT(configureNotifications()), collection); + KStandardAction::copy(this, SLOT(slotCopy()), collection); + KStandardAction::paste(this, SLOT(slotPaste()), collection); + KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection); KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()), collection); undo->setEnabled(false); @@ -1066,8 +1519,6 @@ void MainWindow::setupActions() redo->setEnabled(false); connect(m_commandStack, SIGNAL(canRedoChanged(bool)), redo, SLOT(setEnabled(bool))); - KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection); - /* //TODO: Add status tooltip to actions ? connect(collection, SIGNAL(actionHovered(QAction*)), @@ -1090,6 +1541,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())); @@ -1118,11 +1573,16 @@ void MainWindow::setupActions() connect(reloadClip , SIGNAL(triggered()), m_projectList, SLOT(slotReloadClip())); reloadClip->setEnabled(false); + QAction *stopMotion = new KAction(KIcon("image-x-generic"), i18n("Stop Motion Capture"), this); + collection->addAction("stopmotion", stopMotion); + connect(stopMotion , SIGNAL(triggered()), this, SLOT(slotOpenStopmotion())); + QMenu *addClips = new QMenu(); addClips->addAction(addClip); addClips->addAction(addColorClip); addClips->addAction(addSlideClip); addClips->addAction(addTitleClip); + addClips->addAction(addTitleTemplateClip); addClips->addAction(addFolderButton); addClips->addAction(reloadClip); @@ -1131,6 +1591,50 @@ void MainWindow::setupActions() addClips->addAction(deleteClip); m_projectList->setupMenu(addClips, addClip); + // Setup effects and transitions actions. + m_effectsActionCollection = new KActionCollection(this, KGlobal::mainComponent()); + //KActionCategory *videoEffectActions = new KActionCategory(i18n("Video Effects"), m_effectsActionCollection); + KActionCategory *videoEffectActions = new KActionCategory(i18n("Video Effects"), collection); + m_videoEffects = new KAction*[videoEffects.count()]; + for (int i = 0; i < videoEffects.count(); ++i) { + QStringList effectInfo = videoEffects.effectIdInfo(i); + m_videoEffects[i] = new KAction(KIcon("kdenlive-show-video"), effectInfo.at(0), this); + m_videoEffects[i]->setData(effectInfo); + m_videoEffects[i]->setIconVisibleInMenu(false); + videoEffectActions->addAction("video_effect_" + effectInfo.at(0), m_videoEffects[i]); + } + //KActionCategory *audioEffectActions = new KActionCategory(i18n("Audio Effects"), m_effectsActionCollection); + KActionCategory *audioEffectActions = new KActionCategory(i18n("Audio Effects"), collection); + m_audioEffects = new KAction*[audioEffects.count()]; + for (int i = 0; i < audioEffects.count(); ++i) { + QStringList effectInfo = audioEffects.effectIdInfo(i); + m_audioEffects[i] = new KAction(KIcon("kdenlive-show-audio"), effectInfo.at(0), this); + m_audioEffects[i]->setData(effectInfo); + m_audioEffects[i]->setIconVisibleInMenu(false); + audioEffectActions->addAction("audio_effect_" + effectInfo.at(0), m_audioEffects[i]); + } + //KActionCategory *customEffectActions = new KActionCategory(i18n("Custom Effects"), m_effectsActionCollection); + KActionCategory *customEffectActions = new KActionCategory(i18n("Custom Effects"), collection); + m_customEffects = new KAction*[customEffects.count()]; + for (int i = 0; i < customEffects.count(); ++i) { + QStringList effectInfo = customEffects.effectIdInfo(i); + m_customEffects[i] = new KAction(KIcon("kdenlive-custom-effect"), effectInfo.at(0), this); + m_customEffects[i]->setData(effectInfo); + m_customEffects[i]->setIconVisibleInMenu(false); + customEffectActions->addAction("custom_effect_" + effectInfo.at(0), m_customEffects[i]); + } + //KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), m_effectsActionCollection); + KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), collection); + m_transitions = new KAction*[transitions.count()]; + for (int i = 0; i < transitions.count(); i++) { + QStringList effectInfo = transitions.effectIdInfo(i); + m_transitions[i] = new KAction(effectInfo.at(0), this); + m_transitions[i]->setData(effectInfo); + m_transitions[i]->setIconVisibleInMenu(false); + transitionActions->addAction("transition_" + effectInfo.at(0), m_transitions[i]); + } + m_effectsActionCollection->readSettings(); + //connect(collection, SIGNAL( clearStatusText() ), //statusBar(), SLOT( clear() ) ); } @@ -1140,6 +1644,71 @@ void MainWindow::slotDisplayActionMessage(QAction *a) statusBar()->showMessage(a->data().toString(), 3000); } +void MainWindow::loadLayouts() +{ + QMenu *saveLayout = (QMenu*)(factory()->container("layout_save_as", this)); + QMenu *loadLayout = (QMenu*)(factory()->container("layout_load", this)); + if (loadLayout == NULL || saveLayout == NULL) return; + KSharedConfigPtr config = KGlobal::config(); + KConfigGroup layoutGroup(config, "Layouts"); + QStringList entries = layoutGroup.keyList(); + QList loadActions = loadLayout->actions(); + QList saveActions = saveLayout->actions(); + for (int i = 1; i < 5; i++) { + // Rename the layouts actions + foreach(const QString & key, entries) { + if (key.endsWith(QString("_%1").arg(i))) { + // Found previously saved layout + QString layoutName = key.section("_", 0, -2); + for (int j = 0; j < loadActions.count(); j++) { + if (loadActions.at(j)->data().toString().endsWith("_" + QString::number(i))) { + loadActions[j]->setText(layoutName); + loadActions[j]->setData(key); + break; + } + } + for (int j = 0; j < saveActions.count(); j++) { + if (saveActions.at(j)->data().toString().endsWith("_" + QString::number(i))) { + saveActions[j]->setText(layoutName); + saveActions[j]->setData(key); + break; + } + } + } + } + } +} + +void MainWindow::slotLoadLayout(QAction *action) +{ + if (!action) return; + QString layoutId = action->data().toString(); + if (layoutId.isEmpty()) return; + KSharedConfigPtr config = KGlobal::config(); + KConfigGroup layouts(config, "Layouts"); + //QByteArray geom = QByteArray::fromBase64(layouts.readEntry(layoutId).toAscii()); + QByteArray state = QByteArray::fromBase64(layouts.readEntry(layoutId).toAscii()); + //restoreGeometry(geom); + restoreState(state); +} + +void MainWindow::slotSaveLayout(QAction *action) +{ + QString originallayoutName = action->data().toString(); + int layoutId = originallayoutName.section('_', -1).toInt(); + + QString layoutName = QInputDialog::getText(this, i18n("Save Layout"), i18n("Layout name:"), QLineEdit::Normal, originallayoutName.section('_', 0, -2)); + if (layoutName.isEmpty()) return; + KSharedConfigPtr config = KGlobal::config(); + KConfigGroup layouts(config, "Layouts"); + layouts.deleteEntry(originallayoutName); + + QByteArray st = saveState(); + layoutName.append("_" + QString::number(layoutId)); + layouts.writeEntry(layoutName, st.toBase64()); + loadLayouts(); +} + void MainWindow::saveOptions() { KdenliveSettings::self()->writeConfig(); @@ -1157,15 +1726,17 @@ void MainWindow::readOptions() 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); } } @@ -1197,95 +1768,123 @@ void MainWindow::slotRunWizard() delete w; } -void MainWindow::newFile(bool showProjectSettings) +void MainWindow::newFile(bool showProjectSettings, bool force) { - QString profileName; - KUrl projectFolder; + if (!m_timelineArea->isEnabled() && !force) + return; + m_fileRevert->setEnabled(false); + QString profileName = KdenliveSettings::default_profile(); + KUrl projectFolder = KdenliveSettings::defaultprojectfolder(); QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); - if (!showProjectSettings && m_timelineArea->count() == 0) { - if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); - profileName = KdenliveSettings::default_profile(); + if (!showProjectSettings) { + if (!KdenliveSettings::activatetabs()) + if (!closeCurrentDocument()) + return; } 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()); + ProjectSettings *w = new ProjectSettings(NULL, QStringList(), projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this); + if (w->exec() != QDialog::Accepted) + return; + if (!KdenliveSettings::activatetabs()) + if (!closeCurrentDocument()) + return; + if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) + slotSwitchVideoThumbs(); + if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) + slotSwitchAudioThumbs(); profileName = w->selectedProfile(); projectFolder = w->selectedFolder(); projectTracks = w->tracks(); delete w; } - KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this); + m_timelineArea->setEnabled(true); + m_projectList->setEnabled(true); + KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, m_notesWidget, 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); + slotPreferences(6); + return; + } if (m_timelineArea->count() == 1) { connectDocumentInfo(doc); connectDocument(trackView, doc); - } else m_timelineArea->setTabBarHidden(false); + } else + m_timelineArea->setTabBarHidden(false); + m_monitorManager->activateMonitor("clip"); m_closeAction->setEnabled(m_timelineArea->count() > 1); } void MainWindow::activateDocument() { - if (m_timelineArea->currentWidget() == NULL) return; + 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() +bool MainWindow::closeCurrentDocument(bool saveChanges) { QWidget *w = m_timelineArea->currentWidget(); - if (!w) return; + if (!w) return true; // closing current document int ix = m_timelineArea->currentIndex() + 1; if (ix == m_timelineArea->count()) ix = 0; m_timelineArea->setCurrentIndex(ix); TrackView *tabToClose = (TrackView *) w; KdenliveDoc *docToClose = tabToClose->document(); - if (docToClose && docToClose->isModified()) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { + if (docToClose && docToClose->isModified() && saveChanges) { + QString message; + if (m_activeDocument->url().fileName().isEmpty()) + message = i18n("Save changes to document?"); + else + message = i18n("The project \"%1\" has been changed.\nDo you want to save your changes?").arg(m_activeDocument->url().fileName()); + switch (KMessageBox::warningYesNoCancel(this, message)) { case KMessageBox::Yes : // save document here. If saving fails, return false; - if (saveFile() == false) return; + if (saveFile() == false) return false; break; case KMessageBox::Cancel : - return; + return false; + break; default: break; } } + m_clipMonitor->slotSetXml(NULL); m_timelineArea->removeTab(m_timelineArea->indexOf(w)); if (m_timelineArea->count() == 1) { 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; m_effectStack->clear(); - m_transitionConfig->slotTransitionItemSelected(NULL, false); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + } else { + delete docToClose; + } + if (w == m_activeTimeline) { + delete m_activeTimeline; + m_activeTimeline = NULL; + } else { + delete w; } + return true; } 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) + m_monitorManager->stopActiveMonitor(); + + if (m_activeDocument->saveSceneList(outputFileName, m_projectMonitor->sceneList()) == false) return false; // Save timeline thumbnails @@ -1299,20 +1898,20 @@ bool MainWindow::saveFileAs(const QString &outputFileName) m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), m_activeDocument->url().path()); m_activeDocument->setModified(false); m_fileOpenRecent->addUrl(KUrl(outputFileName)); + m_fileRevert->setEnabled(true); return true; } bool MainWindow::saveFileAs() { - // Check that the Kdenlive mime type is correctly installed - QString mimetype = "application/x-kdenlive"; - KMimeType::Ptr mime = KMimeType::mimeType(mimetype); - if (!mime) mimetype = "*.kdenlive"; - - QString outputFile = KFileDialog::getSaveFileName(KUrl(), mimetype); - if (outputFile.isEmpty()) return false; + QString outputFile = KFileDialog::getSaveFileName(m_activeDocument->projectFolder(), getMimeType()); + 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; + // Show the file dialog again if the user does not want to overwrite the file + if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", outputFile)) == KMessageBox::No) + return saveFileAs(); } return saveFileAs(outputFile); } @@ -1331,12 +1930,12 @@ bool MainWindow::saveFile() 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("kfiledialog:///projectfolder"), mimetype); + if (!m_startUrl.isEmpty()) { + openFile(m_startUrl); + m_startUrl = KUrl(); + return; + } + KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), getMimeType()); if (url.isEmpty()) return; m_fileOpenRecent->addUrl(url); openFile(url); @@ -1370,6 +1969,8 @@ void MainWindow::openFile(const KUrl &url) return; } + if (!KdenliveSettings::activatetabs()) if (!closeCurrentDocument()) return; + // Check for backup file QList staleFiles = KAutoSaveFile::staleFiles(url); if (!staleFiles.isEmpty()) { @@ -1381,19 +1982,42 @@ void MainWindow::openFile(const KUrl &url) return; } else { // remove the stale files - foreach(KAutoSaveFile *stale, staleFiles) { + foreach(KAutoSaveFile * stale, staleFiles) { stale->open(QIODevice::ReadWrite); delete stale; } } } - if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); + m_messageLabel->setMessage(i18n("Opening file %1", url.path()), InformationMessage); + m_messageLabel->repaint(); 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); + if (!m_timelineArea->isEnabled()) return; + m_fileRevert->setEnabled(true); + + // Recreate stopmotion widget on document change + if (m_stopmotion) { + delete m_stopmotion; + m_stopmotion = NULL; + } + + KProgressDialog progressDialog(this, i18n("Loading project"), i18n("Loading project")); + progressDialog.setAllowCancel(false); + progressDialog.progressBar()->setMaximum(4); + progressDialog.show(); + progressDialog.progressBar()->setValue(0); + qApp->processEvents(); + + KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, m_notesWidget, this, &progressDialog); + + progressDialog.progressBar()->setValue(1); + progressDialog.progressBar()->setMaximum(4); + progressDialog.setLabelText(i18n("Loading project")); + qApp->processEvents(); + if (stale == NULL) { stale = new KAutoSaveFile(url, doc); doc->m_autosave = stale; @@ -1404,23 +2028,41 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) stale->setParent(doc); } connectDocumentInfo(doc); - TrackView *trackView = new TrackView(doc, this); + + progressDialog.progressBar()->setValue(2); + qApp->processEvents(); + + bool ok; + TrackView *trackView = new TrackView(doc, &ok, this); + + progressDialog.progressBar()->setValue(3); + qApp->processEvents(); + m_timelineArea->setCurrentIndex(m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description())); + if (!ok) { + m_timelineArea->setEnabled(false); + m_projectList->setEnabled(false); + KMessageBox::sorry(this, i18n("Cannot open file %1.\nProject is corrupted.", url.path())); + slotGotProgressInfo(QString(), -1); + newFile(false, true); + return; + } m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path()); trackView->setDuration(trackView->duration()); trackView->projectView()->initCursorPos(m_projectMonitor->render->seekPosition().frames(doc->fps())); 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()); + m_clipMonitor->refreshMonitor(true); + + progressDialog.progressBar()->setValue(4); } void MainWindow::recoverFiles(QList staleFiles) { - if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); - foreach(KAutoSaveFile *stale, staleFiles) { + foreach(KAutoSaveFile * stale, staleFiles) { /*if (!stale->open(QIODevice::QIODevice::ReadOnly)) { // show an error message; we could not steal the lockfile // maybe another application got to the file before us? @@ -1434,42 +2076,50 @@ void MainWindow::recoverFiles(QList staleFiles) } } - void MainWindow::parseProfiles(const QString &mltPath) { - //kdDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <exec() == QDialog::Rejected) { + ::exit(0); + } + KUrl rendererPath = getUrl->selectedUrl(); + delete getUrl; + if (rendererPath.isEmpty()) ::exit(0); + KdenliveSettings::setRendererpath(rendererPath.path()); + } + QStringList profilesFilter; profilesFilter << "*"; QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); - if (profilesList.isEmpty()) { // Cannot find MLT path, try finding melt QString profilePath = KdenliveSettings::rendererpath(); if (!profilePath.isEmpty()) { profilePath = profilePath.section('/', 0, -3); KdenliveSettings::setMltpath(profilePath + "/share/mlt/profiles/"); - QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); + profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); } - if (profilesList.isEmpty()) { // Cannot find the MLT profiles, ask for location - KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find your Mlt profiles, please give the path"), this); + KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find your MLT profiles, please give the path"), this); getUrl->fileDialog()->setMode(KFile::Directory); if (getUrl->exec() == QDialog::Rejected) { ::exit(0); @@ -1477,26 +2127,14 @@ void MainWindow::parseProfiles(const QString &mltPath) KUrl mltPath = getUrl->selectedUrl(); delete getUrl; if (mltPath.isEmpty()) ::exit(0); - KdenliveSettings::setMltpath(mltPath.path()); - QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); - } - } - - if (KdenliveSettings::rendererpath().isEmpty()) { - // Cannot find the MLT 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); + KdenliveSettings::setMltpath(mltPath.path(KUrl::AddTrailingSlash)); + profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); } - KUrl rendererPath = getUrl->selectedUrl(); - delete getUrl; - if (rendererPath.isEmpty()) ::exit(0); - KdenliveSettings::setRendererpath(rendererPath.path()); } kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath(); - // Parse MLT profiles to build a list of available video formats + // Parse again MLT profiles to build a list of available video formats if (profilesList.isEmpty()) parseProfiles(); } @@ -1511,210 +2149,141 @@ void MainWindow::slotEditProfiles() delete w; } +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); + ProjectSettings *w = new ProjectSettings(m_projectList, m_activeTimeline->projectView()->extractTransitionsLumas(), p.x(), p.y(), m_activeDocument->projectFolder().path(), true, !m_activeDocument->isModified(), 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); - KdenliveSettings::setCurrent_profile(profile); - KdenliveSettings::setProject_fps(m_activeDocument->fps()); - setCaption(m_activeDocument->description(), m_activeDocument->isModified()); - m_monitorManager->resetProfiles(m_activeDocument->timecode()); - if (m_renderWidget) m_renderWidget->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(); - } +#ifndef Q_WS_MAC + m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); +#endif + if (m_renderWidget) m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); + if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs(); + if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs(); + if (m_activeDocument->profilePath() != profile) slotUpdateProjectProfile(profile); } delete w; } +void MainWindow::slotUpdateProjectProfile(const QString &profile) +{ + double dar = m_activeDocument->dar(); + + // Recreate the stopmotion widget if profile changes + if (m_stopmotion) { + delete m_stopmotion; + m_stopmotion = NULL; + } + + // Deselect current effect / transition + m_effectStack->slotClipItemSelected(NULL, 0); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + m_clipMonitor->slotSetXml(NULL); + bool updateFps = 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_activeDocument->tracksList()); + m_effectStack->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode()); + m_projectList->updateProjectFormat(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()); + if (dar != m_activeDocument->dar()) m_projectList->reloadClipThumbnails(); + if (updateFps) m_activeTimeline->updateProjectFps(); + m_activeDocument->setModified(true); + m_commandStack->activeStack()->clear(); + //Update the mouse position display so it will display in DF/NDF format by default based on the project setting. + slotUpdateMousePosition(0); + // We need to desactivate & reactivate monitors to get a refresh + //m_monitorManager->switchMonitors(); +} + + 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 QStringList&, const QStringList&)), this, SLOT(slotDoRender(const QStringList&, const QStringList&))); + connect(m_renderWidget, SIGNAL(shutdown()), this, SLOT(slotShutdown())); + connect(m_renderWidget, SIGNAL(selectedRenderProfile(QMap )), this, SLOT(slotSetDocumentRenderProfile(QMap ))); + 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->getRenderProperties()); } } - /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) m_renderWidget->setTimeline(currentTab); - m_renderWidget->setDocument(m_activeDocument);*/ + slotCheckRenderStatus(); m_renderWidget->show(); -} - -void MainWindow::slotDoRender(const QStringList args, const QStringList overlay_args) -{ - QString dest = args.at(0); - QString render = args.at(1); - QStringList avformat_args = args.at(2).split(' '); - bool zoneOnly = args.at(3).toInt(); - bool playAfter = args.at(4).toInt(); - double guideStart = args.at(5).toDouble(); - double guideEnd = args.at(6).toDouble(); - bool resizeProfile = args.at(7).toInt(); - QString scriptExport = args.at(8); - bool createChapterFile = args.at(9).toInt(); - - if (dest.isEmpty()) return; - 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(".mlt"); - if (!scriptExport.isEmpty() || temp.open()) { - if (KdenliveSettings::dropbframes()) { - KdenliveSettings::setDropbframes(false); - m_activeDocument->clipManager()->updatePreviewSettings(); - if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".mlt"); - else m_projectMonitor->saveSceneList(temp.fileName()); - KdenliveSettings::setDropbframes(true); - m_activeDocument->clipManager()->updatePreviewSettings(); - } else { - if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".mlt"); - else m_projectMonitor->saveSceneList(temp.fileName()); - } + m_renderWidget->showNormal(); - 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 melt 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)) { - KMessageBox::error(this, i18n("Cannot write to file %1", scriptExport)); - return; - } - - QTextStream outStream(&file); - outStream << "#! /bin/sh" << "\n" << "\n"; - outStream << "SOURCE=" << "\"" + scriptExport + ".westley\"" << "\n"; - outStream << "TARGET=" << "\"" + dest + "\"" << "\n"; - outStream << 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); - } + // What are the following lines supposed to do? + //m_activeTimeline->tracksNumber(); + //m_renderWidget->enableAudio(false); + //m_renderWidget->export_audio; +} - if (createChapterFile) { - QDomDocument doc; - QDomElement chapters = doc.createElement("chapters"); - chapters.setAttribute("fps", m_activeDocument->fps()); - doc.appendChild(chapters); - - QDomElement guidesxml = m_activeDocument->guidesXml(); - if (!zoneOnly) out = (int) GenTime(m_activeDocument->projectDuration()).frames(m_activeDocument->fps()); - - 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(dest + ".dvdchapter"); - if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - kWarning() << "////// ERROR writing DVD CHAPTER file: " << dest + ".dvdchapter"; - } else { - file.write(doc.toString().toUtf8()); - if (file.error() != QFile::NoError) - kWarning() << "////// ERROR writing DVD CHAPTER file: " << dest + ".dvdchapter"; - file.close(); - } - } - } - } +void MainWindow::slotCheckRenderStatus() +{ + // Make sure there are no missing clips + if (m_renderWidget) + m_renderWidget->missingClips(m_projectList->hasMissingClips()); } void MainWindow::setRenderingProgress(const QString &url, int progress) { - if (m_renderWidget) m_renderWidget->setRenderJob(url, 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); + if (m_renderWidget) + m_renderWidget->setRenderStatus(url, status, error); +} + +void MainWindow::slotCleanProject() +{ + if (KMessageBox::warningContinueCancel(this, i18n("This will remove all unused clips from your project."), i18n("Clean up project")) == KMessageBox::Cancel) return; + m_projectList->cleanup(); } void MainWindow::slotUpdateMousePosition(int pos) @@ -1763,113 +2332,151 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha 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_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeDocument, SLOT(setModified())); + disconnect(m_notesWidget, SIGNAL(textChanged()), m_activeDocument, SLOT(setModified())); + disconnect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeDocument, SLOT(setModified())); disconnect(m_projectList, SIGNAL(projectModified()), m_activeDocument, SLOT(setModified())); - disconnect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), m_activeDocument, SLOT(checkProjectClips())); + disconnect(m_projectList, SIGNAL(updateProfile(const QString &)), this, SLOT(slotUpdateProjectProfile(const QString &))); + 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(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); - disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &))); + disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), this, 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)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); - 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(clipItemSelected(ClipItem*, int)), m_projectMonitor, SLOT(slotSetSelectedClip(ClipItem*))); + 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_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(Transition*))); + disconnect(m_activeTimeline->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay())); disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); - disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); + disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int))); disconnect(m_activeTimeline, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); disconnect(m_activeTimeline, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); - disconnect(m_activeTimeline, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int))); + disconnect(m_activeTimeline, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int))); disconnect(m_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); - 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(updateEffect(ClipItem*, int, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, int, QDomElement, QDomElement, int))); + disconnect(m_effectStack, SIGNAL(removeEffect(ClipItem*, int, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, int, QDomElement))); + disconnect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, int, bool))); + disconnect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int, int))); disconnect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*))); disconnect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); + disconnect(m_effectStack, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); 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())); + disconnect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); + disconnect(m_projectList, SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus())); + disconnect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), m_activeTimeline->projectView(), SLOT(slotUpdateClip(const QString &, bool))); m_effectStack->clear(); } //m_activeDocument->setRenderer(NULL); disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); + disconnect(m_projectList, SIGNAL(refreshClip()), m_monitorManager, SLOT(slotRefreshCurrentMonitor())); m_clipMonitor->stop(); } KdenliveSettings::setCurrent_profile(doc->profilePath()); KdenliveSettings::setProject_fps(doc->fps()); m_monitorManager->resetProfiles(doc->timecode()); m_projectList->setDocument(doc); - m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber()); + m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), doc->tracksList()); m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode()); - connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); + connect(m_projectList, SIGNAL(clipSelected(DocClipBase *, QPoint)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint))); + connect(m_projectList, SIGNAL(refreshClip()), m_monitorManager, SLOT(slotRefreshCurrentMonitor())); + connect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), trackView->projectView(), SLOT(slotUpdateClip(const QString &, bool))); + connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified())); + connect(m_projectList, SIGNAL(updateProfile(const QString &)), this, SLOT(slotUpdateProjectProfile(const QString &))); connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString))); + connect(m_projectList, SIGNAL(findInTimeline(const QString&)), this, SLOT(slotClipInTimeline(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))); - connect(trackView, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int))); + connect(trackView, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int))); + connect(trackView, SIGNAL(updateTracksInfo()), this, SLOT(slotUpdateTrackInfo())); connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int))); + connect(trackView->projectView(), SIGNAL(forceClipProcessing(const QString &)), m_projectList, SLOT(slotForceProcessing(const QString &))); connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int))); connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint))); + connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_projectList, SLOT(slotUpdateClipCut(QPoint))); + connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified())); + connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified())); 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 &))); + connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), this, SLOT(slotDeleteClip(const QString &))); connect(doc, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &))); connect(doc, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &))); connect(doc, SIGNAL(deleteTimelineClip(const QString &)), trackView, SLOT(slotDeleteClip(const QString &))); connect(doc, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); connect(doc, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated())); - + connect(m_notesWidget, SIGNAL(textChanged()), doc, SLOT(setModified())); connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); + connect(trackView->projectView(), SIGNAL(updateClipMarkers(DocClipBase *)), this, SLOT(slotUpdateClipMarkers(DocClipBase*))); + connect(trackView, SIGNAL(showTrackEffects(int, TrackInfo)), m_effectStack, SLOT(slotTrackItemSelected(int, TrackInfo))); + connect(trackView, SIGNAL(showTrackEffects(int, TrackInfo)), this, SLOT(slotActivateEffectStackView())); + connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); - 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(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(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); connect(trackView->projectView(), SIGNAL(zoomOut()), this, SLOT(slotZoomOut())); + connect(trackView, SIGNAL(setZoom(int)), this, SLOT(slotSetZoom(int))); connect(trackView->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); - connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); + connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int))); + connect(trackView->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay())); + connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_projectMonitor, SLOT(slotSetSelectedClip(ClipItem*))); + connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(Transition*))); - 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(updateEffect(ClipItem*, int, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, int, QDomElement, QDomElement, int))); + connect(m_effectStack, SIGNAL(updateClipRegion(ClipItem*, int, QString)), trackView->projectView(), SLOT(slotUpdateClipRegion(ClipItem*, int, QString))); + connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, int, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, int, QDomElement))); + connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, int, bool))); + connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, 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(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); + connect(m_effectStack, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); 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())); + connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); + connect(m_projectList, SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus())); + - trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup); + trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup, (QMenu*)(factory()->container("marker_menu", this))); m_activeTimeline = trackView; if (m_renderWidget) { + slotCheckRenderStatus(); 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->getRenderProperties()); } //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()); @@ -1878,9 +2485,15 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha setCaption(doc->description(), doc->isModified()); m_saveAction->setEnabled(doc->isModified()); + m_normalEditTool->setChecked(true); m_activeDocument = doc; - if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings(); - + m_activeTimeline->updateProjectFps(); + m_activeDocument->checkProjectClips(); +#ifndef Q_WS_MAC + m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); +#endif + //Update the mouse position display so it will display in DF/NDF format by default based on the project setting. + slotUpdateMousePosition(0); // set tool to select tool m_buttonSelectTool->setChecked(true); } @@ -1893,14 +2506,26 @@ void MainWindow::slotZoneMoved(int start, int end) void MainWindow::slotGuidesUpdated() { - if (m_renderWidget) m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); + if (m_renderWidget) + m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); +} + +void MainWindow::slotEditKeys() +{ + KShortcutsDialog dialog(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this); + dialog.addCollection(actionCollection(), i18nc("general keyboard shortcuts", "General")); + dialog.addCollection(m_effectsActionCollection, i18nc("effects and transitions keyboard shortcuts", "Effects & Transitions")); + dialog.configure(); } 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 + /* + * 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 (m_stopmotion) m_stopmotion->slotLive(false); if (KConfigDialog::showDialog("settings")) { KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); if (page != -1) d->showPage(page, option); @@ -1911,20 +2536,22 @@ 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())); - //connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); +#ifndef Q_WS_MAC + connect(dialog, SIGNAL(updateCaptureFolder()), this, SLOT(slotUpdateCaptureFolder())); +#endif dialog->show(); if (page != -1) dialog->showPage(page, option); } -void MainWindow::slotUpdatePreviewSettings() +void MainWindow::slotUpdateCaptureFolder() { - if (m_activeDocument) { - m_clipMonitor->slotSetXml(NULL, 0); - m_activeDocument->updatePreviewSettings(); - } + +#ifndef Q_WS_MAC + if (m_activeDocument) m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); + else m_recMonitor->slotUpdateCaptureFolder(KdenliveSettings::defaultprojectfolder()); +#endif } void MainWindow::updateConfiguration() @@ -1934,23 +2561,33 @@ void MainWindow::updateConfiguration() m_activeTimeline->refresh(); m_activeTimeline->projectView()->checkAutoScroll(); m_activeTimeline->projectView()->checkTrackHeight(); - if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs(); + if (m_activeDocument) + m_activeDocument->clipManager()->checkAudioThumbs(); } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); + m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers()); + m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio()); + + // Update list of transcoding profiles + loadTranscoders(); #ifndef NO_JOGSHUTTLE activateShuttleDevice(); #endif /* NO_JOGSHUTTLE */ } +void MainWindow::slotSwitchSplitAudio() +{ + KdenliveSettings::setSplitaudio(!KdenliveSettings::splitaudio()); + m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio()); +} void MainWindow::slotSwitchVideoThumbs() { KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails()); - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->slotUpdateAllThumbs(); - } m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); } @@ -1960,7 +2597,8 @@ void MainWindow::slotSwitchAudioThumbs() if (m_activeTimeline) { m_activeTimeline->refresh(); m_activeTimeline->projectView()->checkAutoScroll(); - if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs(); + if (m_activeDocument) + m_activeDocument->clipManager()->checkAudioThumbs(); } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); } @@ -1968,9 +2606,8 @@ void MainWindow::slotSwitchAudioThumbs() void MainWindow::slotSwitchMarkersComments() { KdenliveSettings::setShowmarkers(!KdenliveSettings::showmarkers()); - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->refresh(); - } m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers()); } @@ -1981,19 +2618,35 @@ void MainWindow::slotSwitchSnap() } -void MainWindow::slotDeleteTimelineClip() +void MainWindow::slotDeleteItem() { - if (QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) m_projectList->slotRemoveClip(); - else if (m_activeTimeline) { - m_activeTimeline->projectView()->deleteSelectedClips(); + if (QApplication::focusWidget() && + QApplication::focusWidget()->parentWidget() && + QApplication::focusWidget()->parentWidget()->parentWidget() && + QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) { + m_projectList->slotRemoveClip(); + + } else { + QWidget *widget = QApplication::focusWidget(); + while (widget) { + if (widget == m_effectStackDock) { + m_effectStack->slotItemDel(); + return; + } + widget = widget->parentWidget(); + } + + // effect stack has no focus + if (m_activeTimeline) + m_activeTimeline->projectView()->deleteSelectedClips(); } } -void MainWindow::slotChangeClipSpeed() +void MainWindow::slotUpdateClipMarkers(DocClipBase *clip) { - if (m_activeTimeline) { - m_activeTimeline->projectView()->changeClipSpeed(); - } + if (m_clipMonitor->isActive()) + m_clipMonitor->checkOverlay(); + m_clipMonitor->updateMarkers(clip); } void MainWindow::slotAddClipMarker() @@ -2004,7 +2657,7 @@ void MainWindow::slotAddClipMarker() if (m_activeTimeline) { ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor(); if (item) { - pos = m_projectMonitor->position() - item->startPos() + item->cropStart(); + pos = GenTime((int)((m_projectMonitor->position() - item->startPos() + item->cropStart()).frames(m_activeDocument->fps()) * item->speed() + 0.5), m_activeDocument->fps()); clip = item->baseClip(); } } @@ -2019,10 +2672,8 @@ void MainWindow::slotAddClipMarker() QString id = clip->getId(); CommentedTime marker(pos, i18n("Marker")); MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Add Marker"), this); - if (d.exec() == QDialog::Accepted) { + if (d.exec() == QDialog::Accepted) m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment()); - } - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); } void MainWindow::slotDeleteClipMarker() @@ -2033,7 +2684,7 @@ void MainWindow::slotDeleteClipMarker() 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(); } } @@ -2053,8 +2704,6 @@ void MainWindow::slotDeleteClipMarker() return; } m_activeTimeline->projectView()->slotDeleteClipMarker(comment, id, pos); - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); - } void MainWindow::slotDeleteAllClipMarkers() @@ -2075,7 +2724,6 @@ void MainWindow::slotDeleteAllClipMarkers() return; } m_activeTimeline->projectView()->slotDeleteAllClipMarkers(clip->getId()); - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); } void MainWindow::slotEditClipMarker() @@ -2086,7 +2734,7 @@ void MainWindow::slotEditClipMarker() 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(); } } @@ -2114,7 +2762,26 @@ void MainWindow::slotEditClipMarker() // remove old marker m_activeTimeline->projectView()->slotAddClipMarker(id, pos, QString()); } - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); + } +} + +void MainWindow::slotAddMarkerGuideQuickly() +{ + if (!m_activeTimeline || !m_activeDocument) + return; + + if (m_clipMonitor->isActive()) { + DocClipBase *clip = m_clipMonitor->activeClip(); + GenTime pos = m_clipMonitor->position(); + + if (!clip) { + m_messageLabel->setMessage(i18n("Cannot find clip to add marker"), ErrorMessage); + return; + } + + m_activeTimeline->projectView()->slotAddClipMarker(clip->getId(), pos, m_activeDocument->timecode().getDisplayTimecode(pos, false)); + } else { + m_activeTimeline->projectView()->slotAddGuide(false); } } @@ -2141,6 +2808,8 @@ void MainWindow::slotInsertTrack(int ix) m_projectMonitor->activateMonitor(); if (m_activeTimeline) m_activeTimeline->projectView()->slotInsertTrack(ix); + if (m_activeDocument) + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } void MainWindow::slotDeleteTrack(int ix) @@ -2148,13 +2817,17 @@ void MainWindow::slotDeleteTrack(int ix) m_projectMonitor->activateMonitor(); if (m_activeTimeline) m_activeTimeline->projectView()->slotDeleteTrack(ix); + if (m_activeDocument) + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } -void MainWindow::slotChangeTrack(int ix) +void MainWindow::slotConfigTrack(int ix) { m_projectMonitor->activateMonitor(); if (m_activeTimeline) - m_activeTimeline->projectView()->slotChangeTrack(ix); + m_activeTimeline->projectView()->slotConfigTracks(ix); + if (m_activeDocument) + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } void MainWindow::slotEditGuide() @@ -2177,23 +2850,70 @@ void MainWindow::slotDeleteAllGuides() void MainWindow::slotCutTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->cutSelectedClips(); +} + +void MainWindow::slotInsertClipOverwrite() +{ + if (m_activeTimeline) { + QStringList data = m_clipMonitor->getZoneInfo(); + m_activeTimeline->projectView()->insertZoneOverwrite(data, m_activeTimeline->inPoint()); } } +void MainWindow::slotSelectTimelineClip() +{ + if (m_activeTimeline) + m_activeTimeline->projectView()->selectClip(true); +} + +void MainWindow::slotSelectTimelineTransition() +{ + if (m_activeTimeline) + m_activeTimeline->projectView()->selectTransition(true); +} + +void MainWindow::slotDeselectTimelineClip() +{ + if (m_activeTimeline) + m_activeTimeline->projectView()->selectClip(false, true); +} + +void MainWindow::slotDeselectTimelineTransition() +{ + if (m_activeTimeline) + m_activeTimeline->projectView()->selectTransition(false, true); +} + +void MainWindow::slotSelectAddTimelineClip() +{ + if (m_activeTimeline) + m_activeTimeline->projectView()->selectClip(true, true); +} + +void MainWindow::slotSelectAddTimelineTransition() +{ + if (m_activeTimeline) + m_activeTimeline->projectView()->selectTransition(true, true); +} + void MainWindow::slotGroupClips() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->groupClips(); - } } void MainWindow::slotUnGroupClips() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->groupClips(false); - } +} + +void MainWindow::slotEditItemDuration() +{ + if (m_activeTimeline) + m_activeTimeline->projectView()->editItemDuration(); } void MainWindow::slotAddProjectClip(KUrl url) @@ -2243,26 +2963,65 @@ void MainWindow::slotAddCustomEffect(QAction *result) void MainWindow::slotZoomIn() { m_zoomSlider->setValue(m_zoomSlider->value() - 1); + slotShowZoomSliderToolTip(); } void MainWindow::slotZoomOut() { m_zoomSlider->setValue(m_zoomSlider->value() + 1); + slotShowZoomSliderToolTip(); } void MainWindow::slotFitZoom() { - if (m_activeTimeline) { + if (m_activeTimeline) m_zoomSlider->setValue(m_activeTimeline->fitZoom()); - } +} + +void MainWindow::slotSetZoom(int value) +{ + value = qMax(m_zoomSlider->minimum(), value); + value = qMin(m_zoomSlider->maximum(), value); + + if (m_activeTimeline) + m_activeTimeline->slotChangeZoom(value); + + m_zoomOut->setEnabled(value < m_zoomSlider->maximum()); + m_zoomIn->setEnabled(value > m_zoomSlider->minimum()); + slotUpdateZoomSliderToolTip(value); + + m_zoomSlider->blockSignals(true); + m_zoomSlider->setValue(value); + m_zoomSlider->blockSignals(false); +} + +void MainWindow::slotShowZoomSliderToolTip(int zoomlevel) +{ + if (zoomlevel != -1) + slotUpdateZoomSliderToolTip(zoomlevel); + + QPoint global = m_zoomSlider->rect().topLeft(); + global.ry() += m_zoomSlider->height() / 2; + QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global)); + QApplication::sendEvent(m_zoomSlider, &toolTipEvent); +} + +void MainWindow::slotUpdateZoomSliderToolTip(int zoomlevel) +{ + m_zoomSlider->setToolTip(i18n("Zoom Level: %1/13", (13 - zoomlevel))); } 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); + if (!message.isEmpty()) + m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message); m_statusProgressBar->setVisible(true); + } else if (progress == -2) { + if (!message.isEmpty()) + m_messageLabel->setMessage(message, ErrorMessage); + m_statusProgressBar->setVisible(false); } else { m_messageLabel->setMessage(QString(), DefaultMessage); m_statusProgressBar->setVisible(false); @@ -2272,22 +3031,84 @@ void MainWindow::slotGotProgressInfo(const QString &message, int progress) 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("resource").isEmpty() && clip->getProperty("xmldata").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("resource"); + 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")); + 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("resource", 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"); + else newprops.insert("templatetext", description); + //newprops.insert("xmldata", m_projectList->generateTemplateXml(newtemplate, description).toString()); + if (!newprops.isEmpty()) { + EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); + m_activeDocument->commandStack()->push(command); + } + } + delete dia; + 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()); QMap newprops; newprops.insert("xmldata", dia_ui->xml().toString()); + if (dia_ui->outPoint() != clip->duration().frames(m_activeDocument->fps()) - 1) { + // duration changed, we need to update duration + newprops.insert("out", QString::number(dia_ui->outPoint())); + } + if (!path.isEmpty()) { + // we are editing an external file, asked if we want to detach from that file or save the result to that title file. + if (KMessageBox::questionYesNo(this, i18n("You are editing an external title clip (%1). Do you want to save your changes to the title file or save the changes for this project only?", path), i18n("Save Title"), KGuiItem(i18n("Save to title file")), KGuiItem(i18n("Save in project only"))) == KMessageBox::Yes) { + // save to external file + dia_ui->saveTitle(path); + } else newprops.insert("resource", QString()); + } 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; @@ -2295,26 +3116,49 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) //m_activeDocument->editTextClip(clip->getProperty("xml"), clip->getId()); return; } - ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this); - connect(&dia, SIGNAL(addMarker(const QString &, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, GenTime, QString))); - if (dia.exec() == QDialog::Accepted) { - EditClipCommand *command = new EditClipCommand(m_projectList, dia.clipId(), clip->properties(), dia.properties(), true); - m_activeDocument->commandStack()->push(command); - //m_projectList->slotUpdateClipProperties(dia.clipId(), dia.properties()); - if (dia.needsTimelineRefresh()) { - // update clip occurences in timeline - m_activeTimeline->projectView()->slotUpdateClip(dia.clipId()); + // any type of clip but a title + ClipProperties *dia = new ClipProperties(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))); + connect(dia, SIGNAL(applyNewClipProperties(const QString, QMap , QMap , bool, bool)), this, SLOT(slotApplyNewClipProperties(const QString, QMap , QMap , bool, bool))); + dia->show(); +} + + +void MainWindow::slotApplyNewClipProperties(const QString id, QMap props, QMap newprops, bool refresh, bool reload) +{ + if (newprops.isEmpty()) return; + EditClipCommand *command = new EditClipCommand(m_projectList, id, props, newprops, true); + m_activeDocument->commandStack()->push(command); + m_activeDocument->setModified(); + + if (refresh) { + // update clip occurences in timeline + m_activeTimeline->projectView()->slotUpdateClip(id, reload); + } +} + + +void MainWindow::slotShowClipProperties(QList cliplist, QMap commonproperties) +{ + ClipProperties dia(cliplist, m_activeDocument->timecode(), commonproperties, this); + if (dia.exec() == QDialog::Accepted) { + QUndoCommand *command = new QUndoCommand(); + command->setText(i18n("Edit clips")); + for (int i = 0; i < cliplist.count(); i++) { + DocClipBase *clip = cliplist.at(i); + new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true, command); } + m_activeDocument->commandStack()->push(command); + for (int i = 0; i < cliplist.count(); i++) + m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload()); } } void MainWindow::customEvent(QEvent* e) { - if (e->type() == QEvent::User) { - // The timeline playing position changed... - kDebug() << "RECEIVED JOG EVEMNT!!!"; - } + if (e->type() == QEvent::User) + m_messageLabel->setMessage(static_cast (e)->message(), MltError); } void MainWindow::slotActivateEffectStackView() { @@ -2323,7 +3167,8 @@ void MainWindow::slotActivateEffectStackView() void MainWindow::slotActivateTransitionView(Transition *t) { - if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock); + if (t) + m_transitionConfig->raiseWindow(m_transitionConfigDock); } void MainWindow::slotSnapRewind() @@ -2331,7 +3176,9 @@ void MainWindow::slotSnapRewind() if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToPreviousSnap(); - } else m_clipMonitor->slotSeekToPreviousSnap(); + } else { + m_clipMonitor->slotSeekToPreviousSnap(); + } } void MainWindow::slotSnapForward() @@ -2339,7 +3186,9 @@ void MainWindow::slotSnapForward() if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToNextSnap(); - } else m_clipMonitor->slotSeekToNextSnap(); + } else { + m_clipMonitor->slotSeekToNextSnap(); + } } void MainWindow::slotClipStart() @@ -2358,37 +3207,82 @@ void MainWindow::slotClipEnd() } } +void MainWindow::slotZoneStart() +{ + if (m_projectMonitor->isActive()) + m_projectMonitor->slotZoneStart(); + else + m_clipMonitor->slotZoneStart(); +} + +void MainWindow::slotZoneEnd() +{ + if (m_projectMonitor->isActive()) + m_projectMonitor->slotZoneEnd(); + else + m_clipMonitor->slotZoneEnd(); +} + 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); + if (action == m_buttonSelectTool) + slotSetTool(SELECTTOOL); + else if (action == m_buttonRazorTool) + slotSetTool(RAZORTOOL); + else if (action == m_buttonSpacerTool) + slotSetTool(SPACERTOOL); +} + +void MainWindow::slotChangeEdit(QAction * action) +{ + if (!m_activeTimeline) + return; + + if (action == m_overwriteEditTool) + m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT); + else if (action == m_insertEditTool) + m_activeTimeline->projectView()->setEditMode(INSERTEDIT); + else + m_activeTimeline->projectView()->setEditMode(NORMALEDIT); } void MainWindow::slotSetTool(PROJECTTOOL tool) { if (m_activeDocument && m_activeTimeline) { //m_activeDocument->setTool(tool); + QString message; + switch (tool) { + case SPACERTOOL: + message = i18n("Ctrl + click to use spacer on current track only"); + break; + case RAZORTOOL: + message = i18n("Click on a clip to cut it"); + break; + default: + message = i18n("Shift + click to create a selection rectangle, Ctrl + click to add an item to selection"); + break; + } + m_messageLabel->setMessage(message, InformationMessage); m_activeTimeline->projectView()->setTool(tool); } } void MainWindow::slotCopy() { - if (!m_activeDocument || !m_activeTimeline) return; - m_activeTimeline->projectView()->copyClip(); + if (m_activeDocument && m_activeTimeline) + m_activeTimeline->projectView()->copyClip(); } void MainWindow::slotPaste() { - if (!m_activeDocument || !m_activeTimeline) return; - m_activeTimeline->projectView()->pasteClip(); + if (m_activeDocument && m_activeTimeline) + m_activeTimeline->projectView()->pasteClip(); } void MainWindow::slotPasteEffects() { - if (!m_activeDocument || !m_activeTimeline) return; - m_activeTimeline->projectView()->pasteClipEffects(); + if (m_activeDocument && m_activeTimeline) + m_activeTimeline->projectView()->pasteClipEffects(); } void MainWindow::slotFind() @@ -2405,11 +3299,10 @@ void MainWindow::slotFind() void MainWindow::slotFindNext() { - if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) { + if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) statusBar()->showMessage(i18n("Found: %1", m_findString)); - } else { + else statusBar()->showMessage(i18n("Reached end of project")); - } m_findTimer.start(4000); } @@ -2435,17 +3328,83 @@ void MainWindow::findTimeout() removeEventFilter(this); } +void MainWindow::slotClipInTimeline(const QString &clipId) +{ + if (m_activeTimeline && m_activeDocument) { + QList matching = m_activeTimeline->projectView()->findId(clipId); + + QMenu *inTimelineMenu = static_cast(factory()->container("clip_in_timeline", this)); + inTimelineMenu->clear(); + + QList actionList; + + for (int i = 0; i < matching.count(); ++i) { + QString track = QString::number(matching.at(i).track); + QString start = m_activeDocument->timecode().getTimecode(matching.at(i).startPos); + int j = 0; + QAction *a = new QAction(track + ": " + start, this); + a->setData(QStringList() << track << start); + connect(a, SIGNAL(triggered()), this, SLOT(slotSelectClipInTimeline())); + while (j < actionList.count()) { + if (actionList.at(j)->text() > a->text()) break; + j++; + } + actionList.insert(j, a); + } + inTimelineMenu->addActions(actionList); + + if (matching.empty()) + inTimelineMenu->setEnabled(false); + else + inTimelineMenu->setEnabled(true); + } +} + +void MainWindow::slotClipInProjectTree() +{ + if (m_activeTimeline) { + const QStringList &clipIds = m_activeTimeline->projectView()->selectedClips(); + if (clipIds.isEmpty()) + return; + m_projectListDock->raise(); + for (int i = 0; i < clipIds.count(); i++) + m_projectList->selectItemById(clipIds.at(i)); + if (m_projectMonitor->isActive()) + slotSwitchMonitors(); + } +} + +/*void MainWindow::slotClipToProjectTree() +{ + if (m_activeTimeline) { + const QList clips = m_activeTimeline->projectView()->selectedClipItems(); + if (clips.isEmpty()) return; + for (int i = 0; i < clips.count(); i++) { + m_projectList->slotAddXmlClip(clips.at(i)->itemXml()); + } + //m_projectList->selectItemById(clipIds.at(i)); + } +}*/ + +void MainWindow::slotSelectClipInTimeline() +{ + if (m_activeTimeline) { + QAction *action = qobject_cast(sender()); + QStringList data = action->data().toStringList(); + m_activeTimeline->projectView()->selectFound(data.at(0), data.at(1)); + } +} + void MainWindow::keyPressEvent(QKeyEvent *ke) { if (m_findActivated) { if (ke->key() == Qt::Key_Backspace) { m_findString = m_findString.left(m_findString.length() - 1); - if (!m_findString.isEmpty()) { + if (!m_findString.isEmpty()) findAhead(); - } else { + else findTimeout(); - } m_findTimer.start(4000); ke->accept(); @@ -2463,19 +3422,17 @@ void MainWindow::keyPressEvent(QKeyEvent *ke) ke->accept(); return; } - } else KXmlGuiWindow::keyPressEvent(ke); + } else { + KXmlGuiWindow::keyPressEvent(ke); + } } /** Gets called when the window gets hidden */ void MainWindow::hideEvent(QHideEvent */*event*/) { - // kDebug() << "I was hidden"; - // issue http://www.kdenlive.org/mantis/view.php?id=231 - if (isMinimized()) { - // kDebug() << "I am minimized"; - if (m_monitorManager) m_monitorManager->stopActiveMonitor(); - } + if (isMinimized() && m_monitorManager) + m_monitorManager->stopActiveMonitor(); } bool MainWindow::eventFilter(QObject *obj, QEvent *event) @@ -2486,13 +3443,16 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) if (ke->text().trimmed().isEmpty()) return false; ke->accept(); return true; - } else return false; + } else { + return false; + } } else { // pass the event on to the parent class return QMainWindow::eventFilter(obj, event); } } + void MainWindow::slotSaveZone(Render *render, QPoint zone) { KDialog *dialog = new KDialog(this); @@ -2504,8 +3464,7 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone) QVBoxLayout *vbox = new QVBoxLayout(widget); QLabel *label1 = new QLabel(i18n("Save clip zone as:"), this); - QString path = m_activeDocument->projectFolder().path(); - path.append("/"); + QString path = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash); path.append("untitled.mlt"); KUrlRequester *url = new KUrlRequester(KUrl(path), this); url->setFilter("video/mlt-playlist"); @@ -2515,97 +3474,105 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone) vbox->addWidget(url); vbox->addWidget(label2); vbox->addWidget(edit); - if (dialog->exec() == QDialog::Accepted) render->saveZone(url->url(), edit->text(), zone); + if (dialog->exec() == QDialog::Accepted) + render->saveZone(url->url(), edit->text(), zone); } void MainWindow::slotSetInPoint() { - if (m_clipMonitor->isActive()) { + if (m_clipMonitor->isActive()) m_clipMonitor->slotSetZoneStart(); - } else m_activeTimeline->projectView()->setInPoint(); + else + m_projectMonitor->slotSetZoneStart(); + //else m_activeTimeline->projectView()->setInPoint(); } void MainWindow::slotSetOutPoint() { - if (m_clipMonitor->isActive()) { + if (m_clipMonitor->isActive()) m_clipMonitor->slotSetZoneEnd(); - } else m_activeTimeline->projectView()->setOutPoint(); + else + m_projectMonitor->slotSetZoneEnd(); + // else m_activeTimeline->projectView()->setOutPoint(); } -void MainWindow::slotGetNewLumaStuff() +void MainWindow::slotResizeItemStart() { - //KNS::Entry::List download(); - KNS::Entry::List entries = KNS::Engine::download(); - // list of changed entries - kDebug() << "// PARSING KNS"; - 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; - } - } - } - qDeleteAll(entries); - initEffects::refreshLumas(); + if (m_activeTimeline) + m_activeTimeline->projectView()->setInPoint(); } -void MainWindow::slotGetNewRenderStuff() +void MainWindow::slotResizeItemEnd() { - //KNS::Entry::List download(); + if (m_activeTimeline) + m_activeTimeline->projectView()->setOutPoint(); +} +int MainWindow::getNewStuff(const QString &configFile) +{ + KNS3::Entry::List entries; +#if KDE_IS_VERSION(4,3,80) + KNS3::DownloadDialog dialog(configFile); + dialog.exec(); + entries = dialog.changedEntries(); + foreach(const KNS3::Entry & entry, entries) { + if (entry.status() == KNS3::Entry::Installed) + kDebug() << "// Installed files: " << entry.installedFiles(); + } +#else 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(); + if (engine.init(configFile)) + entries = engine.downloadDialogModal(this); + foreach(KNS::Entry * entry, entries) { + if (entry->status() == KNS::Entry::Installed) + kDebug() << "// Installed files: " << entry->installedFiles(); } +#endif /* KDE_IS_VERSION(4,3,80) */ + return entries.size(); } -void MainWindow::slotGetNewMltProfileStuff() +void MainWindow::slotGetNewTitleStuff() { - //KNS::Entry::List download(); + if (getNewStuff("kdenlive_titles.knsrc") > 0) + TitleWidget::refreshTitleTemplates(); +} - 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; - } - } - } +void MainWindow::slotGetNewLumaStuff() +{ + if (getNewStuff("kdenlive_wipes.knsrc") > 0) { + initEffects::refreshLumas(); + m_activeTimeline->projectView()->reloadTransitionLumas(); + } +} - // update the list of profiles in settings dialog - KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); - if (d) d->checkProfile(); - } +void MainWindow::slotGetNewRenderStuff() +{ + if (getNewStuff("kdenlive_renderprofiles.knsrc") > 0) + if (m_renderWidget) + m_renderWidget->reloadProfiles(); +} + +void MainWindow::slotGetNewMltProfileStuff() +{ + if (getNewStuff("kdenlive_projectprofiles.knsrc") > 0) { + // 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(); + if (m_activeTimeline) + m_activeTimeline->projectView()->autoTransition(); } void MainWindow::slotSplitAudio() { - if (m_activeTimeline) m_activeTimeline->projectView()->splitAudio(); + if (m_activeTimeline) + m_activeTimeline->projectView()->splitAudio(); } void MainWindow::slotUpdateClipType(QAction *action) @@ -2619,8 +3586,12 @@ void MainWindow::slotUpdateClipType(QAction *action) void MainWindow::slotDvdWizard(const QString &url, const QString &profile) { - DvdWizard *w = new DvdWizard(url, profile, this); - w->exec(); + // We must stop the monitors since we create a new on in the dvd wizard + m_clipMonitor->stop(); + m_projectMonitor->stop(); + DvdWizard w(url, profile, this); + w.exec(); + m_projectMonitor->start(); } void MainWindow::slotShowTimeline(bool show) @@ -2634,16 +3605,15 @@ void MainWindow::slotShowTimeline(bool show) } } -void MainWindow::slotMaximizeCurrent(bool show) +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) { + while (par->parentWidget() && par->parentWidget() != this) par = par->parentWidget(); - } kDebug() << "CURRENT WIDGET: " << par->objectName(); } /*else { @@ -2656,55 +3626,424 @@ void MainWindow::loadTranscoders() { QMenu *transMenu = static_cast(factory()->container("transcoders", this)); transMenu->clear(); - KSharedConfigPtr config = KGlobal::config(); + + 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(); + QStringList data = i.value().split(";", QString::SkipEmptyParts); QAction *a = transMenu->addAction(i.key()); - a->setData(i.value()); + a->setData(data); + if (data.count() > 1) + a->setToolTip(data.at(1)); connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode())); } } -void MainWindow::slotTranscode() +void MainWindow::slotTranscode(KUrl::List urls) { - if (m_transcodeProcess.state() != QProcess::NotRunning) { - m_messageLabel->setMessage(i18n("A transcoding job is already running"), ErrorMessage); + QString params; + QString desc; + QString condition; + if (urls.isEmpty()) { + QAction *action = qobject_cast(sender()); + QStringList data = action->data().toStringList(); + params = data.at(0); + if (data.count() > 1) desc = data.at(1); + if (data.count() > 2) condition = data.at(2); + urls << m_projectList->getConditionalUrls(condition); + urls.removeAll(KUrl()); + } + if (urls.isEmpty()) { + m_messageLabel->setMessage(i18n("No clip to transcode"), ErrorMessage); return; } - QString url = m_projectList->currentClipUrl(); - if (url.isEmpty()) return; - QAction *action = qobject_cast(sender()); - QString params = action->data().toString(); - params = params.simplified(); - QStringList parameters; - parameters << "-i" << url; - QString fileName = url; //.section('.', 0, -1); - params.replace("%1", fileName); - QString newFile = params.section(' ', -1); - kDebug() << "//PARAMS: " << params << "\n\nNAME: " << newFile; - if (QFile::exists(newFile)) { - if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", newFile)) == KMessageBox::No) return; - parameters << "-y"; - } - parameters << params.split(' '); - kDebug() << "/// FFMPEG ARGS: " << parameters; - m_transcodeProcess.setProcessChannelMode(QProcess::MergedChannels); - connect(&m_transcodeProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowTranscodeInfo())); - m_transcodeProcess.start("ffmpeg", parameters); - + ClipTranscode *d = new ClipTranscode(urls, params, desc); + connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); + d->show(); //QProcess::startDetached("ffmpeg", parameters); } -void MainWindow::slotShowTranscodeInfo() +void MainWindow::slotTranscodeClip() { - QString log = QString(m_transcodeProcess.readAll()); - kDebug() << "//LOG: " << log; - //TODO: find better way to display transcode output info - m_messageLabel->setMessage(log, ErrorMessage); + KUrl::List urls = KFileDialog::getOpenUrls(KUrl("kfiledialog:///projectfolder")); + if (urls.isEmpty()) return; + slotTranscode(urls); +} + +void MainWindow::slotSetDocumentRenderProfile(QMap props) +{ + if (m_activeDocument == NULL) return; + QMapIterator i(props); + while (i.hasNext()) { + i.next(); + m_activeDocument->setDocumentProperty(i.key(), i.value()); + } + 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(KUrl::AddTrailingSlash) + "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(); + } + } + } + bool exportAudio; + if (m_renderWidget->automaticAudioExport()) { + exportAudio = m_activeTimeline->checkProjectAudio(); + } else exportAudio = m_renderWidget->selectedAudioExport(); + m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath, exportAudio); +} + +void MainWindow::slotUpdateTimecodeFormat(int ix) +{ + KdenliveSettings::setFrametimecode(ix == 1); + m_clipMonitor->updateTimecodeFormat(); + m_projectMonitor->updateTimecodeFormat(); + m_transitionConfig->updateTimecodeFormat(); + m_effectStack->updateTimecodeFormat(); + //m_activeTimeline->projectView()->clearSelection(); + m_activeTimeline->updateRuler(); +} + +void MainWindow::slotRemoveFocus() +{ + statusBar()->setFocus(); + statusBar()->clearFocus(); +} + +void MainWindow::slotRevert() +{ + if (KMessageBox::warningContinueCancel(this, i18n("This will delete all changes made since you last saved your project. Are you sure you want to continue?"), i18n("Revert to last saved version")) == KMessageBox::Cancel) return; + KUrl url = m_activeDocument->url(); + if (closeCurrentDocument(false)) + doOpenFile(url, NULL); +} + + +void MainWindow::slotShutdown() +{ + if (m_activeDocument) m_activeDocument->setModified(false); + // Call shutdown + QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface(); + if (interface && interface->isServiceRegistered("org.kde.ksmserver")) { + QDBusInterface smserver("org.kde.ksmserver", "/KSMServer", "org.kde.KSMServerInterface"); + smserver.call("logout", 1, 2, 2); + } else if (interface && interface->isServiceRegistered("org.gnome.SessionManager")) { + QDBusInterface smserver("org.gnome.SessionManager", "/org/gnome/SessionManager", "org.gnome.SessionManager"); + smserver.call("Shutdown"); + } +} + +void MainWindow::slotUpdateTrackInfo() +{ + if (m_activeDocument) + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); +} + +void MainWindow::slotChangePalette(QAction *action, const QString &themename) +{ + // Load the theme file + QString theme; + if (action == NULL) theme = themename; + else theme = action->data().toString(); + KdenliveSettings::setColortheme(theme); + // Make palette for all widgets. + QPalette plt; + if (theme.isEmpty()) + plt = QApplication::desktop()->palette(); + else { + KSharedConfigPtr config = KSharedConfig::openConfig(theme); + plt = KGlobalSettings::createApplicationPalette(config); + } + + kapp->setPalette(plt); + const QObjectList children = statusBar()->children(); + + foreach(QObject * child, children) { + if (child->isWidgetType()) + ((QWidget*)child)->setPalette(plt); + const QObjectList subchildren = child->children(); + foreach(QObject * subchild, subchildren) { + if (subchild->isWidgetType()) + ((QWidget*)subchild)->setPalette(plt); + } + } + if (m_activeTimeline) { + m_activeTimeline->projectView()->updatePalette(); + } +} + + +QPixmap MainWindow::createSchemePreviewIcon(const KSharedConfigPtr &config) +{ + // code taken from kdebase/workspace/kcontrol/colors/colorscm.cpp + const uchar bits1[] = { 0xff, 0xff, 0xff, 0x2c, 0x16, 0x0b }; + const uchar bits2[] = { 0x68, 0x34, 0x1a, 0xff, 0xff, 0xff }; + const QSize bitsSize(24, 2); + const QBitmap b1 = QBitmap::fromData(bitsSize, bits1); + const QBitmap b2 = QBitmap::fromData(bitsSize, bits2); + + QPixmap pixmap(23, 16); + pixmap.fill(Qt::black); // ### use some color other than black for borders? + + KConfigGroup group(config, "WM"); + QPainter p(&pixmap); + KColorScheme windowScheme(QPalette::Active, KColorScheme::Window, config); + p.fillRect(1, 1, 7, 7, windowScheme.background()); + p.fillRect(2, 2, 5, 2, QBrush(windowScheme.foreground().color(), b1)); + + KColorScheme buttonScheme(QPalette::Active, KColorScheme::Button, config); + p.fillRect(8, 1, 7, 7, buttonScheme.background()); + p.fillRect(9, 2, 5, 2, QBrush(buttonScheme.foreground().color(), b1)); + + p.fillRect(15, 1, 7, 7, group.readEntry("activeBackground", QColor(96, 148, 207))); + p.fillRect(16, 2, 5, 2, QBrush(group.readEntry("activeForeground", QColor(255, 255, 255)), b1)); + + KColorScheme viewScheme(QPalette::Active, KColorScheme::View, config); + p.fillRect(1, 8, 7, 7, viewScheme.background()); + p.fillRect(2, 12, 5, 2, QBrush(viewScheme.foreground().color(), b2)); + + KColorScheme selectionScheme(QPalette::Active, KColorScheme::Selection, config); + p.fillRect(8, 8, 7, 7, selectionScheme.background()); + p.fillRect(9, 12, 5, 2, QBrush(selectionScheme.foreground().color(), b2)); + + p.fillRect(15, 8, 7, 7, group.readEntry("inactiveBackground", QColor(224, 223, 222))); + p.fillRect(16, 12, 5, 2, QBrush(group.readEntry("inactiveForeground", QColor(20, 19, 18)), b2)); + + p.end(); + return pixmap; +} + +void MainWindow::slotSwitchMonitors() +{ + m_monitorManager->slotSwitchMonitors(!m_clipMonitor->isActive()); + if (m_projectMonitor->isActive()) m_activeTimeline->projectView()->setFocus(); + else m_projectList->focusTree(); +} + +void MainWindow::slotSwitchFullscreen() +{ + if (m_projectMonitor->isActive()) m_projectMonitor->slotSwitchFullScreen(); + else m_clipMonitor->slotSwitchFullScreen(); +} + +void MainWindow::slotInsertZoneToTree() +{ + if (!m_clipMonitor->isActive() || m_clipMonitor->activeClip() == NULL) return; + QStringList info = m_clipMonitor->getZoneInfo(); + m_projectList->slotAddClipCut(info.at(0), info.at(1).toInt(), info.at(2).toInt()); +} + +void MainWindow::slotInsertZoneToTimeline() +{ + if (m_activeTimeline == NULL || m_clipMonitor->activeClip() == NULL) return; + QStringList info = m_clipMonitor->getZoneInfo(); + m_activeTimeline->projectView()->insertClipCut(m_clipMonitor->activeClip(), info.at(1).toInt(), info.at(2).toInt()); +} + + +void MainWindow::slotDeleteProjectClips(QStringList ids, QMap folderids) +{ + if (m_activeDocument && m_activeTimeline) { + if (!ids.isEmpty()) { + for (int i = 0; i < ids.size(); ++i) { + m_activeTimeline->slotDeleteClip(ids.at(i)); + } + m_activeDocument->clipManager()->slotDeleteClips(ids); + } + if (!folderids.isEmpty()) m_projectList->deleteProjectFolder(folderids); + m_activeDocument->setModified(true); + } +} + +void MainWindow::slotShowTitleBars(bool show) +{ + QList docks = findChildren(); + for (int i = 0; i < docks.count(); i++) { + QDockWidget* dock = docks.at(i); + if (show) { + dock->setTitleBarWidget(0); + } else { + if (!dock->isFloating()) { + dock->setTitleBarWidget(new QWidget); + } + } + } + KdenliveSettings::setShowtitlebars(show); +} + +void MainWindow::slotSwitchTitles() +{ + slotShowTitleBars(!KdenliveSettings::showtitlebars()); +} + +QString MainWindow::getMimeType() +{ + QString mimetype = "application/x-kdenlive"; + KMimeType::Ptr mime = KMimeType::mimeType(mimetype); + if (!mime) mimetype = "*.kdenlive"; + return mimetype; +} + +void MainWindow::slotMonitorRequestRenderFrame(bool request) +{ + if (request) { + m_projectMonitor->render->sendFrameForAnalysis = true; + return; + } else { + for (int i = 0; i < m_scopesList.count(); i++) { + if (m_scopesList.at(i)->isVisible() && tabifiedDockWidgets(m_scopesList.at(i)).isEmpty() && static_cast(m_scopesList.at(i)->widget())->autoRefreshEnabled()) { + request = true; + break; + } + } + } + if (!request) { + m_projectMonitor->render->sendFrameForAnalysis = false; + } +} + +void MainWindow::slotUpdateScopeFrameRequest() +{ + // We need a delay to make sure widgets are hidden after a close event for example + QTimer::singleShot(500, this, SLOT(slotDoUpdateScopeFrameRequest())); +} + +void MainWindow::slotDoUpdateScopeFrameRequest() +{ + // Check scopes + bool request = false; + for (int i = 0; i < m_scopesList.count(); i++) { + if (!m_scopesList.at(i)->widget()->visibleRegion().isEmpty() && static_cast(m_scopesList.at(i)->widget())->autoRefreshEnabled()) { + kDebug() << "SCOPE VISIBLE: " << static_cast(m_scopesList.at(i)->widget())->widgetName(); + request = true; + break; + } + } + if (!request) { + if (!m_projectMonitor->effectSceneDisplayed()) + m_projectMonitor->render->sendFrameForAnalysis = false; + m_clipMonitor->render->sendFrameForAnalysis = false; + } else { + m_projectMonitor->render->sendFrameForAnalysis = true; + m_clipMonitor->render->sendFrameForAnalysis = true; + } +} + +void MainWindow::slotUpdateColorScopes() +{ + bool request = false; + for (int i = 0; i < m_scopesList.count(); i++) { + // Check if we need the renderer to send a new frame for update + if (!m_scopesList.at(i)->widget()->visibleRegion().isEmpty() && !(static_cast(m_scopesList.at(i)->widget())->autoRefreshEnabled())) request = true; + static_cast(m_scopesList.at(i)->widget())->slotActiveMonitorChanged(m_clipMonitor->isActive()); + } + if (request) { + if (m_clipMonitor->isActive()) m_clipMonitor->render->sendFrameUpdate(); + else m_projectMonitor->render->sendFrameUpdate(); + } +} + +void MainWindow::slotOpenStopmotion() +{ + if (m_stopmotion == NULL) { + m_stopmotion = new StopmotionWidget(m_activeDocument->projectFolder(), m_stopmotion_actions->actions(), this); + connect(m_stopmotion, SIGNAL(addOrUpdateSequence(const QString)), m_projectList, SLOT(slotAddOrUpdateSequence(const QString))); + for (int i = 0; i < m_scopesList.count(); i++) { + // Check if we need the renderer to send a new frame for update + /*if (!m_scopesList.at(i)->widget()->visibleRegion().isEmpty() && !(static_cast(m_scopesList.at(i)->widget())->autoRefreshEnabled())) request = true;*/ + connect(m_stopmotion, SIGNAL(gotFrame(QImage)), static_cast(m_scopesList.at(i)->widget()), SLOT(slotRenderZoneUpdated(QImage))); + //static_cast(m_scopesList.at(i)->widget())->slotMonitorCapture(); + } + } + m_stopmotion->show(); +} + +void MainWindow::slotDeleteClip(const QString &id) +{ + QList list = findChildren(); + for (int i = 0; i < list.size(); ++i) { + list.at(i)->disableClipId(id); + } + m_projectList->slotDeleteClip(id); } #include "mainwindow.moc" +