Commit 3203bfe1 authored by Benjamin Arnaud's avatar Benjamin Arnaud Committed by Felix Paul Kühne
Browse files

qml: Rename LanguageMenu to TracksMenu

parent fb58afc9
Pipeline #221019 failed with stages
in 43 minutes and 28 seconds
......@@ -806,7 +806,6 @@ libqt_plugin_la_QML = \
gui/qt/player/qml/qmldir \
gui/qt/player/qml/ControlBar.qml \
gui/qt/player/qml/ControlbarControls.qml \
gui/qt/player/qml/LanguageMenu.qml \
gui/qt/player/qml/PlaybackSpeed.qml \
gui/qt/player/qml/MiniPlayer.qml \
gui/qt/player/qml/PIPPlayer.qml \
......@@ -819,6 +818,7 @@ libqt_plugin_la_QML = \
gui/qt/player/qml/SliderBar.qml \
gui/qt/player/qml/TopBar.qml \
gui/qt/player/qml/TrackInfo.qml \
gui/qt/player/qml/TracksMenu.qml \
gui/qt/player/qml/TracksPage.qml \
gui/qt/player/qml/TracksPageAudio.qml \
gui/qt/player/qml/TracksPageSpeed.qml \
......
......@@ -29,18 +29,18 @@ Widgets.IconControlButton {
size: VLCStyle.icon_medium
iconText: VLCIcons.audiosub
enabled: langMenuLoader.status === Loader.Ready
onClicked: langMenuLoader.item.open()
enabled: menuLoader.status === Loader.Ready
onClicked: menuLoader.item.open()
text: I18n.qtr("Languages and tracks")
Loader {
id: langMenuLoader
id: menuLoader
active: (typeof rootPlayer !== 'undefined') && (rootPlayer !== null)
sourceComponent: Player.LanguageMenu {
id: langMenu
sourceComponent: Player.TracksMenu {
id: menu
parent: rootPlayer
focus: true
......@@ -51,7 +51,7 @@ Widgets.IconControlButton {
onOpened: {
playerControlLayout.requestLockUnlockAutoHide(true, playerControlLayout)
if (!!rootPlayer)
rootPlayer.menu = langMenu
rootPlayer.menu = menu
}
onClosed: {
......
......@@ -345,6 +345,7 @@
<file alias="ControlBar.qml">player/qml/ControlBar.qml</file>
<file alias="ResumeDialog.qml">player/qml/ResumeDialog.qml</file>
<file alias="SliderBar.qml">player/qml/SliderBar.qml</file>
<file alias="TracksMenu.qml">player/qml/TracksMenu.qml</file>
<file alias="TrackInfo.qml">player/qml/TrackInfo.qml</file>
<file alias="TracksPage.qml">player/qml/TracksPage.qml</file>
<file alias="TracksPageSpeed.qml">player/qml/TracksPageSpeed.qml</file>
......@@ -357,7 +358,6 @@
<file alias="PlayerControlLayout.qml">player/qml/PlayerControlLayout.qml</file>
<file alias="PlayerMenu.qml">player/qml/PlayerMenu.qml</file>
<file alias="PlayerMenuItem.qml">player/qml/PlayerMenuItem.qml</file>
<file alias="LanguageMenu.qml">player/qml/LanguageMenu.qml</file>
<file alias="ControlLayout.qml">player/qml/ControlLayout.qml</file>
<file alias="PlaybackSpeed.qml">player/qml/PlaybackSpeed.qml</file>
<file alias="PlayerPlaylistVisibilityFSM.qml">player/qml/PlayerPlaylistVisibilityFSM.qml</file>
......
......@@ -869,10 +869,10 @@ modules/gui/qt/network/qml/NetworkHomeDisplay.qml
modules/gui/qt/network/qml/NetworkListItem.qml
modules/gui/qt/network/qml/ServicesHomeDisplay.qml
modules/gui/qt/player/qml/ControlbarControls.qml
modules/gui/qt/player/qml/LanguageMenu.qml
modules/gui/qt/player/qml/Player.qml
modules/gui/qt/player/qml/ResumeDialog.qml
modules/gui/qt/player/qml/TopBar.qml
modules/gui/qt/player/qml/TracksMenu.qml
modules/gui/qt/player/qml/TracksPageAudio.qml
modules/gui/qt/player/qml/TracksPageSubtitle.qml
modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment