[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] /: Embed all qml monitor overlays in a Qt resource so that we can run without installing
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2015-12-31 14:45:32
Message-ID: E1aEeTs-0002se-Hj () scm ! kde ! org
[Download RAW message or body]

Git commit 17477282915bbc0ed05560e8e5f4f784c0c0fcfa by Jean-Baptiste Mardelle.
Committed on 31/12/2015 at 14:45.
Pushed by mardelle into branch 'master'.

Embed all qml monitor overlays in a Qt resource so that we can run without installing

M  +6    -5    data/CMakeLists.txt
M  +5    -5    src/monitor/monitor.cpp
M  +7    -0    src/uiresources.qrc

http://commits.kde.org/kdenlive/17477282915bbc0ed05560e8e5f4f784c0c0fcfa

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 5f34ba4..bbfad39 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -19,11 +19,12 @@ install(FILES
   timeline_vthumbs.png
   kdenliveeffectscategory.rc
   kdenlivetranscodingrc
-  kdenlivemonitor.qml
-  kdenliveclipmonitor.qml
-  kdenlivemonitoreffectscene.qml
-  kdenlivemonitorcornerscene.qml
-  kdenlivemonitorsplit.qml
+# Qml are now embeded as Qt resources from /src/uiresources.qrc
+#  kdenlivemonitor.qml
+#  kdenliveclipmonitor.qml
+#  kdenlivemonitoreffectscene.qml
+#  kdenlivemonitorcornerscene.qml
+#  kdenlivemonitorsplit.qml
   DESTINATION ${DATA_INSTALL_DIR}/kdenlive)
 install(FILES  kdenlive.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
 install(FILES kdenlive_projectprofiles.knsrc kdenlive_renderprofiles.knsrc \
                kdenlive_wipes.knsrc kdenlive_titles.knsrc DESTINATION \
                ${CONFIG_INSTALL_DIR})
diff --git a/src/monitor/monitor.cpp b/src/monitor/monitor.cpp
index 44e45c7..a210269 100644
--- a/src/monitor/monitor.cpp
+++ b/src/monitor/monitor.cpp
@@ -1456,7 +1456,7 @@ void Monitor::slotShowEffectScene(MonitorSceneType sceneType, \
bool temporary)  if (!temporary) m_lastMonitorSceneType = sceneType;
     if (sceneType == MonitorSceneGeometry) {
         if (!m_rootItem || m_rootItem->objectName() != \
                QLatin1String("rooteffectscene")) {
-            m_glMonitor->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, \
QStringLiteral("kdenlivemonitoreffectscene.qml")))); +            \
m_glMonitor->setSource(QUrl(QStringLiteral("qrc:/qml/kdenlivemonitoreffectscene.qml")));
  m_rootItem = m_glMonitor->rootObject();
             QObject::connect(m_rootItem, SIGNAL(addKeyframe()), this, \
                SIGNAL(addKeyframe()), Qt::UniqueConnection);
             QObject::connect(m_rootItem, SIGNAL(seekToKeyframe()), this, \
SLOT(slotSeekToKeyFrame()), Qt::UniqueConnection); @@ -1465,7 +1465,7 @@ void \
Monitor::slotShowEffectScene(MonitorSceneType sceneType, bool temporary)  }
     else if (sceneType == MonitorSceneCorners) {
         if (!m_rootItem || m_rootItem->objectName() != \
                QLatin1String("rootcornerscene")) {
-            m_glMonitor->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, \
QStringLiteral("kdenlivemonitorcornerscene.qml")))); +            \
m_glMonitor->setSource(QUrl(QStringLiteral("qrc:/qml/kdenlivemonitorcornerscene.qml")));
  m_rootItem = m_glMonitor->rootObject();
             QObject::connect(m_rootItem, SIGNAL(addKeyframe()), this, \
                SIGNAL(addKeyframe()), Qt::UniqueConnection);
             QObject::connect(m_rootItem, SIGNAL(seekToKeyframe()), this, \
SLOT(slotSeekToKeyFrame()), Qt::UniqueConnection); @@ -1475,7 +1475,7 @@ void \
Monitor::slotShowEffectScene(MonitorSceneType sceneType, bool temporary)  else if \
(sceneType == MonitorSceneRoto) {  // TODO
         if (!m_rootItem || m_rootItem->objectName() != \
                QLatin1String("rootcornerscene")) {
-            m_glMonitor->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, \
QStringLiteral("kdenlivemonitorcornerscene.qml")))); +            \
m_glMonitor->setSource(QUrl(QStringLiteral("qrc:/qml/kdenlivemonitorcornerscene.qml")));
  m_rootItem = m_glMonitor->rootObject();
             QObject::connect(m_rootItem, SIGNAL(addKeyframe()), this, \
                SIGNAL(addKeyframe()), Qt::UniqueConnection);
             QObject::connect(m_rootItem, SIGNAL(seekToKeyframe()), this, \
SLOT(slotSeekToKeyFrame()), Qt::UniqueConnection); @@ -1691,7 +1691,7 @@ void \
Monitor::slotSwitchCompare(bool enable)  delete original;
         m_splitProducer = new Mlt::Producer(trac.get_producer());
         render->setProducer(m_splitProducer, pos, isActive());
-        m_glMonitor->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, \
QStringLiteral("kdenlivemonitorsplit.qml")))); +        \
m_glMonitor->setSource(QUrl(QStringLiteral("qrc:/qml/kdenlivemonitorsplit.qml")));  \
m_rootItem = m_glMonitor->rootObject();  m_markerItem = NULL;
         QObject::connect(m_rootItem, SIGNAL(qmlMoveSplit()), this, \
SLOT(slotAdjustEffectCompare()), Qt::UniqueConnection); @@ -1811,7 +1811,7 @@ void \
Monitor::prepareAudioThumb(int channels, QVariantList &audioCache)  
 void Monitor::loadMonitorScene()
 {
-    m_glMonitor->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::DataLocation, \
m_id == Kdenlive::ClipMonitor ? QStringLiteral("kdenliveclipmonitor.qml") : \
QStringLiteral("kdenlivemonitor.qml")))); +    m_glMonitor->setSource(QUrl(m_id == \
Kdenlive::ClipMonitor ? QStringLiteral("qrc:/qml/kdenliveclipmonitor.qml") : \
QStringLiteral("qrc:/qml/kdenlivemonitor.qml")));  \
m_glMonitor->slotShowEffectScene(MonitorSceneNone);  m_rootItem = \
m_glMonitor->rootObject();  if (m_id == Kdenlive::DvdMonitor) {
diff --git a/src/uiresources.qrc b/src/uiresources.qrc
index 49447d4..917fca1 100644
--- a/src/uiresources.qrc
+++ b/src/uiresources.qrc
@@ -2,4 +2,11 @@
   <qresource prefix="kxmlgui5/kdenlive">
     <file>kdenliveui.rc</file>
   </qresource>
+  <qresource prefix="qml">
+    <file alias="kdenlivemonitor.qml">../data/kdenlivemonitor.qml</file>
+    <file alias="kdenliveclipmonitor.qml">../data/kdenliveclipmonitor.qml</file>
+    <file alias="kdenlivemonitoreffectscene.qml">../data/kdenlivemonitoreffectscene.qml</file>
 +    <file alias="kdenlivemonitorcornerscene.qml">../data/kdenlivemonitorcornerscene.qml</file>
 +    <file alias="kdenlivemonitorsplit.qml">../data/kdenlivemonitorsplit.qml</file>
+  </qresource>
 </RCC>


[prev in list] [next in list] [prev in thread] [next in thread]