Browse Source
Removed the recent videos row from the All sub-view of the Video view. 'Continue Watching' row is now present in Home view. Signed-off by: Ash <ashutoshv191@gmail.com>pull/179/head
Ashutosh Verma
2 years ago
committed by
Steve Lhomme
Steve Lhomme
7 changed files with 7 additions and 273 deletions
@ -1,164 +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 |
|||
import QtQuick.Controls |
|||
import QtQuick.Layouts |
|||
import QtQml.Models |
|||
|
|||
import VLC.MainInterface |
|||
import VLC.MediaLibrary |
|||
|
|||
import VLC.Widgets as Widgets |
|||
import VLC.Util |
|||
import VLC.Style |
|||
|
|||
FocusScope { |
|||
id: root |
|||
|
|||
// properties |
|||
|
|||
readonly property bool isSearchable: true |
|||
|
|||
property alias subtitleText: subtitleLabel.text |
|||
|
|||
property int leftPadding: VLCStyle.margin_xsmall |
|||
property int rightPadding: VLCStyle.margin_xsmall |
|||
|
|||
property int nbItemPerRow |
|||
|
|||
property int allVideosContentLeftMargin |
|||
property int allVideosContentRightMargin |
|||
|
|||
property alias model: recentModel |
|||
|
|||
// Settings |
|||
|
|||
implicitHeight: recentVideosColumn.height |
|||
|
|||
Navigation.navigable: recentModel.count > 0 |
|||
|
|||
function setCurrentItemFocus(reason) { |
|||
console.assert(root.Navigation.navigable) |
|||
if (reason === Qt.BacktabFocusReason) |
|||
view.setCurrentItemFocus(reason) |
|||
else |
|||
button.forceActiveFocus(reason) |
|||
} |
|||
|
|||
// Childs |
|||
|
|||
MLRecentVideoModel { |
|||
id: recentModel |
|||
|
|||
ml: MediaLib |
|||
|
|||
limit: MainCtx.gridView ? root.nbItemPerRow |
|||
: 5 |
|||
|
|||
searchPattern: MainCtx.search.pattern |
|||
} |
|||
|
|||
readonly property ColorContext colorContext: ColorContext { |
|||
id: theme |
|||
colorSet: ColorContext.View |
|||
} |
|||
|
|||
Column { |
|||
id: recentVideosColumn |
|||
|
|||
width: root.width |
|||
|
|||
topPadding: VLCStyle.layoutTitle_top_padding |
|||
|
|||
Widgets.ViewHeader { |
|||
id: viewHeader |
|||
|
|||
view: root |
|||
|
|||
visible: recentModel.count > 0 |
|||
seeAllButton.visible: recentModel.maximumCount > recentModel.count |
|||
|
|||
Layout.fillWidth: true |
|||
|
|||
leftPadding: view.currentItem?.contentLeftMargin ?? 0 |
|||
rightPadding: view.currentItem?.contentRightMargin ?? 0 |
|||
topPadding: 0 |
|||
|
|||
text: qsTr("Continue Watching") |
|||
|
|||
onSeeAllButtonClicked: reason => History.push(["mc", "video", "all", "recentVideos"]) |
|||
|
|||
Navigation.parentItem: root |
|||
|
|||
Navigation.downAction: function() { |
|||
view.setCurrentItemFocus(Qt.TabFocusReason) |
|||
} |
|||
} |
|||
|
|||
VideoAll { |
|||
id: view |
|||
|
|||
// Settings |
|||
|
|||
visible: recentModel.count > 0 |
|||
|
|||
anchors { |
|||
left: parent.left |
|||
right: parent.right |
|||
leftMargin: root.leftPadding |
|||
rightMargin: root.rightPadding |
|||
} |
|||
|
|||
height: currentItem?.contentHeight ?? 0 |
|||
|
|||
focus: true |
|||
|
|||
model: recentModel |
|||
|
|||
sectionProperty: "" |
|||
|
|||
fadingEdgeList: false |
|||
|
|||
sortModel: [] |
|||
|
|||
contextMenu: MLContextMenu { |
|||
model: recentModel |
|||
|
|||
showPlayAsAudioAction: true |
|||
} |
|||
|
|||
Navigation.parentItem: root |
|||
|
|||
Navigation.upItem: viewHeader.seeAllButton |
|||
} |
|||
|
|||
Widgets.ViewHeader { |
|||
id: subtitleLabel |
|||
|
|||
view: root |
|||
|
|||
leftPadding: allVideosContentLeftMargin |
|||
rightPadding: allVideosContentRightMargin |
|||
topPadding: recentModel.count > 0 ? (MainCtx.gridView ? VLCStyle.gridView_spacing : |
|||
VLCStyle.tableView_spacing) |
|||
: 0 |
|||
|
|||
text: view.title |
|||
} |
|||
} |
|||
} |
|||
@ -1,56 +0,0 @@ |
|||
/***************************************************************************** |
|||
* Copyright (C) 2023 VLC authors and VideoLAN |
|||
* |
|||
* Authors: Leon Vitanos <leon.vitanos@gmail.com> |
|||
* |
|||
* 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 |
|||
|
|||
import VLC.MediaLibrary |
|||
|
|||
import VLC.Widgets as Widgets |
|||
import VLC.Style |
|||
import VLC.Util |
|||
import VLC.MainInterface |
|||
|
|||
VideoAll { |
|||
id: root |
|||
|
|||
// Settings |
|||
|
|||
sectionProperty: "" |
|||
|
|||
sortModel: [] |
|||
isSearchable: false |
|||
|
|||
// Children |
|||
|
|||
model: MLRecentVideoModel { |
|||
id: recentModel |
|||
ml: MediaLib |
|||
} |
|||
|
|||
contextMenu: MLContextMenu { model: recentModel; showPlayAsAudioAction: true } |
|||
|
|||
header: Widgets.ViewHeader { |
|||
view: root |
|||
|
|||
visible: view.count > 0 |
|||
|
|||
text: qsTr("Continue Watching") |
|||
} |
|||
} |
|||
Loading…
Reference in new issue