ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always include QtQuick.Controls as QQC2

Browse Source
This commit is contained in:
Tobias Fella
2022-10-31 01:33:47 +01:00
parent f733a2edef
commit ab5afa26ef
35 changed files with 262 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qml/Component/Timeline/AudioDelegate.qml
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15
import QtMultimedia 5.15
@@ -80,16 +80,16 @@ TimelineContainer {
]
RowLayout {
ToolButton {
QQC2.ToolButton {
id: playButton
}
Label {
QQC2.Label {
text: model.display
wrapMode: Text.Wrap
Layout.fillWidth: true
}
}
ProgressBar {
QQC2.ProgressBar {
id: downloadBar
visible: false
Layout.fillWidth: true
@@ -100,7 +100,7 @@ TimelineContainer {
RowLayout {
visible: audio.hasAudio
Slider {
QQC2.Slider {
Layout.fillWidth: true
from: 0
to: audio.duration
@@ -108,13 +108,13 @@ TimelineContainer {
onMoved: audio.seek(value)
}
Label {
QQC2.Label {
visible: audioDelegate.contentMaxWidth > Kirigami.Units.gridUnit * 12
text: Controller.formatDuration(audio.position) + "/" + Controller.formatDuration(audio.duration)
}
}
Label {
QQC2.Label {
Layout.alignment: Qt.AlignRight
Layout.rightMargin: Kirigami.Units.smallSpacing
visible: audio.hasAudio && audioDelegate.contentMaxWidth < Kirigami.Units.gridUnit * 12

2
src/qml/Component/Timeline/EncryptedDelegate.qml
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.15 as Kirigami

10
src/qml/Component/Timeline/ImageDelegate.qml
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15
import Qt.labs.platform 1.1
@@ -45,9 +45,9 @@ TimelineContainer {
fillMode: Image.PreserveAspectFit
ToolTip.text: model.display
ToolTip.visible: hoverHandler.hovered
ToolTip.delay: Kirigami.Units.toolTipDelay
QQC2.ToolTip.text: model.display
QQC2.ToolTip.visible: hoverHandler.hovered
QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
HoverHandler {
id: hoverHandler
@@ -60,7 +60,7 @@ TimelineContainer {
color: "#BB000000"
ProgressBar {
QQC2.ProgressBar {
anchors.centerIn: parent
width: parent.width * 0.8

4
src/qml/Component/Timeline/LinkPreviewDelegate.qml
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-or-later OR LicenseRef-KDE-Accepted-GPL
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.15 as Kirigami
@@ -65,7 +65,7 @@ a {
visible: lp.loaded
onLinkActivated: RoomManager.openResource(link)
}
Label {
QQC2.Label {
text: lp.description
Layout.maximumWidth: messageDelegate.bubbleMaxWidth
Layout.fillWidth: true

10
src/qml/Component/Timeline/ReactionDelegate.qml
View File

@@ -3,7 +3,7 @@
// SPDX-License-Identifier: GPL-3.0-only
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.15 as Kirigami
@@ -14,10 +14,10 @@ Flow {
Repeater {
model: reaction ?? null
delegate: AbstractButton {
delegate: QQC2.AbstractButton {
width: Math.max(implicitWidth, height)
contentItem: Label {
contentItem: QQC2.Label {
horizontalAlignment: Text.AlignHCenter
text: modelData.reaction + " " + modelData.count
}
@@ -41,8 +41,8 @@ Flow {
hoverEnabled: true
ToolTip.visible: hovered
ToolTip.text: {
QQC2.ToolTip.visible: hovered
QQC2.ToolTip.text: {
var text = "";
for (var i = 0; i < modelData.authors.length && i < 3; i++) {

8
src/qml/Component/Timeline/StateDelegate.qml
View File

@@ -2,14 +2,14 @@
// SPDX-License-Identifier: GPL-3.0-only
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15
import org.kde.kirigami 2.15 as Kirigami
import org.kde.neochat 1.0
Control {
QQC2.Control {
id: stateDelegate
readonly property bool sectionVisible: model.showSection
@@ -88,11 +88,11 @@ Control {
MouseArea {
anchors.fill: parent
onClicked: userDetailDialog.createObject(ApplicationWindow.overlay, {room: currentRoom, user: author.object, displayName: author.displayName, avatarMediaId: author.avatarMediaId, avatarUrl: author.avatarUrl}).open()
onClicked: userDetailDialog.createObject(QQC2.ApplicationWindow.overlay, {room: currentRoom, user: author.object, displayName: author.displayName, avatarMediaId: author.avatarMediaId, avatarUrl: author.avatarUrl}).open()
}
}
Label {
QQC2.Label {
id: label
Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true

6
src/qml/Component/Timeline/VideoDelegate.qml
View File

@@ -2,7 +2,7 @@
// SPDX-License-Identifier: GPL-3.0-only
import QtQuick 2.15
import QtQuick.Controls 2.15
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.15
import QtMultimedia 5.15
import Qt.labs.platform 1.1 as Platform
@@ -70,7 +70,7 @@ TimelineContainer {
fillMode: Image.PreserveAspectFit
}
Label {
QQC2.Label {
anchors.centerIn: parent
visible: vid.playbackState == MediaPlayer.StoppedState || vid.error != MediaPlayer.NoError
@@ -94,7 +94,7 @@ TimelineContainer {
color: "#BB000000"
ProgressBar {
QQC2.ProgressBar {
anchors.centerIn: parent
width: parent.width * 0.8