[vlc-commits] [Git][videolan/vlc][master] 3 commits: qml: remove unused views and widgets
Steve Lhomme (@robUx4)
gitlab at videolan.org
Tue Feb 7 08:06:08 UTC 2023
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
a7a39b2c by Pierre Lamot at 2023-02-07T07:37:48+00:00
qml: remove unused views and widgets
- - - - -
c15ae8cd by Pierre Lamot at 2023-02-07T07:37:48+00:00
qml: unify usage of SpinBox
- - - - -
2568dc7d by Pierre Lamot at 2023-02-07T07:37:48+00:00
qml: factorize Textfield styles in TextfieldExt
- - - - -
20 changed files:
- modules/gui/qt/Makefile.am
- modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml
- − modules/gui/qt/dialogs/help/qml/About.qml
- modules/gui/qt/maininterface/qml/MainInterface.qml
- modules/gui/qt/network/qml/DiscoverUrlDisplay.qml
- − modules/gui/qt/network/qml/NetworkListItem.qml
- − modules/gui/qt/player/qml/PlayerMenu.qml
- − modules/gui/qt/player/qml/PlayerMenuItem.qml
- − modules/gui/qt/player/qml/TrackInfo.qml
- modules/gui/qt/player/qml/TracksPageAudio.qml
- modules/gui/qt/player/qml/TracksPageSubtitle.qml
- modules/gui/qt/vlc.qrc
- − modules/gui/qt/widgets/qml/LabelSeparator.qml
- − modules/gui/qt/widgets/qml/MenuExt.qml
- − modules/gui/qt/widgets/qml/MenuItemExt.qml
- modules/gui/qt/widgets/qml/SearchBox.qml
- modules/gui/qt/widgets/qml/SpinBoxExt.qml
- modules/gui/qt/widgets/qml/ToolTipArea.qml → modules/gui/qt/widgets/qml/TextFieldExt.qml
- − modules/gui/qt/widgets/qml/TransparentSpinBox.qml
- po/POTFILES.in
Changes:
=====================================
modules/gui/qt/Makefile.am
=====================================
@@ -819,7 +819,6 @@ libqt_plugin_la_QML = \
gui/qt/dialogs/dialogs/qml/Dialogs.qml \
gui/qt/dialogs/dialogs/qml/ModalDialog.qml \
gui/qt/dialogs/dialogs/qml/WindowDialog.qml \
- gui/qt/dialogs/help/qml/About.qml \
gui/qt/dialogs/toolbar/qml/EditorDNDDelegate.qml \
gui/qt/dialogs/toolbar/qml/EditorDNDView.qml\
gui/qt/dialogs/toolbar/qml/EditorDummyButton.qml \
@@ -881,7 +880,6 @@ libqt_plugin_la_QML = \
gui/qt/network/qml/NetworkAddressbar.qml \
gui/qt/network/qml/NetworkCustomCover.qml \
gui/qt/network/qml/NetworkGridItem.qml \
- gui/qt/network/qml/NetworkListItem.qml \
gui/qt/network/qml/NetworkThumbnailItem.qml \
gui/qt/network/qml/ServicesHomeDisplay.qml \
gui/qt/network/qml/ServicesManage.qml \
@@ -897,13 +895,10 @@ libqt_plugin_la_QML = \
gui/qt/player/qml/PlayerBlurredBackground.qml \
gui/qt/player/qml/PlayerBlurredBackground.frag \
gui/qt/player/qml/PlayerControlLayout.qml \
- gui/qt/player/qml/PlayerMenu.qml \
- gui/qt/player/qml/PlayerMenuItem.qml \
gui/qt/player/qml/PlayerPlaylistVisibilityFSM.qml \
gui/qt/player/qml/ResumeDialog.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 \
@@ -1012,7 +1007,6 @@ libqt_plugin_la_QML = \
gui/qt/widgets/qml/KeyNavigableListView.qml \
gui/qt/widgets/qml/KeyNavigableTableView.qml \
gui/qt/widgets/qml/TableViewDelegate.qml \
- gui/qt/widgets/qml/LabelSeparator.qml \
gui/qt/widgets/qml/ListCoverShadow.qml \
gui/qt/widgets/qml/ListItem.qml \
gui/qt/widgets/qml/ListLabel.qml \
@@ -1020,8 +1014,6 @@ libqt_plugin_la_QML = \
gui/qt/widgets/qml/MediaCover.qml \
gui/qt/widgets/qml/SubtitleLabel.qml \
gui/qt/widgets/qml/MenuCaption.qml \
- gui/qt/widgets/qml/MenuExt.qml \
- gui/qt/widgets/qml/MenuItemExt.qml \
gui/qt/widgets/qml/MenuLabel.qml \
gui/qt/widgets/qml/MLDragItem.qml \
gui/qt/widgets/qml/NavigableCol.qml \
@@ -1038,9 +1030,8 @@ libqt_plugin_la_QML = \
gui/qt/widgets/qml/PageLoader.qml \
gui/qt/widgets/qml/ButtonExt.qml \
gui/qt/widgets/qml/TableColumns.qml \
- gui/qt/widgets/qml/TransparentSpinBox.qml \
+ gui/qt/widgets/qml/TextFieldExt.qml \
gui/qt/widgets/qml/TextToolButton.qml \
- gui/qt/widgets/qml/ToolTipArea.qml \
gui/qt/widgets/qml/VideoProgressBar.qml \
gui/qt/widgets/qml/VideoQualityLabels.qml \
gui/qt/widgets/qml/ListSubtitleLabel.qml \
=====================================
modules/gui/qt/dialogs/dialogs/qml/Dialogs.qml
=====================================
@@ -265,12 +265,11 @@ Item {
font.pixelSize: VLCStyle.fontSize_normal
}
- TextField {
+ Widgets.TextFieldExt {
id: username
focus: true
text: loginDialog.defaultUsername
- font.pixelSize: VLCStyle.fontSize_normal
Layout.fillWidth:true
@@ -285,7 +284,7 @@ Item {
font.pixelSize: VLCStyle.fontSize_normal
}
- TextField {
+ Widgets.TextFieldExt {
id: password
echoMode: TextInput.Password
=====================================
modules/gui/qt/dialogs/help/qml/About.qml deleted
=====================================
@@ -1,175 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * 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 QtQuick.Controls 2.4
-import QtQuick.Layouts 1.11
-import org.videolan.vlc 0.1
-
-import "qrc:///style/"
-import "qrc:///widgets/" as Widgets
-
-FocusScope {
- id: root
- property alias columnLayout: columnLayout
-
- Navigation.onActionCancel: {
- History.previous()
- }
-
- AboutModel {
- id: about
- }
-
- ButtonGroup {
- buttons: columnLayout.children
- }
-
- RowLayout {
- id: rowLayout
- anchors.fill: parent
- spacing: 0
-
- Rectangle {
-
- Layout.preferredWidth: columnLayout.implicitWidth
- Layout.fillHeight: true
- color: VLCStyle.colors.topBanner
-
- ColumnLayout {
- id: columnLayout
- anchors.fill: parent
-
- Widgets.TextToolButton {
- id: authorsBtn
- text: I18n.qtr("Authors")
- Layout.alignment: Qt.AlignLeft | Qt.AlignTop
- onClicked: {
- checked = true
- textArea.text = about.authors
- }
- KeyNavigation.down: licenseBtn
- KeyNavigation.right: textScroll
- focus: true
- }
-
- Widgets.TextToolButton {
- id: licenseBtn
- text: I18n.qtr("License")
- Layout.alignment: Qt.AlignLeft | Qt.AlignTop
- onClicked: textArea.text = about.license
- KeyNavigation.down: creditBtn
- KeyNavigation.right: textScroll
- }
-
- Widgets.TextToolButton {
- id: creditBtn
- text: I18n.qtr("Credit")
- Layout.alignment: Qt.AlignLeft | Qt.AlignTop
- KeyNavigation.down: backBtn
- KeyNavigation.right: textScroll
-
- onClicked: {
- checked = true
- textArea.text = about.thanks
- }
- }
-
- Item {
- Layout.fillHeight: true
- }
-
- Widgets.IconToolButton {
- id: backBtn
- size: VLCStyle.icon_large
- iconText: VLCIcons.exit
- text: I18n.qtr("Back")
- Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
- KeyNavigation.right: textScroll
-
- onClicked: {
- History.previous()
- }
- }
- }
- }
-
-
- Rectangle {
-
- Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.alignment: Qt.AlignHCenter
-
- color: VLCStyle.colors.bg
-
- ColumnLayout {
- id: columnLayout1
- anchors.fill: parent
- anchors.margins: 10
-
- Text {
- id: text1
- text: I18n.qtr("VLC Media Player")
- color: VLCStyle.colors.text
- font.pixelSize: VLCStyle.fontSize_xxxlarge
- }
-
-
- Text {
- text: about.version
- color: VLCStyle.colors.text
- font.pixelSize: VLCStyle.fontSize_xlarge
- }
-
-
- ScrollView {
- id: textScroll
- Layout.fillHeight: true
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignHCenter
-
- Keys.onPressed: {
- if (KeyHelper.matchLeft(event)) {
- backBtn.focus = true
- event.accepted = true
- }
- }
-
- clip: true
-
- Text {
- id: textArea
- text: about.thanks
- horizontalAlignment: Text.AlignHLeft
- font.family: "Courier New, Monospace"
- anchors.fill: parent
- Layout.fillHeight: true
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignHCenter
-
- color: VLCStyle.colors.text
- enabled: false
- }
- }
- }
- }
- }
-
- Keys.priority: Keys.AfterItem
- Keys.onPressed: root.Navigation.defaultKeyAction(event)
-}
=====================================
modules/gui/qt/maininterface/qml/MainInterface.qml
=====================================
@@ -92,7 +92,6 @@ Item {
}
readonly property var pageModel: [
- { name: "about", url: "qrc:///about/About.qml" },
{ name: "mc", url: "qrc:///main/MainDisplay.qml" },
{ name: "player", url:"qrc:///player/Player.qml" },
]
=====================================
modules/gui/qt/network/qml/DiscoverUrlDisplay.qml
=====================================
@@ -71,7 +71,7 @@ FocusScope {
Navigation.parentItem: root
Navigation.downItem: (!!urlListDisplay.item) ? urlListDisplay.item : null
- TextField {
+ Widgets.TextFieldExt {
id: searchField
focus: true
@@ -79,18 +79,8 @@ FocusScope {
height: VLCStyle.dp(32, VLCStyle.scale)
width: VLCStyle.colWidth(Math.max(VLCStyle.gridColumnsForWidth(root.width * .6), 2))
placeholderText: I18n.qtr("Paste or write the URL here")
- palette.text: VLCStyle.colors.text
- palette.highlight: VLCStyle.colors.bgHover
- palette.highlightedText: VLCStyle.colors.bgHoverText
- font.pixelSize: VLCStyle.fontSize_large
selectByMouse: true
- background: Rectangle {
- color: VLCStyle.colors.bg
- border.width: VLCStyle.dp(2, VLCStyle.scale)
- border.color: _getColor()
- }
-
onAccepted: {
if (urlListDisplay.status == Loader.Ready)
urlListDisplay.item.model.addAndPlay(text)
=====================================
modules/gui/qt/network/qml/NetworkListItem.qml deleted
=====================================
@@ -1,48 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * 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 QtQuick.Controls 2.4
-import QtQml.Models 2.2
-
-import org.videolan.vlc 0.1
-
-import "qrc:///widgets/" as Widgets
-import "qrc:///style/"
-
-Widgets.ListItem {
- id: item
-
- width: root.width
- height: VLCStyle.icon_normal + VLCStyle.margin_small
-
- focus: true
-
- cover: NetworkCustomCover {
- id: cover_obj
- networkModel: model
- fillMode: Image.PreserveAspectFit
- }
-
- line1: model.name || I18n.qtr("Unknown share")
- line2: model.mrl
- imageText: (model.type !== NetworkMediaModel.TYPE_DIRECTORY && model.type !== NetworkMediaModel.TYPE_NODE) ? model.protocol : ""
-
- showContextButton: true
-
- actionButtons: []
-}
=====================================
modules/gui/qt/player/qml/PlayerMenu.qml deleted
=====================================
@@ -1,106 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * 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 QtQuick.Controls 2.4
-import QtQuick.Templates 2.4 as T
-import QtQuick.Layouts 1.11
-import QtQml.Models 2.11
-
-import org.videolan.vlc 0.1
-
-import "qrc:///style/"
-import "qrc:///widgets/" as Widgets
-
-T.Menu {
- id: control
-
- property Item parentMenu: null
- property bool _emitMenuClose: true
- signal menuClosed()
-
- font.pixelSize: VLCStyle.fontSize_normal
-
- topPadding: VLCStyle.applicationVerticalMargin
- bottomPadding: VLCStyle.applicationVerticalMargin
-
- modal: true
- cascade: false
-
- //don't CloseOnEscape, otherwise the event is processed before our key handlers
- closePolicy: Popup.CloseOnPressOutside
-
- x:0
- y:0
- width: parent.width / 4
- height: parent.height
- z: 1
-
- delegate: PlayerMenuItem {
- parentMenu: control
- }
-
- onOpened: {
- control._emitMenuClose = true
-
- for (var i = 0; i < control.count; i++) {
- if (control.itemAt(i).enabled) {
- control.currentIndex = i
- break
- }
- }
- }
-
- onClosed: {
- if (control._emitMenuClose) {
- menuClosed()
- }
- }
-
- contentItem: ListView {
- header: T.Label {
- leftPadding: VLCStyle.applicationHorizontalMargin
- text: control.title
- color: VLCStyle.colors.playerFg
- font.bold: true
- font.pixelSize: VLCStyle.fontSize_xlarge
- padding: VLCStyle.margin_xxsmall
- }
-
- keyNavigationEnabled: false
-
- implicitWidth: contentWidth
- implicitHeight: contentHeight
- model: control.contentModel
- clip: true
- currentIndex: control.currentIndex
-
- ScrollIndicator.vertical: ScrollIndicator {}
- }
-
- background: Rectangle {
- color: VLCStyle.colors.playerBg
- opacity: 0.8
- }
-
- T.Overlay.modal: Rectangle {
- color: "transparent"
- }
-
-}
-
=====================================
modules/gui/qt/player/qml/PlayerMenuItem.qml deleted
=====================================
@@ -1,152 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * 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 QtQuick.Controls 2.4
-import QtQuick.Controls.impl 2.4
-import QtQuick.Templates 2.4 as T
-import QtQuick.Layouts 1.11
-import QtQml.Models 2.11
-
-import org.videolan.vlc 0.1
-
-import "qrc:///style/"
-import "qrc:///widgets/" as Widgets
-
-T.MenuItem {
- id: control
-
- property Item parentMenu: null
-
- property bool _keyPressed: false
-
- //implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
- // implicitContentWidth + leftPadding + rightPadding)
- implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding
-
- padding: VLCStyle.margin_xsmall
- spacing: VLCStyle.margin_xsmall
-
- icon.width: VLCStyle.icon_small
- icon.height: VLCStyle.icon_small
- icon.color: enabled ? VLCStyle.colors.playerFg : VLCStyle.colors.playerFgInactive
-
- font.pixelSize: VLCStyle.fontSize_normal
-
- leftPadding: VLCStyle.applicationHorizontalMargin
-
- //workaround QTBUG-7018 for Qt < 5.12.2
- activeFocusOnTab: control.enabled
-
- indicator: ColorImage {
- id: indicatorId
-
- width: control.icon.width
- height: control.icon.height
-
- x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding
- y: control.topPadding + (control.availableHeight - height) / 2
-
- visible: true
- source: control.checked ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
- : icon.source ? icon.source
- : ""
- color: control.enabled ? VLCStyle.colors.playerFg : VLCStyle.colors.playerFgInactive
- }
-
- arrow: ColorImage {
- x: control.mirrored ? control.padding : control.width - width - control.padding
- y: control.topPadding + (control.availableHeight - height) / 2
-
- width: VLCStyle.icon_xsmall
- height: VLCStyle.icon_xsmall
-
- visible: control.subMenu
- mirror: control.mirrored
- color: control.enabled ? VLCStyle.colors.playerFg : VLCStyle.colors.playerFgInactive
- source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/arrow-indicator.png"
- }
-
- contentItem: IconLabel {
- implicitHeight: VLCStyle.fontHeight_normal
-
- readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0
- readonly property real indicatorPadding: control.indicator.width + control.spacing
- leftPadding: !control.mirrored ? indicatorPadding : arrowPadding
- rightPadding: control.mirrored ? indicatorPadding : arrowPadding
-
- width: parent.width
-
- spacing: control.spacing
- mirrored: control.mirrored
- display: control.display
- alignment: Qt.AlignLeft
-
- //icon: control.icon
- text: control.text
- font: control.font
- color: control.enabled ? VLCStyle.colors.playerFg : VLCStyle.colors.playerFgInactive
- }
-
-
- background: Widgets.AnimatedBackground {
- implicitHeight: VLCStyle.fontHeight_normal
-
- active: visualFocus
-
- backgroundColor: control.highlighted ? VLCStyle.colors.buttonHover
- : VLCStyle.colors.setColorAlpha(VLCStyle.colors.buttonHover, 0)
- }
-
- //hack around QTBUG-79115
- Keys.priority: Keys.BeforeItem
- Keys.onLeftPressed: {
- if (parentMenu && parentMenu.parentMenu) {
- parentMenu._emitMenuClose = false
- }
- event.accepted = false
- }
-
- Keys.onRightPressed: {
- if (parentMenu && subMenu) {
- parentMenu._emitMenuClose = false
- }
- event.accepted = false
- }
-
- Keys.onPressed: _keyPressed = true
-
- Keys.onReleased: {
- if (_keyPressed === false)
- return
-
- _keyPressed = false
-
- if (KeyHelper.matchCancel(event)) {
- event.accepted = true
-
- parentMenu.dismiss()
- }
- }
-
- onTriggered: {
- if (parentMenu && subMenu) {
- parentMenu._emitMenuClose = false
- }
- }
-}
=====================================
modules/gui/qt/player/qml/TrackInfo.qml deleted
=====================================
@@ -1,71 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * 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 QtQuick.Controls 2.4
-import QtQuick.Layouts 1.11
-import org.videolan.vlc 0.1
-
-import "qrc:///style/"
-import "qrc:///widgets/" as Widgets
-
-Item {
- id: root
-
- RowLayout {
- id: rowLayout
- anchors.fill: parent
-
- Image {
- //color:"red"
- Layout.preferredWidth: VLCStyle.heightAlbumCover_small
- Layout.preferredHeight: VLCStyle.heightAlbumCover_small
- Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
- fillMode : Image.PreserveAspectFit
- source: (mainPlaylistController.currentItem.artwork && mainPlaylistController.currentItem.artwork.toString()) ? mainPlaylistController.currentItem.artwork : VLCStyle.noArtAlbumCover
- }
-
- ColumnLayout {
- Layout.fillHeight: true
- Layout.fillWidth: true
-
- Text {
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-
- font.pixelSize: VLCStyle.fontSize_normal
- color: VLCStyle.colors.text
- font.bold: true
-
- text: mainPlaylistController.currentItem.title
- }
-
- Text {
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
-
- font.pixelSize: VLCStyle.fontSize_small
-
- color: VLCStyle.colors.text
- text: mainPlaylistController.currentItem.artist
- }
-
- }
-
- }
-
-}
=====================================
modules/gui/qt/player/qml/TracksPageAudio.qml
=====================================
@@ -70,7 +70,7 @@ TracksPage {
color: "white"
}
- Widgets.TransparentSpinBox {
+ Widgets.SpinBoxExt {
id: spinBox
property bool update: false
@@ -79,6 +79,7 @@ TracksPage {
stepSize: 50
from: -10000
+ to: 10000
textFromValue: root.textFromValue
valueFromText: root.valueFromText
=====================================
modules/gui/qt/player/qml/TracksPageSubtitle.qml
=====================================
@@ -78,7 +78,7 @@ TracksPage {
color: "white"
}
- Widgets.TransparentSpinBox {
+ Widgets.SpinBoxExt {
id: spinBoxA
property bool update: false
@@ -87,6 +87,7 @@ TracksPage {
stepSize: 50
from: -10000
+ to: 10000
textFromValue: root.textFromValueA
valueFromText: root.valueFromTextA
@@ -149,7 +150,7 @@ TracksPage {
color: "white"
}
- Widgets.TransparentSpinBox {
+ Widgets.SpinBoxExt {
id: spinBoxB
property bool update: false
@@ -158,6 +159,7 @@ TracksPage {
stepSize: 50
from: -10000
+ to: 10000
textFromValue: root.textFromValueA
valueFromText: root.valueFromTextA
@@ -219,7 +221,7 @@ TracksPage {
color: "white"
}
- Widgets.TransparentSpinBox {
+ Widgets.SpinBoxExt {
id: spinBoxC
property bool update: false
@@ -227,6 +229,8 @@ TracksPage {
Layout.preferredWidth: VLCStyle.dp(128, VLCStyle.scale)
stepSize: 1
+ from: 0
+ to: 100
textFromValue: root.textFromValueB
valueFromText: root.valueFromTextB
=====================================
modules/gui/qt/vlc.qrc
=====================================
@@ -170,11 +170,9 @@
<file alias="ListItem.qml">widgets/qml/ListItem.qml</file>
<file alias="DrawerExt.qml">widgets/qml/DrawerExt.qml</file>
<file alias="KeyNavigableListView.qml">widgets/qml/KeyNavigableListView.qml</file>
- <file alias="ToolTipArea.qml">widgets/qml/ToolTipArea.qml</file>
<file alias="KeyNavigableTableView.qml">widgets/qml/KeyNavigableTableView.qml</file>
<file alias="TableViewDelegate.qml">widgets/qml/TableViewDelegate.qml</file>
<file alias="TableColumns.qml">widgets/qml/TableColumns.qml</file>
- <file alias="TransparentSpinBox.qml">widgets/qml/TransparentSpinBox.qml</file>
<file alias="ImageToolButton.qml">widgets/qml/ImageToolButton.qml</file>
<file alias="TextToolButton.qml">widgets/qml/TextToolButton.qml</file>
<file alias="IconToolButton.qml">widgets/qml/IconToolButton.qml</file>
@@ -182,14 +180,11 @@
<file alias="StackViewExt.qml">widgets/qml/StackViewExt.qml</file>
<file alias="ComboBoxExt.qml">widgets/qml/ComboBoxExt.qml</file>
<file alias="SpinBoxExt.qml">widgets/qml/SpinBoxExt.qml</file>
- <file alias="MenuExt.qml">widgets/qml/MenuExt.qml</file>
- <file alias="MenuItemExt.qml">widgets/qml/MenuItemExt.qml</file>
<file alias="ExpandGridView.qml">widgets/qml/ExpandGridView.qml</file>
<file alias="ScanProgressBar.qml">widgets/qml/ScanProgressBar.qml</file>
<file alias="SearchBox.qml">widgets/qml/SearchBox.qml</file>
<file alias="SortControl.qml">widgets/qml/SortControl.qml</file>
<file alias="RoundButton.qml">widgets/qml/RoundButton.qml</file>
- <file alias="LabelSeparator.qml">widgets/qml/LabelSeparator.qml</file>
<file alias="VideoQualityLabels.qml">widgets/qml/VideoQualityLabels.qml</file>
<file alias="VideoProgressBar.qml">widgets/qml/VideoProgressBar.qml</file>
<file alias="NavigableCol.qml">widgets/qml/NavigableCol.qml</file>
@@ -225,6 +220,7 @@
<file alias="FadingEdgeListView.qml">widgets/qml/FadingEdgeListView.qml</file>
<file alias="CSDThemeButtonSet.qml">widgets/qml/CSDThemeButtonSet.qml</file>
<file alias="CSDThemeButton.qml">widgets/qml/CSDThemeButton.qml</file>
+ <file alias="TextFieldExt.qml">widgets/qml/TextFieldExt.qml</file>
</qresource>
<qresource prefix="/network">
<file alias="AddressbarButton.qml">network/qml/AddressbarButton.qml</file>
@@ -237,7 +233,6 @@
<file alias="DiscoverUrlDisplay.qml">network/qml/DiscoverUrlDisplay.qml</file>
<file alias="NetworkCustomCover.qml">network/qml/NetworkCustomCover.qml</file>
<file alias="NetworkGridItem.qml">network/qml/NetworkGridItem.qml</file>
- <file alias="NetworkListItem.qml">network/qml/NetworkListItem.qml</file>
<file alias="NetworkThumbnailItem.qml">network/qml/NetworkThumbnailItem.qml</file>
<file alias="NetworkAddressbar.qml">network/qml/NetworkAddressbar.qml</file>
<file alias="ServicesHomeDisplay.qml">network/qml/ServicesHomeDisplay.qml</file>
@@ -306,7 +301,6 @@
<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>
<file alias="TracksPageAudio.qml">player/qml/TracksPageAudio.qml</file>
@@ -316,8 +310,6 @@
<file alias="TopBar.qml">player/qml/TopBar.qml</file>
<file alias="PIPPlayer.qml">player/qml/PIPPlayer.qml</file>
<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="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>
@@ -372,9 +364,6 @@
<file alias="VolumeWidget.qml">player/qml/controlbarcontrols/VolumeWidget.qml</file>
<file alias="Fallback.qml">player/qml/controlbarcontrols/Fallback.qml</file>
</qresource>
- <qresource prefix="/about">
- <file alias="About.qml">dialogs/help/qml/About.qml</file>
- </qresource>
<qresource prefix="/dialogs">
<file alias="CustomDialog.qml">dialogs/dialogs/qml/CustomDialog.qml</file>
<file alias="Dialogs.qml">dialogs/dialogs/qml/Dialogs.qml</file>
=====================================
modules/gui/qt/widgets/qml/LabelSeparator.qml deleted
=====================================
@@ -1,87 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * 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 QtQuick.Templates 2.4 as T
-import QtQuick.Layouts 1.11
-
-import "qrc:///style/"
-import "qrc:///widgets/" as Widgets
-
-FocusScope {
- id: control
- height: implicitHeight
- width: implicitWidth
- implicitHeight: colLayout.implicitHeight + VLCStyle.margin_small * 2
- implicitWidth: colLayout.implicitWidth + VLCStyle.margin_large
-
- property alias text: txt.text
- property alias font: txt.font
- property alias color: txt.color
-
- property Component inlineComponent: Item {}
- property alias inlineItem: inlineComponentLoader.item
-
- ColumnLayout {
- id: colLayout
- anchors.fill: parent
- anchors.leftMargin: VLCStyle.margin_large
- anchors.topMargin: VLCStyle.margin_small
- anchors.bottomMargin: VLCStyle.margin_small
-
- RowLayout {
- id: rowLayout
-
- Layout.fillHeight: true
- Layout.preferredHeight: rowLayout.implicitHeight
- Layout.fillWidth: true
-
- T.Label {
- id: txt
-
- Layout.fillWidth: true
- Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
-
- font.pixelSize: VLCStyle.fontSize_xxlarge
- color: VLCStyle.colors.text
- font.weight: Font.Bold
- elide: Text.ElideRight
- }
-
- Loader {
- id: inlineComponentLoader
- Layout.preferredWidth: item.implicitWidth
- active: !!inlineComponent
- visible: active
- focus: true
- sourceComponent: inlineComponent
- }
- }
-
- Rectangle {
- Layout.fillWidth: true
- Layout.preferredHeight: height
- height: VLCStyle.heightBar_xxxsmall
-
- radius: 2
-
- color: VLCStyle.colors.bgAlt
- }
- }
-
-
-}
=====================================
modules/gui/qt/widgets/qml/MenuExt.qml deleted
=====================================
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * 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 QtQuick.Controls 2.4
-import QtQuick.Controls.impl 2.4
-import QtQuick.Templates 2.4 as T
-import QtQuick.Window 2.11
-
-import "qrc:///style/"
-
-T.Menu {
- id: control
-
- implicitWidth: Math.max(background ? background.implicitWidth : 0,
- contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0)
- implicitHeight: Math.max(background ? background.implicitHeight : 0,
- contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding
-
- margins: 0
- overlap: 1
-
- font.pixelSize: VLCStyle.fontSize_normal
-
- delegate: MenuItemExt { }
-
- contentItem: ListView {
- implicitHeight: contentHeight
- model: control.contentModel
- interactive: Window.window ? contentHeight > Window.window.height : false
- clip: true
- currentIndex: control.currentIndex
-
- ScrollIndicator.vertical: ScrollIndicator {}
- }
-
- background: Rectangle {
- implicitWidth: 200
- implicitHeight: VLCStyle.fontSize_normal
- color: VLCStyle.colors.button
- border.color: VLCStyle.colors.buttonBorder
- }
-
- T.Overlay.modal: Rectangle {
- color: "transparent"
- }
-
- T.Overlay.modeless: Rectangle {
- color: Color.transparent(VLCStyle.colors.buttonBorder, 0.12)
- }
-}
=====================================
modules/gui/qt/widgets/qml/MenuItemExt.qml deleted
=====================================
@@ -1,93 +0,0 @@
-/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
- *
- * 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 QtQuick.Controls 2.4
-import QtQuick.Controls.impl 2.4
-import QtQuick.Templates 2.4 as T
-
-import "qrc:///style/"
-
-T.MenuItem {
- id: control
-
- implicitWidth: Math.max(background ? background.implicitWidth : 0,
- contentItem.implicitWidth + leftPadding + rightPadding)
- implicitHeight: Math.max(background ? background.implicitHeight : 0,
- Math.max(contentItem.implicitHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
- baselineOffset: contentItem.y + contentItem.baselineOffset
-
- padding: 6
- spacing: 6
-
- icon.width: 24
- icon.height: 24
-
- font.pixelSize: VLCStyle.fontSize_normal
-
- hoverEnabled: true
-
- contentItem: IconLabel {
- readonly property real arrowPadding: control.subMenu && control.arrow ? control.arrow.width + control.spacing : 0
- readonly property real indicatorPadding: control.checkable && control.indicator ? control.indicator.width + control.spacing : 0
- leftPadding: !control.mirrored ? indicatorPadding : arrowPadding
- rightPadding: control.mirrored ? indicatorPadding : arrowPadding
-
- spacing: control.spacing
- mirrored: control.mirrored
- display: control.display
- alignment: Qt.AlignLeft
-
- icon: control.icon
- text: control.text
- font: control.font
- color: control.enabled ? VLCStyle.colors.text : VLCStyle.colors.textDisabled
- }
-
- indicator: ColorImage {
- x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding
- y: control.topPadding + (control.availableHeight - height) / 2
-
- visible: control.checked
- source: control.checkable ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png" : ""
- color: control.enabled ? VLCStyle.colors.text : VLCStyle.colors.textDisabled
- defaultColor: "#353637"
- }
-
- arrow: ColorImage {
- x: control.mirrored ? control.leftPadding : control.width - width - control.rightPadding
- y: control.topPadding + (control.availableHeight - height) / 2
-
- visible: control.subMenu
- mirror: control.mirrored
- source: control.subMenu ? "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/arrow-indicator.png" : ""
- color: control.enabled ? VLCStyle.colors.text : VLCStyle.colors.textDisabled
- defaultColor: "#353637"
- }
-
- background: Rectangle {
- implicitWidth: 200
- implicitHeight: 30
- x: 1
- y: 1
- width: control.width - 2
- height: control.height - 2
- color: control.down ? VLCStyle.colors.bgHover : control.highlighted ? VLCStyle.colors.bgHover : "transparent"
- }
-}
=====================================
modules/gui/qt/widgets/qml/SearchBox.qml
=====================================
@@ -99,7 +99,7 @@ FocusScope {
}
}
- TextField {
+ TextFieldExt {
id: textField
property bool _keyPressed: false
@@ -116,14 +116,6 @@ FocusScope {
leftPadding: padding + VLCStyle.dp(4)
rightPadding: (textField.width - clearButton.x)
- font.pixelSize: VLCStyle.fontSize_normal
-
- palette.text: VLCStyle.colors.buttonText
- palette.highlightedText: VLCStyle.colors.bgHoverText
- palette.base: VLCStyle.colors.button
- palette.highlight: VLCStyle.colors.accent
- palette.mid: VLCStyle.colors.buttonBorder
-
selectByMouse: true
placeholderText: I18n.qtr("filter")
@@ -166,12 +158,6 @@ FocusScope {
Navigation.defaultKeyReleaseAction(event)
}
- Component.onCompleted: {
- background.border.width = Qt.binding(function() { return root.activeFocus ? VLCStyle.dp(2)
- : VLCStyle.dp(1) })
-
- }
-
Widgets.IconToolButton {
id: clearButton
=====================================
modules/gui/qt/widgets/qml/SpinBoxExt.qml
=====================================
@@ -23,13 +23,18 @@ import org.videolan.vlc 0.1
import "qrc:///style/"
-SpinBox{
+SpinBox {
id: control
font.pixelSize: VLCStyle.fontSize_large
+ padding: 0
+ leftPadding: padding + (control.mirrored ? up.indicator.width : 0)
+ rightPadding: padding + (control.mirrored ? 0 : up.indicator.width)
+
property color textColor: VLCStyle.colors.buttonText
property color bgColor: VLCStyle.colors.bg
property color borderColor: VLCStyle.colors.buttonBorder
+ property int borderWidth: 0
Keys.priority: Keys.AfterItem
Keys.onPressed: Navigation.defaultKeyAction(event)
@@ -44,9 +49,9 @@ SpinBox{
}
background: Rectangle {
- implicitWidth: VLCStyle.dp(4, VLCStyle.scale)
- implicitHeight: VLCStyle.dp(32, VLCStyle.scale)
+ radius: VLCStyle.margin_xxxsmall
border.color: control.borderColor
+ border.width: control.borderWidth
color: control.bgColor
}
@@ -59,12 +64,15 @@ SpinBox{
font: control.font
color: enabled ? control.textColor : "grey"
+ padding: 0
horizontalAlignment: Qt.AlignRight
verticalAlignment: Qt.AlignVCenter
+
selectByMouse: true
autoScroll: false
readOnly: !control.editable
validator: control.validator
+ inputMethodHints: Qt.ImhFormattedNumbersOnly
Keys.priority: Keys.AfterItem
@@ -72,9 +80,10 @@ SpinBox{
Keys.onReleased: Navigation.defaultKeyReleaseAction(event)
Navigation.parentItem: control
+
}
up.indicator: Rectangle {
- x: parent.width - width
+ x: control.mirrored ? 0: parent.width - width
height: parent.height / 2
implicitWidth: VLCStyle.dp(15, VLCStyle.scale)
implicitHeight: VLCStyle.dp(10, VLCStyle.scale)
@@ -83,9 +92,10 @@ SpinBox{
border.color: control.borderColor
Text {
- text: "+"
+ text: "\u2227" // ^ logical AND
font.pixelSize: control.font.pixelSize * 2
color: control.textColor
+ font.bold: true
anchors.fill: parent
fontSizeMode: Text.Fit
horizontalAlignment: Text.AlignHCenter
@@ -94,7 +104,7 @@ SpinBox{
}
down.indicator: Rectangle {
- x: parent.width - width
+ x: control.mirrored ? 0 : parent.width - width
height: parent.height / 2
implicitWidth: VLCStyle.dp(15, VLCStyle.scale)
implicitHeight: VLCStyle.dp(10, VLCStyle.scale)
@@ -103,7 +113,7 @@ SpinBox{
border.color: control.borderColor
Text {
- text: "-"
+ text: "\u2228" // ^ logical OR
font.pixelSize: control.font.pixelSize * 2
color: control.textColor
anchors.fill: parent
=====================================
modules/gui/qt/widgets/qml/ToolTipArea.qml → modules/gui/qt/widgets/qml/TextFieldExt.qml
=====================================
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (C) 2019 VLC authors and VideoLAN
+ * Copyright (C) 2022 VLC authors and VideoLAN
*
* 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
@@ -15,24 +15,28 @@
* 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 QtQuick.Controls 2.4
-import "qrc:///style/"
-MouseArea {
- property alias text: tip.text
- property alias delay: tip.delay
- property bool activated: true
+import org.videolan.vlc 0.1
- anchors.fill: parent
+import "qrc:///style/"
- hoverEnabled: true
- propagateComposedEvents: true
+TextField {
+ id: control
- ToolTipExt {
- id: tip
- text: "plop"
- delay: VLCStyle.delayToolTipAppear
- visible: activated && parent.containsMouse
+ selectedTextColor : VLCStyle.colors.bgHoverText
+ selectionColor : VLCStyle.colors.bgHover
+ color : VLCStyle.colors.text
+ font.pixelSize: VLCStyle.fontSize_normal
+
+ background: Rectangle {
+ implicitWidth: 200
+ implicitHeight: 40
+ border.width: control.enabled ? VLCStyle.dp(2, VLCStyle.scale) : 0
+ color: VLCStyle.colors.bgAlt
+ border.color: control.activeFocus ? VLCStyle.colors.accent : VLCStyle.colors.buttonBorder
}
+
}
=====================================
modules/gui/qt/widgets/qml/TransparentSpinBox.qml deleted
=====================================
@@ -1,124 +0,0 @@
-
-/*****************************************************************************
- * Copyright (C) 2020 VLC authors and VideoLAN
- *
- * 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 QtQuick.Controls 2.4
-import QtQuick.Templates 2.4 as T
-
-import org.videolan.vlc 0.1
-
-import "qrc:///widgets/" as Widgets
-import "qrc:///style/"
-
-T.SpinBox {
- id: control
-
- property color color: "white"
- property int borderWidth: VLCStyle.dp(1, VLCStyle.scale)
- property color borderColor: control.activeFocus
- || control.hovered ? VLCStyle.colors.accent : Qt.rgba(
- 1, 1, 1, .2)
- value: 50
- editable: true
- from: 0
- to: 99999
- padding: VLCStyle.dp(6, VLCStyle.scale)
- font.pixelSize: VLCStyle.fontSize_normal
- implicitHeight: VLCStyle.fontHeight_normal + control.topPadding + control.bottomPadding
-
- Keys.priority: Keys.AfterItem
- Keys.onPressed: Navigation.defaultKeyAction(event)
-
- contentItem: TextInput {
- // NOTE: This is required for InterfaceWindowHandler::applyKeyEvent.
- property bool visualFocus: control.activeFocus
-
- z: 2
- text: control.textFromValue(control.value, control.locale)
- color: control.color
- font: control.font
- horizontalAlignment: Qt.AlignHCenter
- verticalAlignment: Qt.AlignVCenter
- readOnly: !control.editable
- validator: control.validator
- inputMethodHints: Qt.ImhFormattedNumbersOnly
- padding: 0
- }
-
- background: Rectangle {
- color: "transparent"
- border.width: control.borderWidth
- border.color: control.borderColor
- }
-
- up.indicator: T.Label {
- x: control.mirrored ? 0 : parent.width - width
- z: 4
- height: parent.height
- width: implicitWidth
- text: "\uff0b" // Full-width Plus
- font.pixelSize: control.font.pixelSize
- color: !control.up.pressed ? control.color : VLCStyle.colors.accent
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- leftPadding: control.leftPadding
- rightPadding: control.rightPadding
-
- MouseArea {
- anchors.fill: parent
- acceptedButtons: Qt.LeftButton
- onPressed: {
- control.up.pressed = true
- control.increase()
- mouse.accepted = true
- }
- onReleased: {
- control.up.pressed = false
- mouse.accepted = true
- }
- }
- }
-
- down.indicator: T.Label {
- x: control.mirrored ? parent.width - width : 0
- z: 4
- height: parent.height
- width: implicitWidth
- text: "\uff0d" // Full-width Hyphen-minus
- font.pixelSize: control.font.pixelSize
- color: !control.down.pressed ? control.color : VLCStyle.colors.accent
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- leftPadding: control.leftPadding
- rightPadding: control.rightPadding
-
- MouseArea {
- anchors.fill: parent
- acceptedButtons: Qt.LeftButton
- onPressed: {
- control.down.pressed = true
- control.decrease()
- mouse.accepted = true
- }
- onReleased: {
- control.down.pressed = false
- mouse.accepted = true
- }
- }
- }
-}
=====================================
po/POTFILES.in
=====================================
@@ -716,7 +716,6 @@ modules/gui/qt/dialogs/gototime/gototime.cpp
modules/gui/qt/dialogs/gototime/gototime.hpp
modules/gui/qt/dialogs/help/help.cpp
modules/gui/qt/dialogs/help/help.hpp
-modules/gui/qt/dialogs/help/qml/About.qml
modules/gui/qt/dialogs/mediainfo/info_panels.cpp
modules/gui/qt/dialogs/mediainfo/info_panels.hpp
modules/gui/qt/dialogs/mediainfo/info_widgets.cpp
@@ -840,7 +839,6 @@ modules/gui/qt/network/qml/BrowseTreeDisplay.qml
modules/gui/qt/network/qml/DiscoverDisplay.qml
modules/gui/qt/network/qml/DiscoverUrlDisplay.qml
modules/gui/qt/network/qml/NetworkGridItem.qml
-modules/gui/qt/network/qml/NetworkListItem.qml
modules/gui/qt/network/qml/ServicesHomeDisplay.qml
modules/gui/qt/player/control_list_filter.cpp
modules/gui/qt/player/control_list_filter.hpp
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/16668b08237c918f6d4c9264c7b5cb778f6ca64e...2568dc7df306dfd4c6c3c9106e442d55142b833f
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/16668b08237c918f6d4c9264c7b5cb778f6ca64e...2568dc7df306dfd4c6c3c9106e442d55142b833f
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list