[vlc-commits] [Git][videolan/vlc][master] 3 commits: qml: Create DvdMenuButton

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
5175d5b8 by Benjamin Arnaud at 2022-02-13T19:54:59+00:00
qml: Create DvdMenuButton

- - - - -
d52d056a by Benjamin Arnaud at 2022-02-13T19:54:59+00:00
qt/control_list_model: Add DVD_MENUS_BUTTON

- - - - -
c4dd4c9b by Benjamin Arnaud at 2022-02-13T19:54:59+00:00
qml/ControlbarControls: Add DVD_MENUS_BUTTON

fix #25732

- - - - -


6 changed files:

- modules/gui/qt/Makefile.am
- modules/gui/qt/player/control_list_model.hpp
- modules/gui/qt/player/qml/ControlbarControls.qml
- + modules/gui/qt/player/qml/controlbarcontrols/DvdMenuButton.qml
- modules/gui/qt/vlc.qrc
- po/POTFILES.in


Changes:

=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -810,6 +810,7 @@ libqt_plugin_la_QML = \
 	gui/qt/player/qml/controlbarcontrols/BackButton.qml \
 	gui/qt/player/qml/controlbarcontrols/ChapterNextButton.qml \
 	gui/qt/player/qml/controlbarcontrols/ChapterPreviousButton.qml \
+	gui/qt/player/qml/controlbarcontrols/DvdMenuButton.qml \
 	gui/qt/player/qml/controlbarcontrols/ExpandingSpacerWidget.qml \
 	gui/qt/player/qml/controlbarcontrols/ExtendedSettingsButton.qml \
 	gui/qt/player/qml/controlbarcontrols/FasterButton.qml \


=====================================
modules/gui/qt/player/control_list_model.hpp
=====================================
@@ -71,6 +71,7 @@ public:
         VOLUME,
         TELETEXT_BUTTONS,
         ASPECT_RATIO_COMBOBOX,
+        DVD_MENUS_BUTTON,
         SPECIAL_MAX,
 
         WIDGET_SPACER = 0x40,


=====================================
modules/gui/qt/player/qml/ControlbarControls.qml
=====================================
@@ -56,6 +56,7 @@ QtObject {
         { id: ControlListModel.CHAPTER_PREVIOUS_BUTTON, file: "ChapterPreviousButton.qml", label: VLCIcons.dvd_prev, text: I18n.qtr("Previous chapter") },
         { id: ControlListModel.CHAPTER_NEXT_BUTTON, file: "ChapterNextButton.qml", label: VLCIcons.dvd_next, text: I18n.qtr("Next chapter") },
         { id: ControlListModel.VOLUME, file: "VolumeWidget.qml", label: VLCIcons.volume_high, text: I18n.qtr("Volume Widget") },
+        { id: ControlListModel.DVD_MENUS_BUTTON, file: "DvdMenuButton.qml", label: VLCIcons.dvd_menu, text: I18n.qtr("DVD menus") },
         { id: ControlListModel.TELETEXT_BUTTONS, file: "TeletextWidget.qml", label: VLCIcons.tvtelx, text: I18n.qtr("Teletext") },
         { id: ControlListModel.ASPECT_RATIO_COMBOBOX, file: "AspectRatioWidget.qml", label: VLCIcons.aspect_ratio, text: I18n.qtr("Aspect Ratio") },
         { id: ControlListModel.WIDGET_SPACER, file: "SpacerWidget.qml", label: VLCIcons.space, text: I18n.qtr("Spacer") },


=====================================
modules/gui/qt/player/qml/controlbarcontrols/DvdMenuButton.qml
=====================================
@@ -0,0 +1,37 @@
+/*****************************************************************************
+ * Copyright (C) 2021 VLC authors and VideoLAN
+ *
+ * Authors: Benjamin Arnaud <bunjee at omega.gg>
+ *
+ * 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 2.11
+
+import "qrc:///widgets/" as Widgets
+import "qrc:///style/"
+
+import org.videolan.vlc 0.1
+
+Widgets.IconControlButton {
+    size: VLCStyle.icon_medium
+
+    enabled: Player.hasMenu
+
+    iconText: VLCIcons.dvd_menu
+    text: I18n.qtr("Menu")
+
+    onClicked: Player.sectionMenu()
+}


=====================================
modules/gui/qt/vlc.qrc
=====================================
@@ -361,6 +361,7 @@
         <file alias="BackButton.qml">player/qml/controlbarcontrols/BackButton.qml</file>
         <file alias="ChapterNextButton.qml">player/qml/controlbarcontrols/ChapterNextButton.qml</file>
         <file alias="ChapterPreviousButton.qml">player/qml/controlbarcontrols/ChapterPreviousButton.qml</file>
+        <file alias="DvdMenuButton.qml">player/qml/controlbarcontrols/DvdMenuButton.qml</file>
         <file alias="ExpandingSpacerWidget.qml">player/qml/controlbarcontrols/ExpandingSpacerWidget.qml</file>
         <file alias="ExtendedSettingsButton.qml">player/qml/controlbarcontrols/ExtendedSettingsButton.qml</file>
         <file alias="FasterButton.qml">player/qml/controlbarcontrols/FasterButton.qml</file>


=====================================
po/POTFILES.in
=====================================
@@ -871,6 +871,7 @@ modules/gui/qt/player/qml/controlbarcontrols/AtoBButton.qml
 modules/gui/qt/player/qml/controlbarcontrols/BackButton.qml
 modules/gui/qt/player/qml/controlbarcontrols/ChapterNextButton.qml
 modules/gui/qt/player/qml/controlbarcontrols/ChapterPreviousButton.qml
+modules/gui/qt/player/qml/controlbarcontrols/DvdMenuButton.qml
 modules/gui/qt/player/qml/controlbarcontrols/ExpandingSpacerWidget.qml
 modules/gui/qt/player/qml/controlbarcontrols/ExtendedSettingsButton.qml
 modules/gui/qt/player/qml/controlbarcontrols/FasterButton.qml



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ef6b298f2e20dba0b8e8cbf30d74de74d645f9ed...c4dd4c9b0e22ce0cd2c26555ca97ffcc45aa6ba0

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/ef6b298f2e20dba0b8e8cbf30d74de74d645f9ed...c4dd4c9b0e22ce0cd2c26555ca97ffcc45aa6ba0
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance