From 33bcb993e51c429e15ca3a10691aaac6f1e41190 Mon Sep 17 00:00:00 2001
From: Fatih Uzunoglu <fuzun54@outlook.com>
Date: Thu, 22 Jul 2021 19:06:09 +0300
Subject: [PATCH] qml: move TeletextWidget.qml and VolumeWidget.qml
---
modules/gui/qt/Makefile.am | 4 ++--
modules/gui/qt/player/qml/ControlButtons.qml | 4 ++--
.../qt/player/qml/{ => controlbarcontrols}/TeletextWidget.qml | 0
.../qt/player/qml/{ => controlbarcontrols}/VolumeWidget.qml | 0
modules/gui/qt/vlc.qrc | 4 ++--
po/POTFILES.in | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
rename modules/gui/qt/player/qml/{ => controlbarcontrols}/TeletextWidget.qml (100%)
rename modules/gui/qt/player/qml/{ => controlbarcontrols}/VolumeWidget.qml (100%)
diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index 6a6ad5c6d525..7f554e32b450 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -750,10 +750,8 @@ libqt_plugin_la_QML = \
gui/qt/player/qml/PlayerMenuItem.qml \
gui/qt/player/qml/ResumeDialog.qml \
gui/qt/player/qml/SliderBar.qml \
- gui/qt/player/qml/TeletextWidget.qml \
gui/qt/player/qml/TopBar.qml \
gui/qt/player/qml/TrackInfo.qml \
- gui/qt/player/qml/VolumeWidget.qml \
gui/qt/player/qml/ButtonsLayout.qml \
gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml \
gui/qt/player/qml/controlbarcontrols/AspectRatioWidget.qml \
@@ -786,6 +784,8 @@ libqt_plugin_la_QML = \
gui/qt/player/qml/controlbarcontrols/SnapshotButton.qml \
gui/qt/player/qml/controlbarcontrols/SpacerWidget.qml \
gui/qt/player/qml/controlbarcontrols/StopButton.qml \
+ gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml \
+ gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml \
gui/qt/playlist/qml/PlaylistDelegate.qml \
gui/qt/playlist/qml/PlaylistListView.qml \
gui/qt/playlist/qml/PlaylistOverlayMenu.qml \
diff --git a/modules/gui/qt/player/qml/ControlButtons.qml b/modules/gui/qt/player/qml/ControlButtons.qml
index c6b25c7e06e4..9be48c7c3d78 100644
--- a/modules/gui/qt/player/qml/ControlButtons.qml
+++ b/modules/gui/qt/player/qml/ControlButtons.qml
@@ -155,9 +155,9 @@ QtObject {
readonly property Component aspectRatioDelegate : Controls.AspectRatioWidget { }
- readonly property Component teletextdelegate : TeletextWidget { }
+ readonly property Component teletextdelegate : Controls.TeletextWidget { }
- readonly property Component volumeBtnDelegate : VolumeWidget { parentWindow: controlButtons.parentWindow }
+ readonly property Component volumeBtnDelegate : Controls.VolumeWidget { parentWindow: controlButtons.parentWindow }
readonly property Component playerSwitchBtnDelegate : Controls.PlayerSwitchButton { }
diff --git a/modules/gui/qt/player/qml/TeletextWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml
similarity index 100%
rename from modules/gui/qt/player/qml/TeletextWidget.qml
rename to modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml
diff --git a/modules/gui/qt/player/qml/VolumeWidget.qml b/modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml
similarity index 100%
rename from modules/gui/qt/player/qml/VolumeWidget.qml
rename to modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 0a954dccd191..e69e931d531b 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -334,8 +334,6 @@
<file alias="SliderBar.qml">player/qml/SliderBar.qml</file>
<file alias="TrackInfo.qml">player/qml/TrackInfo.qml</file>
<file alias="ControlButtons.qml">player/qml/ControlButtons.qml</file>
- <file alias="VolumeWidget.qml">player/qml/VolumeWidget.qml</file>
- <file alias="TeletextWidget.qml">player/qml/TeletextWidget.qml</file>
<file alias="MiniPlayer.qml">player/qml/MiniPlayer.qml</file>
<file alias="TopBar.qml">player/qml/TopBar.qml</file>
<file alias="PIPPlayer.qml">player/qml/PIPPlayer.qml</file>
@@ -378,6 +376,8 @@
<file alias="SnapshotButton.qml">player/qml/controlbarcontrols/SnapshotButton.qml</file>
<file alias="SpacerWidget.qml">player/qml/controlbarcontrols/SpacerWidget.qml</file>
<file alias="StopButton.qml">player/qml/controlbarcontrols/StopButton.qml</file>
+ <file alias="TeletextWidget.qml">player/qml/controlbarcontrols/TeletextWidget.qml</file>
+ <file alias="VolumeWidget.qml">player/qml/controlbarcontrols/VolumeWidget.qml</file>
</qresource>
<qresource prefix="/about">
<file alias="About.qml">dialogs/help/qml/About.qml</file>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5f2e8a800c5b..696eb4832f8d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -864,9 +864,9 @@ modules/gui/qt/player/qml/ControlButtons.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/TeletextWidget.qml
modules/gui/qt/player/qml/TopBar.qml
-modules/gui/qt/player/qml/VolumeWidget.qml
+modules/gui/qt/player/qml/controlbarcontrols/TeletextWidget.qml
+modules/gui/qt/player/qml/controlbarcontrols/VolumeWidget.qml
modules/gui/qt/player/qml/controlbarcontrols/ArtworkInfoWidget.qml
modules/gui/qt/player/qml/controlbarcontrols/AspectRatioWidget.qml
modules/gui/qt/player/qml/controlbarcontrols/AtoBButton.qml
--
GitLab