diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index b7538b43f1d80fbf9254ee127d4cb72994b3f2b0..9363050f7cdfe2ee37144f46ec8085e8f0c97c69 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 a59293dc7e96c845e875be4eb34380a166d8d1e1..ba8adf52a0b21de809d2b0466d7e31f5d4cb7576 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 946c4a2c04f08cb1bf6a8bb6b913c9c999ca7de3..e154c3073419596d8a2a571f752204e378ef1e57 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 2395e6fc0af13be9d644f1c69f3c1c7a342d85b4..4223fb28dd9f78936fea6b450b76a37a999075d5 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