X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=55431d6f6ddd2d7d2fa79495bf6cb9454a0204f7;hb=0a381233be965974d175f34899ed5422e71e6d00;hp=3dac3ce49a7a74b95ecac591e9aa4672be950e31;hpb=5b05ca94fa0fa491334de6ea0b8d82de0598a5fa;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 3dac3ce4..55431d6f 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -39,6 +39,7 @@ #include "transitionsettings.h" #include "renderwidget.h" #include "renderer.h" +#include "audiosignal.h" #ifndef NO_JOGSHUTTLE #include "jogshuttle.h" #endif /* NO_JOGSHUTTLE */ @@ -52,13 +53,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 @@ -89,6 +96,7 @@ #endif /* KDE_IS_VERSION(4,3,80) */ #include #include +#include #include #include @@ -114,15 +122,16 @@ EffectsList MainWindow::audioEffects; EffectsList MainWindow::customEffects; EffectsList MainWindow::transitions; -MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent) : - KXmlGuiWindow(parent), - m_activeDocument(NULL), - m_activeTimeline(NULL), - m_renderWidget(NULL), +MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & clipsToLoad, QWidget *parent) : + KXmlGuiWindow(parent), + m_activeDocument(NULL), + m_activeTimeline(NULL), + m_renderWidget(NULL), #ifndef NO_JOGSHUTTLE - m_jogProcess(NULL), + m_jogProcess(NULL), #endif /* NO_JOGSHUTTLE */ - m_findActivated(false) + m_findActivated(false), + m_stopmotion(NULL) { // Create DBus interface @@ -135,9 +144,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent setFont(KGlobalSettings::toolBarFont()); parseProfiles(MltPath); m_commandStack = new QUndoGroup; + setDockNestingEnabled(true); m_timelineArea = new KTabWidget(this); m_timelineArea->setTabReorderingEnabled(true); m_timelineArea->setTabBarHidden(true); + m_timelineArea->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); + m_timelineArea->setMinimumHeight(200); QToolButton *closeTabButton = new QToolButton; connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeCurrentDocument())); @@ -156,70 +168,126 @@ 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_timelineArea); m_clipMonitorDock->setWidget(m_clipMonitor); addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock); - //m_clipMonitor->stop(); m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); m_projectMonitorDock->setObjectName("project_monitor"); - m_projectMonitor = new Monitor("project", m_monitorManager, 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); +#if KDE_IS_VERSION(4,4,0) + m_notesWidget->setClickMessage(i18n("Enter your project notes here...")); +#endif + m_notesDock->setWidget(m_notesWidget); + addDockWidget(Qt::TopDockWidgetArea, m_notesDock); + + m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this); + m_effectStackDock->setObjectName("effect_stack"); + m_effectStack = new EffectStackView(m_projectMonitor); + m_effectStackDock->setWidget(m_effectStack); + addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock); + + m_transitionConfigDock = new QDockWidget(i18n("Transition"), this); + m_transitionConfigDock->setObjectName("transition"); + m_transitionConfig = new TransitionSettings(m_projectMonitor); + m_transitionConfigDock->setWidget(m_transitionConfig); + addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock); + + m_effectListDock = new QDockWidget(i18n("Effect List"), this); + m_effectListDock->setObjectName("effect_list"); + m_effectList = new EffectsListView(); + m_effectListDock->setWidget(m_effectList); + addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); + + m_vectorscope = new Vectorscope(m_projectMonitor, m_clipMonitor); + m_vectorscopeDock = new QDockWidget(i18n("Vectorscope"), this); + m_vectorscopeDock->setObjectName(m_vectorscope->widgetName()); + m_vectorscopeDock->setWidget(m_vectorscope); + addDockWidget(Qt::TopDockWidgetArea, m_vectorscopeDock); + connect(m_vectorscopeDock, SIGNAL(visibilityChanged(bool)), m_vectorscope, SLOT(forceUpdate(bool))); + connect(m_vectorscopeDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + connect(m_vectorscope, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + m_scopesList.append(m_vectorscopeDock); + + m_waveform = new Waveform(m_projectMonitor, m_clipMonitor); + m_waveformDock = new QDockWidget(i18n("Waveform"), this); + m_waveformDock->setObjectName(m_waveform->widgetName()); + m_waveformDock->setWidget(m_waveform); + addDockWidget(Qt::TopDockWidgetArea, m_waveformDock); + connect(m_waveformDock, SIGNAL(visibilityChanged(bool)), m_waveform, SLOT(forceUpdate(bool))); + connect(m_waveformDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + connect(m_waveform, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + m_scopesList.append(m_waveformDock); + + m_RGBParade = new RGBParade(m_projectMonitor, m_clipMonitor); + m_RGBParadeDock = new QDockWidget(i18n("RGB Parade"), this); + m_RGBParadeDock->setObjectName(m_RGBParade->widgetName()); + m_RGBParadeDock->setWidget(m_RGBParade); + addDockWidget(Qt::TopDockWidgetArea, m_RGBParadeDock); + connect(m_RGBParadeDock, SIGNAL(visibilityChanged(bool)), m_RGBParade, SLOT(forceUpdate(bool))); + connect(m_RGBParadeDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + connect(m_RGBParade, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + m_scopesList.append(m_RGBParadeDock); + + m_histogram = new Histogram(m_projectMonitor, m_clipMonitor); + m_histogramDock = new QDockWidget(i18n("Histogram"), this); + m_histogramDock->setObjectName(m_histogram->widgetName()); + m_histogramDock->setWidget(m_histogram); + addDockWidget(Qt::TopDockWidgetArea, m_histogramDock); + connect(m_histogramDock, SIGNAL(visibilityChanged(bool)), m_histogram, SLOT(forceUpdate(bool))); + connect(m_histogramDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + connect(m_histogram, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + m_scopesList.append(m_histogramDock); + + + m_audiosignal = new AudioSignal; + m_audiosignalDock = new QDockWidget(i18n("Audio Signal"), this); + m_audiosignalDock->setObjectName("audiosignal"); + m_audiosignalDock->setWidget(m_audiosignal); + addDockWidget(Qt::TopDockWidgetArea, m_audiosignalDock); + if (m_projectMonitor) { + connect(m_projectMonitor->render, SIGNAL(showAudioSignal(const QByteArray&)), m_audiosignal, SLOT(showAudio(const QByteArray&))); + } + if (m_clipMonitor) { + connect(m_clipMonitor->render, SIGNAL(showAudioSignal(const QByteArray&)), m_audiosignal, SLOT(showAudio(const QByteArray&))); + } + //connect(m_histogramDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + //connect(m_histogram, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest())); + 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 +300,64 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent //overviewDock->setWidget(m_overView); //addDockWidget(Qt::TopDockWidgetArea, overviewDock); + setupActions(); - //tabifyDockWidget(projectListDock, effectListDock); + + /// Tabify Widgets /// tabifyDockWidget(m_projectListDock, m_effectStackDock); tabifyDockWidget(m_projectListDock, m_transitionConfigDock); - //tabifyDockWidget(projectListDock, undoViewDock); + tabifyDockWidget(m_projectListDock, m_notesDock); tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock); #ifndef Q_WS_MAC tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock); #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); + } + + KAction *action; + // Stop motion actions. Beware of the order, we MUST use the same order in stopmotion/stopmotion.cpp + m_stopmotion_actions = new KActionCategory(i18n("Stop Motion"), actionCollection()); + action = new KAction(KIcon("media-record"), i18n("Capture frame"), this); + action->setShortcut(Qt::Key_Space); + //action->setShortcutContext(Qt::WidgetWithChildrenShortcut); + m_stopmotion_actions->addAction("stopmotion_capture", action); + action = new KAction(i18n("Switch live / captured frame"), this); + //action->setShortcutContext(Qt::WidgetWithChildrenShortcut); + m_stopmotion_actions->addAction("stopmotion_switch", action); + action = new KAction(KIcon("edit-paste"), i18n("Show last frame over video"), this); + action->setCheckable(true); + action->setChecked(false); + m_stopmotion_actions->addAction("stopmotion_overlay", action); setupGUI(); + // 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,11 +368,23 @@ 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_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, NULL, m_loopClip); m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast(factory()->container("marker_menu", this))); QMenu *clipInTimeline = static_cast(factory()->container("clip_in_timeline", this)); @@ -269,7 +393,6 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent static_cast(factory()->container("transcoders", this)), clipInTimeline); - KAction *action; // build themes menus QMenu *themesMenu = static_cast(factory()->container("themes_menu", this)); QActionGroup *themegroup = new QActionGroup(this); @@ -358,19 +481,22 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent //m_timelineContextClipMenu->addAction(actionCollection()->action("clip_to_project_tree")); m_timelineContextClipMenu->addAction(actionCollection()->action("edit_item_duration")); m_timelineContextClipMenu->addAction(actionCollection()->action("delete_item")); + m_timelineContextClipMenu->addSeparator(); m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip")); + m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio")); + m_timelineContextClipMenu->addSeparator(); m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); m_timelineContextClipMenu->addAction(actionCollection()->action("paste_effects")); - m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio")); + m_timelineContextClipMenu->addSeparator(); QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this)); m_timelineContextClipMenu->addMenu(markersMenu); + m_timelineContextClipMenu->addSeparator(); m_timelineContextClipMenu->addMenu(m_transitionsMenu); m_timelineContextClipMenu->addMenu(m_videoEffectsMenu); m_timelineContextClipMenu->addMenu(m_audioEffectsMenu); - //TODO: re-enable custom effects menu when it is implemented m_timelineContextClipMenu->addMenu(m_customEffectsMenu); m_timelineContextTransitionMenu->addAction(actionCollection()->action("edit_item_duration")); @@ -383,15 +509,13 @@ 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())); m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor); slotConnectMonitors(); - // Disable drop B frames, see Kdenlive issue #1330, see also kdenlivesettingsdialog.cpp - KdenliveSettings::setDropbframes(false); - // Open or create a file. Command line argument passed in Url has // precedence, then "openlastproject", then just a plain empty file. // If opening Url fails, openlastproject will _not_ be used. @@ -405,28 +529,50 @@ 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(); + + actionCollection()->addAssociatedWidget(m_clipMonitor->container()); + actionCollection()->addAssociatedWidget(m_projectMonitor->container()); +} + +MainWindow::~MainWindow() +{ + if (m_stopmotion) { + delete m_stopmotion; + } + m_effectStack->slotClipItemSelected(NULL, 0); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + + if (m_projectMonitor) m_projectMonitor->stop(); + if (m_clipMonitor) m_clipMonitor->stop(); + + delete m_activeTimeline; + delete m_effectStack; + delete m_transitionConfig; + delete m_activeDocument; + delete m_projectMonitor; + delete m_clipMonitor; + delete m_shortcutRemoveFocus; + Mlt::Factory::close(); } void MainWindow::queryQuit() { 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(); + close(); } } @@ -452,10 +598,17 @@ bool MainWindow::queryClose() saveOptions(); if (m_monitorManager) m_monitorManager->stopActiveMonitor(); // 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())) { - switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { + 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(); @@ -470,29 +623,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) @@ -509,7 +669,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); @@ -564,17 +724,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); @@ -643,7 +802,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()) { @@ -651,7 +810,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) @@ -684,6 +846,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))); } @@ -720,8 +884,12 @@ 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 @@ -855,7 +1023,7 @@ void MainWindow::setupActions() toolbar->addSeparator(); - //create automatic audio split button + //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); @@ -947,13 +1115,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); @@ -972,6 +1137,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); @@ -990,6 +1159,11 @@ void MainWindow::setupActions() collection->addAction("monitor_loop_zone", m_loopZone); connect(m_loopZone, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotLoopZone())); + m_loopClip = new KAction(KIcon("media-playback-start"), i18n("Loop selected clip"), this); + m_loopClip->setEnabled(false); + collection->addAction("monitor_loop_clip", m_loopClip); + connect(m_loopClip, SIGNAL(triggered(bool)), m_projectMonitor, SLOT(slotLoopClip())); + KAction *dvdWizard = new KAction(KIcon("media-optical"), i18n("DVD Wizard"), this); collection->addAction("dvd_wizard", dvdWizard); connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard())); @@ -1013,6 +1187,11 @@ void MainWindow::setupActions() switchMon->setShortcut(Qt::Key_T); connect(switchMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchMonitors())); + KAction *fullMon = collection->addAction("monitor_fullscreen"); + fullMon->setText(i18n("Switch monitor fullscreen")); + fullMon->setIcon(KIcon("view-fullscreen")); + connect(fullMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchFullscreen())); + KAction *insertTree = collection->addAction("insert_project_tree"); insertTree->setText(i18n("Insert zone in project tree")); insertTree->setShortcut(Qt::CTRL + Qt::Key_I); @@ -1142,7 +1321,7 @@ void MainWindow::setupActions() /*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); @@ -1199,6 +1378,11 @@ void MainWindow::setupActions() collection->addAction("edit_clip_marker", editClipMarker); connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker())); + KAction *addMarkerGuideQuickly = new KAction(KIcon("bookmark-new"), i18n("Add Marker/Guide quickly"), this); + addMarkerGuideQuickly->setShortcut(Qt::Key_Asterisk); + collection->addAction("add_marker_guide_quickly", addMarkerGuideQuickly); + connect(addMarkerGuideQuickly, SIGNAL(triggered(bool)), this, SLOT(slotAddMarkerGuideQuickly())); + KAction* splitAudio = new KAction(KIcon("document-new"), i18n("Split Audio"), this); collection->addAction("split_audio", splitAudio); connect(splitAudio, SIGNAL(triggered(bool)), this, SLOT(slotSplitAudio())); @@ -1279,32 +1463,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); @@ -1314,8 +1494,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*)), @@ -1370,6 +1548,10 @@ void MainWindow::setupActions() connect(reloadClip , SIGNAL(triggered()), m_projectList, SLOT(slotReloadClip())); reloadClip->setEnabled(false); + QAction *stopMotion = new KAction(KIcon("image-x-generic"), i18n("Stop Motion Capture"), this); + collection->addAction("stopmotion", stopMotion); + connect(stopMotion , SIGNAL(triggered()), this, SLOT(slotOpenStopmotion())); + QMenu *addClips = new QMenu(); addClips->addAction(addClip); addClips->addAction(addColorClip); @@ -1385,38 +1567,48 @@ void MainWindow::setupActions() 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); - collection->addAction("video_effect_" + effectInfo.at(0), m_videoEffects[i]); + 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); - collection->addAction("audio_effect_" + effectInfo.at(0), m_audioEffects[i]); + 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); - collection->addAction("custom_effect_" + effectInfo.at(0), m_customEffects[i]); + 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); - collection->addAction("transition_" + effectInfo.at(0), m_transitions[i]); + transitionActions->addAction("transition_" + effectInfo.at(0), m_transitions[i]); } + m_effectsActionCollection->readSettings(); //connect(collection, SIGNAL( clearStatusText() ), //statusBar(), SLOT( clear() ) ); @@ -1427,6 +1619,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(); @@ -1488,21 +1745,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(); @@ -1510,7 +1773,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); @@ -1525,7 +1788,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); } @@ -1539,10 +1803,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; @@ -1550,13 +1814,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; @@ -1573,26 +1842,24 @@ 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) { QString currentSceneList; m_monitorManager->stopActiveMonitor(); - if (KdenliveSettings::dropbframes()) { - KdenliveSettings::setDropbframes(false); - m_activeDocument->clipManager()->updatePreviewSettings(); - currentSceneList = m_projectMonitor->sceneList(); - KdenliveSettings::setDropbframes(true); - m_activeDocument->clipManager()->updatePreviewSettings(); - } else currentSceneList = m_projectMonitor->sceneList(); - - if (m_activeDocument->saveSceneList(outputFileName, currentSceneList) == false) + + if (m_activeDocument->saveSceneList(outputFileName, m_projectMonitor->sceneList()) == false) return false; // Save timeline thumbnails @@ -1612,11 +1879,13 @@ bool MainWindow::saveFileAs(const QString &outputFileName) bool MainWindow::saveFileAs() { - QString outputFile = KFileDialog::getSaveFileName(KUrl(), getMimeType()); - if (outputFile.isEmpty()) return false; + QString outputFile = KFileDialog::getSaveFileName(m_activeDocument->projectFolder(), getMimeType()); + if (outputFile.isEmpty()) { + return false; + } if (QFile::exists(outputFile)) { // Show the file dialog again if the user does not want to overwrite the file - if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) + if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", outputFile)) == KMessageBox::No) return saveFileAs(); } return saveFileAs(outputFile); @@ -1675,6 +1944,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()) { @@ -1686,13 +1957,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); @@ -1702,7 +1972,27 @@ 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); + + // Recreate stopmotion widget on document change + if (m_stopmotion) { + delete m_stopmotion; + m_stopmotion = NULL; + } + + KProgressDialog progressDialog(this, i18n("Loading project"), i18n("Loading project")); + progressDialog.setAllowCancel(false); + progressDialog.progressBar()->setMaximum(4); + progressDialog.show(); + progressDialog.progressBar()->setValue(0); + qApp->processEvents(); + + KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, m_notesWidget, this, &progressDialog); + + progressDialog.progressBar()->setValue(1); + progressDialog.progressBar()->setMaximum(4); + progressDialog.setLabelText(i18n("Loading project")); + qApp->processEvents(); + if (stale == NULL) { stale = new KAutoSaveFile(url, doc); doc->m_autosave = stale; @@ -1713,8 +2003,16 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) stale->setParent(doc); } connectDocumentInfo(doc); + + progressDialog.progressBar()->setValue(2); + qApp->processEvents(); + bool ok; TrackView *trackView = new TrackView(doc, &ok, this); + + progressDialog.progressBar()->setValue(3); + qApp->processEvents(); + m_timelineArea->setCurrentIndex(m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description())); if (!ok) { m_timelineArea->setEnabled(false); @@ -1733,12 +2031,13 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) m_projectMonitor->adjustRulerSize(trackView->duration()); m_projectMonitor->slotZoneMoved(trackView->inPoint(), trackView->outPoint()); m_clipMonitor->refreshMonitor(true); + + progressDialog.progressBar()->setValue(4); } void MainWindow::recoverFiles(QList staleFiles) { - if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); - foreach(KAutoSaveFile *stale, staleFiles) { + foreach(KAutoSaveFile * stale, staleFiles) { /*if (!stale->open(QIODevice::QIODevice::ReadOnly)) { // show an error message; we could not steal the lockfile // maybe another application got to the file before us? @@ -1760,9 +2059,8 @@ void MainWindow::parseProfiles(const QString &mltPath) KdenliveSettings::setRendererpath(mltPath + "/bin/melt"); } - if (KdenliveSettings::mltpath().isEmpty()) { + if (KdenliveSettings::mltpath().isEmpty()) KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/")); - } if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::rendererpath().endsWith("inigo")) { QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt"); @@ -1862,44 +2160,54 @@ void MainWindow::slotEditProjectSettings() if (w->exec() == QDialog::Accepted) { QString profile = w->selectedProfile(); m_activeDocument->setProjectFolder(w->selectedFolder()); - if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash)); +#ifndef Q_WS_MAC + m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); +#endif + if (m_renderWidget) m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs(); if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs(); - if (m_activeDocument->profilePath() != profile) { - // 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(); + + // Recreate the stopmotion widget if profile changes + if (m_stopmotion) { + delete m_stopmotion; + m_stopmotion = NULL; + } + + // Deselect current effect / transition + m_effectStack->slotClipItemSelected(NULL, 0); + m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); + m_clipMonitor->slotSetXml(NULL); + bool updateFps = m_activeDocument->setProfilePath(profile); + KdenliveSettings::setCurrent_profile(profile); + KdenliveSettings::setProject_fps(m_activeDocument->fps()); + setCaption(m_activeDocument->description(), m_activeDocument->isModified()); + + m_activeDocument->clipManager()->clearUnusedProducers(); + m_monitorManager->resetProfiles(m_activeDocument->timecode()); + m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); + m_effectStack->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode()); + m_projectList->updateProjectFormat(m_activeDocument->timecode()); + if (m_renderWidget) m_renderWidget->setProfile(m_activeDocument->mltProfile()); + m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); + //m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList()); + if (dar != m_activeDocument->dar()) m_projectList->reloadClipThumbnails(); + if (updateFps) m_activeTimeline->updateProjectFps(); + m_activeDocument->setModified(true); + m_commandStack->activeStack()->clear(); + //Update the mouse position display so it will display in DF/NDF format by default based on the project setting. + slotUpdateMousePosition(0); + // We need to desactivate & reactivate monitors to get a refresh + //m_monitorManager->switchMonitors(); +} + void MainWindow::slotRenderProject() { @@ -1907,7 +2215,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 &))); @@ -1915,31 +2223,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() @@ -1994,20 +2307,27 @@ 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())); disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); disconnect(m_activeDocument, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); - disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &))); + disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), this, SLOT(slotDeleteClip(const QString &))); disconnect(m_activeDocument, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &))); disconnect(m_activeDocument, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &))); disconnect(m_activeDocument, SIGNAL(deleteTimelineClip(const QString &)), m_activeTimeline, SLOT(slotDeleteClip(const QString &))); disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); + disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_projectMonitor, SLOT(slotSetSelectedClip(ClipItem*))); disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); + disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(Transition*))); disconnect(m_activeTimeline->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay())); disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int))); @@ -2016,12 +2336,13 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(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())); @@ -2034,7 +2355,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha } //m_activeDocument->setRenderer(NULL); disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); - disconnect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor())); + disconnect(m_projectList, SIGNAL(refreshClip()), m_monitorManager, SLOT(slotRefreshCurrentMonitor())); m_clipMonitor->stop(); } KdenliveSettings::setCurrent_profile(doc->profilePath()); @@ -2044,10 +2365,11 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), doc->tracksList()); m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode()); connect(m_projectList, SIGNAL(clipSelected(DocClipBase *, QPoint)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint))); - connect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor())); + connect(m_projectList, SIGNAL(refreshClip()), m_monitorManager, SLOT(slotRefreshCurrentMonitor())); connect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), trackView->projectView(), SLOT(slotUpdateClip(const QString &, bool))); connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified())); + connect(m_projectList, SIGNAL(updateProfile(const QString &)), this, SLOT(slotUpdateProjectProfile(const QString &))); connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString))); connect(m_projectList, SIGNAL(findInTimeline(const QString&)), this, SLOT(slotClipInTimeline(const QString&))); @@ -2059,25 +2381,30 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int))); connect(trackView, SIGNAL(updateTracksInfo()), this, SLOT(slotUpdateTrackInfo())); connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int))); + connect(trackView->projectView(), SIGNAL(forceClipProcessing(const QString &)), m_projectList, SLOT(slotForceProcessing(const QString &))); connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int))); connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint))); connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_projectList, SLOT(slotUpdateClipCut(QPoint))); + connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified())); + connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified())); connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView, SLOT(setDuration(int))); connect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), doc, SLOT(checkProjectClips())); connect(doc, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); connect(doc, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); - connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &))); + connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), this, SLOT(slotDeleteClip(const QString &))); connect(doc, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &))); connect(doc, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &))); connect(doc, SIGNAL(deleteTimelineClip(const QString &)), trackView, SLOT(slotDeleteClip(const QString &))); connect(doc, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); connect(doc, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated())); - + connect(m_notesWidget, SIGNAL(textChanged()), doc, SLOT(setModified())); connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); connect(trackView->projectView(), SIGNAL(updateClipMarkers(DocClipBase *)), this, SLOT(slotUpdateClipMarkers(DocClipBase*))); + connect(trackView, SIGNAL(showTrackEffects(int, TrackInfo)), m_effectStack, SLOT(slotTrackItemSelected(int, TrackInfo))); + connect(trackView, SIGNAL(showTrackEffects(int, TrackInfo)), this, SLOT(slotActivateEffectStackView())); connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); @@ -2091,16 +2418,20 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int))); connect(trackView->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay())); + connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_projectMonitor, SLOT(slotSetSelectedClip(ClipItem*))); + connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(Transition*))); - connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); - connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); - connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); - connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); + connect(m_effectStack, SIGNAL(updateEffect(ClipItem*, int, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, int, QDomElement, QDomElement, int))); + connect(m_effectStack, SIGNAL(updateClipRegion(ClipItem*, int, QString)), trackView->projectView(), SLOT(slotUpdateClipRegion(ClipItem*, int, QString))); + connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, int, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, int, QDomElement))); + connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, int, bool))); + connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int, int))); connect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*))); connect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); connect(m_transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); connect(m_effectStack, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int))); connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); + connect(m_effectStack, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); @@ -2116,7 +2447,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()); @@ -2133,7 +2464,9 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha m_activeDocument = doc; m_activeTimeline->updateProjectFps(); m_activeDocument->checkProjectClips(); - if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings(); +#ifndef Q_WS_MAC + m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); +#endif //Update the mouse position display so it will display in DF/NDF format by default based on the project setting. slotUpdateMousePosition(0); // set tool to select tool @@ -2148,14 +2481,26 @@ void MainWindow::slotZoneMoved(int start, int end) void MainWindow::slotGuidesUpdated() { - if (m_renderWidget) m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); + if (m_renderWidget) + m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); +} + +void MainWindow::slotEditKeys() +{ + KShortcutsDialog dialog(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this); + dialog.addCollection(actionCollection(), i18nc("general keyboard shortcuts", "General")); + dialog.addCollection(m_effectsActionCollection, i18nc("effects and transitions keyboard shortcuts", "Effects & Transitions")); + dialog.configure(); } void MainWindow::slotPreferences(int page, int option) { - //An instance of your dialog could be already created and could be - // cached, in which case you want to display the cached dialog - // instead of creating another one + /* + * An instance of your dialog could be already created and could be + * cached, in which case you want to display the cached dialog + * instead of creating another one + */ + if (m_stopmotion) m_stopmotion->slotLive(false); if (KConfigDialog::showDialog("settings")) { KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); if (page != -1) d->showPage(page, option); @@ -2168,21 +2513,20 @@ void MainWindow::slotPreferences(int page, int option) connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration())); //connect(dialog, SIGNAL(doResetProfile()), this, SLOT(slotDetectAudioDriver())); connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles())); - connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); #ifndef Q_WS_MAC - connect(dialog, SIGNAL(updateCaptureFolder()), m_recMonitor, SLOT(slotUpdateCaptureFolder())); + connect(dialog, SIGNAL(updateCaptureFolder()), this, SLOT(slotUpdateCaptureFolder())); #endif - //connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); dialog->show(); if (page != -1) dialog->showPage(page, option); } -void MainWindow::slotUpdatePreviewSettings() +void MainWindow::slotUpdateCaptureFolder() { - if (m_activeDocument) { - m_clipMonitor->slotSetXml(NULL); - m_activeDocument->updatePreviewSettings(); - } + +#ifndef Q_WS_MAC + if (m_activeDocument) m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); + else m_recMonitor->slotUpdateCaptureFolder(KdenliveSettings::defaultprojectfolder()); +#endif } void MainWindow::updateConfiguration() @@ -2192,10 +2536,12 @@ 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 @@ -2215,9 +2561,8 @@ void MainWindow::slotSwitchSplitAudio() void MainWindow::slotSwitchVideoThumbs() { KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails()); - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->slotUpdateAllThumbs(); - } m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); } @@ -2227,7 +2572,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()); } @@ -2235,9 +2581,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()); } @@ -2250,10 +2595,10 @@ void MainWindow::slotSwitchSnap() void MainWindow::slotDeleteItem() { - if (QApplication::focusWidget() - && QApplication::focusWidget()->parentWidget() - && QApplication::focusWidget()->parentWidget()->parentWidget() - && QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) { + if (QApplication::focusWidget() && + QApplication::focusWidget()->parentWidget() && + QApplication::focusWidget()->parentWidget()->parentWidget() && + QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) { m_projectList->slotRemoveClip(); } else { @@ -2274,7 +2619,8 @@ void MainWindow::slotDeleteItem() void MainWindow::slotUpdateClipMarkers(DocClipBase *clip) { - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); + if (m_clipMonitor->isActive()) + m_clipMonitor->checkOverlay(); m_clipMonitor->updateMarkers(clip); } @@ -2301,9 +2647,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() @@ -2395,6 +2740,26 @@ void MainWindow::slotEditClipMarker() } } +void MainWindow::slotAddMarkerGuideQuickly() +{ + if (!m_activeTimeline || !m_activeDocument) + return; + + if (m_clipMonitor->isActive()) { + DocClipBase *clip = m_clipMonitor->activeClip(); + GenTime pos = m_clipMonitor->position(); + + if (!clip) { + m_messageLabel->setMessage(i18n("Cannot find clip to add marker"), ErrorMessage); + return; + } + + m_activeTimeline->projectView()->slotAddClipMarker(clip->getId(), pos, m_activeDocument->timecode().getDisplayTimecode(pos, false)); + } else { + m_activeTimeline->projectView()->slotAddGuide(false); + } +} + void MainWindow::slotAddGuide() { if (m_activeTimeline) @@ -2460,9 +2825,8 @@ void MainWindow::slotDeleteAllGuides() void MainWindow::slotCutTimelineClip() { - if (m_activeTimeline) { + if (m_activeTimeline) m_activeTimeline->projectView()->cutSelectedClips(); - } } void MainWindow::slotInsertClipOverwrite() @@ -2475,65 +2839,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) @@ -2594,13 +2949,15 @@ void MainWindow::slotZoomOut() 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); @@ -2633,10 +2990,12 @@ 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); @@ -2725,18 +3084,25 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) //m_activeDocument->editTextClip(clip->getProperty("xml"), clip->getId()); return; } - ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this); - connect(&dia, SIGNAL(addMarker(const QString &, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, GenTime, QString))); - if (dia.exec() == QDialog::Accepted) { - QMap newprops = dia.properties(); - if (newprops.isEmpty()) return; - EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); - m_activeDocument->commandStack()->push(command); - if (dia.needsTimelineRefresh()) { - // update clip occurences in timeline - m_activeTimeline->projectView()->slotUpdateClip(clip->getId(), dia.needsTimelineReload()); - } + // any type of clip but a title + ClipProperties *dia = new ClipProperties(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this); + connect(dia, SIGNAL(addMarker(const QString &, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, GenTime, QString))); + connect(dia, SIGNAL(applyNewClipProperties(const QString, QMap , QMap , bool, bool)), this, SLOT(slotApplyNewClipProperties(const QString, QMap , QMap , bool, bool))); + dia->show(); +} + + +void MainWindow::slotApplyNewClipProperties(const QString id, QMap props, QMap newprops, bool refresh, bool reload) +{ + if (newprops.isEmpty()) return; + EditClipCommand *command = new EditClipCommand(m_projectList, id, props, newprops, true); + m_activeDocument->commandStack()->push(command); + m_activeDocument->setModified(); + + if (refresh) { + // update clip occurences in timeline + m_activeTimeline->projectView()->slotUpdateClip(id, reload); } } @@ -2752,17 +3118,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() { @@ -2771,7 +3135,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() @@ -2779,7 +3144,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() @@ -2787,7 +3154,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() @@ -2808,29 +3177,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) @@ -2856,20 +3237,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() @@ -2886,11 +3267,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); } @@ -2938,7 +3318,6 @@ void MainWindow::slotClipInTimeline(const QString &clipId) j++; } actionList.insert(j, a); - } inTimelineMenu->addActions(actionList); @@ -2953,11 +3332,11 @@ 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(); } @@ -2966,10 +3345,10 @@ void MainWindow::slotClipInProjectTree() /*void MainWindow::slotClipToProjectTree() { if (m_activeTimeline) { - const QList clips = m_activeTimeline->projectView()->selectedClipItems(); + 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->slotAddXmlClip(clips.at(i)->itemXml()); } //m_projectList->selectItemById(clipIds.at(i)); } @@ -2990,11 +3369,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(); @@ -3012,16 +3390,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*/) { - if (isMinimized()) - if (m_monitorManager) - m_monitorManager->stopActiveMonitor(); + if (isMinimized() && m_monitorManager) + m_monitorManager->stopActiveMonitor(); } bool MainWindow::eventFilter(QObject *obj, QEvent *event) @@ -3032,7 +3411,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); @@ -3051,8 +3432,7 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone) QVBoxLayout *vbox = new QVBoxLayout(widget); QLabel *label1 = new QLabel(i18n("Save clip zone as:"), this); - QString path = m_activeDocument->projectFolder().path(); - path.append("/"); + QString path = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash); path.append("untitled.mlt"); KUrlRequester *url = new KUrlRequester(KUrl(path), this); url->setFilter("video/mlt-playlist"); @@ -3062,34 +3442,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) @@ -3099,7 +3484,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(); } @@ -3107,7 +3492,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(); } @@ -3148,12 +3533,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) @@ -3193,9 +3580,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 { @@ -3219,9 +3605,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())); } } @@ -3257,13 +3642,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); } @@ -3275,7 +3661,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS QString playlistPath; if (scriptExport) { bool ok; - QString scriptsFolder = m_activeDocument->projectFolder().path() + "/scripts/"; + QString scriptsFolder = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) + "scripts/"; QString path = m_renderWidget->getFreeScriptName(); scriptPath = QInputDialog::getText(this, i18n("Create Render Script"), i18n("Script name (will be saved in: %1)", scriptsFolder), QLineEdit::Normal, KUrl(path).fileName(), &ok); if (!ok || scriptPath.isEmpty()) return; @@ -3346,8 +3732,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) @@ -3371,8 +3760,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); } @@ -3415,16 +3804,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); } } - m_activeTimeline->projectView()->updatePalette(); + if (m_activeTimeline) { + m_activeTimeline->projectView()->updatePalette(); + } } @@ -3475,6 +3866,12 @@ void MainWindow::slotSwitchMonitors() else m_projectList->focusTree(); } +void MainWindow::slotSwitchFullscreen() +{ + if (m_projectMonitor->isActive()) m_projectMonitor->slotSwitchFullScreen(); + else m_clipMonitor->slotSwitchFullScreen(); +} + void MainWindow::slotInsertZoneToTree() { if (!m_clipMonitor->isActive() || m_clipMonitor->activeClip() == NULL) return; @@ -3506,28 +3903,16 @@ void MainWindow::slotDeleteProjectClips(QStringList ids, QMap void MainWindow::slotShowTitleBars(bool show) { - if (show) { - m_effectStackDock->setTitleBarWidget(0); - m_clipMonitorDock->setTitleBarWidget(0); - m_projectMonitorDock->setTitleBarWidget(0); -#ifndef Q_WS_MAC - m_recMonitorDock->setTitleBarWidget(0); -#endif - m_effectListDock->setTitleBarWidget(0); - m_transitionConfigDock->setTitleBarWidget(0); - m_projectListDock->setTitleBarWidget(0); - m_undoViewDock->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)); -#ifndef Q_WS_MAC - if (!m_recMonitorDock->isFloating()) m_recMonitorDock->setTitleBarWidget(new QWidget(this)); -#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)); + QList docks = findChildren(); + for (int i = 0; i < docks.count(); i++) { + QDockWidget* dock = docks.at(i); + if (show) { + dock->setTitleBarWidget(0); + } else { + if (!dock->isFloating()) { + dock->setTitleBarWidget(new QWidget); + } + } } KdenliveSettings::setShowtitlebars(show); } @@ -3545,5 +3930,82 @@ QString MainWindow::getMimeType() return mimetype; } +void MainWindow::slotMonitorRequestRenderFrame(bool request) +{ + if (request) { + m_projectMonitor->render->sendFrameForAnalysis = true; + return; + } else { + for (int i = 0; i < m_scopesList.count(); i++) { + if (m_scopesList.at(i)->isVisible() && tabifiedDockWidgets(m_scopesList.at(i)).isEmpty() && static_cast(m_scopesList.at(i)->widget())->autoRefreshEnabled()) { + request = true; + break; + } + } + } + if (!request) { + m_projectMonitor->render->sendFrameForAnalysis = false; + } +} + +void MainWindow::slotUpdateScopeFrameRequest() +{ + // We need a delay to make sure widgets are hidden after a close event for example + QTimer::singleShot(500, this, SLOT(slotDoUpdateScopeFrameRequest())); +} + +void MainWindow::slotDoUpdateScopeFrameRequest() +{ + // Check scopes + bool request = false; + for (int i = 0; i < m_scopesList.count(); i++) { + if (!m_scopesList.at(i)->widget()->visibleRegion().isEmpty() && static_cast(m_scopesList.at(i)->widget())->autoRefreshEnabled()) { + kDebug() << "SCOPE VISIBLE: " << static_cast(m_scopesList.at(i)->widget())->widgetName(); + request = true; + break; + } + } + if (!request) { + if (!m_projectMonitor->effectSceneDisplayed()) + m_projectMonitor->render->sendFrameForAnalysis = false; + m_clipMonitor->render->sendFrameForAnalysis = false; + } else { + m_projectMonitor->render->sendFrameForAnalysis = true; + m_clipMonitor->render->sendFrameForAnalysis = true; + } +} + +void MainWindow::slotUpdateColorScopes() +{ + bool request = false; + for (int i = 0; i < m_scopesList.count(); i++) { + // Check if we need the renderer to send a new frame for update + if (!m_scopesList.at(i)->widget()->visibleRegion().isEmpty() && !(static_cast(m_scopesList.at(i)->widget())->autoRefreshEnabled())) request = true; + static_cast(m_scopesList.at(i)->widget())->slotActiveMonitorChanged(m_clipMonitor->isActive()); + } + if (request) { + if (m_clipMonitor->isActive()) m_clipMonitor->render->sendFrameUpdate(); + else m_projectMonitor->render->sendFrameUpdate(); + } +} + +void MainWindow::slotOpenStopmotion() +{ + if (m_stopmotion == NULL) { + m_stopmotion = new StopmotionWidget(m_activeDocument->projectFolder(), m_stopmotion_actions->actions(), this); + connect(m_stopmotion, SIGNAL(addOrUpdateSequence(const QString)), m_projectList, SLOT(slotAddOrUpdateSequence(const QString))); + } + m_stopmotion->show(); +} + +void MainWindow::slotDeleteClip(const QString &id) +{ + QList list = findChildren(); + for (int i = 0; i < list.size(); ++i) { + list.at(i)->disableClipId(id); + } + m_projectList->slotDeleteClip(id); +} + #include "mainwindow.moc"