vlc | branch: master | Adrien Maglo <[email protected]> | Tue May 14 14:41:31 2019 +0200| [dd5ad02ae81af45923dd202aedff4c8eb955a5c4] | committer: Thomas Guillem
qml: remove dead code, ArtistGridView and ArtistListView Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd5ad02ae81af45923dd202aedff4c8eb955a5c4 --- modules/gui/qt/Makefile.am | 2 - modules/gui/qt/qml/mediacenter/ArtistGridView.qml | 61 ----------------------- modules/gui/qt/qml/mediacenter/ArtistListView.qml | 56 --------------------- modules/gui/qt/vlc.qrc | 2 - 4 files changed, 121 deletions(-) diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am index 4b32a2241a..5334d951d5 100644 --- a/modules/gui/qt/Makefile.am +++ b/modules/gui/qt/Makefile.am @@ -559,8 +559,6 @@ libqt_plugin_la_QML = \ gui/qt/qml/menus/ToolsMenu.qml \ gui/qt/qml/menus/ViewMenu.qml \ gui/qt/qml/menus/VideoMenu.qml \ - gui/qt/qml/mediacenter/ArtistListView.qml \ - gui/qt/qml/mediacenter/ArtistGridView.qml \ gui/qt/qml/mediacenter/ArtistTopBanner.qml \ gui/qt/qml/mediacenter/MCMainDisplay.qml \ gui/qt/qml/mediacenter/MCMusicDisplay.qml \ diff --git a/modules/gui/qt/qml/mediacenter/ArtistGridView.qml b/modules/gui/qt/qml/mediacenter/ArtistGridView.qml deleted file mode 100644 index b10100e7b6..0000000000 --- a/modules/gui/qt/qml/mediacenter/ArtistGridView.qml +++ /dev/null @@ -1,61 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2019 VLC authors and VideoLAN - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * ( at your option ) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 - -import "qrc:///utils/" as Utils -import "qrc:///style/" - -import org.videolan.medialib 0.1 - - -GridView { - id: artistGridView - - cellWidth: (VLCStyle.cover_normal) + VLCStyle.margin_small - cellHeight: (VLCStyle.cover_normal + VLCStyle.fontHeight_normal) + VLCStyle.margin_small - clip: true - ScrollBar.vertical: ScrollBar { } - - delegate : Utils.GridItem { - id: gridItem - width: VLCStyle.cover_normal - height: VLCStyle.cover_normal + VLCStyle.fontHeight_normal - - cover: Utils.MultiCoverPreview { - albums: MLAlbumModel { - ml: medialib - parentId: model.id - maxItems: 4 - } - } - name: model.name || "Unknown Artist" - - onItemClicked: { - console.log('Clicked on details : '+model.name); - } - onPlayClicked: { - console.log('Clicked on play : '+model.name); - medialib.addAndPlay( model.id ) - } - onAddToPlaylistClicked: { - console.log('Clicked on addToPlaylist : '+model.name); - medialib.addToPlaylist( model.id ); - } - } -} diff --git a/modules/gui/qt/qml/mediacenter/ArtistListView.qml b/modules/gui/qt/qml/mediacenter/ArtistListView.qml deleted file mode 100644 index bb2ff5b3d2..0000000000 --- a/modules/gui/qt/qml/mediacenter/ArtistListView.qml +++ /dev/null @@ -1,56 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2019 VLC authors and VideoLAN - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * ( at your option ) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ -import QtQuick 2.11 -import QtQuick.Controls 2.4 - -import "qrc:///utils/" as Utils -import "qrc:///style/" - -ListView { - id: artistListView - property var onItemClicked - - spacing: 2 - delegate : Utils.ListItem { - height: VLCStyle.icon_normal - width: parent.width - - cover: Image { - id: cover_obj - fillMode: Image.PreserveAspectFit - source: model.cover || VLCStyle.noArtArtist - } - line1: model.name || qsTr("Unknown artist") - - - onItemClicked: { - artistListView.onItemClicked( model.id ) - } - - onPlayClicked: { - console.log('Clicked on play : '+model.name); - medialib.addAndPlay( model.id ) - } - onAddToPlaylistClicked: { - console.log('Clicked on addToPlaylist : '+model.name); - medialib.addToPlaylist( model.id ); - } - } - - ScrollBar.vertical: ScrollBar { } -} diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc index f4c5e475ee..3658c2702e 100644 --- a/modules/gui/qt/vlc.qrc +++ b/modules/gui/qt/vlc.qrc @@ -195,8 +195,6 @@ <file alias="MusicArtistsDisplay.qml">qml/mediacenter/MusicArtistsDisplay.qml</file> <file alias="MusicGenresDisplay.qml">qml/mediacenter/MusicGenresDisplay.qml</file> <file alias="MusicTracksDisplay.qml">qml/mediacenter/MusicTracksDisplay.qml</file> - <file alias="ArtistGridView.qml">qml/mediacenter/ArtistGridView.qml</file> - <file alias="ArtistListView.qml">qml/mediacenter/ArtistListView.qml</file> <file alias="MusicTrackListDisplay.qml">qml/mediacenter/MusicTrackListDisplay.qml</file> <file alias="ArtistTopBanner.qml">qml/mediacenter/ArtistTopBanner.qml</file> <file alias="MCMainDisplay.qml">qml/mediacenter/MCMainDisplay.qml</file> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
