[vlc-devel] [PATCH 10/11] qml: move the MainDisplay view to the maininterface package

Pierre Lamot pierre at videolabs.io
Fri Oct 9 12:07:40 CEST 2020


  it is no longer dependant of the medialibrary
---
 modules/gui/qt/Makefile.am                                      | 2 +-
 .../gui/qt/{medialibrary => maininterface}/qml/MainDisplay.qml  | 0
 modules/gui/qt/maininterface/qml/MainInterface.qml              | 2 +-
 modules/gui/qt/vlc.qrc                                          | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename modules/gui/qt/{medialibrary => maininterface}/qml/MainDisplay.qml (100%)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index b7538b43f1..9363050f7c 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -615,11 +615,11 @@ libqt_plugin_la_QML = \
 	gui/qt/dialogs/toolbar/qml/ToolbarEditorButtonList.qml \
 	gui/qt/maininterface/qml/BannerSources.qml \
 	gui/qt/maininterface/qml/MainInterface.qml \
+	gui/qt/maininterface/qml/MainDisplay.qml \
 	gui/qt/maininterface/qml/NoMedialibHome.qml \
 	gui/qt/medialibrary/qml/ArtistTopBanner.qml \
 	gui/qt/medialibrary/qml/AudioGridItem.qml \
 	gui/qt/medialibrary/qml/EmptyLabel.qml \
-	gui/qt/medialibrary/qml/MainDisplay.qml \
 	gui/qt/medialibrary/qml/MusicAlbums.qml \
 	gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml \
 	gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml \
diff --git a/modules/gui/qt/medialibrary/qml/MainDisplay.qml b/modules/gui/qt/maininterface/qml/MainDisplay.qml
similarity index 100%
rename from modules/gui/qt/medialibrary/qml/MainDisplay.qml
rename to modules/gui/qt/maininterface/qml/MainDisplay.qml
diff --git a/modules/gui/qt/maininterface/qml/MainInterface.qml b/modules/gui/qt/maininterface/qml/MainInterface.qml
index a59293dc7e..ba8adf52a0 100644
--- a/modules/gui/qt/maininterface/qml/MainInterface.qml
+++ b/modules/gui/qt/maininterface/qml/MainInterface.qml
@@ -73,7 +73,7 @@ Rectangle {
 
     readonly property var pageModel: [
         { name: "about", url: "qrc:///about/About.qml" },
-        { name: "mc", url: "qrc:///medialibrary/MainDisplay.qml" },
+        { name: "mc", url: "qrc:///main/MainDisplay.qml" },
         { name: "player", url:"qrc:///player/Player.qml" },
     ]
 
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 946c4a2c04..e154c30734 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -178,6 +178,7 @@
     <qresource prefix="/main">
         <file alias="BannerSources.qml">maininterface/qml/BannerSources.qml</file>
         <file alias="MainInterface.qml">maininterface/qml/MainInterface.qml</file>
+        <file alias="MainDisplay.qml">maininterface/qml/MainDisplay.qml</file>
         <file alias="NoMedialibHome.qml">maininterface/qml/NoMedialibHome.qml</file>
     </qresource>
     <qresource prefix="/widgets">
@@ -260,7 +261,6 @@
         <file alias="MusicTracksDisplay.qml">medialibrary/qml/MusicTracksDisplay.qml</file>
         <file alias="MusicTrackListDisplay.qml">medialibrary/qml/MusicTrackListDisplay.qml</file>
         <file alias="ArtistTopBanner.qml">medialibrary/qml/ArtistTopBanner.qml</file>
-        <file alias="MainDisplay.qml">medialibrary/qml/MainDisplay.qml</file>
         <file alias="UrlListDisplay.qml">medialibrary/qml/UrlListDisplay.qml</file>
         <file alias="VideoInfoExpandPanel.qml">medialibrary/qml/VideoInfoExpandPanel.qml</file>
         <file alias="VideoListDisplay.qml">medialibrary/qml/VideoListDisplay.qml</file>
-- 
2.25.1



More information about the vlc-devel mailing list