X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=dd8e2d01637be992ec1202efd5fe6e623fc36251;hb=04d9ee1d73082325557f73929600ffca12701cf3;hp=dfced3adf2ab72b1c3a4ca2ef0c55839c083d3a0;hpb=cb09e7448728683406735d995e0388075c2c9276;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index dfced3ad..dd8e2d01 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -52,13 +52,19 @@ #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 #include #include #include #include +#include #include +#include #include #include #include @@ -114,15 +120,15 @@ 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) { // Create DBus interface @@ -138,6 +144,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent 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())); @@ -156,70 +164,110 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_monitorManager = new MonitorManager(); - m_projectListDock = new QDockWidget(i18n("Project Tree"), this); - m_projectListDock->setObjectName("project_tree"); - m_projectList = new ProjectList(this); - m_projectListDock->setWidget(m_projectList); - addDockWidget(Qt::TopDockWidgetArea, m_projectListDock); - m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this); connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus())); - m_effectListDock = new QDockWidget(i18n("Effect List"), this); - m_effectListDock->setObjectName("effect_list"); - m_effectList = new EffectsListView(); - - //m_effectList = new KListWidget(this); - 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_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection()); - m_fileRevert->setEnabled(false); + /// Add Widgets /// - //slotDetectAudioDriver(); + m_projectListDock = new QDockWidget(i18n("Project Tree"), this); + m_projectListDock->setObjectName("project_tree"); + m_projectList = new ProjectList(); + m_projectListDock->setWidget(m_projectList); + addDockWidget(Qt::TopDockWidgetArea, m_projectListDock); m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); m_clipMonitorDock->setObjectName("clip_monitor"); - m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), this); + m_clipMonitor = new Monitor("clip", m_monitorManager, QString()); 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, QString(), 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); + m_notesWidget->setClickMessage(i18n("Enter your project notes here...")); + 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_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); @@ -232,20 +280,49 @@ 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_clipMonitorDock, m_projectMonitorDock); #ifndef Q_WS_MAC tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock); #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); + + setCentralWidget(m_timelineArea); + + + 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); + } + setupGUI(); + // Find QDockWidget tab bars and show / hide widget title bars on right click QList tabs = findChildren(); for (int i = 0; i < tabs.count(); i++) { @@ -256,27 +333,41 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent /*ScriptingPart* sp = new ScriptingPart(this, QStringList()); guiFactory()->addClient(sp);*/ + + 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*))); + + + // Load layout names from config file + loadLayouts(); + loadPlugins(); loadTranscoders(); //kDebug() << factory() << " " << factory()->container("video_effects_menu", this); m_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone); m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast(factory()->container("marker_menu", this))); + + 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)), - static_cast(factory()->container("clip_in_timeline", this))); + clipInTimeline); - QAction *action; + KAction *action; // build themes menus QMenu *themesMenu = static_cast(factory()->container("themes_menu", this)); QActionGroup *themegroup = new QActionGroup(this); themegroup->setExclusive(true); - action = new QAction(i18n("Default"), this); + 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) { @@ -289,7 +380,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent QIcon icon = createSchemePreviewIcon(config); KConfigGroup group(config, "General"); const QString name = group.readEntry("Name", info.baseName()); - action = new QAction(name, this); + action = new KAction(name, this); action->setData(filename); action->setIcon(icon); action->setCheckable(true); @@ -297,11 +388,6 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent 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) @@ -316,113 +402,71 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent themesMenu->addActions(themegroup->actions()); connect(themesMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotChangePalette(QAction*))); - // build effects menus - QMenu *videoEffectsMenu = static_cast(factory()->container("video_effects_menu", this)); - - 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); - } - - QMenu *audioEffectsMenu = static_cast(factory()->container("audio_effects_menu", this)); - - - effectsList.clear(); - for (int ix = 0; ix < audioEffects.count(); ix++) { - effectInfo = audioEffects.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } - - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - audioEffectsMenu->addAction(action); - } - + // 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); - - effectsList.clear(); - for (int ix = 0; ix < customEffects.count(); ix++) { - effectInfo = customEffects.effectIdInfo(ix); - effectsList.insert(effectInfo.at(0).toLower(), effectInfo); - } - - foreach(const QStringList &value, effectsList) { - action = new QAction(value.at(0), this); - action->setData(value); - m_customEffectsMenu->addAction(action); - } + 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("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_timeline_clip")); + 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("edit_item_duration")); - m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip")); + m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_item")); m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); m_timelineContextTransitionMenu->addAction(actionCollection()->action("auto_transition")); @@ -431,6 +475,7 @@ 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_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())); @@ -453,27 +498,43 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent 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(); } +MainWindow::~MainWindow() +{ + 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() { if (queryClose()) { - if (m_projectMonitor) m_projectMonitor->stop(); - if (m_clipMonitor) m_clipMonitor->stop(); - delete m_effectStack; - delete m_activeTimeline; -#ifndef Q_WS_MAC - // This sometimes causes crash on exit on OS X for some reason. - delete m_projectMonitor; - delete m_clipMonitor; -#endif - delete m_activeDocument; - delete m_shortcutRemoveFocus; - Mlt::Factory::close(); kapp->quit(); } } @@ -499,8 +560,18 @@ bool MainWindow::queryClose() } saveOptions(); if (m_monitorManager) m_monitorManager->stopActiveMonitor(); - if (m_activeDocument && m_activeDocument->isModified()) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { + // 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(); @@ -515,29 +586,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) @@ -554,7 +632,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); @@ -579,7 +657,8 @@ 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); } @@ -608,17 +687,16 @@ void MainWindow::slotReloadEffects() QAction *action; 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()) { + if (effectsList.isEmpty()) m_customEffectsMenu->setEnabled(false); - return; - } else m_customEffectsMenu->setEnabled(true); + else + m_customEffectsMenu->setEnabled(true); - foreach(const QStringList &value, effectsList) { + foreach(const QStringList & value, effectsList) { action = new QAction(value.at(0), this); action->setData(value); m_customEffectsMenu->addAction(action); @@ -687,7 +765,7 @@ void MainWindow::slotFullScreen() KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked()); } -void MainWindow::slotAddEffect(const QDomElement effect, GenTime pos, int track) +void MainWindow::slotAddEffect(const QDomElement effect) { if (!m_activeDocument) return; if (effect.isNull()) { @@ -695,7 +773,10 @@ void MainWindow::slotAddEffect(const QDomElement effect, GenTime pos, int track) return; } QDomElement effectToAdd = effect.cloneNode().toElement(); - m_activeTimeline->projectView()->slotAddEffect(effectToAdd, pos, track); + 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) @@ -712,7 +793,6 @@ 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(deleteProjectClips(QStringList, QMap)), this, SLOT(slotDeleteProjectClips(QStringList, QMap))); @@ -729,6 +809,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))); } @@ -765,8 +847,13 @@ void MainWindow::setupActions() 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 = "QToolBar { border: 0px } QToolButton { 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;}"; + 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); @@ -858,20 +945,54 @@ void MainWindow::setupActions() 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(max); - actionWidget->setMaximumHeight(max - 4); + 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); + m_zoomIn = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this); + toolbar->addAction(m_zoomIn); + m_zoomIn->setShortcut(Qt::CTRL + Qt::Key_Plus); + + 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(); + + //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); m_buttonVideoThumbs->setCheckable(true); @@ -896,6 +1017,10 @@ void MainWindow::setupActions() m_buttonSnap->setChecked(KdenliveSettings::snaptopoints()); connect(m_buttonSnap, SIGNAL(triggered()), this, SLOT(slotSwitchSnap())); + actionWidget = toolbar->widgetForAction(m_buttonAutomaticSplitAudio); + actionWidget->setMaximumWidth(max); + actionWidget->setMaximumHeight(max - 4); + actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs); actionWidget->setMaximumWidth(max); actionWidget->setMaximumHeight(max - 4); @@ -929,21 +1054,14 @@ void MainWindow::setupActions() 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); @@ -960,13 +1078,10 @@ void MainWindow::setupActions() collection->addAction("manage_profiles", profilesAction); connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles())); - 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 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"); + 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); @@ -985,6 +1100,10 @@ void MainWindow::setupActions() 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); @@ -1116,10 +1235,10 @@ 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); collection->addAction("change_clip_speed", editTimelineClipSpeed); @@ -1147,11 +1266,15 @@ void MainWindow::setupActions() 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); @@ -1250,9 +1373,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); @@ -1288,32 +1411,28 @@ void MainWindow::setupActions() 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); @@ -1323,8 +1442,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*)), @@ -1393,6 +1510,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() ) ); } @@ -1402,6 +1563,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(); @@ -1463,21 +1689,27 @@ void MainWindow::slotRunWizard() void MainWindow::newFile(bool showProjectSettings, bool force) { - if (!m_timelineArea->isEnabled() && !force) return; + if (!m_timelineArea->isEnabled() && !force) + return; m_fileRevert->setEnabled(false); - QString profileName; - KUrl projectFolder; + QString profileName = KdenliveSettings::default_profile(); + KUrl projectFolder = KdenliveSettings::defaultprojectfolder(); QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); if (!showProjectSettings) { - if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); - profileName = KdenliveSettings::default_profile(); - projectFolder = KdenliveSettings::defaultprojectfolder(); + if (!KdenliveSettings::activatetabs()) + if (!closeCurrentDocument()) + return; } else { ProjectSettings *w = new ProjectSettings(NULL, QStringList(), projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this); - if (w->exec() != QDialog::Accepted) return; - if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); - if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs(); - if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs(); + 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(); @@ -1485,7 +1717,7 @@ void MainWindow::newFile(bool showProjectSettings, bool force) } m_timelineArea->setEnabled(true); m_projectList->setEnabled(true); - KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this); + KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, m_notesWidget, this); doc->m_autosave = new KAutoSaveFile(KUrl(), doc); bool ok; TrackView *trackView = new TrackView(doc, &ok, this); @@ -1500,7 +1732,8 @@ void MainWindow::newFile(bool showProjectSettings, bool force) 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); } @@ -1514,10 +1747,10 @@ void MainWindow::activateDocument() connectDocument(currentTab, currentDoc); } -void MainWindow::closeCurrentDocument(bool saveChanges) +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; @@ -1525,13 +1758,18 @@ void MainWindow::closeCurrentDocument(bool saveChanges) TrackView *tabToClose = (TrackView *) w; KdenliveDoc *docToClose = tabToClose->document(); if (docToClose && docToClose->isModified() && saveChanges) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { + 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; @@ -1548,11 +1786,16 @@ void MainWindow::closeCurrentDocument(bool saveChanges) m_activeDocument = NULL; m_effectStack->clear(); m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); - } else delete docToClose; + } else { + delete docToClose; + } if (w == m_activeTimeline) { delete m_activeTimeline; m_activeTimeline = NULL; - } else delete w; + } else { + delete w; + } + return true; } bool MainWindow::saveFileAs(const QString &outputFileName) @@ -1587,15 +1830,14 @@ bool MainWindow::saveFileAs(const QString &outputFileName) 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); } @@ -1619,12 +1861,7 @@ void MainWindow::openFile() m_startUrl = KUrl(); return; } - // 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); + KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), getMimeType()); if (url.isEmpty()) return; m_fileOpenRecent->addUrl(url); openFile(url); @@ -1658,6 +1895,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()) { @@ -1669,13 +1908,12 @@ 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); @@ -1685,7 +1923,7 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { if (!m_timelineArea->isEnabled()) return; m_fileRevert->setEnabled(true); - KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, this); + KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, m_notesWidget, this); if (stale == NULL) { stale = new KAutoSaveFile(url, doc); doc->m_autosave = stale; @@ -1720,8 +1958,7 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) 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? @@ -1735,42 +1972,50 @@ void MainWindow::recoverFiles(QList staleFiles) } } - void MainWindow::parseProfiles(const QString &mltPath) { - // kDebug()<<" + + 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); @@ -1779,25 +2024,13 @@ void MainWindow::parseProfiles(const QString &mltPath) delete getUrl; if (mltPath.isEmpty()) ::exit(0); KdenliveSettings::setMltpath(mltPath.path(KUrl::AddTrailingSlash)); - QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); + 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); - } - 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(); } @@ -1851,41 +2084,42 @@ void MainWindow::slotEditProjectSettings() if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash)); if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs(); if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs(); - if (m_activeDocument->profilePath() != profile) { - // Profile was changed - double dar = m_activeDocument->dar(); - - // Deselect current effect / transition - m_effectStack->slotClipItemSelected(NULL, 0); - m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); - m_clipMonitor->slotSetXml(NULL); - 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(); - } + if (m_activeDocument->profilePath() != profile) slotUpdateProjectProfile(profile); } delete w; } +void MainWindow::slotUpdateProjectProfile(const QString &profile) +{ + double dar = m_activeDocument->dar(); + + // Deselect current effect / transition + m_effectStack->slotClipItemSelected(NULL, 0); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + m_clipMonitor->slotSetXml(NULL); + 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() { @@ -1893,7 +2127,7 @@ void MainWindow::slotRenderProject() QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder(); m_renderWidget = new RenderWidget(projectfolder, this); connect(m_renderWidget, SIGNAL(shutdown()), this, SLOT(slotShutdown())); - connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &, const QString &, const QString&)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString &, const QString&))); + 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 &))); @@ -1901,31 +2135,36 @@ void MainWindow::slotRenderProject() m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); - m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("rendercategory"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl")); + m_renderWidget->setRenderProfile(m_activeDocument->getRenderProperties()); } } slotCheckRenderStatus(); - /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) m_renderWidget->setTimeline(currentTab); - m_renderWidget->setDocument(m_activeDocument);*/ m_renderWidget->show(); m_renderWidget->showNormal(); + + // What are the following lines supposed to do? + //m_activeTimeline->tracksNumber(); + //m_renderWidget->enableAudio(false); + //m_renderWidget->export_audio; } void MainWindow::slotCheckRenderStatus() { // Make sure there are no missing clips - if (m_renderWidget) m_renderWidget->missingClips(m_projectList->hasMissingClips()); + 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() @@ -1980,7 +2219,12 @@ 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_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())); @@ -1995,20 +2239,20 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha 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(playMonitor()), m_projectMonitor, SLOT(slotPlay())); - disconnect(m_zoomSlider, SIGNAL(valueChanged(int)), m_activeTimeline, SLOT(slotChangeZoom(int))); disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, 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())); @@ -2035,6 +2279,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha 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&))); @@ -2043,12 +2288,15 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha 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())); @@ -2061,16 +2309,17 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha 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->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); m_zoomSlider->setValue(doc->zoom().x()); - connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int))); connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); connect(trackView->projectView(), SIGNAL(zoomOut()), this, SLOT(slotZoomOut())); connect(trackView, SIGNAL(setZoom(int)), this, SLOT(slotSetZoom(int))); @@ -2080,15 +2329,17 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay())); - 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))); @@ -2104,7 +2355,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha m_renderWidget->setProfile(doc->mltProfile()); m_renderWidget->setGuides(doc->guidesXml(), doc->projectDuration()); m_renderWidget->setDocumentPath(doc->projectFolder().path(KUrl::AddTrailingSlash)); - m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("rendercategory"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl")); + m_renderWidget->setRenderProfile(doc->getRenderProperties()); } //doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); @@ -2136,7 +2387,16 @@ 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) @@ -2180,10 +2440,13 @@ 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(); @@ -2193,13 +2456,17 @@ void MainWindow::updateConfiguration() } +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()); } @@ -2209,7 +2476,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()); } @@ -2217,9 +2485,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()); } @@ -2230,17 +2497,34 @@ void MainWindow::slotSwitchSnap() } -void MainWindow::slotDeleteTimelineClip() +void MainWindow::slotDeleteItem() { - if (QApplication::focusWidget() && QApplication::focusWidget()->parentWidget() && QApplication::focusWidget()->parentWidget()->parentWidget() && 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::slotUpdateClipMarkers(DocClipBase *clip) { - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); + if (m_clipMonitor->isActive()) + m_clipMonitor->checkOverlay(); m_clipMonitor->updateMarkers(clip); } @@ -2267,9 +2551,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()); - } } void MainWindow::slotDeleteClipMarker() @@ -2397,11 +2680,13 @@ void MainWindow::slotDeleteTrack(int ix) 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() @@ -2424,9 +2709,8 @@ void MainWindow::slotDeleteAllGuides() void MainWindow::slotCutTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->cutSelectedClips(); - } } void MainWindow::slotInsertClipOverwrite() @@ -2439,65 +2723,56 @@ void MainWindow::slotInsertClipOverwrite() void MainWindow::slotSelectTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectClip(true); - } } void MainWindow::slotSelectTimelineTransition() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectTransition(true); - } } void MainWindow::slotDeselectTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectClip(false, true); - } } void MainWindow::slotDeselectTimelineTransition() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectTransition(false, true); - } } void MainWindow::slotSelectAddTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->selectClip(true, true); - } } void MainWindow::slotSelectAddTimelineTransition() { - if (m_activeTimeline) { + 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) { + if (m_activeTimeline) m_activeTimeline->projectView()->editItemDuration(); - } } void MainWindow::slotAddProjectClip(KUrl url) @@ -2547,33 +2822,64 @@ 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); + if (!message.isEmpty()) + m_messageLabel->setMessage(message, ErrorMessage); m_statusProgressBar->setVisible(false); } else { m_messageLabel->setMessage(QString(), DefaultMessage); @@ -2662,6 +2968,8 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) //m_activeDocument->editTextClip(clip->getProperty("xml"), clip->getId()); return; } + + // any type of clip but a title 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) { @@ -2669,6 +2977,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) if (newprops.isEmpty()) return; EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); m_activeDocument->commandStack()->push(command); + m_activeDocument->setModified(); if (dia.needsTimelineRefresh()) { // update clip occurences in timeline @@ -2689,17 +2998,15 @@ void MainWindow::slotShowClipProperties(QList cliplist, QMapgetId(), clip->properties(), dia.properties(), true, command); } m_activeDocument->commandStack()->push(command); - for (int i = 0; i < cliplist.count(); i++) { + 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) { + if (e->type() == QEvent::User) m_messageLabel->setMessage(static_cast (e)->message(), MltError); - } } void MainWindow::slotActivateEffectStackView() { @@ -2708,7 +3015,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() @@ -2716,7 +3024,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() @@ -2724,7 +3034,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() @@ -2745,29 +3057,41 @@ void MainWindow::slotClipEnd() void MainWindow::slotZoneStart() { - if (m_projectMonitor->isActive()) m_projectMonitor->slotZoneStart(); - else m_clipMonitor->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(); + 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); + 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) @@ -2793,20 +3117,20 @@ void MainWindow::slotSetTool(PROJECTTOOL 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() @@ -2823,11 +3147,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); } @@ -2875,7 +3198,6 @@ void MainWindow::slotClipInTimeline(const QString &clipId) j++; } actionList.insert(j, a); - } inTimelineMenu->addActions(actionList); @@ -2890,16 +3212,28 @@ void MainWindow::slotClipInProjectTree() { if (m_activeTimeline) { const QStringList &clipIds = m_activeTimeline->projectView()->selectedClips(); - if (clipIds.isEmpty()) return; + if (clipIds.isEmpty()) + return; m_projectListDock->raise(); - for (int i = 0; i < clipIds.count(); i++) { + 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) { @@ -2915,11 +3249,10 @@ void MainWindow::keyPressEvent(QKeyEvent *ke) 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(); @@ -2937,19 +3270,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) @@ -2960,7 +3291,9 @@ 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); @@ -2990,34 +3323,39 @@ 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_projectMonitor->slotSetZoneStart(); + 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_projectMonitor->slotSetZoneEnd(); + else + m_projectMonitor->slotSetZoneEnd(); // else m_activeTimeline->projectView()->setOutPoint(); } void MainWindow::slotResizeItemStart() { - if (m_activeTimeline) m_activeTimeline->projectView()->setInPoint(); + if (m_activeTimeline) + m_activeTimeline->projectView()->setInPoint(); } void MainWindow::slotResizeItemEnd() { - if (m_activeTimeline) m_activeTimeline->projectView()->setOutPoint(); + if (m_activeTimeline) + m_activeTimeline->projectView()->setOutPoint(); } int MainWindow::getNewStuff(const QString &configFile) @@ -3027,7 +3365,7 @@ int MainWindow::getNewStuff(const QString &configFile) KNS3::DownloadDialog dialog(configFile); dialog.exec(); entries = dialog.changedEntries(); - foreach(const KNS3::Entry &entry, entries) { + foreach(const KNS3::Entry & entry, entries) { if (entry.status() == KNS3::Entry::Installed) kDebug() << "// Installed files: " << entry.installedFiles(); } @@ -3035,7 +3373,7 @@ int MainWindow::getNewStuff(const QString &configFile) KNS::Engine engine(0); if (engine.init(configFile)) entries = engine.downloadDialogModal(this); - foreach(KNS::Entry *entry, entries) { + foreach(KNS::Entry * entry, entries) { if (entry->status() == KNS::Entry::Installed) kDebug() << "// Installed files: " << entry->installedFiles(); } @@ -3045,9 +3383,8 @@ int MainWindow::getNewStuff(const QString &configFile) void MainWindow::slotGetNewTitleStuff() { - if (getNewStuff("kdenlive_titles.knsrc") > 0) { + if (getNewStuff("kdenlive_titles.knsrc") > 0) TitleWidget::refreshTitleTemplates(); - } } void MainWindow::slotGetNewLumaStuff() @@ -3060,10 +3397,9 @@ void MainWindow::slotGetNewLumaStuff() void MainWindow::slotGetNewRenderStuff() { - if (getNewStuff("kdenlive_renderprofiles.knsrc") > 0) { + if (getNewStuff("kdenlive_renderprofiles.knsrc") > 0) if (m_renderWidget) m_renderWidget->reloadProfiles(); - } } void MainWindow::slotGetNewMltProfileStuff() @@ -3078,12 +3414,14 @@ void MainWindow::slotGetNewMltProfileStuff() 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) @@ -3123,9 +3461,8 @@ void MainWindow::slotMaximizeCurrent(bool /*show*/) { 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 { @@ -3149,9 +3486,8 @@ void MainWindow::loadTranscoders() QStringList data = i.value().split(";", QString::SkipEmptyParts); QAction *a = transMenu->addAction(i.key()); a->setData(data); - if (data.count() > 1) { + if (data.count() > 1) a->setToolTip(data.at(1)); - } connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode())); } } @@ -3187,13 +3523,14 @@ void MainWindow::slotTranscodeClip() slotTranscode(urls); } -void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &file) +void MainWindow::slotSetDocumentRenderProfile(QMap props) { if (m_activeDocument == NULL) return; - m_activeDocument->setDocumentProperty("renderdestination", dest); - m_activeDocument->setDocumentProperty("rendercategory", group); - m_activeDocument->setDocumentProperty("renderprofile", name); - m_activeDocument->setDocumentProperty("renderurl", file); + QMapIterator i(props); + while (i.hasNext()) { + i.next(); + m_activeDocument->setDocumentProperty(i.key(), i.value()); + } m_activeDocument->setModified(true); } @@ -3276,8 +3613,11 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS } } } - - m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath); + 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) @@ -3285,7 +3625,10 @@ void MainWindow::slotUpdateTimecodeFormat(int ix) KdenliveSettings::setFrametimecode(ix == 1); m_clipMonitor->updateTimecodeFormat(); m_projectMonitor->updateTimecodeFormat(); - m_activeTimeline->projectView()->clearSelection(); + m_transitionConfig->updateTimecodeFormat(); + m_effectStack->updateTimecodeFormat(); + //m_activeTimeline->projectView()->clearSelection(); + m_activeTimeline->updateRuler(); } void MainWindow::slotRemoveFocus() @@ -3298,8 +3641,8 @@ 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(); - closeCurrentDocument(false); - doOpenFile(url, NULL); + if (closeCurrentDocument(false)) + doOpenFile(url, NULL); } @@ -3342,15 +3685,18 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename) kapp->setPalette(plt); const QObjectList children = statusBar()->children(); - foreach(QObject *child, children) { + foreach(QObject * child, children) { if (child->isWidgetType()) ((QWidget*)child)->setPalette(plt); const QObjectList subchildren = child->children(); - foreach(QObject *subchild, subchildren) { + foreach(QObject * subchild, subchildren) { if (subchild->isWidgetType()) ((QWidget*)subchild)->setPalette(plt); } } + if (m_activeTimeline) { + m_activeTimeline->projectView()->updatePalette(); + } } @@ -3418,12 +3764,16 @@ void MainWindow::slotInsertZoneToTimeline() void MainWindow::slotDeleteProjectClips(QStringList ids, QMap folderids) { - for (int i = 0; i < ids.size(); ++i) { - m_activeTimeline->slotDeleteClip(ids.at(i)); + 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); } - m_activeDocument->clipManager()->slotDeleteClips(ids); - if (!folderids.isEmpty()) m_projectList->deleteProjectFolder(folderids); - } void MainWindow::slotShowTitleBars(bool show) @@ -3439,17 +3789,49 @@ void MainWindow::slotShowTitleBars(bool show) m_transitionConfigDock->setTitleBarWidget(0); m_projectListDock->setTitleBarWidget(0); m_undoViewDock->setTitleBarWidget(0); + m_vectorscopeDock->setTitleBarWidget(0); + m_waveformDock->setTitleBarWidget(0); + m_RGBParadeDock->setTitleBarWidget(0); + m_histogramDock->setTitleBarWidget(0); } else { - if (!m_effectStackDock->isFloating()) m_effectStackDock->setTitleBarWidget(new QWidget(this)); - if (!m_clipMonitorDock->isFloating()) m_clipMonitorDock->setTitleBarWidget(new QWidget(this)); - if (!m_projectMonitorDock->isFloating()) m_projectMonitorDock->setTitleBarWidget(new QWidget(this)); + if (!m_effectStackDock->isFloating()) { + m_effectStackDock->setTitleBarWidget(new QWidget); + } + if (!m_clipMonitorDock->isFloating()) { + m_clipMonitorDock->setTitleBarWidget(new QWidget); + } + if (!m_projectMonitorDock->isFloating()) { + m_projectMonitorDock->setTitleBarWidget(new QWidget); + } #ifndef Q_WS_MAC - if (!m_recMonitorDock->isFloating()) m_recMonitorDock->setTitleBarWidget(new QWidget(this)); + if (!m_recMonitorDock->isFloating()) { + m_recMonitorDock->setTitleBarWidget(new QWidget); + } #endif - if (!m_effectListDock->isFloating()) m_effectListDock->setTitleBarWidget(new QWidget(this)); - if (!m_transitionConfigDock->isFloating()) m_transitionConfigDock->setTitleBarWidget(new QWidget(this)); - if (!m_projectListDock->isFloating()) m_projectListDock->setTitleBarWidget(new QWidget(this)); - if (!m_undoViewDock->isFloating()) m_undoViewDock->setTitleBarWidget(new QWidget(this)); + if (!m_effectListDock->isFloating()) { + m_effectListDock->setTitleBarWidget(new QWidget); + } + if (!m_transitionConfigDock->isFloating()) { + m_transitionConfigDock->setTitleBarWidget(new QWidget); + } + if (!m_projectListDock->isFloating()) { + m_projectListDock->setTitleBarWidget(new QWidget); + } + if (!m_undoViewDock->isFloating()) { + m_undoViewDock->setTitleBarWidget(new QWidget); + } + if (!m_vectorscopeDock->isFloating()) { + m_vectorscopeDock->setTitleBarWidget(new QWidget); + } + if (!m_waveformDock->isFloating()) { + m_waveformDock->setTitleBarWidget(new QWidget); + } + if (!m_RGBParadeDock->isFloating()) { + m_RGBParadeDock->setTitleBarWidget(new QWidget(this)); + } + if (!m_histogramDock->isFloating()) { + m_histogramDock->setTitleBarWidget(new QWidget(this)); + } } KdenliveSettings::setShowtitlebars(show); } @@ -3459,5 +3841,72 @@ 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(); + } +} + #include "mainwindow.moc"