vlc | branch: master | Pierre Lamot <[email protected]> | Fri Oct 9 11:48:10 2020 +0200| [5b0e958bf0998317a2ac456b2c48f7c00066673d] | committer: Pierre Lamot
qml: move the MainDisplay view to the maininterface package it is no longer dependant of the medialibrary > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5b0e958bf0998317a2ac456b2c48f7c00066673d --- modules/gui/qt/Makefile.am | 2 +- modules/gui/qt/{medialibrary => maininterface}/qml/MainDisplay.qml | 0 modules/gui/qt/maininterface/qml/MainInterface.qml | 2 +- modules/gui/qt/vlc.qrc | 2 +- po/POTFILES.in | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) 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> diff --git a/po/POTFILES.in b/po/POTFILES.in index 2395e6fc0a..4223fb28dd 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -796,9 +796,9 @@ modules/gui/qt/dialogs/help/qml/About.qml modules/gui/qt/dialogs/toolbar/qml/ToolbarEditor.qml modules/gui/qt/maininterface/qml/BannerSources.qml modules/gui/qt/maininterface/qml/MainInterface.qml +modules/gui/qt/maininterface/qml/MainDisplay.qml modules/gui/qt/medialibrary/qml/ArtistTopBanner.qml modules/gui/qt/medialibrary/qml/AudioGridItem.qml -modules/gui/qt/medialibrary/qml/MainDisplay.qml modules/gui/qt/medialibrary/qml/MusicAlbumsDisplay.qml modules/gui/qt/medialibrary/qml/MusicAlbumsGridExpandDelegate.qml modules/gui/qt/medialibrary/qml/MusicAlbums.qml _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
