[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive/refactoring_timeline] /: Merge branch 'master' into refactoring_timeline
From: Vincent Pinon <null () kde ! org>
Date: 2018-09-28 21:49:32
Message-ID: E1g60dg-000882-5V () code ! kde ! org
[Download RAW message or body]
Git commit 111b6b92bc7399b4f5488d97d683d3962a5a8c92 by Vincent Pinon.
Committed on 28/09/2018 at 21:19.
Pushed by vpinon into branch 'refactoring_timeline'.
Merge branch 'master' into refactoring_timeline
M +4 -4 AUTHORS
M +3 -0 CMakeLists.txt
M +5 -2 src/CMakeLists.txt
M +2 -0 src/core.cpp
M +8 -3 src/main.cpp
https://commits.kde.org/kdenlive/111b6b92bc7399b4f5488d97d683d3962a5a8c92
diff --cc AUTHORS
index 2e18bc1c4,0537fe09a..a223ecb61
--- a/AUTHORS
+++ b/AUTHORS
@@@ -1,13 -1,10 +1,13 @@@
Active Kdenlive authors
Jean-Baptiste Mardelle <jb@kdenlive.org>
- MLT and KDE SC 4 / KF5 port, main developer and maintainer
+ Main developer and maintainer, MLT and KDE SC 4 / KF5 port,
2005-present
+ Nicolas Carion <french.ebook.lover@gmail.com>
+ Code re-architecture & timeline rewrite
+ 2016-present
Vincent Pinon <vpinon@kde.org>
- Interim maintainer, Windows cross-build, KF5 port, profiles updates, etc.
+ KF5 port, Windows cross-build, bugs fixing
2012-present
Former Kdenlive authors
@@@ -15,12 -12,12 +15,12 @@@
Laurent Montel <montel@kde.org>
Bugs fixing, code clean up, review
2013-2017
- Steve Guilford <s.guilford@dbplugins.com>
- Bug fixing
- 2014
Till Theato <root@ttill.de>
- Bug fixing, etc.
- 2010-2015
+ Rotoscoping, bug fixing, etc.
+ 2009-2015
+ Steve Guilford <s.guilford@dbplugins.com>
+ Bug fixing
+ 2014
Simon A. Eugster (Granjow) <simon.eu@gmail.com>
Colour and audio scopes, titler, manual, bug fixing, etc.
2009-2012
diff --cc CMakeLists.txt
index 0e3f5cebc,a6c5a4fae..d296a9f58
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -95,10 -89,12 +95,13 @@@ else(
set(KF5_ICON_COMPATIBILITY TRUE)
endif()
-find_package(KF5 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config \
ConfigWidgets +find_package(KF5 REQUIRED COMPONENTS Archive Bookmarks CoreAddons \
Config ConfigWidgets
DBusAddons KIO WidgetsAddons NotifyConfig NewStuff \
XmlGui Notifications GuiAddons TextWidgets IconThemes + \
Declarative Solid
OPTIONAL_COMPONENTS DocTools FileMetaData Crash Purpose)
+ if(WIN32)
+ find_package(DrMinGW)
+ endif(WIN32)
if (KF5FileMetaData_FOUND)
message(STATUS "Found KF5 FileMetadata to extract file metadata")
diff --cc src/CMakeLists.txt
index e675da357,58394a280..ed6920897
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -304,18 -291,18 +304,21 @@@ message(STATUS "Found MLT++: ${MLTPP_LI
if (KF5_FILEMETADATA)
add_definitions(-DKF5_USE_FILEMETADATA)
- target_link_libraries(kdenlive KF5::FileMetaData)
+ target_link_libraries(kdenliveLib KF5::FileMetaData)
endif()
- if (KF5Crash_FOUND)
+ if (DRMINGW_FOUND)
+ add_definitions(-DUSE_DRMINGW)
+ target_link_libraries(kdenlive ${DRMINGW_LIBRARY})
+ elseif (KF5Crash_FOUND)
add_definitions(-DKF5_USE_CRASH)
- target_link_libraries(kdenliveLib KF5::Crash)
+ target_link_libraries(kdenlive KF5::Crash)
-endif(DRMINGW_FOUND)
+endif()
-target_link_libraries(kdenlive Qt5::Script Qt5::Widgets Qt5::Concurrent Qt5::Qml \
Qt5::Quick) +if (KF5_PURPOSE)
+ add_definitions(-DKF5_USE_PURPOSE)
+ target_link_libraries(kdenliveLib KF5::Purpose KF5::PurposeWidgets)
+endif()
if (KF5_PURPOSE)
add_definitions(-DKF5_USE_PURPOSE)
diff --cc src/core.cpp
index 3d5ccbbc1,5e0548a26..cbf7cf9c0
--- a/src/core.cpp
+++ b/src/core.cpp
@@@ -163,41 -133,30 +163,43 @@@ void Core::initGUI(const QUrl &Url
m_library = new LibraryWidget(m_projectManager);
connect(m_library, SIGNAL(addProjectClips(QList<QUrl>)), m_binWidget, \
SLOT(droppedUrls(QList<QUrl>)));
connect(this, &Core::updateLibraryPath, m_library, \
&LibraryWidget::slotUpdateLibraryPath);
- connect(m_binWidget, SIGNAL(storeFolder(QString, QString, QString, QString)), \
m_binController, SLOT(slotStoreFolder(QString, QString, QString, \
QString)));
- connect(m_binController, SIGNAL(loadFolders(QMap<QString, QString>)), \
m_binWidget, SLOT(slotLoadFolders(QMap<QString, QString>)));
- connect(m_binController, &BinController::requestAudioThumb, m_binWidget, \
&Bin::slotCreateAudioThumb);
- connect(m_binController, &BinController::abortAudioThumbs, m_binWidget, \
&Bin::abortAudioThumbs);
- connect(m_binController, SIGNAL(loadThumb(QString, QImage, bool)), m_binWidget, \
SLOT(slotThumbnailReady(QString, QImage, bool))); + connect(m_binWidget, \
&Bin::storeFolder, m_binController.get(), &BinController::slotStoreFolder); + // \
connect(m_binController.get(), &BinController::slotProducerReady, m_binWidget, \
&Bin::slotProducerReady, Qt::DirectConnection); + // \
connect(m_binController.get(), &BinController::prepareTimelineReplacement, \
m_binWidget, &Bin::prepareTimelineReplacement, Qt::DirectConnection); +
+ // connect(m_binController.get(), &BinController::requestAudioThumb, \
m_binWidget, &Bin::slotCreateAudioThumb); + connect(m_binController.get(), \
&BinController::abortAudioThumbs, m_binWidget, &Bin::abortAudioThumbs); + \
connect(m_binController.get(), &BinController::setDocumentNotes, m_projectManager, \
&ProjectManager::setDocumentNotes); m_monitorManager = new MonitorManager(this);
// Producer queue, creating MLT::Producers on request
+ /*
m_producerQueue = new ProducerQueue(m_binController);
- connect(m_producerQueue, SIGNAL(gotFileProperties(requestClipInfo, \
ClipController *)), m_binWidget, SLOT(slotProducerReady(requestClipInfo, \
ClipController *)), Qt::DirectConnection); + connect(m_producerQueue, \
&ProducerQueue::gotFileProperties, m_binWidget, \
&Bin::slotProducerReady);
connect(m_producerQueue, &ProducerQueue::replyGetImage, m_binWidget, \
&Bin::slotThumbnailReady); + connect(m_producerQueue, \
&ProducerQueue::requestProxy, + [this](const QString &id){ \
m_binWidget->startJob(id, AbstractClipJob::PROXYJOB);});
connect(m_producerQueue, &ProducerQueue::removeInvalidClip, m_binWidget, \
&Bin::slotRemoveInvalidClip, Qt::DirectConnection);
connect(m_producerQueue, SIGNAL(addClip(QString, QMap<QString, QString>)), \
m_binWidget, SLOT(slotAddUrl(QString, QMap<QString, QString>)));
- connect(m_binController, SIGNAL(createThumb(QDomElement, QString, int)), \
m_producerQueue, SLOT(getFileProperties(QDomElement, QString, int))); + \
connect(m_binController.get(), SIGNAL(createThumb(QDomElement, QString, int)), \
m_producerQueue, SLOT(getFileProperties(QDomElement, QString, int)));
connect(m_binWidget, &Bin::producerReady, m_producerQueue, \
&ProducerQueue::slotProcessingDone, Qt::DirectConnection); + // TODO
+ connect(m_producerQueue, SIGNAL(removeInvalidProxy(QString,bool)), m_binWidget, \
SLOT(slotRemoveInvalidProxy(QString,bool)));*/
- //TODO
- /*connect(m_producerQueue, SIGNAL(removeInvalidProxy(QString,bool)), \
m_binWidget, SLOT(slotRemoveInvalidProxy(QString,bool)));*/
-
+ m_mainWindow->init();
+ projectManager()->init(Url, QString());
+ QTimer::singleShot(0, pCore->projectManager(), \
&ProjectManager::slotLoadOnOpen); + if (qApp->isSessionRestored()) {
+ // NOTE: we are restoring only one window, because Kdenlive only uses one \
MainWindow + m_mainWindow->restore(1, false);
+ }
+ m_mainWindow->show();
}
-Core *Core::self()
+std::unique_ptr<Core> &Core::self()
{
+ if (!m_self) {
+ qDebug() << "Error : Core has not been created";
+ }
return m_self;
}
diff --cc src/main.cpp
index 912ea0e77,a9213028a..8423cf224
--- a/src/main.cpp
+++ b/src/main.cpp
@@@ -26,26 -26,26 +26,29 @@@
#include "kxmlgui_version.h"
#include <KAboutData>
+#include <KConfigGroup>
- #ifdef KF5_USE_CRASH
- #include <KCrash>
+ #ifdef USE_DRMINGW
+ # include <exchndl.h>
+ #elif defined(KF5_USE_CRASH)
+ # include <KCrash>
#endif
+
#include <KIconLoader>
#include <KSharedConfig>
-#include <KConfigGroup>
+#include "definitions.h"
#include "kdenlive_debug.h"
-#include <QUrl> //new
-#include <QDir>
+#include <KDBusService>
#include <QApplication>
-#include <klocalizedstring.h>
-#include <QCommandLineParser>
#include <QCommandLineOption>
-#include <KDBusService>
-#include <QProcess>
+#include <QCommandLineParser>
+#include <QDir>
#include <QIcon>
+#include <KIconTheme>
+#include <QProcess>
+#include <QQmlEngine>
+#include <QUrl> //new
+#include <klocalizedstring.h>
int main(int argc, char *argv[])
{
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic