vlc | branch: master | Prince Gupta <guptaprince8...@gmail.com> | Wed Oct 7 19:06:36 2020 +0530| [4d39aefc7a0c43a20e20cb25ad4729811031e1c5] | committer: Pierre Lamot
qml: rearrange playlist in maxplayer Signed-off-by: Pierre Lamot <pie...@videolabs.io> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4d39aefc7a0c43a20e20cb25ad4729811031e1c5 --- modules/gui/qt/player/qml/Player.qml | 178 ++++++++++++++++++++--------- modules/gui/qt/player/qml/ResumeDialog.qml | 12 -- modules/gui/qt/player/qml/TopBar.qml | 64 +---------- 3 files changed, 128 insertions(+), 126 deletions(-) diff --git a/modules/gui/qt/player/qml/Player.qml b/modules/gui/qt/player/qml/Player.qml index 11b9046697..e76acb162a 100644 --- a/modules/gui/qt/player/qml/Player.qml +++ b/modules/gui/qt/player/qml/Player.qml @@ -73,6 +73,132 @@ Widgets.NavigableFocusScope { } } + Widgets.DrawerExt { + id: csdGroup + + z: 4 + anchors.right: parent.right + anchors.top: parent.top + state: topcontrolView.state + edge: Widgets.DrawerExt.Edges.Top + width: contentItem.width + focus: true + + component: Column { + spacing: VLCStyle.margin_xxsmall + focus: true + + onActiveFocusChanged: if (activeFocus) menu_selector.forceActiveFocus() + + Loader { + focus: false + anchors.right: parent.right + height: VLCStyle.icon_normal + active: mainInterface.clientSideDecoration + enabled: mainInterface.clientSideDecoration + visible: mainInterface.clientSideDecoration + source: "qrc:///widgets/CSDWindowButtonSet.qml" + onLoaded: { + item.color = VLCStyle.colors.playerFg + item.hoverColor = VLCStyle.colors.windowCSDButtonDarkBg + } + } + + Row { + anchors.right: parent.right + focus: true + KeyNavigation.down: playlistpopup.state === "visible" ? playlistpopup : controlBarView + + Widgets.IconToolButton { + id: menu_selector + + focus: true + size: VLCStyle.banner_icon_size + iconText: VLCIcons.ellipsis + text: i18n.qtr("Menu") + color: VLCStyle.colors.playerFg + property bool acceptFocus: true + + onClicked: contextMenu.popup(this.mapToGlobal(0, height)) + + KeyNavigation.left: topcontrolView + KeyNavigation.right: playlistBtn + + QmlGlobalMenu { + id: contextMenu + ctx: mainctx + } + } + + Widgets.IconToolButton { + id: playlistBtn + + objectName: PlayerControlBarModel.PLAYLIST_BUTTON + size: VLCStyle.banner_icon_size + iconText: VLCIcons.playlist + text: i18n.qtr("Playlist") + color: VLCStyle.colors.playerFg + focus: false + onClicked: { + if (mainInterface.playlistDocked) + playlistpopup.showPlaylist = !playlistpopup.showPlaylist + else + mainInterface.playlistVisible = !mainInterface.playlistVisible + } + property bool acceptFocus: true + + KeyNavigation.left: menu_selector + } + } + } + } + + Widgets.DrawerExt { + id: playlistpopup + + property bool showPlaylist: false + property var previousFocus: undefined + + z: 2 + anchors { + top: parent.top + right: parent.right + bottom: parent.bottom + bottomMargin: parent.height - rootPlayer.positionSliderY + } + focus: false + edge: Widgets.DrawerExt.Edges.Right + state: showPlaylist && mainInterface.playlistDocked ? "visible" : "hidden" + component: Rectangle { + color: VLCStyle.colors.setColorAlpha(VLCStyle.colors.banner, 0.8) + width: rootPlayer.width/4 + height: playlistpopup.height + + PL.PlaylistListView { + id: playlistView + focus: true + anchors.fill: parent + + forceDark: true + navigationParent: rootPlayer + navigationUpItem: csdGroup + navigationDownItem: controlBarView + navigationLeft: function() { + playlistpopup.showPlaylist = false + controlBarView.forceActiveFocus() + } + navigationCancel: function() { + playlistpopup.showPlaylist = false + controlBarView.forceActiveFocus() + } + } + } + onStateChanged: { + if (state === "hidden") + toolbarAutoHide.restart() + } + } + //property alias centralLayout: mainLayout.centralLayout ColumnLayout { id: mainLayout @@ -111,18 +237,11 @@ Widgets.NavigableFocusScope { } lockAutoHide: playlistpopup.state === "visible" - - onTogglePlaylistVisiblity: { - if (mainInterface.playlistDocked) - playlistpopup.showPlaylist = !playlistpopup.showPlaylist - else - mainInterface.playlistVisible = !mainInterface.playlistVisible - } - title: mainPlaylistController.currentItem.title navigationParent: rootPlayer navigationDownItem: playlistpopup.showPlaylist ? playlistpopup : controlBarView + navigationRightItem: csdGroup } ResumeDialog { @@ -227,50 +346,7 @@ Widgets.NavigableFocusScope { } } - Widgets.DrawerExt { - id: playlistpopup - - z: 2 - anchors { - top: centralLayout.top - right: parent.right - bottom: centralLayout.bottom - } - property bool showPlaylist: false - property var previousFocus: undefined - focus: false - edge: Widgets.DrawerExt.Edges.Right - state: showPlaylist && mainInterface.playlistDocked ? "visible" : "hidden" - component: Rectangle { - color: VLCStyle.colors.setColorAlpha(VLCStyle.colors.banner, 0.8) - width: rootPlayer.width/4 - height: playlistpopup.height - - PL.PlaylistListView { - id: playlistView - focus: true - anchors.fill: parent - - forceDark: true - navigationParent: rootPlayer - navigationUpItem: topcontrolView - navigationDownItem: controlBarView - navigationLeft: function() { - playlistpopup.showPlaylist = false - controlBarView.forceActiveFocus() - } - navigationCancel: function() { - playlistpopup.showPlaylist = false - controlBarView.forceActiveFocus() - } - } - } - onStateChanged: { - if (state === "hidden") - toolbarAutoHide.restart() - } - } } Widgets.DrawerExt { diff --git a/modules/gui/qt/player/qml/ResumeDialog.qml b/modules/gui/qt/player/qml/ResumeDialog.qml index 058c39d7a3..72c2bc5b97 100644 --- a/modules/gui/qt/player/qml/ResumeDialog.qml +++ b/modules/gui/qt/player/qml/ResumeDialog.qml @@ -143,18 +143,6 @@ Widgets.NavigableFocusScope { Item { Layout.fillWidth: true } - - Loader { - Layout.alignment: Qt.AlignRight | Qt.AlignTop - height: VLCStyle.icon_normal - active: mainInterface.clientSideDecoration - enabled: mainInterface.clientSideDecoration - source: "qrc:///widgets/CSDWindowButtonSet.qml" - onLoaded: { - item.color = VLCStyle.colors.playerFg - item.hoverColor = VLCStyle.colors.windowCSDButtonDarkBg - } - } } } } diff --git a/modules/gui/qt/player/qml/TopBar.qml b/modules/gui/qt/player/qml/TopBar.qml index 085b18a246..b2cd3da1de 100644 --- a/modules/gui/qt/player/qml/TopBar.qml +++ b/modules/gui/qt/player/qml/TopBar.qml @@ -40,8 +40,6 @@ Widgets.NavigableFocusScope{ property alias title: titleText.text - signal togglePlaylistVisiblity(); - Keys.priority: Keys.AfterItem Keys.onPressed: defaultKeyAction(event, 0) @@ -115,7 +113,6 @@ Widgets.NavigableFocusScope{ } history.previous() } - KeyNavigation.right: menu_selector focus: true } @@ -133,7 +130,7 @@ Widgets.NavigableFocusScope{ anchors.left: parent.left anchors.leftMargin: VLCStyle.icon_normal - width: rowLayout.width - (windowAndGlobalButtonsLayout.width + anchors.leftMargin) + width: rowLayout.width - anchors.leftMargin horizontalAlignment: Text.AlignLeft color: VLCStyle.colors.playerFg @@ -144,65 +141,6 @@ Widgets.NavigableFocusScope{ } } - - Column{ - id: windowAndGlobalButtonsLayout - Layout.alignment: Qt.AlignTop | Qt.AlignRight - - spacing: 0 - - Loader { - //Layout.alignment: Qt.AlignRight | Qt.AlignTop - anchors.right: parent.right - height: VLCStyle.icon_normal - active: mainInterface.clientSideDecoration - enabled: mainInterface.clientSideDecoration - source: "qrc:///widgets/CSDWindowButtonSet.qml" - onLoaded: { - item.color = VLCStyle.colors.playerFg - item.hoverColor = VLCStyle.colors.windowCSDButtonDarkBg - } - } - - Row { - //Layout.alignment: Qt.AlignRight | Qt.AlignTop - anchors.right: parent.right - - Widgets.IconToolButton { - id: playlistBtn - - objectName: PlayerControlBarModel.PLAYLIST_BUTTON - size: VLCStyle.icon_normal - iconText: VLCIcons.playlist - text: i18n.qtr("Playlist") - color: VLCStyle.colors.playerFg - onClicked: togglePlaylistVisiblity() - property bool acceptFocus: true - - KeyNavigation.left: menu_selector - } - - Widgets.IconToolButton { - id: menu_selector - - size: VLCStyle.icon_normal - iconText: VLCIcons.ellipsis - text: i18n.qtr("Menu") - color: VLCStyle.colors.playerFg - property bool acceptFocus: true - - onClicked: contextMenu.popup(this.mapToGlobal(0, height)) - - KeyNavigation.left: backBtn - KeyNavigation.right: playlistBtn - - QmlGlobalMenu { - id: contextMenu - ctx: mainctx - } - } - } - } } } } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
