vlc | branch: master | Pierre Lamot <[email protected]> | Wed Jul 10 10:41:53 2019 +0200| [ba1e1c2dc6e137f1fc158583160281ed948effd8] | committer: Jean-Baptiste Kempf
qml: playlist button should always be visible Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ba1e1c2dc6e137f1fc158583160281ed948effd8 --- modules/gui/qt/qml/player/ControlBar.qml | 1 - modules/gui/qt/qml/player/ControlButtons.qml | 1 - modules/gui/qt/qml/player/ModalControlBar.qml | 4 ---- modules/gui/qt/qml/player/Player.qml | 1 - 4 files changed, 7 deletions(-) diff --git a/modules/gui/qt/qml/player/ControlBar.qml b/modules/gui/qt/qml/player/ControlBar.qml index 6d17375e13..b4cd089321 100644 --- a/modules/gui/qt/qml/player/ControlBar.qml +++ b/modules/gui/qt/qml/player/ControlBar.qml @@ -37,7 +37,6 @@ Utils.NavigableFocusScope { property bool noAutoHide: _lockAutoHide !== 0 property int _lockAutoHide: 0 //count the number of element locking the autoHide - property bool showPlaylistButton: false Keys.priority: Keys.AfterItem Keys.onPressed: defaultKeyAction(event, 0) diff --git a/modules/gui/qt/qml/player/ControlButtons.qml b/modules/gui/qt/qml/player/ControlButtons.qml index eb5617025a..cd51f415ec 100644 --- a/modules/gui/qt/qml/player/ControlButtons.qml +++ b/modules/gui/qt/qml/player/ControlButtons.qml @@ -159,7 +159,6 @@ Item{ Utils.IconToolButton { id: playlistBtn objectName: "IconToolButton" - visible: showPlaylistButton size: VLCStyle.icon_medium text: VLCIcons.playlist onClicked: root.showPlaylist() diff --git a/modules/gui/qt/qml/player/ModalControlBar.qml b/modules/gui/qt/qml/player/ModalControlBar.qml index a8e0d5ebeb..cce8baf94d 100644 --- a/modules/gui/qt/qml/player/ModalControlBar.qml +++ b/modules/gui/qt/qml/player/ModalControlBar.qml @@ -26,8 +26,6 @@ import "qrc:///utils/" as Utils Utils.NavigableFocusScope { id: root - property bool showPlaylistButton: false - property bool forceNoAutoHide: false property bool noAutoHide: stack_id.currentItem.noAutoHide || forceNoAutoHide @@ -36,8 +34,6 @@ Utils.NavigableFocusScope { ControlBar { focus: true - showPlaylistButton: root.showPlaylistButton - onShowTrackBar: root.state = "tracks" onActionUp: root.actionUp(index) diff --git a/modules/gui/qt/qml/player/Player.qml b/modules/gui/qt/qml/player/Player.qml index 7beb818947..f690731b4a 100644 --- a/modules/gui/qt/qml/player/Player.qml +++ b/modules/gui/qt/qml/player/Player.qml @@ -194,7 +194,6 @@ Utils.NavigableFocusScope { if (!noAutoHide) toolbarAutoHide.restart() } - showPlaylistButton: true onActionUp: root.actionUp(index) onActionDown: root.actionDown(index) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
