X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=89039b27dd7f3ea0b4235754cb7d3f9ea42dee35;hb=f555964fc8fd3452f2aa6d8217d20e2aa4013334;hp=a02d12a4a74660d1472e093a774d01d52e7e034d;hpb=4ea740d89bef3af2870a2578f252f889be897516;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index a02d12a4..ad1cf6e8 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -35,33 +35,37 @@ #include "trackview.h" #include "customtrackview.h" #include "effectslistview.h" -#include "effectstackview.h" +#include "effectstack/effectstackview2.h" #include "transitionsettings.h" #include "renderwidget.h" #include "renderer.h" -#include "audiosignal.h" -#ifndef NO_JOGSHUTTLE +#ifdef USE_JOGSHUTTLE #include "jogshuttle.h" #include "jogaction.h" #include "jogshuttleconfig.h" -#endif /* NO_JOGSHUTTLE */ +#endif #include "clipproperties.h" #include "wizard.h" -#include "editclipcommand.h" +#include "commands/editclipcommand.h" #include "titlewidget.h" #include "markerdialog.h" #include "clipitem.h" #include "interfaces.h" -#include "kdenlive-config.h" +#include "config-kdenlive.h" #include "cliptranscode.h" #include "ui_templateclip_ui.h" -#include "colorscopes/vectorscope.h" -#include "colorscopes/waveform.h" -#include "colorscopes/rgbparade.h" -#include "colorscopes/histogram.h" -#include "audiospectrum.h" -#include "spectrogram.h" +#include "scopes/scopemanager.h" +#include "scopes/colorscopes/vectorscope.h" +#include "scopes/colorscopes/waveform.h" +#include "scopes/colorscopes/rgbparade.h" +#include "scopes/colorscopes/histogram.h" +#include "scopes/audioscopes/audiosignal.h" +#include "scopes/audioscopes/audiospectrum.h" +#include "scopes/audioscopes/spectrogram.h" #include "archivewidget.h" +#include "databackup/backupwidget.h" +#include "utils/resourcewidget.h" + #include #include @@ -86,7 +90,6 @@ #include #include #include -#include #include #include #include @@ -98,7 +101,7 @@ #include #include #define KNS3 KNS -#endif /* KDE_IS_VERSION(4,3,80) */ +#endif #include #include #include @@ -112,6 +115,7 @@ #include #include +#include // Uncomment for deeper debugging //#define DEBUG_MAINW @@ -130,30 +134,57 @@ class Producer; Q_DECLARE_METATYPE(QVector) + EffectsList MainWindow::videoEffects; EffectsList MainWindow::audioEffects; EffectsList MainWindow::customEffects; EffectsList MainWindow::transitions; +QMap MainWindow::m_lumacache; + MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & clipsToLoad, QWidget *parent) : KXmlGuiWindow(parent), m_activeDocument(NULL), m_activeTimeline(NULL), + m_projectList(NULL), + m_effectList(NULL), + m_effectStack(NULL), + m_clipMonitor(NULL), + m_projectMonitor(NULL), + m_recMonitor(NULL), m_renderWidget(NULL), -#ifndef NO_JOGSHUTTLE +#ifdef USE_JOGSHUTTLE m_jogProcess(NULL), m_jogShuttle(NULL), -#endif /* NO_JOGSHUTTLE */ +#endif m_findActivated(false), m_stopmotion(NULL) { qRegisterMetaType > (); + qRegisterMetaType ("stringMap"); + qRegisterMetaType ("audioByteArray"); + + // Init locale + QLocale systemLocale = QLocale(); + setlocale(LC_NUMERIC, NULL); + char *separator = localeconv()->decimal_point; + if (separator != systemLocale.decimalPoint()) { + kDebug()<<"------\n!!! system locale is not similar to Qt's locale... be prepared for bugs!!!\n------"; + // HACK: There is a locale conflict, so set locale to C + // Make sure to override exported values or it won't work + setenv("LANG", "C", 1); + setlocale(LC_NUMERIC, "C"); + systemLocale = QLocale::c(); + } + + systemLocale.setNumberOptions(QLocale::OmitGroupSeparator); + QLocale::setDefault(systemLocale); + // Create DBus interface new MainWindowAdaptor(this); QDBusConnection dbus = QDBusConnection::sessionBus(); dbus.registerObject("/MainWindow", this); - setlocale(LC_NUMERIC, "POSIX"); if (!KdenliveSettings::colortheme().isEmpty()) slotChangePalette(NULL, KdenliveSettings::colortheme()); setFont(KGlobalSettings::toolBarFont()); parseProfiles(MltPath); @@ -172,7 +203,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & closeTabButton->adjustSize(); closeTabButton->setToolTip(i18n("Close the current tab")); m_timelineArea->setCornerWidget(closeTabButton); - connect(m_timelineArea, SIGNAL(currentChanged(int)), this, SLOT(activateDocument())); + //connect(m_timelineArea, SIGNAL(currentChanged(int)), this, SLOT(activateDocument())); connect(&m_findTimer, SIGNAL(timeout()), this, SLOT(findTimeout())); m_findTimer.setSingleShot(true); @@ -180,7 +211,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & // FIXME: the next call returns a newly allocated object, which leaks initEffects::parseEffectFiles(); //initEffects::parseCustomEffectsFile(); - + m_monitorManager = new MonitorManager(); m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this); @@ -197,29 +228,45 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); m_clipMonitorDock->setObjectName("clip_monitor"); - m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), m_timelineArea); + m_clipMonitor = new Monitor(Kdenlive::clipMonitor, m_monitorManager, QString(), m_timelineArea); m_clipMonitorDock->setWidget(m_clipMonitor); + // Connect the project list + connect(m_projectList, SIGNAL(clipSelected(DocClipBase *, QPoint, bool)), m_clipMonitor, SLOT(slotSetClipProducer(DocClipBase *, QPoint, bool))); + connect(m_projectList, SIGNAL(raiseClipMonitor()), m_clipMonitor, SLOT(slotActivateMonitor())); + connect(m_projectList, SIGNAL(loadingIsOver()), this, SLOT(slotElapsedTime())); + connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); + connect(m_projectList, SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus())); + connect(m_projectList, SIGNAL(clipNeedsReload(const QString&)),this, SLOT(slotUpdateClip(const QString &))); + connect(m_projectList, SIGNAL(updateProfile(const QString &)), this, SLOT(slotUpdateProjectProfile(const QString &))); + connect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), m_monitorManager, SLOT(slotRefreshCurrentMonitor(const QString &))); + connect(m_projectList, SIGNAL(findInTimeline(const QString&)), this, SLOT(slotClipInTimeline(const QString&))); + connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_projectList, SLOT(slotUpdateClipCut(QPoint))); + connect(m_clipMonitor, SIGNAL(extractZone(const QString &, QPoint)), m_projectList, SLOT(slotCutClipJob(const QString &, QPoint))); + m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); m_projectMonitorDock->setObjectName("project_monitor"); - m_projectMonitor = new Monitor("project", m_monitorManager, QString()); + m_projectMonitor = new Monitor(Kdenlive::projectMonitor, m_monitorManager, QString()); m_projectMonitorDock->setWidget(m_projectMonitor); #ifndef Q_WS_MAC m_recMonitorDock = new QDockWidget(i18n("Record Monitor"), this); m_recMonitorDock->setObjectName("record_monitor"); - m_recMonitor = new RecMonitor("record"); + m_recMonitor = new RecMonitor(Kdenlive::recordMonitor, m_monitorManager); m_recMonitorDock->setWidget(m_recMonitor); connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); + connect(m_recMonitor, SIGNAL(addProjectClipList(KUrl::List)), this, SLOT(slotAddProjectClipList(KUrl::List))); connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int))); -#endif + +#endif /* ! Q_WS_MAC */ + m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor, m_recMonitor); m_notesDock = new QDockWidget(i18n("Project Notes"), this); m_notesDock->setObjectName("notes_widget"); m_notesWidget = new NotesWidget(); connect(m_notesWidget, SIGNAL(insertNotesTimecode()), this, SLOT(slotInsertNotesTimecode())); connect(m_notesWidget, SIGNAL(seekProject(int)), m_projectMonitor->render, SLOT(seekToFrame(int))); - + m_notesWidget->setTabChangesFocus(true); #if KDE_IS_VERSION(4,4,0) m_notesWidget->setClickMessage(i18n("Enter your project notes here ...")); @@ -229,9 +276,10 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this); m_effectStackDock->setObjectName("effect_stack"); - m_effectStack = new EffectStackView(m_projectMonitor); + m_effectStack = new EffectStackView2(m_projectMonitor); m_effectStackDock->setWidget(m_effectStack); addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock); + connect(m_effectStack, SIGNAL(startFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QString&,const QString&)), m_projectList, SLOT(slotStartFilterJob(ItemInfo, const QString&,const QString&,const QString&,const QString&,const QString&,const QString&,const QString&))); m_transitionConfigDock = new QDockWidget(i18n("Transition"), this); m_transitionConfigDock->setObjectName("transition"); @@ -245,97 +293,55 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_effectListDock->setWidget(m_effectList); addDockWidget(Qt::TopDockWidgetArea, m_effectListDock); - m_vectorscope = new Vectorscope(m_projectMonitor, m_clipMonitor); + m_scopeManager = new ScopeManager(m_monitorManager); + m_vectorscope = new Vectorscope(); 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(slotUpdateGfxScopeFrameRequest())); - connect(m_vectorscope, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateGfxScopeFrameRequest())); - m_gfxScopesList.append(m_vectorscopeDock); + m_scopeManager->addScope(m_vectorscope, m_vectorscopeDock); - m_waveform = new Waveform(m_projectMonitor, m_clipMonitor); + m_waveform = new Waveform(); 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(slotUpdateGfxScopeFrameRequest())); - connect(m_waveform, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateGfxScopeFrameRequest())); - m_gfxScopesList.append(m_waveformDock); + m_scopeManager->addScope(m_waveform, m_waveformDock); - m_RGBParade = new RGBParade(m_projectMonitor, m_clipMonitor); + m_RGBParade = new RGBParade(); 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(slotUpdateGfxScopeFrameRequest())); - connect(m_RGBParade, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateGfxScopeFrameRequest())); - m_gfxScopesList.append(m_RGBParadeDock); + m_scopeManager->addScope(m_RGBParade, m_RGBParadeDock); - m_histogram = new Histogram(m_projectMonitor, m_clipMonitor); + m_histogram = new Histogram(); 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(slotUpdateGfxScopeFrameRequest())); - connect(m_histogram, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateGfxScopeFrameRequest())); - m_gfxScopesList.append(m_histogramDock); - + m_scopeManager->addScope(m_histogram, m_histogramDock); m_audiosignal = new AudioSignal; m_audiosignalDock = new QDockWidget(i18n("Audio Signal"), this); m_audiosignalDock->setObjectName("audiosignal"); m_audiosignalDock->setWidget(m_audiosignal); addDockWidget(Qt::TopDockWidgetArea, m_audiosignalDock); - connect(m_audiosignalDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest())); - connect(m_audiosignal, SIGNAL(updateAudioMonitoring()), this, SLOT(slotUpdateAudioScopeFrameRequest())); + m_scopeManager->addScope(m_audiosignal, m_audiosignalDock); m_audioSpectrum = new AudioSpectrum(); m_audioSpectrumDock = new QDockWidget(i18n("AudioSpectrum"), this); m_audioSpectrumDock->setObjectName(m_audioSpectrum->widgetName()); m_audioSpectrumDock->setWidget(m_audioSpectrum); addDockWidget(Qt::TopDockWidgetArea, m_audioSpectrumDock); - m_audioScopesList.append(m_audioSpectrum); - connect(m_audioSpectrumDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest())); - connect(m_audioSpectrum, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest())); + m_scopeManager->addScope(m_audioSpectrum, m_audioSpectrumDock); m_spectrogram = new Spectrogram(); m_spectrogramDock = new QDockWidget(i18n("Spectrogram"), this); m_spectrogramDock->setObjectName(m_spectrogram->widgetName()); m_spectrogramDock->setWidget(m_spectrogram); addDockWidget(Qt::TopDockWidgetArea, m_spectrogramDock); - m_audioScopesList.append(m_spectrogram); - connect(m_audioSpectrumDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest())); - connect(m_audioSpectrum, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest())); - - // Connect the audio signal to the audio scope slots - bool b = true; - if (m_projectMonitor) { - qDebug() << "project monitor connected"; - b &= connect(m_projectMonitor->render, SIGNAL(audioSamplesSignal(QVector, int, int, int)), - m_audioSpectrum, SLOT(slotReceiveAudio(QVector, int, int, int))); - b &= connect(m_projectMonitor->render, SIGNAL(audioSamplesSignal(const QVector&, const int&, const int&, const int&)), - m_audiosignal, SLOT(slotReceiveAudio(const QVector&, const int&, const int&, const int&))); - b &= connect(m_projectMonitor->render, SIGNAL(audioSamplesSignal(QVector,int,int,int)), - m_spectrogram, SLOT(slotReceiveAudio(QVector,int,int,int))); - } - if (m_clipMonitor) { - qDebug() << "clip monitor connected"; - b &= connect(m_clipMonitor->render, SIGNAL(audioSamplesSignal(QVector, int, int, int)), - m_audioSpectrum, SLOT(slotReceiveAudio(QVector, int, int, int))); - b &= connect(m_clipMonitor->render, SIGNAL(audioSamplesSignal(const QVector&, int, int, int)), - m_audiosignal, SLOT(slotReceiveAudio(const QVector&, int, int, int))); - b &= connect(m_clipMonitor->render, SIGNAL(audioSamplesSignal(QVector,int,int,int)), - m_spectrogram, SLOT(slotReceiveAudio(QVector,int,int,int))); - } - // Ensure connections were set up correctly - Q_ASSERT(b); - - + m_scopeManager->addScope(m_spectrogram, m_spectrogramDock); // Add monitors here to keep them at the right of the window addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock); @@ -355,6 +361,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & setupActions(); + connect(m_commandStack, SIGNAL(cleanChanged(bool)), m_saveAction, SLOT(setDisabled(bool))); // Close non-general docks for the initial layout @@ -381,13 +388,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & #ifndef Q_WS_MAC tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock); #endif - - - - setCentralWidget(m_timelineArea); - m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection()); readOptions(); m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection()); @@ -397,14 +399,15 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & KActionCategory *layoutActions = new KActionCategory(i18n("Layouts"), actionCollection()); m_loadLayout = new KSelectAction(i18n("Load Layout"), actionCollection()); for (int i = 1; i < 5; i++) { - KAction *load = new KAction(KIcon(), i18n("Layout %1").arg(i), this); - load->setData("_" + QString::number(i)); + KAction *load = new KAction(KIcon(), i18n("Layout %1", i), this); + load->setData('_' + QString::number(i)); layoutActions->addAction("load_layout" + QString::number(i), load); m_loadLayout->addAction(load); - KAction *save = new KAction(KIcon(), i18n("Save As Layout %1").arg(i), this); - save->setData("_" + QString::number(i)); + KAction *save = new KAction(KIcon(), i18n("Save As Layout %1", i), this); + save->setData('_' + QString::number(i)); layoutActions->addAction("save_layout" + QString::number(i), save); } + // Required to enable user to add the load layout action to toolbar layoutActions->addAction("load_layouts", m_loadLayout); connect(m_loadLayout, SIGNAL(triggered(QAction*)), this, SLOT(slotLoadLayout(QAction*))); @@ -427,7 +430,10 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_effectActions = new KActionCategory(i18n("Effects"), actionCollection()); m_effectList->reloadEffectList(m_effectsMenu, m_effectActions); m_effectsActionCollection->readSettings(); - + + // Populate View menu with show / hide actions for dock widgets + KActionCategory *guiActions = new KActionCategory(i18n("Interface"), actionCollection()); + setupGUI(); // Find QDockWidget tab bars and show / hide widget title bars on right click @@ -439,6 +445,9 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & /*ScriptingPart* sp = new ScriptingPart(this, QStringList()); guiFactory()->addClient(sp);*/ + QMenu *trackMenu = (QMenu*)(factory()->container("track_menu", this)); + if (trackMenu) trackMenu->addActions(m_tracksActionCollection->actions()); + QMenu *saveLayout = (QMenu*)(factory()->container("layout_save_as", this)); if (saveLayout) @@ -450,15 +459,20 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & loadPlugins(); loadTranscoders(); + loadStabilize(); 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)); clipInTimeline->setIcon(KIcon("go-jump")); - m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this)), - static_cast(factory()->container("transcoders", this)), - clipInTimeline); + QHash menus; + menus.insert("addMenu",static_cast(factory()->container("generators", this))); + menus.insert("extractAudioMenu",static_cast(factory()->container("extract_audio", this))); + menus.insert("transcodeMenu",static_cast(factory()->container("transcoders", this))); + menus.insert("stabilizeMenu",static_cast(factory()->container("stabilize", this))); + menus.insert("inTimelineMenu",clipInTimeline); + m_projectList->setupGeneratorMenu(menus); // build themes menus QMenu *themesMenu = static_cast(factory()->container("themes_menu", this)); @@ -516,13 +530,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & connect(m, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *))); connect(m_effectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *))); - connect(m_transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *))); - - m_effectStack->setMenu(m_effectsMenu); - - QMenu *viewMenu = static_cast(factory()->container("dockwindows", this)); - const QList viewActions = createPopupMenu()->actions(); - viewMenu->insertActions(NULL, viewActions); + connect(m_transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *))); m_timelineContextMenu = new QMenu(this); m_timelineContextClipMenu = new QMenu(this); @@ -534,12 +542,13 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_timelineContextClipMenu->addAction(actionCollection()->action("clip_in_project_tree")); //m_timelineContextClipMenu->addAction(actionCollection()->action("clip_to_project_tree")); - m_timelineContextClipMenu->addAction(actionCollection()->action("edit_item_duration")); m_timelineContextClipMenu->addAction(actionCollection()->action("delete_item")); m_timelineContextClipMenu->addSeparator(); m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio")); + m_timelineContextClipMenu->addAction(actionCollection()->action("set_audio_align_ref")); + m_timelineContextClipMenu->addAction(actionCollection()->action("align_audio")); m_timelineContextClipMenu->addSeparator(); m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); @@ -552,7 +561,6 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & m_timelineContextClipMenu->addMenu(m_transitionsMenu); m_timelineContextClipMenu->addMenu(m_effectsMenu); - m_timelineContextTransitionMenu->addAction(actionCollection()->action("edit_item_duration")); m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_item")); m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); @@ -560,13 +568,9 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & connect(m_projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool))); connect(m_clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); - //connect(m_monitorManager, SIGNAL(connectMonitors()), this, SLOT(slotConnectMonitors())); - connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), this, SLOT(slotRaiseMonitor(bool))); - connect(m_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(); // Open or create a file. Command line argument passed in Url has @@ -585,20 +589,85 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & if (!clipsToLoad.isEmpty() && m_activeDocument) { QStringList list = clipsToLoad.split(','); QList urls; - foreach(QString path, list) { + foreach(const QString &path, list) { kDebug() << QDir::current().absoluteFilePath(path); urls << QUrl::fromLocalFile(QDir::current().absoluteFilePath(path)); } m_projectList->slotAddClip(urls); } -#ifndef NO_JOGSHUTTLE +#ifdef USE_JOGSHUTTLE activateShuttleDevice(); -#endif /* NO_JOGSHUTTLE */ +#endif m_projectListDock->raise(); actionCollection()->addAssociatedWidget(m_clipMonitor->container()); actionCollection()->addAssociatedWidget(m_projectMonitor->container()); + + QMap viewActions; + KAction *showTimeline = new KAction(i18n("Timeline"), this); + showTimeline->setCheckable(true); + showTimeline->setChecked(true); + connect(showTimeline, SIGNAL(triggered(bool)), this, SLOT(slotShowTimeline(bool))); + viewActions.insert(showTimeline->text(), showTimeline); + + QList docks = findChildren(); + for (int i = 0; i < docks.count(); i++) { + QDockWidget* dock = docks.at(i); + KAction* dockInformations = new KAction(this); + dockInformations->setText(dock->windowTitle()); + dockInformations->setCheckable(true); + dockInformations->setChecked(!dock->isHidden()); + connect(dockInformations,SIGNAL(toggled(bool)), dock, SLOT(setVisible(bool))); + viewActions.insert(dockInformations->text(), dockInformations); + } + + + KMenu *viewMenu = static_cast(factory()->container("dockwindows", this)); + //const QList viewActions = createPopupMenu()->actions(); + QMap::const_iterator i = viewActions.constBegin(); + while (i != viewActions.constEnd()) { + viewMenu->addAction(guiActions->addAction(i.key(), i.value())); + ++i; + } + + // Populate encoding profiles + KConfig conf("encodingprofiles.rc", KConfig::FullConfig, "appdata"); + if (KdenliveSettings::proxyparams().isEmpty() || KdenliveSettings::proxyextension().isEmpty()) { + KConfigGroup group(&conf, "proxy"); + QMap< QString, QString > values = group.entryMap(); + QMapIterator i(values); + if (i.hasNext()) { + i.next(); + QString data = i.value(); + KdenliveSettings::setProxyparams(data.section(';', 0, 0)); + KdenliveSettings::setProxyextension(data.section(';', 1, 1)); + } + } + if (KdenliveSettings::v4l_parameters().isEmpty() || KdenliveSettings::v4l_extension().isEmpty()) { + KConfigGroup group(&conf, "video4linux"); + QMap< QString, QString > values = group.entryMap(); + QMapIterator i(values); + if (i.hasNext()) { + i.next(); + QString data = i.value(); + KdenliveSettings::setV4l_parameters(data.section(';', 0, 0)); + KdenliveSettings::setV4l_extension(data.section(';', 1, 1)); + } + } + if (KdenliveSettings::decklink_parameters().isEmpty() || KdenliveSettings::decklink_extension().isEmpty()) { + KConfigGroup group(&conf, "decklink"); + QMap< QString, QString > values = group.entryMap(); + QMapIterator i(values); + if (i.hasNext()) { + i.next(); + QString data = i.value(); + KdenliveSettings::setDecklink_parameters(data.section(';', 0, 0)); + KdenliveSettings::setDecklink_extension(data.section(';', 1, 1)); + } + } + + connect (KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), this, SLOT(slotChangePalette())); } MainWindow::~MainWindow() @@ -606,7 +675,7 @@ MainWindow::~MainWindow() if (m_stopmotion) { delete m_stopmotion; } - m_effectStack->slotClipItemSelected(NULL, 0); + m_effectStack->slotClipItemSelected(NULL); m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); if (m_projectMonitor) m_projectMonitor->stop(); @@ -620,6 +689,8 @@ MainWindow::~MainWindow() delete m_clipMonitor; delete m_shortcutRemoveFocus; delete[] m_transitions; + delete m_monitorManager; + delete m_scopeManager; Mlt::Factory::close(); } @@ -654,7 +725,7 @@ bool MainWindow::queryClose() 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()); + message = i18n("The project \"%1\" has been changed.\nDo you want to save your changes?", m_activeDocument->url().fileName()); switch (KMessageBox::warningYesNoCancel(this, message)) { case KMessageBox::Yes : // save document here. If saving fails, return false; @@ -770,7 +841,7 @@ void MainWindow::slotReloadEffects() m_effectList->reloadEffectList(m_effectsMenu, m_effectActions); } -#ifndef NO_JOGSHUTTLE +#ifdef USE_JOGSHUTTLE void MainWindow::activateShuttleDevice() { delete m_jogShuttle; @@ -778,17 +849,17 @@ void MainWindow::activateShuttleDevice() delete m_jogProcess; m_jogProcess = NULL; if (KdenliveSettings::enableshuttle() == false) return; - + m_jogProcess = new JogShuttle(KdenliveSettings::shuttledevice()); m_jogShuttle = new JogShuttleAction(m_jogProcess, JogShuttleConfig::actionMap(KdenliveSettings::shuttlebuttons())); - + connect(m_jogShuttle, SIGNAL(rewindOneFrame()), m_monitorManager, SLOT(slotRewindOneFrame())); connect(m_jogShuttle, SIGNAL(forwardOneFrame()), m_monitorManager, SLOT(slotForwardOneFrame())); connect(m_jogShuttle, SIGNAL(rewind(double)), m_monitorManager, SLOT(slotRewind(double))); connect(m_jogShuttle, SIGNAL(forward(double)), m_monitorManager, SLOT(slotForward(double))); connect(m_jogShuttle, SIGNAL(action(const QString&)), this, SLOT(slotDoAction(const QString&))); } -#endif /* NO_JOGSHUTTLE */ +#endif /* USE_JOGSHUTTLE */ void MainWindow::slotDoAction(const QString& action_name) { @@ -824,30 +895,33 @@ void MainWindow::slotAddEffect(const QDomElement effect) else m_activeTimeline->projectView()->slotAddEffect(effectToAdd, GenTime(), -1); } -void MainWindow::slotRaiseMonitor(bool clipMonitor) -{ - if (clipMonitor) m_clipMonitorDock->raise(); - else m_projectMonitorDock->raise(); -} - void MainWindow::slotUpdateClip(const QString &id) { if (!m_activeDocument) return; - m_activeTimeline->projectView()->slotUpdateClip(id); + DocClipBase *clip = m_activeDocument->clipManager()->getClipById(id); + if (!clip) return; + if (clip->numReferences() > 0) m_activeTimeline->projectView()->slotUpdateClip(id); + if (m_clipMonitor->activeClip() && m_clipMonitor->activeClip()->getId() == id) { + Mlt::Producer *monitorProducer = clip->getCloneProducer(); + m_clipMonitor->updateClipProducer(monitorProducer); + } + clip->cleanupProducers(); } void MainWindow::slotConnectMonitors() { m_projectList->setRenderer(m_projectMonitor->render); - //connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &))); connect(m_projectList, SIGNAL(deleteProjectClips(QStringList, QMap)), this, SLOT(slotDeleteProjectClips(QStringList, QMap))); connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *))); connect(m_projectList, SIGNAL(showClipProperties(QList , QMap)), this, SLOT(slotShowClipProperties(QList , QMap))); - connect(m_projectList, SIGNAL(getFileProperties(const QDomElement, const QString &, int, bool, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement, const QString &, int, bool, bool))); - connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &))); - connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool, bool))); + connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QString &, int, int)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QString &, int, int))); + connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QImage &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QImage &))); + + kDebug()<<" - - - - - -\n CONNECTED REPLY"; + connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const stringMap &, const stringMap &, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const stringMap &, const stringMap &, bool))); connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &, bool)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &, bool))); + connect(m_projectMonitor->render, SIGNAL(removeInvalidProxy(const QString &, bool)), m_projectList, SLOT(slotRemoveInvalidProxy(const QString &, bool))); connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &, bool)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &, bool))); @@ -857,8 +931,8 @@ void MainWindow::slotConnectMonitors() 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))); + connect(m_clipMonitor, SIGNAL(saveZone(Render *, QPoint, DocClipBase *)), this, SLOT(slotSaveZone(Render *, QPoint, DocClipBase *))); + connect(m_projectMonitor, SIGNAL(saveZone(Render *, QPoint, DocClipBase *)), this, SLOT(slotSaveZone(Render *, QPoint, DocClipBase *))); } void MainWindow::slotAdjustClipMonitor() @@ -915,12 +989,8 @@ 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 = 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()); + + setStatusBarStyleSheet(palette()); QString styleBorderless = "QToolButton { border-width: 0px;margin: 1px 3px 0px;padding: 0px;}"; //create edit mode buttons @@ -1006,7 +1076,6 @@ void MainWindow::setupActions() actionWidget->setMaximumWidth(max); actionWidget->setMaximumHeight(max - 4); - toolbar->setStyleSheet(style1); connect(toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *))); toolbar->addSeparator(); @@ -1159,6 +1228,10 @@ void MainWindow::setupActions() collection.addAction("project_settings", projectAction); connect(projectAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProjectSettings())); + KAction* backupAction = new KAction(KIcon("edit-undo"), i18n("Open Backup File"), this); + collection.addAction("open_backup", backupAction); + connect(backupAction, SIGNAL(triggered(bool)), this, SLOT(slotOpenBackupDialog())); + KAction* projectRender = new KAction(KIcon("media-record"), i18n("Render"), this); collection.addAction("project_render", projectRender); projectRender->setShortcut(Qt::CTRL + Qt::Key_Return); @@ -1210,7 +1283,7 @@ void MainWindow::setupActions() KAction *archiveProject = new KAction(KIcon("file-save"), i18n("Archive Project"), this); collection.addAction("archive_project", archiveProject); connect(archiveProject, SIGNAL(triggered(bool)), this, SLOT(slotArchiveProject())); - + KAction *markIn = collection.addAction("mark_in"); markIn->setText(i18n("Set Zone In")); @@ -1230,7 +1303,7 @@ void MainWindow::setupActions() 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())); + connect(fullMon, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotSwitchFullscreen())); KAction *insertTree = collection.addAction("insert_project_tree"); insertTree->setText(i18n("Insert zone in project tree")); @@ -1353,6 +1426,10 @@ void MainWindow::setupActions() KAction* editItemDuration = new KAction(KIcon("measure"), i18n("Edit Duration"), this); collection.addAction("edit_item_duration", editItemDuration); connect(editItemDuration, SIGNAL(triggered(bool)), this, SLOT(slotEditItemDuration())); + + KAction* saveTimelineClip = new KAction(KIcon("document-save"), i18n("Save clip"), this); + collection.addAction("save_timeline_clip", saveTimelineClip); + connect(saveTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotSaveTimelineClip())); KAction* clipInProjectTree = new KAction(KIcon("go-jump-definition"), i18n("Clip in Project Tree"), this); collection.addAction("clip_in_project_tree", clipInProjectTree); @@ -1419,7 +1496,7 @@ 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); + 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())); @@ -1428,6 +1505,14 @@ void MainWindow::setupActions() collection.addAction("split_audio", splitAudio); connect(splitAudio, SIGNAL(triggered(bool)), this, SLOT(slotSplitAudio())); + KAction* setAudioAlignReference = new KAction(i18n("Set Audio Reference"), this); + collection.addAction("set_audio_align_ref", setAudioAlignReference); + connect(setAudioAlignReference, SIGNAL(triggered()), this, SLOT(slotSetAudioAlignReference())); + + KAction* alignAudio = new KAction(i18n("Align Audio to Reference"), this); + collection.addAction("align_audio", alignAudio); + connect(alignAudio, SIGNAL(triggered()), this, SLOT(slotAlignAudio())); + KAction* audioOnly = new KAction(KIcon("document-new"), i18n("Audio Only"), this); collection.addAction("clip_audio_only", audioOnly); audioOnly->setData("clip_audio_only"); @@ -1458,18 +1543,29 @@ void MainWindow::setupActions() collection.addAction("delete_space", removeSpace); connect(removeSpace, SIGNAL(triggered()), this, SLOT(slotRemoveSpace())); - KAction *insertTrack = new KAction(KIcon(), i18n("Insert Track"), this); - collection.addAction("insert_track", insertTrack); + m_tracksActionCollection = new KActionCollection(this, KGlobal::mainComponent()); + m_tracksActionCollection->addAssociatedWidget(m_timelineArea); + + KAction *insertTrack = new KAction(KIcon(), i18n("Insert Track"), m_tracksActionCollection); + m_tracksActionCollection->addAction("insert_track", insertTrack); connect(insertTrack, SIGNAL(triggered()), this, SLOT(slotInsertTrack())); - KAction *deleteTrack = new KAction(KIcon(), i18n("Delete Track"), this); - collection.addAction("delete_track", deleteTrack); + KAction *deleteTrack = new KAction(KIcon(), i18n("Delete Track"), m_tracksActionCollection); + m_tracksActionCollection->addAction("delete_track", deleteTrack); connect(deleteTrack, SIGNAL(triggered()), this, SLOT(slotDeleteTrack())); - KAction *configTracks = new KAction(KIcon("configure"), i18n("Configure Tracks"), this); - collection.addAction("config_tracks", configTracks); + KAction *configTracks = new KAction(KIcon("configure"), i18n("Configure Tracks"), m_tracksActionCollection); + m_tracksActionCollection->addAction("config_tracks", configTracks); connect(configTracks, SIGNAL(triggered()), this, SLOT(slotConfigTrack())); + KAction *selectTrack = new KAction(KIcon(), i18n("Select All in Current Track"), m_tracksActionCollection); + connect(selectTrack, SIGNAL(triggered()), this, SLOT(slotSelectTrack())); + m_tracksActionCollection->addAction("select_track", selectTrack); + + QAction *selectAll = KStandardAction::selectAll(this, SLOT(slotSelectAllTracks()), m_tracksActionCollection); + selectAll->setShortcutContext(Qt::WidgetWithChildrenShortcut); + m_tracksActionCollection->addAction("select_all_tracks", selectAll); + KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this); collection.addAction("add_guide", addGuide); connect(addGuide, SIGNAL(triggered()), this, SLOT(slotAddGuide())); @@ -1491,12 +1587,6 @@ void MainWindow::setupActions() pasteEffects->setData("paste_effects"); connect(pasteEffects , SIGNAL(triggered()), this, SLOT(slotPasteEffects())); - QAction *showTimeline = new KAction(i18n("Show Timeline"), this); - collection.addAction("show_timeline", showTimeline); - showTimeline->setCheckable(true); - showTimeline->setChecked(true); - connect(showTimeline, SIGNAL(triggered(bool)), this, SLOT(slotShowTimeline(bool))); - QAction *showTitleBar = new KAction(i18n("Show Title Bars"), this); collection.addAction("show_titlebars", showTitleBar); showTitleBar->setCheckable(true); @@ -1504,15 +1594,6 @@ 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(close()), collection); KStandardAction::open(this, SLOT(openFile()), collection); @@ -1520,7 +1601,7 @@ void MainWindow::setupActions() 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::keyBindings(this, SLOT(slotEditKeys()), collection); KStandardAction::preferences(this, SLOT(slotPreferences()), collection); KStandardAction::configureNotifications(this, SLOT(configureNotifications()), collection); KStandardAction::copy(this, SLOT(slotCopy()), collection); @@ -1565,6 +1646,10 @@ void MainWindow::setupActions() collection.addAction("add_folder", addFolderButton); connect(addFolderButton , SIGNAL(triggered()), m_projectList, SLOT(slotAddFolder())); + QAction *downloadResources = new KAction(KIcon("download"), i18n("Online Resources"), this); + collection.addAction("download_resource", downloadResources); + connect(downloadResources , SIGNAL(triggered()), this, SLOT(slotDownloadResources())); + QAction *clipProperties = new KAction(KIcon("document-edit"), i18n("Clip Properties"), this); collection.addAction("clip_properties", clipProperties); clipProperties->setData("clip_properties"); @@ -1589,6 +1674,13 @@ void MainWindow::setupActions() connect(reloadClip , SIGNAL(triggered()), m_projectList, SLOT(slotReloadClip())); reloadClip->setEnabled(false); + QAction *proxyClip = new KAction(i18n("Proxy Clip"), this); + collection.addAction("proxy_clip", proxyClip); + proxyClip->setData("proxy_clip"); + proxyClip->setCheckable(true); + proxyClip->setChecked(false); + connect(proxyClip, SIGNAL(toggled(bool)), m_projectList, SLOT(slotProxyCurrentItem(bool))); + QAction *stopMotion = new KAction(KIcon("image-x-generic"), i18n("Stop Motion Capture"), this); collection.addAction("stopmotion", stopMotion); connect(stopMotion , SIGNAL(triggered()), this, SLOT(slotOpenStopmotion())); @@ -1600,8 +1692,10 @@ void MainWindow::setupActions() addClips->addAction(addTitleClip); addClips->addAction(addTitleTemplateClip); addClips->addAction(addFolderButton); + addClips->addAction(downloadResources); addClips->addAction(reloadClip); + addClips->addAction(proxyClip); addClips->addAction(clipProperties); addClips->addAction(openClip); addClips->addAction(deleteClip); @@ -1623,8 +1717,6 @@ void MainWindow::setupActions() } //m_effectsActionCollection->readSettings(); - //connect(collection, SIGNAL( clearStatusText() ), - //statusBar(), SLOT( clear() ) ); } void MainWindow::slotDisplayActionMessage(QAction *a) @@ -1632,6 +1724,17 @@ void MainWindow::slotDisplayActionMessage(QAction *a) statusBar()->showMessage(a->data().toString(), 3000); } +void MainWindow::setStatusBarStyleSheet(const QPalette &p) +{ + KColorScheme scheme(p.currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor buttonBg = scheme.background(KColorScheme::LinkBackground).color(); + QColor buttonBord = scheme.foreground(KColorScheme::LinkText).color(); + QColor buttonBord2 = scheme.shade(KColorScheme::LightShade); + statusBar()->setStyleSheet(QString("QStatusBar QLabel {font-size:%1pt;} QStatusBar::item { border: 0px; font-size:%1pt;padding:0px; }").arg(statusBar()->font().pointSize())); + QString style1 = QString("QToolBar { border: 0px } QToolButton { border-style: inset; border:1px solid transparent;border-radius: 3px;margin: 0px 3px;padding: 0px;} QToolButton:hover { background: %3;border-style: inset; border:1px solid %3;border-radius: 3px;} QToolButton:checked { background-color: %1; border-style: inset; border:1px solid %2;border-radius: 3px;}").arg(buttonBg.name()).arg(buttonBord.name()).arg(buttonBord2.name()); + statusBar()->setStyleSheet(style1); +} + void MainWindow::loadLayouts() { QMenu *saveLayout = (QMenu*)(factory()->container("layout_save_as", this)); @@ -1646,17 +1749,17 @@ void MainWindow::loadLayouts() foreach(const QString & key, entries) { if (key.endsWith(QString("_%1").arg(i))) { // Found previously saved layout - QString layoutName = key.section("_", 0, -2); + QString layoutName = key.section('_', 0, -2); for (int j = 0; j < loadActions.count(); j++) { - if (loadActions.at(j)->data().toString().endsWith("_" + QString::number(i))) { + 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(i18n("Save as %1").arg(layoutName)); + if (saveActions.at(j)->data().toString().endsWith('_' + QString::number(i))) { + saveActions[j]->setText(i18n("Save as %1", layoutName)); saveActions[j]->setData(key); break; } @@ -1673,9 +1776,7 @@ void MainWindow::slotLoadLayout(QAction *action) 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); } @@ -1691,7 +1792,7 @@ void MainWindow::slotSaveLayout(QAction *action) layouts.deleteEntry(originallayoutName); QByteArray st = saveState(); - layoutName.append("_" + QString::number(layoutId)); + layoutName.append('_' + QString::number(layoutId)); layouts.writeEntry(layoutName, st.toBase64()); loadLayouts(); } @@ -1731,12 +1832,13 @@ void MainWindow::readOptions() if (!initialGroup.exists() || upgrade) { // this is our first run, show Wizard - Wizard *w = new Wizard(upgrade, this); + QPointer w = new Wizard(upgrade, this); if (w->exec() == QDialog::Accepted && w->isOk()) { w->adjustSettings(); initialGroup.writeEntry("version", version); delete w; } else { + delete w; ::exit(1); } } @@ -1748,7 +1850,7 @@ void MainWindow::readOptions() void MainWindow::slotRunWizard() { - Wizard *w = new Wizard(false, this); + QPointer w = new Wizard(false, this); if (w->exec() == QDialog::Accepted && w->isOk()) { w->adjustSettings(); } @@ -1763,26 +1865,23 @@ void MainWindow::newFile(bool showProjectSettings, bool force) QString profileName = KdenliveSettings::default_profile(); KUrl projectFolder = KdenliveSettings::defaultprojectfolder(); QMap documentProperties; + QMap documentMetadata; QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); if (!showProjectSettings) { - // set up default properties - documentProperties.insert("enableproxy", QString::number((int) KdenliveSettings::enableproxy())); - documentProperties.insert("generateproxy", QString::number((int) KdenliveSettings::generateproxy())); - documentProperties.insert("proxyminsize", QString::number(KdenliveSettings::proxyminsize())); - documentProperties.insert("proxyparams", KdenliveSettings::proxyparams()); - documentProperties.insert("proxyextension", KdenliveSettings::proxyextension()); - documentProperties.insert("generateimageproxy", QString::number((int) KdenliveSettings::generateimageproxy())); - documentProperties.insert("proxyimageminsize", QString::number(KdenliveSettings::proxyimageminsize())); 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) + QPointer w = new ProjectSettings(NULL, QMap (), QStringList(), projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this); + if (w->exec() != QDialog::Accepted) { + delete w; return; + } if (!KdenliveSettings::activatetabs()) - if (!closeCurrentDocument()) + if (!closeCurrentDocument()) { + delete w; return; + } if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs(); if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) @@ -1797,15 +1896,16 @@ void MainWindow::newFile(bool showProjectSettings, bool force) documentProperties.insert("proxyextension", w->proxyExtension()); documentProperties.insert("generateimageproxy", QString::number((int) w->generateImageProxy())); documentProperties.insert("proxyimageminsize", QString::number(w->proxyImageMinSize())); + documentMetadata = w->metadata(); delete w; } m_timelineArea->setEnabled(true); m_projectList->setEnabled(true); - - KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, documentProperties, projectTracks, m_projectMonitor->render, m_notesWidget, this); + bool openBackup; + KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, documentProperties, documentMetadata, projectTracks, m_projectMonitor->render, m_notesWidget, &openBackup, this); doc->m_autosave = new KAutoSaveFile(KUrl(), doc); bool ok; - TrackView *trackView = new TrackView(doc, &ok, this); + TrackView *trackView = new TrackView(doc, m_tracksActionCollection->actions(), &ok, this); m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description()); if (!ok) { // MLT is broken @@ -1819,7 +1919,7 @@ void MainWindow::newFile(bool showProjectSettings, bool force) connectDocument(trackView, doc); } else m_timelineArea->setTabBarHidden(false); - m_monitorManager->activateMonitor("clip"); + m_monitorManager->activateMonitor(Kdenlive::clipMonitor); m_closeAction->setEnabled(m_timelineArea->count() > 1); } @@ -1847,7 +1947,7 @@ bool MainWindow::closeCurrentDocument(bool saveChanges) 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()); + message = i18n("The project \"%1\" has been changed.\nDo you want to save your changes?", m_activeDocument->url().fileName()); switch (KMessageBox::warningYesNoCancel(this, message)) { case KMessageBox::Yes : // save document here. If saving fails, return false; @@ -1860,7 +1960,8 @@ bool MainWindow::closeCurrentDocument(bool saveChanges) break; } } - m_clipMonitor->slotSetXml(NULL); + m_clipMonitor->slotSetClipProducer(NULL); + m_projectList->slotResetProjectList(); m_timelineArea->removeTab(m_timelineArea->indexOf(w)); if (m_timelineArea->count() == 1) { m_timelineArea->setTabBarHidden(true); @@ -1894,21 +1995,23 @@ bool MainWindow::saveFileAs(const QString &outputFileName) // Save timeline thumbnails m_activeTimeline->projectView()->saveThumbnails(); m_activeDocument->setUrl(KUrl(outputFileName)); + QByteArray hash = QCryptographicHash::hash(KUrl(outputFileName).encodedPath(), QCryptographicHash::Md5).toHex(); if (m_activeDocument->m_autosave == NULL) { - m_activeDocument->m_autosave = new KAutoSaveFile(KUrl(outputFileName), this); - } else m_activeDocument->m_autosave->setManagedFile(KUrl(outputFileName)); + m_activeDocument->m_autosave = new KAutoSaveFile(KUrl(hash), this); + } else m_activeDocument->m_autosave->setManagedFile(KUrl(hash)); setCaption(m_activeDocument->description()); m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), m_activeDocument->url().path()); m_activeDocument->setModified(false); m_fileOpenRecent->addUrl(KUrl(outputFileName)); m_fileRevert->setEnabled(true); + m_undoView->stack()->setClean(); return true; } bool MainWindow::saveFileAs() { - QString outputFile = KFileDialog::getSaveFileName(m_activeDocument->projectFolder(), getMimeType()); + QString outputFile = KFileDialog::getSaveFileName(m_activeDocument->projectFolder(), getMimeType(false)); if (outputFile.isEmpty()) { return false; } @@ -1956,6 +2059,22 @@ void MainWindow::openLastFile() void MainWindow::openFile(const KUrl &url) { + // Make sure the url is a Kdenlive project file + KMimeType::Ptr mime = KMimeType::findByUrl(url); + if (mime.data()->is("application/x-compressed-tar")) { + // Opening a compressed project file, we need to process it + kDebug()<<"Opening archive, processing"; + QPointer ar = new ArchiveWidget(url); + if (ar->exec() == QDialog::Accepted) openFile(KUrl(ar->extractedProjectFile())); + delete ar; + return; + } + if (!url.fileName().endsWith(".kdenlive")) { + // This is not a Kdenlive project file, abort loading + KMessageBox::sorry(this, i18n("File %1 is not a Kdenlive project file", url.path())); + return; + } + // Check if the document is already opened const int ct = m_timelineArea->count(); bool isOpened = false; @@ -1976,13 +2095,14 @@ void MainWindow::openFile(const KUrl &url) if (!KdenliveSettings::activatetabs()) if (!closeCurrentDocument()) return; // Check for backup file - QList staleFiles = KAutoSaveFile::staleFiles(url); + QByteArray hash = QCryptographicHash::hash(url.encodedPath(), QCryptographicHash::Md5).toHex(); + QList staleFiles = KAutoSaveFile::staleFiles(KUrl(hash)); if (!staleFiles.isEmpty()) { if (KMessageBox::questionYesNo(this, i18n("Auto-saved files exist. Do you want to recover them now?"), i18n("File Recovery"), KGuiItem(i18n("Recover")), KGuiItem(i18n("Don't recover"))) == KMessageBox::Yes) { - recoverFiles(staleFiles); + recoverFiles(staleFiles, url); return; } else { // remove the stale files @@ -2008,6 +2128,7 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) m_stopmotion = NULL; } + m_timer.start(); KProgressDialog progressDialog(this, i18n("Loading project"), i18n("Loading project")); progressDialog.setAllowCancel(false); progressDialog.progressBar()->setMaximum(4); @@ -2015,7 +2136,8 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) progressDialog.progressBar()->setValue(0); qApp->processEvents(); - KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QMap (), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, m_notesWidget, this, &progressDialog); + bool openBackup; + KdenliveDoc *doc = new KdenliveDoc(stale ? KUrl(stale->fileName()) : url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QMap (), QMap (), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, m_notesWidget, &openBackup, this, &progressDialog); progressDialog.progressBar()->setValue(1); progressDialog.progressBar()->setMaximum(4); @@ -2023,11 +2145,12 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) qApp->processEvents(); if (stale == NULL) { - stale = new KAutoSaveFile(url, doc); + QByteArray hash = QCryptographicHash::hash(url.encodedPath(), QCryptographicHash::Md5).toHex(); + stale = new KAutoSaveFile(KUrl(hash), doc); doc->m_autosave = stale; } else { doc->m_autosave = stale; - doc->setUrl(stale->managedFile()); + doc->setUrl(url);//stale->managedFile()); doc->setModified(true); stale->setParent(doc); } @@ -2037,8 +2160,8 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) qApp->processEvents(); bool ok; - TrackView *trackView = new TrackView(doc, &ok, this); - + TrackView *trackView = new TrackView(doc, m_tracksActionCollection->actions(), &ok, this); + connectDocument(trackView, doc); progressDialog.progressBar()->setValue(3); qApp->processEvents(); @@ -2059,12 +2182,11 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) slotGotProgressInfo(QString(), -1); m_projectMonitor->adjustRulerSize(trackView->duration()); m_projectMonitor->slotZoneMoved(trackView->inPoint(), trackView->outPoint()); - m_clipMonitor->refreshMonitor(true); - progressDialog.progressBar()->setValue(4); + if (openBackup) slotOpenBackupDialog(url); } -void MainWindow::recoverFiles(QList staleFiles) +void MainWindow::recoverFiles(QList staleFiles, const KUrl &originUrl) { foreach(KAutoSaveFile * stale, staleFiles) { /*if (!stale->open(QIODevice::QIODevice::ReadOnly)) { @@ -2075,7 +2197,7 @@ void MainWindow::recoverFiles(QList staleFiles) }*/ kDebug() << "// OPENING RECOVERY: " << stale->fileName() << "\nMANAGED: " << stale->managedFile().path(); // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile? - if (!stale->fileName().endsWith(".lock")) doOpenFile(KUrl(stale->fileName()), stale); + if (!stale->fileName().endsWith(".lock")) doOpenFile(originUrl, stale); else KIO::NetAccess::del(KUrl(stale->fileName()), this); } } @@ -2100,8 +2222,9 @@ void MainWindow::parseProfiles(const QString &mltPath) if (KdenliveSettings::rendererpath().isEmpty()) { // Cannot find the MLT melt renderer, ask for location - KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the melt program required for rendering (part of MLT)"), this); + QPointer getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the melt program required for rendering (part of MLT)"), this); if (getUrl->exec() == QDialog::Rejected) { + delete getUrl; ::exit(0); } KUrl rendererPath = getUrl->selectedUrl(); @@ -2123,9 +2246,10 @@ void MainWindow::parseProfiles(const QString &mltPath) } if (profilesList.isEmpty()) { // Cannot find the MLT profiles, ask for location - KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find your MLT profiles, please give the path"), this); + QPointer getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find your MLT profiles, please give the path"), this); getUrl->fileDialog()->setMode(KFile::Directory); if (getUrl->exec() == QDialog::Rejected) { + delete getUrl; ::exit(0); } KUrl mltPath = getUrl->selectedUrl(); @@ -2184,12 +2308,13 @@ void MainWindow::slotDetectAudioDriver() void MainWindow::slotEditProjectSettings() { QPoint p = m_activeDocument->getTracksCount(); - ProjectSettings *w = new ProjectSettings(m_projectList, m_activeTimeline->projectView()->extractTransitionsLumas(), p.x(), p.y(), m_activeDocument->projectFolder().path(), true, !m_activeDocument->isModified(), this); + QPointer w = new ProjectSettings(m_projectList, m_activeDocument->metadata(), m_activeTimeline->projectView()->extractTransitionsLumas(), p.x(), p.y(), m_activeDocument->projectFolder().path(), true, !m_activeDocument->isModified(), this); + connect(w, SIGNAL(disableProxies()), this, SLOT(slotDisableProxies())); if (w->exec() == QDialog::Accepted) { QString profile = w->selectedProfile(); m_activeDocument->setProjectFolder(w->selectedFolder()); -#ifndef Q_WS_MAC +#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)); @@ -2229,14 +2354,20 @@ void MainWindow::slotEditProjectSettings() m_activeDocument->setModified(); slotUpdateProxySettings(); } + m_activeDocument->setMetadata(w->metadata()); } delete w; } -void MainWindow::slotUpdateProjectProfile(const QString &profile) +void MainWindow::slotDisableProxies() { - double dar = m_activeDocument->dar(); + m_activeDocument->setDocumentProperty("enableproxy", QString::number((int) false)); + m_activeDocument->setModified(); + slotUpdateProxySettings(); +} +void MainWindow::slotUpdateProjectProfile(const QString &profile) +{ // Recreate the stopmotion widget if profile changes if (m_stopmotion) { delete m_stopmotion; @@ -2244,9 +2375,9 @@ void MainWindow::slotUpdateProjectProfile(const QString &profile) } // Deselect current effect / transition - m_effectStack->slotClipItemSelected(NULL, 0); + m_effectStack->slotClipItemSelected(NULL); m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); - m_clipMonitor->slotSetXml(NULL); + m_clipMonitor->slotSetClipProducer(NULL); bool updateFps = m_activeDocument->setProfilePath(profile); KdenliveSettings::setCurrent_profile(profile); KdenliveSettings::setProject_fps(m_activeDocument->fps()); @@ -2259,9 +2390,9 @@ void MainWindow::slotUpdateProjectProfile(const QString &profile) 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->clipManager()->clearCache(); + m_activeTimeline->updateProfile(); 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. @@ -2275,7 +2406,9 @@ void MainWindow::slotRenderProject() { if (!m_renderWidget) { QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder(); - m_renderWidget = new RenderWidget(projectfolder, m_projectList->useProxy(), this); + MltVideoProfile profile; + if (m_activeDocument) profile = m_activeDocument->mltProfile(); + m_renderWidget = new RenderWidget(projectfolder, m_projectList->useProxy(), profile, this); connect(m_renderWidget, SIGNAL(shutdown()), this, SLOT(slotShutdown())); connect(m_renderWidget, SIGNAL(selectedRenderProfile(QMap )), this, SLOT(slotSetDocumentRenderProfile(QMap ))); connect(m_renderWidget, SIGNAL(prepareRenderingData(bool, bool, const QString&)), this, SLOT(slotPrepareRendering(bool, bool, const QString&))); @@ -2373,9 +2506,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha 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_projectMonitor->render, SIGNAL(refreshDocumentProducers(bool, bool)), m_activeDocument, SLOT(checkProjectClips(bool, bool))); disconnect(m_activeDocument, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated())); disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); @@ -2383,76 +2515,58 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha 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, bool)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); - disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), this, SLOT(slotActivateEffectStackView(ClipItem*, int, bool))); - disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(ClipItem*))); + disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, bool)), this, SLOT(slotTimelineClipSelected(ClipItem*, bool))); 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))); - disconnect(m_activeTimeline, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); - disconnect(m_activeTimeline, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); - disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); + disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, bool, const int)), m_clipMonitor, SLOT(slotSetClipProducer(DocClipBase *, QPoint, bool, const int))); + disconnect(m_projectList, SIGNAL(gotFilterJobResults(const QString &, int, int, const QString &, stringMap)), m_activeTimeline->projectView(), SLOT(slotGotFilterJobResults(const QString &, int, int, const QString &, stringMap))); + + disconnect(m_activeTimeline, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(slotActivateMonitor())); disconnect(m_activeTimeline, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int))); disconnect(m_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); - disconnect(m_effectStack, SIGNAL(updateEffect(ClipItem*, int, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, int, QDomElement, QDomElement, int))); + disconnect(m_effectStack, SIGNAL(updateEffect(ClipItem*, int, QDomElement, QDomElement, int,bool)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, int, QDomElement, QDomElement, int,bool))); 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(addEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotAddEffect(ClipItem*, QDomElement))); + disconnect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, QList , bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, QList , bool))); + disconnect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, QList, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, QList , int))); disconnect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*))); disconnect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); disconnect(m_effectStack, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); disconnect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); disconnect(m_transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int))); - disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); + disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(slotActivateMonitor())); disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs())); - disconnect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); - disconnect(m_projectList, SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus())); - disconnect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), m_activeTimeline->projectView(), SLOT(slotUpdateClip(const QString &, bool))); disconnect(m_projectList, SIGNAL(refreshClip(const QString &)), m_activeTimeline->projectView(), SLOT(slotRefreshThumbs(const QString &))); m_effectStack->clear(); } //m_activeDocument->setRenderer(NULL); - disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); - disconnect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), m_monitorManager, SLOT(slotRefreshCurrentMonitor())); m_clipMonitor->stop(); } KdenliveSettings::setCurrent_profile(doc->profilePath()); KdenliveSettings::setProject_fps(doc->fps()); m_monitorManager->resetProfiles(doc->timecode()); + m_clipMonitorDock->raise(); m_projectList->setDocument(doc); 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(const QString &, bool)), m_monitorManager, SLOT(slotRefreshCurrentMonitor())); connect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), trackView->projectView(), SLOT(slotRefreshThumbs(const QString &, bool))); - connect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), trackView->projectView(), SLOT(slotUpdateClip(const QString &, bool))); connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified())); - connect(m_projectList, SIGNAL(updateProfile(const QString &)), this, SLOT(slotUpdateProjectProfile(const QString &))); connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString))); - connect(m_projectList, SIGNAL(findInTimeline(const QString&)), this, SLOT(slotClipInTimeline(const QString&))); - - - connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); - connect(trackView, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); - connect(trackView, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); connect(trackView, SIGNAL(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(m_projectMonitor->render, SIGNAL(refreshDocumentProducers(bool, bool)), doc, SLOT(checkProjectClips(bool, bool))); connect(doc, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); connect(doc, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); @@ -2460,17 +2574,16 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha 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(doc, SIGNAL(saveTimelinePreview(const QString &)), trackView, SLOT(slotSaveTimelinePreview(const QString))); + connect(m_notesWidget, SIGNAL(textChanged()), doc, SLOT(setModified())); - connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), 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, SIGNAL(showTrackEffects(int, TrackInfo)), this, SLOT(slotTrackSelected(int, TrackInfo))); - connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), this, SLOT(slotActivateEffectStackView(ClipItem*, int, bool))); + connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, bool)), this, SLOT(slotTimelineClipSelected(ClipItem*, bool))); connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); m_zoomSlider->setValue(doc->zoom().x()); @@ -2479,32 +2592,33 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView, SIGNAL(setZoom(int)), this, SLOT(slotSetZoom(int))); connect(trackView->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); - connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int))); + connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, bool, const int)), m_clipMonitor, SLOT(slotSetClipProducer(DocClipBase *, QPoint, bool, const int))); connect(trackView->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay())); - connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(ClipItem*))); connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(Transition*))); - connect(m_effectStack, SIGNAL(updateEffect(ClipItem*, int, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, int, QDomElement, QDomElement, int))); + connect(m_projectList, SIGNAL(gotFilterJobResults(const QString &, int, int, const QString &, stringMap)), trackView->projectView(), SLOT(slotGotFilterJobResults(const QString &, int, int, const QString &, stringMap))); + + // Effect stack signals + connect(m_effectStack, SIGNAL(updateEffect(ClipItem*, int, QDomElement, QDomElement, int,bool)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, int, QDomElement, QDomElement, int,bool))); 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(addEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotAddEffect(ClipItem*, QDomElement))); + connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, QList , bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, QList , bool))); + connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, QList , int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, QList , 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(seekTimeline(int)), trackView->projectView() , SLOT(seekCursorPos(int))); connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); connect(m_effectStack, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); + + // Transition config signals + connect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); + connect(m_transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(seekCursorPos(int))); - connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); + connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(slotActivateMonitor())); connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs())); - connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); - connect(m_projectList, SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus())); - - - trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup, (QMenu*)(factory()->container("marker_menu", this))); + trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup, static_cast(factory()->container("marker_menu", this))); m_activeTimeline = trackView; if (m_renderWidget) { slotCheckRenderStatus(); @@ -2528,11 +2642,12 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha m_activeDocument = doc; m_activeTimeline->updateProjectFps(); m_activeDocument->checkProjectClips(); -#ifndef Q_WS_MAC +#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); + m_monitorManager->activateMonitor(Kdenlive::clipMonitor); // set tool to select tool m_buttonSelectTool->setChecked(true); } @@ -2554,6 +2669,7 @@ 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.addCollection(m_tracksActionCollection, i18nc("timeline track keyboard shortcuts", "Timeline and Tracks")); dialog.configure(); } @@ -2573,14 +2689,14 @@ void MainWindow::slotPreferences(int page, int option) // KConfigDialog didn't find an instance of this dialog, so lets // create it : - + // Get the mappable actions in localized form QMap actions; KActionCollection* collection = actionCollection(); foreach (const QString& action_name, m_action_names) { actions[collection->action(action_name)->text()] = action_name; } - + KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(actions, this); connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration())); connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles())); @@ -2594,7 +2710,7 @@ void MainWindow::slotPreferences(int page, int option) void MainWindow::slotUpdateCaptureFolder() { -#ifndef Q_WS_MAC +#ifndef Q_WS_MAC if (m_activeDocument) m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); else m_recMonitor->slotUpdateCaptureFolder(KdenliveSettings::defaultprojectfolder()); #endif @@ -2606,7 +2722,7 @@ void MainWindow::updateConfiguration() if (m_activeTimeline) { m_activeTimeline->refresh(); m_activeTimeline->projectView()->checkAutoScroll(); - m_activeTimeline->projectView()->checkTrackHeight(); + m_activeTimeline->checkTrackHeight(); if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs(); } @@ -2617,9 +2733,10 @@ void MainWindow::updateConfiguration() // Update list of transcoding profiles loadTranscoders(); -#ifndef NO_JOGSHUTTLE + loadStabilize(); +#ifdef USE_JOGSHUTTLE activateShuttleDevice(); -#endif /* NO_JOGSHUTTLE */ +#endif } @@ -2676,7 +2793,7 @@ void MainWindow::slotDeleteItem() QWidget *widget = QApplication::focusWidget(); while (widget) { if (widget == m_effectStackDock) { - m_effectStack->slotItemDel(); + m_effectStack->deleteCurrentEffect(); return; } widget = widget->parentWidget(); @@ -2717,9 +2834,11 @@ 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) - m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment()); + QPointer d = new MarkerDialog(clip, marker, + m_activeDocument->timecode(), i18n("Add Marker"), this); + if (d->exec() == QDialog::Accepted) + m_activeTimeline->projectView()->slotAddClipMarker(id, d->newMarker().time(), d->newMarker().comment()); + delete d; } void MainWindow::slotDeleteClipMarker() @@ -2801,14 +2920,16 @@ void MainWindow::slotEditClipMarker() } CommentedTime marker(pos, oldcomment); - MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Edit Marker"), this); - if (d.exec() == QDialog::Accepted) { - m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment()); - if (d.newMarker().time() != pos) { + QPointer d = new MarkerDialog(clip, marker, + m_activeDocument->timecode(), i18n("Edit Marker"), this); + if (d->exec() == QDialog::Accepted) { + m_activeTimeline->projectView()->slotAddClipMarker(id, d->newMarker().time(), d->newMarker().comment()); + if (d->newMarker().time() != pos) { // remove old marker m_activeTimeline->projectView()->slotAddClipMarker(id, pos, QString()); } } + delete d; } void MainWindow::slotAddMarkerGuideQuickly() @@ -2851,31 +2972,50 @@ void MainWindow::slotRemoveSpace() void MainWindow::slotInsertTrack(int ix) { - m_projectMonitor->activateMonitor(); - if (m_activeTimeline) + m_projectMonitor->slotActivateMonitor(); + if (m_activeTimeline) { + if (ix == -1) ix = m_activeTimeline->projectView()->selectedTrack(); m_activeTimeline->projectView()->slotInsertTrack(ix); + } if (m_activeDocument) m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } void MainWindow::slotDeleteTrack(int ix) { - m_projectMonitor->activateMonitor(); - if (m_activeTimeline) + m_projectMonitor->slotActivateMonitor(); + if (m_activeTimeline) { + if (ix == -1) ix = m_activeTimeline->projectView()->selectedTrack(); m_activeTimeline->projectView()->slotDeleteTrack(ix); + } if (m_activeDocument) m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } void MainWindow::slotConfigTrack(int ix) { - m_projectMonitor->activateMonitor(); + m_projectMonitor->slotActivateMonitor(); if (m_activeTimeline) m_activeTimeline->projectView()->slotConfigTracks(ix); if (m_activeDocument) m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList()); } +void MainWindow::slotSelectTrack() +{ + m_projectMonitor->slotActivateMonitor(); + if (m_activeTimeline) { + m_activeTimeline->projectView()->slotSelectClipsInTrack(); + } +} + +void MainWindow::slotSelectAllTracks() +{ + m_projectMonitor->slotActivateMonitor(); + if (m_activeTimeline) + m_activeTimeline->projectView()->slotSelectAllClips(); +} + void MainWindow::slotEditGuide() { if (m_activeTimeline) @@ -2962,10 +3102,16 @@ void MainWindow::slotEditItemDuration() m_activeTimeline->projectView()->editItemDuration(); } -void MainWindow::slotAddProjectClip(KUrl url) +void MainWindow::slotAddProjectClip(KUrl url, const QString &comment) { if (m_activeDocument) - m_activeDocument->slotAddClipFile(url, QString()); + m_activeDocument->slotAddClipFile(url, QString(), QString(), comment); +} + +void MainWindow::slotAddProjectClipList(KUrl::List urls) +{ + if (m_activeDocument) + m_activeDocument->slotAddClipList(urls, QString()); } void MainWindow::slotAddTransition(QAction *result) @@ -2988,14 +3134,14 @@ void MainWindow::slotAddVideoEffect(QAction *result) if (info.isEmpty() || info.size() < 3) return; QDomElement effect ; - if (info.at(2) == QString::number((int) EFFECT_VIDEO)) + if (info.last() == QString::number((int) EFFECT_VIDEO)) effect = videoEffects.getEffectByTag(info.at(0), info.at(1)); - else if (info.at(2) == QString::number((int) EFFECT_AUDIO)) + else if (info.last() == QString::number((int) EFFECT_AUDIO)) effect = audioEffects.getEffectByTag(info.at(0), info.at(1)); else effect = customEffects.getEffectByTag(info.at(0), info.at(1)); if (!effect.isNull()) slotAddEffect(effect); - else m_messageLabel->setMessage(i18n("Cannot find effect %1 / %2").arg(info.at(0)).arg(info.at(1)), ErrorMessage); + else m_messageLabel->setMessage(i18n("Cannot find effect %1 / %2", info.at(0), info.at(1)), ErrorMessage); } @@ -3119,7 +3265,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) else newprops.insert("templatetext", description); //newprops.insert("xmldata", m_projectList->generateTemplateXml(newtemplate, description).toString()); if (!newprops.isEmpty()) { - EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); + EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->currentProperties(newprops), newprops, true); m_activeDocument->commandStack()->push(command); } } @@ -3127,14 +3273,14 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) return; } QString path = clip->getProperty("resource"); - TitleWidget *dia_ui = new TitleWidget(KUrl(), m_activeDocument->timecode(), titlepath, m_projectMonitor->render, this); + QPointer dia_ui = new TitleWidget(KUrl(), m_activeDocument->timecode(), titlepath, m_projectMonitor->render, this); QDomDocument doc; doc.setContent(clip->getProperty("xmldata")); dia_ui->setXml(doc); if (dia_ui->exec() == QDialog::Accepted) { QMap newprops; newprops.insert("xmldata", dia_ui->xml().toString()); - if (dia_ui->outPoint() != clip->duration().frames(m_activeDocument->fps()) - 1) { + if (dia_ui->outPoint() != clip->duration().frames(m_activeDocument->fps())) { // duration changed, we need to update duration newprops.insert("out", QString::number(dia_ui->outPoint())); int currentLength = QString(clip->producerProperty("length")).toInt(); @@ -3149,7 +3295,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) dia_ui->saveTitle(path); } else newprops.insert("resource", QString()); } - EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); + EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->currentProperties(newprops), newprops, true); m_activeDocument->commandStack()->push(command); //m_activeTimeline->projectView()->slotUpdateClip(clip->getId()); m_activeDocument->setModified(true); @@ -3163,6 +3309,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) // 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(deleteProxy(const QString)), m_projectList, SLOT(slotDeleteProxy(const QString))); connect(dia, SIGNAL(applyNewClipProperties(const QString, QMap , QMap , bool, bool)), this, SLOT(slotApplyNewClipProperties(const QString, QMap , QMap , bool, bool))); dia->show(); } @@ -3184,11 +3331,12 @@ void MainWindow::slotApplyNewClipProperties(const QString id, QMap cliplist, QMap commonproperties) { - ClipProperties dia(cliplist, m_activeDocument->timecode(), commonproperties, this); - if (dia.exec() == QDialog::Accepted) { + QPointer dia = new ClipProperties(cliplist, + m_activeDocument->timecode(), commonproperties, this); + if (dia->exec() == QDialog::Accepted) { QUndoCommand *command = new QUndoCommand(); command->setText(i18n("Edit clips")); - QMap newImageProps = dia.properties(); + QMap newImageProps = dia->properties(); // Transparency setting applies only for images QMap newProps = newImageProps; newProps.remove("transparency"); @@ -3196,14 +3344,15 @@ void MainWindow::slotShowClipProperties(QList cliplist, QMapclipType() == IMAGE) - new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newImageProps, true, command); - else - new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newProps, true, command); + new EditClipCommand(m_projectList, clip->getId(), clip->currentProperties(newImageProps), newImageProps, true, command); + else + new EditClipCommand(m_projectList, clip->getId(), clip->currentProperties(newProps), newProps, true, command); } m_activeDocument->commandStack()->push(command); for (int i = 0; i < cliplist.count(); i++) - m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload()); + m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia->needsTimelineReload()); } + delete dia; } void MainWindow::customEvent(QEvent* e) @@ -3211,11 +3360,18 @@ void MainWindow::customEvent(QEvent* e) if (e->type() == QEvent::User) m_messageLabel->setMessage(static_cast (e)->message(), MltError); } -void MainWindow::slotActivateEffectStackView(ClipItem* item, int ix, bool raise) + +void MainWindow::slotTimelineClipSelected(ClipItem* item, bool raise) { - Q_UNUSED(item) - Q_UNUSED(ix) + m_effectStack->slotClipItemSelected(item); + m_projectMonitor->slotSetSelectedClip(item); + if (raise) + m_effectStack->raiseWindow(m_effectStackDock); +} +void MainWindow::slotTrackSelected(int index, TrackInfo info, bool raise) +{ + m_effectStack->slotTrackItemSelected(index, info); if (raise) m_effectStack->raiseWindow(m_effectStackDock); } @@ -3508,7 +3664,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event) } -void MainWindow::slotSaveZone(Render *render, QPoint zone) +void MainWindow::slotSaveZone(Render *render, QPoint zone, DocClipBase *baseClip, KUrl path) { KDialog *dialog = new KDialog(this); dialog->setCaption("Save clip zone"); @@ -3519,9 +3675,15 @@ 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(KUrl::AddTrailingSlash); - path.append("untitled.mlt"); - KUrlRequester *url = new KUrlRequester(KUrl(path), this); + if (path.isEmpty()) { + QString tmppath = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash); + if (baseClip == NULL) tmppath.append("untitled.mlt"); + else { + tmppath.append((baseClip->name().isEmpty() ? baseClip->fileURL().fileName() : baseClip->name()) + '-' + QString::number(zone.x()).rightJustified(4, '0') + ".mlt"); + } + path = KUrl(tmppath); + } + KUrlRequester *url = new KUrlRequester(path, this); url->setFilter("video/mlt-playlist"); QLabel *label2 = new QLabel(i18n("Description:"), this); KLineEdit *edit = new KLineEdit(this); @@ -3529,27 +3691,54 @@ 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) { + if (QFile::exists(url->url().path())) { + if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", url->url().path())) == KMessageBox::No) { + slotSaveZone(render, zone, baseClip, url->url()); + return; + } + } + if (baseClip && !baseClip->fileURL().isEmpty()) { + // create zone from clip url, so that we don't have problems with proxy clips + QProcess p; +#if QT_VERSION >= 0x040600 + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.remove("MLT_PROFILE"); + p.setProcessEnvironment(env); +#else + QStringList env = QProcess::systemEnvironment(); + env << "MLT_PROFILE='\0'"; + p.setEnvironment(env); +#endif + p.start(KdenliveSettings::rendererpath(), QStringList() << baseClip->fileURL().path() << "in=" + QString::number(zone.x()) << "out=" + QString::number(zone.y()) << "-consumer" << "xml:" + url->url().path()); + if (!p.waitForStarted(3000)) { + KMessageBox::sorry(this, i18n("Cannot start MLT's renderer:\n%1", KdenliveSettings::rendererpath())); + } + else if (!p.waitForFinished(5000)) { + KMessageBox::sorry(this, i18n("Timeout while creating xml output")); + } + } + else render->saveZone(url->url(), edit->text(), zone); + } } void MainWindow::slotSetInPoint() { - if (m_clipMonitor->isActive()) + if (m_clipMonitor->isActive()) { m_clipMonitor->slotSetZoneStart(); - else + } else { m_projectMonitor->slotSetZoneStart(); - //else m_activeTimeline->projectView()->setInPoint(); + } } void MainWindow::slotSetOutPoint() { - if (m_clipMonitor->isActive()) + if (m_clipMonitor->isActive()) { m_clipMonitor->slotSetZoneEnd(); - else + } else { m_projectMonitor->slotSetZoneEnd(); - // else m_activeTimeline->projectView()->setOutPoint(); + } } void MainWindow::slotResizeItemStart() @@ -3568,13 +3757,14 @@ int MainWindow::getNewStuff(const QString &configFile) { KNS3::Entry::List entries; #if KDE_IS_VERSION(4,3,80) - KNS3::DownloadDialog dialog(configFile); - dialog.exec(); - entries = dialog.changedEntries(); + QPointer dialog = new KNS3::DownloadDialog(configFile); + dialog->exec(); + if (dialog) entries = dialog->changedEntries(); foreach(const KNS3::Entry & entry, entries) { if (entry.status() == KNS3::Entry::Installed) kDebug() << "// Installed files: " << entry.installedFiles(); } + delete dialog; #else KNS::Engine engine(0); if (engine.init(configFile)) @@ -3583,7 +3773,7 @@ int MainWindow::getNewStuff(const QString &configFile) if (entry->status() == KNS::Entry::Installed) kDebug() << "// Installed files: " << entry->installedFiles(); } -#endif /* KDE_IS_VERSION(4,3,80) */ +#endif return entries.size(); } @@ -3630,6 +3820,20 @@ void MainWindow::slotSplitAudio() m_activeTimeline->projectView()->splitAudio(); } +void MainWindow::slotSetAudioAlignReference() +{ + if (m_activeTimeline) { + m_activeTimeline->projectView()->setAudioAlignReference(); + } +} + +void MainWindow::slotAlignAudio() +{ + if (m_activeTimeline) { + m_activeTimeline->projectView()->alignAudio(); + } +} + void MainWindow::slotUpdateClipType(QAction *action) { if (m_activeTimeline) { @@ -3644,9 +3848,10 @@ void MainWindow::slotDvdWizard(const QString &url, const QString &profile) // We must stop the monitors since we create a new on in the dvd wizard m_clipMonitor->stop(); m_projectMonitor->stop(); - DvdWizard w(url, profile, this); - w.exec(); + QPointer w = new DvdWizard(url, profile, this); + w->exec(); m_projectMonitor->start(); + delete w; } void MainWindow::slotShowTimeline(bool show) @@ -3660,21 +3865,36 @@ void MainWindow::slotShowTimeline(bool show) } } -void MainWindow::slotMaximizeCurrent(bool /*show*/) +void MainWindow::slotMaximizeCurrent(bool) { //TODO: is there a way to maximize current widget? - //if (show == true) - { - m_timelineState = saveState(); - QWidget *par = focusWidget()->parentWidget(); - while (par->parentWidget() && par->parentWidget() != this) - par = par->parentWidget(); - kDebug() << "CURRENT WIDGET: " << par->objectName(); - } - /*else { - //centralWidget()->setHidden(false); - //restoreState(m_timelineState); - }*/ + + m_timelineState = saveState(); + QWidget *par = focusWidget()->parentWidget(); + while (par->parentWidget() && par->parentWidget() != this) + par = par->parentWidget(); + kDebug() << "CURRENT WIDGET: " << par->objectName(); +} + +void MainWindow::loadStabilize() +{ + QMenu* stabMenu= static_cast(factory()->container("stabilize", this)); + if (stabMenu){ + stabMenu->clear(); + Mlt::Profile profile; + if (Mlt::Factory::filter(profile,(char*)"videostab")){ + QAction *action=stabMenu->addAction("Videostab (vstab)"); + action->setData("videostab"); + connect(action,SIGNAL(triggered()), this, SLOT(slotStabilize())); + } + if (Mlt::Factory::filter(profile,(char*)"videostab2")){ + QAction *action=stabMenu->addAction("Videostab (transcode)"); + action->setData("videostab2"); + connect(action,SIGNAL(triggered()), this, SLOT(slotStabilize())); + } + } + + } void MainWindow::loadTranscoders() @@ -3682,6 +3902,9 @@ void MainWindow::loadTranscoders() QMenu *transMenu = static_cast(factory()->container("transcoders", this)); transMenu->clear(); + QMenu *extractAudioMenu = static_cast(factory()->container("extract_audio", this)); + extractAudioMenu->clear(); + KSharedConfigPtr config = KSharedConfig::openConfig("kdenlivetranscodingrc"); KConfigGroup transConfig(config, "Transcoding"); // read the entries @@ -3689,15 +3912,50 @@ void MainWindow::loadTranscoders() QMapIterator i(profiles); while (i.hasNext()) { i.next(); - QStringList data = i.value().split(";", QString::SkipEmptyParts); - QAction *a = transMenu->addAction(i.key()); + QStringList data = i.value().split(';'); + QAction *a; + // separate audio transcoding in a separate menu + if (data.count() > 2 && data.at(2) == "audio") { + a = extractAudioMenu->addAction(i.key()); + } + else { + a = transMenu->addAction(i.key()); + } a->setData(data); - if (data.count() > 1) - a->setToolTip(data.at(1)); + if (data.count() > 1) a->setToolTip(data.at(1)); connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode())); } } +void MainWindow::slotStabilize() +{ + QString condition,filtername; + QStringList ids; + + // Stablize selected clips + QAction *action = qobject_cast(sender()); + if (action){ + filtername=action->data().toString(); + } + m_projectList->startClipFilterJob(filtername, condition); + /* + if (ids.isEmpty()) { + m_messageLabel->setMessage(i18n("No clip to transcode"), ErrorMessage); + return; + } + QString destination; + ProjectItem *item = m_projectList->getClipById(ids.at(0)); + if (ids.count() == 1) { + + } + ClipStabilize *d = new ClipStabilize(destination, ids.count(), filtername); + //connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); + if (d->exec() == QDialog::Accepted) { + m_projectList->slotStabilizeClipJob(ids, d->autoAddClip(), d->params(), d->desc()); + } + delete d;*/ +} + void MainWindow::slotTranscode(KUrl::List urls) { QString params; @@ -3708,9 +3966,9 @@ void MainWindow::slotTranscode(KUrl::List urls) QStringList data = action->data().toStringList(); params = data.at(0); if (data.count() > 1) desc = data.at(1); - if (data.count() > 2) condition = data.at(2); - urls << m_projectList->getConditionalUrls(condition); - urls.removeAll(KUrl()); + if (data.count() > 3) condition = data.at(3); + m_projectList->slotTranscodeClipJob(condition, params, desc); + return; } if (urls.isEmpty()) { m_messageLabel->setMessage(i18n("No clip to transcode"), ErrorMessage); @@ -3719,7 +3977,6 @@ void MainWindow::slotTranscode(KUrl::List urls) ClipTranscode *d = new ClipTranscode(urls, params, desc); connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl))); d->show(); - //QProcess::startDetached("ffmpeg", parameters); } void MainWindow::slotTranscodeClip() @@ -3821,25 +4078,41 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS if (m_renderWidget->automaticAudioExport()) { exportAudio = m_activeTimeline->checkProjectAudio(); } else exportAudio = m_renderWidget->selectedAudioExport(); - + + // Set playlist audio volume to 100% + QDomDocument doc; + doc.setContent(playlistContent); + QDomElement tractor = doc.documentElement().firstChildElement("tractor"); + if (!tractor.isNull()) { + QDomNodeList props = tractor.elementsByTagName("property"); + for (int i = 0; i < props.count(); i++) { + if (props.at(i).toElement().attribute("name") == "meta.volume") { + props.at(i).firstChild().setNodeValue("1"); + break; + } + } + } + // Do we want proxy rendering if (m_projectList->useProxy() && !m_renderWidget->proxyRendering()) { - QDomDocument doc; - doc.setContent(playlistContent); QString root = doc.documentElement().attribute("root"); // replace proxy clips with originals QMap proxies = m_projectList->getProxies(); - QDomNodeList producers = doc.elementsByTagName("producer"); QString producerResource; QString suffix; for (uint n = 0; n < producers.length(); n++) { QDomElement e = producers.item(n).toElement(); producerResource = EffectsList::property(e, "resource"); + if (producerResource.isEmpty()) continue; + if (!producerResource.startsWith('/')) { + producerResource.prepend(root + '/'); + } if (producerResource.contains('?')) { - suffix = "?" + producerResource.section('?', 1); + // slowmotion producer + suffix = '?' + producerResource.section('?', 1); producerResource = producerResource.section('?', 0, 0); } else suffix.clear(); @@ -3849,16 +4122,11 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS // We need to delete the "aspect_ratio" property because proxy clips // sometimes have different ratio than original clips EffectsList::removeProperty(e, "aspect_ratio"); - } - else if (!root.isEmpty() && producerResource.startsWith(root) && proxies.contains(producerResource.remove(0, root.count() + 1))) { - EffectsList::setProperty(e, "resource", proxies.value(producerResource.remove(0, root.count() + 1)) + suffix); - // We need to delete the "aspect_ratio" property because proxy clips - // sometimes have different ratio than original clips - EffectsList::removeProperty(e, "aspect_ratio"); + EffectsList::removeMetaProperties(e); } } } - + /*QMapIterator i(proxies); while (i.hasNext()) { i.next(); @@ -3871,23 +4139,23 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS playlistContent.replace(key, i.value()); } }*/ - playlistContent = doc.toString(); } - + playlistContent = doc.toString(); + // Do save scenelist QFile file(playlistPath); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - m_messageLabel->setMessage(i18n("Cannot write to file %1").arg(playlistPath), ErrorMessage); + m_messageLabel->setMessage(i18n("Cannot write to file %1", playlistPath), ErrorMessage); return; } file.write(playlistContent.toUtf8()); if (file.error() != QFile::NoError) { - m_messageLabel->setMessage(i18n("Cannot write to file %1").arg(playlistPath), ErrorMessage); + m_messageLabel->setMessage(i18n("Cannot write to file %1", playlistPath), ErrorMessage); file.close(); return; } file.close(); - m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath, exportAudio); + m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), m_activeDocument->metadata(), playlistPath, scriptPath, exportAudio); } void MainWindow::slotUpdateTimecodeFormat(int ix) @@ -3949,23 +4217,24 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename) plt = QApplication::desktop()->palette(); } else { KSharedConfigPtr config = KSharedConfig::openConfig(theme); - - // Since there currently is a bug (or feature change) in KGlobalSettings::createApplicationPalette, we need - // to do the palette loading stuff ourselves... - //plt = KGlobalSettings::createApplicationPalette(config); - + +#if KDE_IS_VERSION(4,6,3) + plt = KGlobalSettings::createNewApplicationPalette(config); +#else + // Since there was a bug in createApplicationPalette in KDE < 4.6.3 we need + // to do the palette loading stuff ourselves. (https://bugs.kde.org/show_bug.cgi?id=263497) QPalette::ColorGroup states[3] = { QPalette::Active, QPalette::Inactive, QPalette::Disabled }; // TT thinks tooltips shouldn't use active, so we use our active colors for all states KColorScheme schemeTooltip(QPalette::Active, KColorScheme::Tooltip, config); - + for ( int i = 0; i < 3 ; i++ ) { QPalette::ColorGroup state = states[i]; KColorScheme schemeView(state, KColorScheme::View, config); KColorScheme schemeWindow(state, KColorScheme::Window, config); KColorScheme schemeButton(state, KColorScheme::Button, config); KColorScheme schemeSelection(state, KColorScheme::Selection, config); - + plt.setBrush( state, QPalette::WindowText, schemeWindow.foreground() ); plt.setBrush( state, QPalette::Window, schemeWindow.background() ); plt.setBrush( state, QPalette::Base, schemeView.background() ); @@ -3976,19 +4245,22 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename) plt.setBrush( state, QPalette::HighlightedText, schemeSelection.foreground() ); plt.setBrush( state, QPalette::ToolTipBase, schemeTooltip.background() ); plt.setBrush( state, QPalette::ToolTipText, schemeTooltip.foreground() ); - + plt.setColor( state, QPalette::Light, schemeWindow.shade( KColorScheme::LightShade ) ); plt.setColor( state, QPalette::Midlight, schemeWindow.shade( KColorScheme::MidlightShade ) ); plt.setColor( state, QPalette::Mid, schemeWindow.shade( KColorScheme::MidShade ) ); plt.setColor( state, QPalette::Dark, schemeWindow.shade( KColorScheme::DarkShade ) ); plt.setColor( state, QPalette::Shadow, schemeWindow.shade( KColorScheme::ShadowShade ) ); - + plt.setBrush( state, QPalette::AlternateBase, schemeView.background( KColorScheme::AlternateBackground) ); plt.setBrush( state, QPalette::Link, schemeView.foreground( KColorScheme::LinkText ) ); plt.setBrush( state, QPalette::LinkVisited, schemeView.foreground( KColorScheme::VisitedText ) ); } +#endif } + kapp->setPalette(plt); + slotChangePalette(); const QObjectList children = statusBar()->children(); foreach(QObject * child, children) { @@ -4000,9 +4272,6 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename) ((QWidget*)subchild)->setPalette(plt); } } - if (m_activeTimeline) { - m_activeTimeline->projectView()->updatePalette(); - } } @@ -4053,12 +4322,6 @@ 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; @@ -4109,11 +4372,15 @@ void MainWindow::slotSwitchTitles() slotShowTitleBars(!KdenliveSettings::showtitlebars()); } -QString MainWindow::getMimeType() +QString MainWindow::getMimeType(bool open) { QString mimetype = "application/x-kdenlive"; KMimeType::Ptr mime = KMimeType::mimeType(mimetype); - if (!mime) mimetype = "*.kdenlive"; + if (!mime) { + mimetype = "*.kdenlive"; + if (open) mimetype.append(" *.tar.gz"); + } + else if (open) mimetype.append(" application/x-compressed-tar"); return mimetype; } @@ -4138,86 +4405,18 @@ void MainWindow::slotMonitorRequestRenderFrame(bool request) } } -void MainWindow::slotUpdateGfxScopeFrameRequest() -{ - // We need a delay to make sure widgets are hidden after a close event for example - QTimer::singleShot(500, this, SLOT(slotDoUpdateGfxScopeFrameRequest())); -} - -void MainWindow::slotDoUpdateGfxScopeFrameRequest() -{ - // Check scopes - bool request = false; - for (int i = 0; i < m_gfxScopesList.count(); i++) { - if (!m_gfxScopesList.at(i)->widget()->visibleRegion().isEmpty() && static_cast(m_gfxScopesList.at(i)->widget())->autoRefreshEnabled()) { - kDebug() << "SCOPE VISIBLE: " << static_cast(m_gfxScopesList.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::slotUpdateAudioScopeFrameRequest() -{ - QTimer::singleShot(500, this, SLOT(slotDoUpdateAudioScopeFrameRequest())); -} - -void MainWindow::slotDoUpdateAudioScopeFrameRequest() -{ - bool request = false; - for (int i = 0; i < m_audioScopesList.count(); i++) { - if (!m_audioScopesList.at(i)->visibleRegion().isEmpty() && m_audioScopesList.at(i)->autoRefreshEnabled()) { - kDebug() << "AUDIO SCOPE VISIBLE: " << m_audioScopesList.at(i)->widgetName(); - request = true; - break; - } - } - // Handle audio signal separately (no common interface) - if (!m_audiosignal->visibleRegion().isEmpty() && m_audiosignal->monitoringEnabled()) { - kDebug() << "AUDIO SCOPE VISIBLE: " << "audiosignal"; - request = true; - } -#ifdef DEBUG_MAINW - qDebug() << "Scopes Requesting Audio data: " << request; -#endif - KdenliveSettings::setMonitor_audio(request); - m_monitorManager->slotUpdateAudioMonitoring(); -} - -void MainWindow::slotUpdateColorScopes() -{ - bool request = false; - for (int i = 0; i < m_gfxScopesList.count(); i++) { - // Check if we need the renderer to send a new frame for update - if (!m_gfxScopesList.at(i)->widget()->visibleRegion().isEmpty() && !(static_cast(m_gfxScopesList.at(i)->widget())->autoRefreshEnabled())) request = true; - static_cast(m_gfxScopesList.at(i)->widget())->slotActiveMonitorChanged(m_clipMonitor->isActive()); - } - if (request) { - if (m_clipMonitor->isActive()) m_clipMonitor->render->sendFrameUpdate(); - else m_projectMonitor->render->sendFrameUpdate(); - } -} void MainWindow::slotOpenStopmotion() { if (m_stopmotion == NULL) { - m_stopmotion = new StopmotionWidget(m_activeDocument->projectFolder(), m_stopmotion_actions->actions(), this); - connect(m_stopmotion, SIGNAL(addOrUpdateSequence(const QString)), m_projectList, SLOT(slotAddOrUpdateSequence(const QString))); - for (int i = 0; i < m_gfxScopesList.count(); i++) { + m_stopmotion = new StopmotionWidget(m_monitorManager, m_activeDocument->projectFolder(), m_stopmotion_actions->actions(), this); + connect(m_stopmotion, SIGNAL(addOrUpdateSequence(const QString &)), m_projectList, SLOT(slotAddOrUpdateSequence(const QString))); + //for (int i = 0; i < m_gfxScopesList.count(); i++) { // Check if we need the renderer to send a new frame for update /*if (!m_scopesList.at(i)->widget()->visibleRegion().isEmpty() && !(static_cast(m_scopesList.at(i)->widget())->autoRefreshEnabled())) request = true;*/ - connect(m_stopmotion, SIGNAL(gotFrame(QImage)), static_cast(m_gfxScopesList.at(i)->widget()), SLOT(slotRenderZoneUpdated(QImage))); + //connect(m_stopmotion, SIGNAL(gotFrame(QImage)), static_cast(m_gfxScopesList.at(i)->widget()), SLOT(slotRenderZoneUpdated(QImage))); //static_cast(m_scopesList.at(i)->widget())->slotMonitorCapture(); - } + //} } m_stopmotion->show(); } @@ -4249,11 +4448,88 @@ void MainWindow::slotInsertNotesTimecode() void MainWindow::slotArchiveProject() { QList list = m_projectList->documentClipList(); - ArchiveWidget *d = new ArchiveWidget(list, m_activeTimeline->projectView()->extractTransitionsLumas(), this); + QDomDocument doc = m_activeDocument->xmlSceneList(m_projectMonitor->sceneList(), m_projectList->expandedFolders()); + ArchiveWidget *d = new ArchiveWidget(m_activeDocument->url().fileName(), doc, list, m_activeTimeline->projectView()->extractTransitionsLumas(), this); d->exec(); } +void MainWindow::slotOpenBackupDialog(const KUrl url) +{ + KUrl projectFile; + KUrl projectFolder; + QString projectId; + kDebug()<<"// BACKUP URL: "<projectFolder(); + projectFile = m_activeDocument->url(); + projectId = m_activeDocument->getDocumentProperty("documentid"); + } + + QPointer dia = new BackupWidget(projectFile, projectFolder, projectId, this); + if (dia->exec() == QDialog::Accepted) { + QString requestedBackup = dia->selectedFile(); + m_activeDocument->backupLastSavedVersion(projectFile.path()); + closeCurrentDocument(false); + doOpenFile(KUrl(requestedBackup), NULL); + m_activeDocument->setUrl(projectFile); + m_activeDocument->setModified(true); + setCaption(m_activeDocument->description()); + } + delete dia; +} + +void MainWindow::slotElapsedTime() +{ + kDebug()<<"-----------------------------------------\n"<<"Time elapsed: "<projectFolder().path(); + else currentFolder = KdenliveSettings::defaultprojectfolder(); + ResourceWidget *d = new ResourceWidget(currentFolder); + connect(d, SIGNAL(addClip(KUrl, const QString &)), this, SLOT(slotAddProjectClip(KUrl, const QString &))); + d->show(); +} + +void MainWindow::slotChangePalette() +{ + QPalette plt = QApplication::palette(); + if (m_effectStack) m_effectStack->updatePalette(); + if (m_projectList) m_projectList->updatePalette(); + if (m_effectList) m_effectList->updatePalette(); + + if (m_clipMonitor) m_clipMonitor->setPalette(plt); + if (m_projectMonitor) m_projectMonitor->setPalette(plt); + + setStatusBarStyleSheet(plt); + if (m_activeTimeline) { + m_activeTimeline->updatePalette(); + } +} + +void MainWindow::slotSaveTimelineClip() +{ + if (m_activeTimeline && m_projectMonitor->render) { + ClipItem *clip = m_activeTimeline->projectView()->getActiveClipUnderCursor(true); + if (!clip) { + m_messageLabel->setMessage(i18n("Select a clip to save"), InformationMessage); + return; + } + KUrl url = KFileDialog::getSaveUrl(m_activeDocument->projectFolder(), "video/mlt-playlist"); + if (!url.isEmpty()) m_projectMonitor->render->saveClip(m_activeDocument->tracksCount() - clip->track(), clip->startPos(), url); + } +} + + #include "mainwindow.moc" #ifdef DEBUG_MAINW