diff --git a/src/qml/Component/ChatBox/AttachmentPane.qml b/src/qml/Component/ChatBox/AttachmentPane.qml index e51797778..b98f36e6c 100644 --- a/src/qml/Component/ChatBox/AttachmentPane.qml +++ b/src/qml/Component/ChatBox/AttachmentPane.qml @@ -4,7 +4,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick.Controls 2.15 as QQC2 import org.kde.kirigami 2.15 as Kirigami @@ -20,7 +20,7 @@ Loader { active: visible sourceComponent: Component { - Pane { + QQC2.Pane { id: attachmentPane Kirigami.Theme.colorSet: Kirigami.Theme.View @@ -72,7 +72,7 @@ Loader { } } - BusyIndicator { + QQC2.BusyIndicator { id: imageBusyIndicator anchors { horizontalCenter: parent.horizontalCenter @@ -98,7 +98,7 @@ Loader { source: attachmentMimetype.iconName } - Label { + QQC2.Label { id: fileLabel text: baseFileName } @@ -115,7 +115,7 @@ Loader { // Using a toolbar to get a button spacing consistent with what the QQC2 style normally has // Also has some accessibility info - ToolBar { + QQC2.ToolBar { id: toolBar width: parent.width anchors.top: parent.top @@ -130,7 +130,7 @@ Loader { contentItem: RowLayout { spacing: parent.spacing - Label { + QQC2.Label { Layout.leftMargin: -attachmentPane.leftPadding Layout.topMargin: -attachmentPane.topPadding leftPadding: cancelAttachmentButton.leftPadding + 1 + attachmentPane.leftPadding @@ -152,12 +152,12 @@ Loader { Item { Layout.fillWidth: true } - ToolButton { + QQC2.ToolButton { id: editImageButton visible: hasImage icon.name: "document-edit" text: i18n("Edit") - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly Component { id: imageEditorPage @@ -172,17 +172,17 @@ Loader { attachmentPaneLoader.attachmentPath = newPath; }); } - ToolTip.text: text - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.visible: hovered } - ToolButton { + QQC2.ToolButton { id: cancelAttachmentButton icon.name: "dialog-close" text: i18n("Cancel sending Image") - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: currentRoom.chatBoxAttachmentPath = ""; - ToolTip.text: text - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.visible: hovered } } background: null diff --git a/src/qml/Component/ChatBox/ChatBar.qml b/src/qml/Component/ChatBox/ChatBar.qml index abc0460fe..72641f4e7 100644 --- a/src/qml/Component/ChatBox/ChatBar.qml +++ b/src/qml/Component/ChatBox/ChatBar.qml @@ -4,13 +4,13 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Window 2.15 import org.kde.kirigami 2.18 as Kirigami import org.kde.neochat 1.0 -ToolBar { +QQC2.ToolBar { id: chatBar property alias inputFieldText: inputField.text property alias textField: inputField @@ -26,7 +26,7 @@ ToolBar { inputField.cursorPosition = inputField.length; } - position: ToolBar.Footer + position: QQC2.ToolBar.Footer Kirigami.Theme.colorSet: Kirigami.Theme.View @@ -41,7 +41,7 @@ ToolBar { contentItem: RowLayout { spacing: chatBar.spacing - ScrollView { + QQC2.ScrollView { Layout.fillHeight: true Layout.fillWidth: true Layout.minimumHeight: inputField.implicitHeight @@ -50,14 +50,14 @@ ToolBar { + inputField.topPadding + inputField.bottomPadding // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890) - ScrollBar.horizontal.policy: ScrollBar.AlwaysOff + QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff FontMetrics { id: fontMetrics font: inputField.font } - TextArea { + QQC2.TextArea { id: inputField focus: true /* Some QQC2 styles will have their own predefined backgrounds for TextAreas. @@ -159,20 +159,20 @@ ToolBar { visible: currentRoom.chatBoxReplyId.length === 0 && (currentRoom.chatBoxAttachmentPath.length === 0 || uploadingBusySpinner.running) implicitWidth: uploadButton.implicitWidth implicitHeight: uploadButton.implicitHeight - ToolButton { + QQC2.ToolButton { id: uploadButton anchors.fill: parent // Matrix does not allow sending attachments in replies visible: currentRoom.chatBoxReplyId.length === 0 && currentRoom.chatBoxAttachmentPath.length === 0 && !uploadingBusySpinner.running icon.name: "mail-attachment" text: i18n("Attach an image or file") - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: { if (Clipboard.hasImage) { attachDialog.open() } else { - var fileDialog = openFileDialog.createObject(ApplicationWindow.overlay) + var fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.overlay) fileDialog.chosen.connect((path) => { if (!path) { return; @@ -183,10 +183,10 @@ ToolBar { } } - ToolTip.text: text - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.visible: hovered } - BusyIndicator { + QQC2.BusyIndicator { id: uploadingBusySpinner anchors.fill: parent visible: running @@ -194,29 +194,29 @@ ToolBar { } } - ToolButton { + QQC2.ToolButton { id: emojiButton icon.name: "smiley" text: i18n("Add an Emoji") - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly checkable: true - ToolTip.text: text - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.visible: hovered } - ToolButton { + QQC2.ToolButton { id: sendButton icon.name: "document-send" text: i18n("Send message") - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: { chatBar.postMessage() } - ToolTip.text: text - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.visible: hovered } } diff --git a/src/qml/Component/ChatBox/CompletionMenu.qml b/src/qml/Component/ChatBox/CompletionMenu.qml index 538801917..202374d4e 100644 --- a/src/qml/Component/ChatBox/CompletionMenu.qml +++ b/src/qml/Component/ChatBox/CompletionMenu.qml @@ -4,14 +4,14 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick.Controls 2.15 as QQC2 import Qt.labs.qmlmodels 1.0 import org.kde.kirigami 2.15 as Kirigami import org.kde.neochat 1.0 -Popup { +QQC2.Popup { id: completionMenu width: parent.width diff --git a/src/qml/Component/ChatBox/ReplyPane.qml b/src/qml/Component/ChatBox/ReplyPane.qml index 8c6cab929..436024f85 100644 --- a/src/qml/Component/ChatBox/ReplyPane.qml +++ b/src/qml/Component/ChatBox/ReplyPane.qml @@ -4,7 +4,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick.Controls 2.15 as QQC2 import org.kde.kirigami 2.14 as Kirigami @@ -17,7 +17,7 @@ Loader { signal replyCancelled() active: visible - sourceComponent: Pane { + sourceComponent: QQC2.Pane { id: replyPane Kirigami.Theme.colorSet: Kirigami.Theme.View @@ -49,7 +49,7 @@ Loader { Layout.alignment: Qt.AlignCenter Layout.fillWidth: true spacing: fontMetrics.leading - Label { + QQC2.Label { Layout.fillWidth: true textFormat: Text.StyledText elide: Text.ElideRight @@ -66,15 +66,15 @@ Loader { } } //TODO edit user mentions - ScrollView { + QQC2.ScrollView { Layout.alignment: Qt.AlignLeft | Qt.AlignTop Layout.fillWidth: true Layout.maximumHeight: fontMetrics.lineSpacing * 8 - fontMetrics.leading // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890) - ScrollBar.horizontal.policy: ScrollBar.AlwaysOff + QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff - TextArea { + QQC2.TextArea { id: textArea leftPadding: 0 rightPadding: 0 @@ -84,7 +84,7 @@ Loader { selectByMouse: true selectByKeyboard: true readOnly: true - wrapMode: Label.Wrap + wrapMode: QQC2.Label.Wrap textFormat: TextEdit.RichText background: Item {} HoverHandler { @@ -94,8 +94,8 @@ Loader { } } - ToolButton { - display: AbstractButton.IconOnly + QQC2.ToolButton { + display: QQC2.AbstractButton.IconOnly action: Kirigami.Action { text: i18nc("@action:button", "Cancel reply") icon.name: "dialog-close" @@ -105,8 +105,8 @@ Loader { } shortcut: "Escape" } - ToolTip.text: text - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.visible: hovered } } diff --git a/src/qml/Component/Emoji/EmojiPicker.qml b/src/qml/Component/Emoji/EmojiPicker.qml index f05c1b798..b7951380c 100644 --- a/src/qml/Component/Emoji/EmojiPicker.qml +++ b/src/qml/Component/Emoji/EmojiPicker.qml @@ -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 org.kde.kirigami 2.15 as Kirigami @@ -19,10 +19,10 @@ ColumnLayout { spacing: 0 - ScrollView { + QQC2.ScrollView { Layout.fillWidth: true - Layout.preferredHeight: Kirigami.Units.gridUnit * 2 + ScrollBar.horizontal.height + 2 // for the focus line - ScrollBar.horizontal.height: ScrollBar.horizontal.visible ? ScrollBar.horizontal.implicitHeight : 0 + Layout.preferredHeight: Kirigami.Units.gridUnit * 2 + QQC2.ScrollBar.horizontal.height + 2 // for the focus line + QQC2.ScrollBar.horizontal.height: QQC2.ScrollBar.horizontal.visible ? QQC2.ScrollBar.horizontal.implicitHeight : 0 ListView { clip: true @@ -41,7 +41,7 @@ ColumnLayout { ListElement { label: "🏁"; category: "flags" } } - delegate: ItemDelegate { + delegate: QQC2.ItemDelegate { id: del required property string label @@ -82,7 +82,7 @@ ColumnLayout { Layout.preferredHeight: 1 } - ScrollView { + QQC2.ScrollView { Layout.fillWidth: true Layout.preferredHeight: Kirigami.Units.gridUnit * 8 Layout.fillHeight: true @@ -119,7 +119,7 @@ ColumnLayout { return null } - delegate: ItemDelegate { + delegate: QQC2.ItemDelegate { width: Kirigami.Units.gridUnit * 2 height: Kirigami.Units.gridUnit * 2 diff --git a/src/qml/Component/FancyEffectsContainer.qml b/src/qml/Component/FancyEffectsContainer.qml index a05d42fc8..02773e4e8 100644 --- a/src/qml/Component/FancyEffectsContainer.qml +++ b/src/qml/Component/FancyEffectsContainer.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL import QtQuick 2.15 -import QtQuick.Controls 2.15 as Controls +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.15 import QtQuick.Particles 2.15 diff --git a/src/qml/Component/FullScreenImage.qml b/src/qml/Component/FullScreenImage.qml index 60289bac9..04f67a5f6 100644 --- a/src/qml/Component/FullScreenImage.qml +++ b/src/qml/Component/FullScreenImage.qml @@ -2,13 +2,13 @@ // 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 import org.kde.kirigami 2.15 as Kirigami -Popup { +QQC2.Popup { id: root property alias source: image.source @@ -18,8 +18,8 @@ Popup { property int imageHeight: -1 property var modelData - parent: Overlay.overlay - closePolicy: Popup.CloseOnEscape + parent: QQC2.Overlay.overlay + closePolicy: QQC2.Popup.CloseOnEscape width: parent.width height: parent.height modal: true @@ -32,7 +32,7 @@ Popup { anchors.fill: parent spacing: Kirigami.Units.largeSpacing - Control { + QQC2.Control { Layout.fillWidth: true contentItem: RowLayout { @@ -52,7 +52,7 @@ Popup { Layout.fillWidth: true spacing: 0 - Label { + QQC2.Label { id: nameLabel text: modelData.author.displayName @@ -60,13 +60,13 @@ Popup { font.weight: Font.Bold color: author.color } - Label { + QQC2.Label { id: timeLabel text: time.toLocaleString(Qt.locale(), Locale.ShortFormat) } } - Label { + QQC2.Label { id: imageLabel Layout.fillWidth: true Layout.leftMargin: Kirigami.Units.largeSpacing @@ -75,14 +75,14 @@ Popup { font.weight: Font.Bold elide: Text.ElideRight } - ToolButton { + QQC2.ToolButton { Layout.preferredWidth: Kirigami.Units.gridUnit * 2 Layout.preferredHeight: Kirigami.Units.gridUnit * 2 text: i18n("Zoom in") Accessible.name: text icon.name: "zoom-in" - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: { image.scaleFactor = image.scaleFactor + 0.25 if (image.scaleFactor > 3) { @@ -90,18 +90,18 @@ Popup { } } - ToolTip.text: text - ToolTip.delay: Kirigami.Units.toolTipDelay - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay + QQC2.ToolTip.visible: hovered } - ToolButton { + QQC2.ToolButton { Layout.preferredWidth: Kirigami.Units.gridUnit * 2 Layout.preferredHeight: Kirigami.Units.gridUnit * 2 text: i18n("Zoom out") Accessible.name: text icon.name: "zoom-out" - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: { image.scaleFactor = image.scaleFactor - 0.25 if (image.scaleFactor < 0.25) { @@ -109,71 +109,71 @@ Popup { } } - ToolTip.text: text - ToolTip.delay: Kirigami.Units.toolTipDelay - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay + QQC2.ToolTip.visible: hovered } - ToolButton { + QQC2.ToolButton { Layout.preferredWidth: Kirigami.Units.gridUnit * 2 Layout.preferredHeight: Kirigami.Units.gridUnit * 2 text: i18n("Rotate left") Accessible.name: text icon.name: "image-rotate-left-symbolic" - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: image.rotationAngle = image.rotationAngle - 90 - ToolTip.text: text - ToolTip.delay: Kirigami.Units.toolTipDelay - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay + QQC2.ToolTip.visible: hovered } - ToolButton { + QQC2.ToolButton { Layout.preferredWidth: Kirigami.Units.gridUnit * 2 Layout.preferredHeight: Kirigami.Units.gridUnit * 2 text: i18n("Rotate right") Accessible.name: text icon.name: "image-rotate-right-symbolic" - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: image.rotationAngle = image.rotationAngle + 90 - ToolTip.text: text - ToolTip.delay: Kirigami.Units.toolTipDelay - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay + QQC2.ToolTip.visible: hovered } - ToolButton { + QQC2.ToolButton { Layout.preferredWidth: Kirigami.Units.gridUnit * 2 Layout.preferredHeight: Kirigami.Units.gridUnit * 2 text: i18n("Save as") Accessible.name: text icon.name: "document-save" - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: { var dialog = saveAsDialog.createObject(ApplicationWindow.overlay) dialog.open() dialog.currentFile = dialog.folder + "/" + currentRoom.fileNameToDownload(eventId) } - ToolTip.text: text - ToolTip.delay: Kirigami.Units.toolTipDelay - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay + QQC2.ToolTip.visible: hovered } - ToolButton { + QQC2.ToolButton { Layout.preferredWidth: Kirigami.Units.gridUnit * 2 Layout.preferredHeight: Kirigami.Units.gridUnit * 2 text: i18n("Close") Accessible.name: text icon.name: "dialog-close" - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: { root.close() } - ToolTip.text: text - ToolTip.delay: Kirigami.Units.toolTipDelay - ToolTip.visible: hovered + QQC2.ToolTip.text: text + QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay + QQC2.ToolTip.visible: hovered } } @@ -191,7 +191,7 @@ Popup { } } - BusyIndicator { + QQC2.BusyIndicator { Layout.fillWidth: true visible: image.status !== Image.Ready && root.blurhash === "" running: visible diff --git a/src/qml/Component/Login/LoginMethod.qml b/src/qml/Component/Login/LoginMethod.qml index 5d2d3134c..05ee16db2 100644 --- a/src/qml/Component/Login/LoginMethod.qml +++ b/src/qml/Component/Login/LoginMethod.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.15 -import QtQuick.Controls 2.15 as Controls +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami @@ -15,14 +15,14 @@ LoginStep { Layout.alignment: Qt.AlignHCenter - Controls.Button { + QQC2.Button { Layout.alignment: Qt.AlignHCenter text: i18n("Login with password") Layout.preferredWidth: Kirigami.Units.gridUnit * 12 onClicked: processed("qrc:/Password.qml") } - Controls.Button { + QQC2.Button { Layout.alignment: Qt.AlignHCenter text: i18n("Login with single sign-on") Layout.preferredWidth: Kirigami.Units.gridUnit * 12 diff --git a/src/qml/Component/Login/LoginRegister.qml b/src/qml/Component/Login/LoginRegister.qml index fb42de4a1..56275ce9a 100644 --- a/src/qml/Component/Login/LoginRegister.qml +++ b/src/qml/Component/Login/LoginRegister.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.15 -import QtQuick.Controls 2.15 as Controls +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami @@ -14,14 +14,14 @@ LoginStep { Layout.alignment: Qt.AlignHCenter - Controls.Button { + QQC2.Button { Layout.alignment: Qt.AlignHCenter text: i18n("Login") Layout.preferredWidth: Kirigami.Units.gridUnit * 12 onClicked: processed("qrc:/Login.qml") } - Controls.Button { + QQC2.Button { Layout.alignment: Qt.AlignHCenter text: i18n("Register") Layout.preferredWidth: Kirigami.Units.gridUnit * 12 diff --git a/src/qml/Component/Login/LoginStep.qml b/src/qml/Component/Login/LoginStep.qml index 52fb9a5e9..42dff75c4 100644 --- a/src/qml/Component/Login/LoginStep.qml +++ b/src/qml/Component/Login/LoginStep.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.14 -import QtQuick.Controls 2.14 +import QtQuick.Controls 2.14 as QQC2 import QtQuick.Layouts 1.14 /// Step for the login/registration flow diff --git a/src/qml/Component/Timeline/AudioDelegate.qml b/src/qml/Component/Timeline/AudioDelegate.qml index bbbc05e64..9016a9f5c 100644 --- a/src/qml/Component/Timeline/AudioDelegate.qml +++ b/src/qml/Component/Timeline/AudioDelegate.qml @@ -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 diff --git a/src/qml/Component/Timeline/EncryptedDelegate.qml b/src/qml/Component/Timeline/EncryptedDelegate.qml index 7b54a31f5..736ad326a 100644 --- a/src/qml/Component/Timeline/EncryptedDelegate.qml +++ b/src/qml/Component/Timeline/EncryptedDelegate.qml @@ -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 diff --git a/src/qml/Component/Timeline/ImageDelegate.qml b/src/qml/Component/Timeline/ImageDelegate.qml index 92c833766..74398a2cd 100644 --- a/src/qml/Component/Timeline/ImageDelegate.qml +++ b/src/qml/Component/Timeline/ImageDelegate.qml @@ -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 diff --git a/src/qml/Component/Timeline/LinkPreviewDelegate.qml b/src/qml/Component/Timeline/LinkPreviewDelegate.qml index 8f41b9cac..20b103510 100644 --- a/src/qml/Component/Timeline/LinkPreviewDelegate.qml +++ b/src/qml/Component/Timeline/LinkPreviewDelegate.qml @@ -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 diff --git a/src/qml/Component/Timeline/ReactionDelegate.qml b/src/qml/Component/Timeline/ReactionDelegate.qml index 92ac37c84..ee6206a86 100644 --- a/src/qml/Component/Timeline/ReactionDelegate.qml +++ b/src/qml/Component/Timeline/ReactionDelegate.qml @@ -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++) { diff --git a/src/qml/Component/Timeline/StateDelegate.qml b/src/qml/Component/Timeline/StateDelegate.qml index ba16aad8f..242c7682b 100644 --- a/src/qml/Component/Timeline/StateDelegate.qml +++ b/src/qml/Component/Timeline/StateDelegate.qml @@ -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 diff --git a/src/qml/Component/Timeline/VideoDelegate.qml b/src/qml/Component/Timeline/VideoDelegate.qml index 855398d8c..11c70f8b6 100644 --- a/src/qml/Component/Timeline/VideoDelegate.qml +++ b/src/qml/Component/Timeline/VideoDelegate.qml @@ -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 diff --git a/src/qml/Component/TypingPane.qml b/src/qml/Component/TypingPane.qml index 6d4ecb47b..bf28f4084 100644 --- a/src/qml/Component/TypingPane.qml +++ b/src/qml/Component/TypingPane.qml @@ -6,7 +6,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 -import QtQuick.Controls 2.15 +import QtQuick.Controls 2.15 as QQC2 import org.kde.kirigami 2.14 as Kirigami import org.kde.neochat 1.0 @@ -15,7 +15,7 @@ Loader { property string labelText: "" active: visible - sourceComponent: Pane { + sourceComponent: QQC2.Pane { id: typingPane leftPadding: Kirigami.Units.largeSpacing @@ -86,7 +86,7 @@ Loader { } } } - Label { + QQC2.Label { id: typingLabel elide: Text.ElideRight text: root.labelText diff --git a/src/qml/Dialog/CreateRoomDialog.qml b/src/qml/Dialog/CreateRoomDialog.qml index 29a3ce36a..f1808d7d0 100644 --- a/src/qml/Dialog/CreateRoomDialog.qml +++ b/src/qml/Dialog/CreateRoomDialog.qml @@ -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 org.kde.kirigami 2.15 as Kirigami @@ -16,19 +16,19 @@ Kirigami.OverlaySheet { title: i18n("Create a Room") contentItem: Kirigami.FormLayout { - TextField { + QQC2.TextField { id: roomNameField Kirigami.FormData.label: i18n("Room Name") onAccepted: roomTopicField.forceActiveFocus(); } - TextField { + QQC2.TextField { id: roomTopicField Kirigami.FormData.label: i18n("Room Topic") onAccepted: okButton.forceActiveFocus(); } - Button { + QQC2.Button { id: okButton text: i18nc("@action:button", "Ok") diff --git a/src/qml/Menu/RoomListContextMenu.qml b/src/qml/Menu/RoomListContextMenu.qml index 21a9ece4a..a9776248c 100644 --- a/src/qml/Menu/RoomListContextMenu.qml +++ b/src/qml/Menu/RoomListContextMenu.qml @@ -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.19 as Kirigami @@ -20,8 +20,8 @@ Loader { Component { id: regularMenu - Menu { - MenuItem { + QQC2.Menu { + QQC2.MenuItem { id: newWindow text: i18n("Open in New Window") icon.name: "window-new" @@ -29,29 +29,29 @@ Loader { visible: !Kirigami.Settings.isMobile } - MenuSeparator { + QQC2.MenuSeparator { visible: newWindow.visible } - MenuItem { + QQC2.MenuItem { text: room.isFavourite ? i18n("Remove from Favourites") : i18n("Add to Favourites") icon.name: room.isFavourite ? "bookmark-remove" : "bookmark-new" onTriggered: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0) } - MenuItem { + QQC2.MenuItem { text: room.isLowPriority ? i18n("Reprioritize") : i18n("Deprioritize") icon.name: room.isLowPriority ? "arrow-up" : "arrow-down" onTriggered: room.isLowPriority ? room.removeTag("m.lowpriority") : room.addTag("m.lowpriority", 1.0) } - MenuItem { + QQC2.MenuItem { text: i18n("Mark as Read") icon.name: "checkmark" onTriggered: room.markAllMessagesAsRead() } - MenuItem { + QQC2.MenuItem { text: i18nc("@action:inmenu", "Copy Address to Clipboard") icon.name: "edit-copy" onTriggered: if (room.canonicalAlias.length === 0) { @@ -61,10 +61,10 @@ Loader { } } - Menu { + QQC2.Menu { title: i18n("Notification State") - MenuItem { + QQC2.MenuItem { text: i18n("Follow Global Setting") icon.name: "globe" checkable: true @@ -75,7 +75,7 @@ Loader { room.pushNotificationState = PushNotificationState.Default } } - MenuItem { + QQC2.MenuItem { text: i18nc("As in 'notify for all messages'","All") icon.name: "notifications" checkable: true @@ -86,7 +86,7 @@ Loader { room.pushNotificationState = PushNotificationState.All } } - MenuItem { + QQC2.MenuItem { text: i18nc("As in 'notify when the user is mentioned or the message contains a set keyword'","@Mentions and Keywords") icon.name: "im-user" checkable: true @@ -97,7 +97,7 @@ Loader { room.pushNotificationState = PushNotificationState.MentionKeyword } } - MenuItem { + QQC2.MenuItem { text: i18nc("As in 'do not notify for any messages'","Off") icon.name: "notifications-disabled" checkable: true @@ -110,15 +110,15 @@ Loader { } } - MenuItem { + QQC2.MenuItem { text: i18n("Room Settings") icon.name: "configure" onTriggered: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}) } - MenuSeparator {} + QQC2.MenuSeparator {} - MenuItem { + QQC2.MenuItem { text: i18n("Leave Room") icon.name: "go-previous" onTriggered: RoomManager.leaveRoom(room) @@ -168,7 +168,7 @@ Loader { text: room.displayName wrapMode: Text.WordWrap } - ToolButton { + QQC2.ToolButton { checked: room.isFavourite checkable: true icon.name: 'favorite' @@ -176,7 +176,7 @@ Loader { onClicked: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0) } - ToolButton { + QQC2.ToolButton { icon.name: 'settings-configure' onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}) } diff --git a/src/qml/Menu/ShareAction.qml b/src/qml/Menu/ShareAction.qml index b7f6e5baa..7cc21f870 100644 --- a/src/qml/Menu/ShareAction.qml +++ b/src/qml/Menu/ShareAction.qml @@ -3,7 +3,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.15 as Controls +import QtQuick.Controls 2.15 as QQC2 import org.kde.kirigami 2.14 as Kirigami /** diff --git a/src/qml/Menu/ShareDialog.qml b/src/qml/Menu/ShareDialog.qml index 8cbbb8e02..824776e10 100644 --- a/src/qml/Menu/ShareDialog.qml +++ b/src/qml/Menu/ShareDialog.qml @@ -7,7 +7,7 @@ import QtQuick 2.7 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.15 as Controls +import QtQuick.Controls 2.15 as QQC2 import org.kde.purpose 1.0 as Purpose import org.kde.notification 1.0 import org.kde.kirigami 2.14 as Kirigami @@ -23,7 +23,7 @@ Kirigami.Page { property alias index: jobView.index property alias model: jobView.model - Controls.Action { + QQC2.Action { shortcut: 'Escape' onTriggered: window.closeDialog() } diff --git a/src/qml/Menu/SpaceListContextMenu.qml b/src/qml/Menu/SpaceListContextMenu.qml index 250b4ae8d..32e99da5c 100644 --- a/src/qml/Menu/SpaceListContextMenu.qml +++ b/src/qml/Menu/SpaceListContextMenu.qml @@ -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.19 as Kirigami @@ -20,8 +20,8 @@ Loader { Component { id: regularMenu - Menu { - MenuItem { + QQC2.Menu { + QQC2.MenuItem { text: i18nc("@action:inmenu", "Copy Address to Clipboard") onTriggered: if (room.canonicalAlias.length === 0) { Clipboard.saveText(room.id) @@ -30,14 +30,14 @@ Loader { } } - MenuItem { + QQC2.MenuItem { text: i18nc("'Space' is a matrix space", "Space Settings") onTriggered: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}) } - MenuSeparator {} + QQC2.MenuSeparator {} - MenuItem { + QQC2.MenuItem { text: i18nc("'Space' is a matrix space", "Leave Space") onTriggered: RoomManager.leaveRoom(room) } @@ -87,7 +87,7 @@ Loader { wrapMode: Text.WordWrap } - ToolButton { + QQC2.ToolButton { icon.name: 'settings-configure' onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}) } diff --git a/src/qml/Menu/Timeline/FileDelegateContextMenu.qml b/src/qml/Menu/Timeline/FileDelegateContextMenu.qml index 6c4faad64..05a96ae6b 100644 --- a/src/qml/Menu/Timeline/FileDelegateContextMenu.qml +++ b/src/qml/Menu/Timeline/FileDelegateContextMenu.qml @@ -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 Qt.labs.platform 1.1 import org.kde.kirigami 2.15 as Kirigami diff --git a/src/qml/Menu/Timeline/MessageSourceSheet.qml b/src/qml/Menu/Timeline/MessageSourceSheet.qml index 400d01023..13283a05c 100644 --- a/src/qml/Menu/Timeline/MessageSourceSheet.qml +++ b/src/qml/Menu/Timeline/MessageSourceSheet.qml @@ -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 org.kde.syntaxhighlighting 1.0 import org.kde.kirigami 2.15 as Kirigami @@ -19,14 +19,14 @@ Kirigami.Page { title: i18n("Message Source") - ScrollView { + QQC2.ScrollView { anchors.fill: parent contentWidth: availableWidth // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890) - ScrollBar.horizontal.policy: ScrollBar.AlwaysOff + QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff - TextArea { + QQC2.TextArea { id: sourceTextArea text: sourceText readOnly: true diff --git a/src/qml/Page/InviteUserPage.qml b/src/qml/Page/InviteUserPage.qml index 819e415e9..94cd6fc38 100644 --- a/src/qml/Page/InviteUserPage.qml +++ b/src/qml/Page/InviteUserPage.qml @@ -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 org.kde.kirigami 2.15 as Kirigami @@ -104,7 +104,7 @@ Kirigami.ScrollablePage { wrapMode: Text.NoWrap } - Label { + QQC2.Label { Layout.fillWidth: true Layout.fillHeight: true @@ -115,7 +115,7 @@ Kirigami.ScrollablePage { } } - ToolButton { + QQC2.ToolButton { visible: !inRoom icon.name: "document-send" text: i18n("Send invitation") diff --git a/src/qml/Page/JoinRoomPage.qml b/src/qml/Page/JoinRoomPage.qml index df9a05881..26c621b7f 100644 --- a/src/qml/Page/JoinRoomPage.qml +++ b/src/qml/Page/JoinRoomPage.qml @@ -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 Qt.labs.qmlmodels 1.0 @@ -22,7 +22,7 @@ Kirigami.ScrollablePage { Component.onCompleted: identifierField.forceActiveFocus() - header: Control { + header: QQC2.Control { padding: Kirigami.Units.largeSpacing contentItem: RowLayout { Kirigami.SearchField { @@ -36,7 +36,7 @@ Kirigami.ScrollablePage { placeholderText: i18n("Find a room...") } - Button { + QQC2.Button { id: joinButton visible: identifierField.isRoomAlias @@ -53,7 +53,7 @@ Kirigami.ScrollablePage { } } - ComboBox { + QQC2.ComboBox { id: serverField // TODO: in KF6 we should be able to switch to using implicitContentWidthPolicy @@ -77,12 +77,12 @@ Kirigami.ScrollablePage { addServerSheet.open() } - trailing: ToolButton { + trailing: QQC2.ToolButton { visible: isAddServerDelegate || isDeletable icon.name: isAddServerDelegate ? "list-add" : "dialog-close" text: i18n("Add new server") Accessible.name: text - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: { if (serverField.currentIndex === index && isDeletable) { @@ -121,13 +121,13 @@ Kirigami.ScrollablePage { } contentItem: Kirigami.FormLayout { - Label { + QQC2.Label { Layout.minimumWidth: Kirigami.Units.gridUnit * 20 text: serverUrlField.length > 0 ? (serverUrlField.acceptableInput ? (serverUrlField.isValidServer ? i18n("Valid server entered") : i18n("This server cannot be resolved or has already been added")) : i18n("The entered text is not a valid url")) : i18n("Enter server url e.g. kde.org") color: serverUrlField.length > 0 ? (serverUrlField.acceptableInput ? (serverUrlField.isValidServer ? Kirigami.Theme.positiveTextColor : Kirigami.Theme.negativeTextColor) : Kirigami.Theme.negativeTextColor) : Kirigami.Theme.textColor } - TextField { + QQC2.TextField { id: serverUrlField property bool isValidServer: false @@ -153,7 +153,7 @@ Kirigami.ScrollablePage { } } - Button { + QQC2.Button { id: okButton text: i18nc("@action:button", "Ok") @@ -222,13 +222,13 @@ Kirigami.ScrollablePage { elide: Text.ElideRight wrapMode: Text.NoWrap } - Label { + QQC2.Label { visible: isJoined || justJoined text: i18n("Joined") color: Kirigami.Theme.linkColor } } - Label { + QQC2.Label { Layout.fillWidth: true visible: text text: topic ? topic.replace(/(\r\n\t|\n|\r\t)/gm," ") : "" @@ -244,7 +244,7 @@ Kirigami.ScrollablePage { implicitHeight: Kirigami.Units.iconSizes.small implicitWidth: Kirigami.Units.iconSizes.small } - Label { + QQC2.Label { text: memberCount + " " + (alias ?? roomID) color: Kirigami.Theme.disabledTextColor elide: Text.ElideRight diff --git a/src/qml/Page/StartChatPage.qml b/src/qml/Page/StartChatPage.qml index 69c630ece..a6fc68dc8 100644 --- a/src/qml/Page/StartChatPage.qml +++ b/src/qml/Page/StartChatPage.qml @@ -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 @@ -17,7 +17,7 @@ Kirigami.ScrollablePage { title: i18n("Start a Chat") - header: Control { + header: QQC2.Control { padding: Kirigami.Units.largeSpacing contentItem: RowLayout { Kirigami.SearchField { @@ -32,7 +32,7 @@ Kirigami.ScrollablePage { onAccepted: userDictListModel.search() } - Button { + QQC2.Button { visible: identifierField.isUserID text: i18n("Chat") @@ -89,7 +89,7 @@ Kirigami.ScrollablePage { wrapMode: Text.NoWrap } - Label { + QQC2.Label { Layout.fillWidth: true Layout.fillHeight: true @@ -100,7 +100,7 @@ Kirigami.ScrollablePage { } } - Button { + QQC2.Button { id: joinChatButton Layout.alignment: Qt.AlignRight visible: directChats && directChats.length > 0 @@ -112,7 +112,7 @@ Kirigami.ScrollablePage { } } - Button { + QQC2.Button { Layout.alignment: Qt.AlignRight icon.name: "irc-join-channel" // We wants to make sure an user can't start more than one diff --git a/src/qml/Page/WelcomePage.qml b/src/qml/Page/WelcomePage.qml index de9ff377d..3d3581eea 100644 --- a/src/qml/Page/WelcomePage.qml +++ b/src/qml/Page/WelcomePage.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.15 -import QtQuick.Controls 2.15 as Controls +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.15 import org.kde.kirigami 2.15 as Kirigami @@ -16,7 +16,7 @@ Kirigami.ScrollablePage { title: module.item.title ?? i18n("Welcome") - header: Controls.Control { + header: QQC2.Control { contentItem: Kirigami.InlineMessage { id: headerMessage type: Kirigami.MessageType.Error @@ -49,7 +49,7 @@ Kirigami.ScrollablePage { Layout.fillWidth: true Layout.preferredHeight: Kirigami.Units.gridUnit * 16 } - Controls.Label { + QQC2.Label { Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter font.pixelSize: 25 @@ -68,7 +68,7 @@ Kirigami.ScrollablePage { RowLayout { Layout.alignment: Qt.AlignHCenter - Controls.Button { + QQC2.Button { text: i18nc("@action:button", "Back") enabled: welcomePage.currentStep.previousUrl !== "" @@ -79,7 +79,7 @@ Kirigami.ScrollablePage { } } - Controls.Button { + QQC2.Button { id: continueButton enabled: welcomePage.currentStep.acceptable visible: welcomePage.currentStep.showContinueButton diff --git a/src/qml/Panel/RoomDrawer.qml b/src/qml/Panel/RoomDrawer.qml index d8202e1bf..2ddc5eae3 100644 --- a/src/qml/Panel/RoomDrawer.qml +++ b/src/qml/Panel/RoomDrawer.qml @@ -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 @@ -93,24 +93,24 @@ Kirigami.OverlayDrawer { text: i18n("Room information") level: 1 } - ToolButton { + QQC2.ToolButton { id: inviteButton Layout.alignment: Qt.AlignRight icon.name: "list-add-user" text: i18n("Invite user to room") - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: { applicationWindow().pageStack.layers.push("qrc:/InviteUserPage.qml", {room: room}) roomDrawer.close(); } - ToolTip { + QQC2.ToolTip { text: inviteButton.text } } - ToolButton { + QQC2.ToolButton { id: favouriteButton Layout.alignment: Qt.AlignRight @@ -118,15 +118,15 @@ Kirigami.OverlayDrawer { checkable: true checked: room && room.isFavourite text: room && room.isFavourite ? i18n("Remove room from favorites") : i18n("Make room favorite") - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: room.isFavourite ? room.removeTag("m.favourite") : room.addTag("m.favourite", 1.0) - ToolTip { + QQC2.ToolTip { text: favouriteButton.text } } - ToolButton { + QQC2.ToolButton { id: encryptButton Layout.alignment: Qt.AlignRight @@ -134,25 +134,25 @@ Kirigami.OverlayDrawer { enabled: roomDrawer.room.canEncryptRoom visible: !roomDrawer.room.usesEncryption && Controller.encryptionSupported text: i18n("Enable encryption") - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly onClicked: roomDrawer.room.activateEncryption() - ToolTip { + QQC2.ToolTip { text: encryptButton.text } } - ToolButton { + QQC2.ToolButton { id: settingsButton Layout.alignment: Qt.AlignRight icon.name: 'settings-configure' text: i18n("Room settings") - display: AbstractButton.IconOnly + display: QQC2.AbstractButton.IconOnly - onClicked: ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}) + onClicked: QQC2.ApplicationWindow.window.pageStack.pushDialogLayer('qrc:/Categories.qml', {room: room}) - ToolTip { + QQC2.ToolTip { text: settingsButton.text } } @@ -186,7 +186,7 @@ Kirigami.OverlayDrawer { Layout.fillWidth: true level: 1 type: Kirigami.Heading.Type.Primary - wrapMode: Label.Wrap + wrapMode: QQC2.Label.Wrap text: room ? room.displayName : i18n("No name") textFormat: Text.PlainText } @@ -228,7 +228,7 @@ Kirigami.OverlayDrawer { label: i18n("Members") activeFocusOnTab: false - Label { + QQC2.Label { Layout.alignment: Qt.AlignRight text: room ? i18np("%1 Member", "%1 Members", room.joinedCount) : i18n("No Member Count") } @@ -245,12 +245,12 @@ Kirigami.OverlayDrawer { onAccepted: sortedMessageEventModel.filterString = text; } - ScrollView { + QQC2.ScrollView { Layout.fillWidth: true Layout.fillHeight: true // HACK: Hide unnecessary horizontal scrollbar (https://bugreports.qt.io/browse/QTBUG-83890) - ScrollBar.horizontal.policy: ScrollBar.AlwaysOff + QQC2.ScrollBar.horizontal.policy: QQC2.ScrollBar.AlwaysOff ListView { id: userListView @@ -297,7 +297,7 @@ Kirigami.OverlayDrawer { name: model.userId } - trailing: Label { + trailing: QQC2.Label { visible: perm != UserType.Member text: { diff --git a/src/qml/RoomSettings/General.qml b/src/qml/RoomSettings/General.qml index 74708d6b6..4ea8e2e80 100644 --- a/src/qml/RoomSettings/General.qml +++ b/src/qml/RoomSettings/General.qml @@ -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 @@ -31,7 +31,7 @@ Kirigami.ScrollablePage { name: room.name source: room.avatarMediaId ? ("image://mxc/" + room.avatarMediaId) : "" - RoundButton { + QQC2.RoundButton { anchors.right: parent.right anchors.bottom: parent.bottom height: Kirigami.Units.gridUnits @@ -52,14 +52,14 @@ Kirigami.ScrollablePage { } } } - TextField { + QQC2.TextField { id: roomNameField text: room.name Kirigami.FormData.label: i18n("Room Name:") enabled: canChangeName } - TextArea { + QQC2.TextArea { id: roomTopicField Layout.fillWidth: true text: room.topic @@ -73,7 +73,7 @@ Kirigami.ScrollablePage { visible: canonicalAliasComboBox.visible || altAlias.visible } - ComboBox { + QQC2.ComboBox { id: canonicalAliasComboBox visible: room.aliases && room.aliases.length Kirigami.FormData.label: i18n("Canonical Alias:") @@ -109,11 +109,11 @@ Kirigami.ScrollablePage { delegate: RowLayout { Layout.maximumWidth: parent.width - Label { + QQC2.Label { text: modelData } - ToolButton { + QQC2.ToolButton { icon.name: "" onClicked: room.removeLocalAlias(modelData) } @@ -128,7 +128,7 @@ Kirigami.ScrollablePage { visible: next.visible || prev.visible } - Control { + QQC2.Control { id: next Layout.fillWidth: true @@ -148,7 +148,7 @@ Kirigami.ScrollablePage { } } - Control { + QQC2.Control { id: prev Layout.fillWidth: true @@ -175,12 +175,12 @@ Kirigami.ScrollablePage { } } - footer: ToolBar { + footer: QQC2.ToolBar { contentItem: RowLayout { Item { Layout.fillWidth: true } - Button { + QQC2.Button { Layout.alignment: Qt.AlignRight enabled: room.name !== roomNameField.text || room.topic !== roomTopicField.text text: i18n("Apply") diff --git a/src/qml/RoomSettings/Security.qml b/src/qml/RoomSettings/Security.qml index 9e995359b..b4c9dce3f 100644 --- a/src/qml/RoomSettings/Security.qml +++ b/src/qml/RoomSettings/Security.qml @@ -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 @@ -20,43 +20,43 @@ Kirigami.ScrollablePage { Kirigami.FormLayout { Layout.fillWidth: true - RadioButton { + QQC2.RadioButton { text: i18nc("@option:check", "Private (invite only)") Kirigami.FormData.label: i18nc("@option:check", "Access:") checked: room.joinRule === "invite" enabled: false } - Label { + QQC2.Label { text: i18n("Only invited people can join.") font: Kirigami.Theme.smallFont } - RadioButton { + QQC2.RadioButton { text: i18nc("@option:check", "Space members") checked: room.joinRule === "restricted" enabled: false } - Label { + QQC2.Label { text: i18n("Anyone in a space can find and join.") font: Kirigami.Theme.smallFont } - RadioButton { + QQC2.RadioButton { text: i18nc("@option:check", "Public") checked: room.joinRule === "public" enabled: false } - Label { + QQC2.Label { text: i18nc("@option:check", "Anyone can find and join.") + room.joinRule font: Kirigami.Theme.smallFont } } } - footer: ToolBar { + footer: QQC2.ToolBar { contentItem: RowLayout { Item { Layout.fillWidth: true } - Button { + QQC2.Button { Layout.alignment: Qt.AlignRight enabled: false text: i18n("Apply") diff --git a/src/qml/Settings/AccountEditorPage.qml b/src/qml/Settings/AccountEditorPage.qml index 5bb4c3493..8d6cdf0a9 100644 --- a/src/qml/Settings/AccountEditorPage.qml +++ b/src/qml/Settings/AccountEditorPage.qml @@ -3,7 +3,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.15 -import QtQuick.Controls 2.15 as Controls +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.15 import Qt.labs.platform 1.1 @@ -33,7 +33,7 @@ Kirigami.ScrollablePage { return; } - fileDialog = openFileDialog.createObject(Controls.ApplicationWindow.Overlay) + fileDialog = openFileDialog.createObject(QQC2.ApplicationWindow.Overlay) fileDialog.chosen.connect(function(receivedSource) { mouseArea.fileDialog = null; @@ -49,7 +49,7 @@ Kirigami.ScrollablePage { } } } - Controls.Button { + QQC2.Button { visible: avatar.source.toString().length !== 0 icon.name: "edit-clear" @@ -57,30 +57,30 @@ Kirigami.ScrollablePage { } Kirigami.FormData.label: i18n("Avatar:") } - Controls.TextField { + QQC2.TextField { id: name text: root.connection ? root.connection.localUser.displayName : "" Kirigami.FormData.label: i18n("Name:") } - Controls.TextField { + QQC2.TextField { id: accountLabel text: root.connection ? root.connection.localUser.accountLabel : "" Kirigami.FormData.label: i18n("Label:") } - Controls.TextField { + QQC2.TextField { id: currentPassword Kirigami.FormData.label: i18n("Current Password:") enabled: root.connection !== undefined && root.connection.canChangePassword !== false echoMode: TextInput.Password } - Controls.TextField { + QQC2.TextField { id: newPassword Kirigami.FormData.label: i18n("New Password:") enabled: root.connection !== undefined && root.connection.canChangePassword !== false echoMode: TextInput.Password } - Controls.TextField { + QQC2.TextField { id: confirmPassword Kirigami.FormData.label: i18n("Confirm new Password:") enabled: root.connection !== undefined && root.connection.canChangePassword !== false @@ -94,7 +94,7 @@ Kirigami.ScrollablePage { Layout.fillWidth: true } - Controls.Button { + QQC2.Button { text: i18n("Save") Layout.bottomMargin: Kirigami.Units.smallSpacing Layout.topMargin: Kirigami.Units.smallSpacing @@ -119,7 +119,7 @@ Kirigami.ScrollablePage { root.closeDialog(); } } - Controls.Button { + QQC2.Button { text: i18n("Cancel") Layout.rightMargin: Kirigami.Units.smallSpacing Layout.bottomMargin: Kirigami.Units.smallSpacing diff --git a/src/qml/Settings/AccountsPage.qml b/src/qml/Settings/AccountsPage.qml index 665a9b8d6..f24ca1860 100644 --- a/src/qml/Settings/AccountsPage.qml +++ b/src/qml/Settings/AccountsPage.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.15 -import QtQuick.Controls 2.15 as Controls +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.15 import Qt.labs.platform 1.1 @@ -40,9 +40,9 @@ Kirigami.ScrollablePage { } trailing: RowLayout { - Controls.ToolButton { - display: Controls.AbstractButton.IconOnly - Controls.ToolTip { + QQC2.ToolButton { + display: QQC2.AbstractButton.IconOnly + QQC2.ToolTip { text: parent.action.text } action: Kirigami.Action { @@ -55,9 +55,9 @@ Kirigami.ScrollablePage { }); } } - Controls.ToolButton { - display: Controls.AbstractButton.IconOnly - Controls.ToolTip { + QQC2.ToolButton { + display: QQC2.AbstractButton.IconOnly + QQC2.ToolTip { text: parent.action.text } action: Kirigami.Action { @@ -75,7 +75,7 @@ Kirigami.ScrollablePage { } } - footer: Controls.ToolBar { + footer: QQC2.ToolBar { Kirigami.Theme.colorSet: Kirigami.Theme.Window Kirigami.ActionToolBar { alignment: Qt.AlignRight diff --git a/src/qml/Settings/DevicesPage.qml b/src/qml/Settings/DevicesPage.qml index b2a7e4913..a2a9543fd 100644 --- a/src/qml/Settings/DevicesPage.qml +++ b/src/qml/Settings/DevicesPage.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later import QtQuick 2.15 -import QtQuick.Controls 2.15 as Controls +import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.15 import org.kde.kirigami 2.19 as Kirigami @@ -29,8 +29,8 @@ Kirigami.ScrollablePage { subtitle: model.id icon: "network-connect" trailing: RowLayout { - Controls.ToolButton { - display: Controls.AbstractButton.IconOnly + QQC2.ToolButton { + display: QQC2.AbstractButton.IconOnly action: Kirigami.Action { text: i18n("Edit device name") iconName: "document-edit" @@ -41,8 +41,8 @@ Kirigami.ScrollablePage { } } } - Controls.ToolButton { - display: Controls.AbstractButton.IconOnly + QQC2.ToolButton { + display: QQC2.AbstractButton.IconOnly visible: Controller.encryptionSupported action: Kirigami.Action { text: i18n("Verify device") @@ -52,8 +52,8 @@ Kirigami.ScrollablePage { } } } - Controls.ToolButton { - display: Controls.AbstractButton.IconOnly + QQC2.ToolButton { + display: QQC2.AbstractButton.IconOnly action: Kirigami.Action { text: i18n("Logout device") iconName: "edit-delete-remove" @@ -74,12 +74,12 @@ Kirigami.ScrollablePage { title: i18n("Remove device") Kirigami.FormLayout { - Controls.TextField { + QQC2.TextField { id: passwordField Kirigami.FormData.label: i18n("Password:") echoMode: TextInput.Password } - Controls.Button { + QQC2.Button { text: i18n("Confirm") onClicked: { devices.logout(passwordSheet.index, passwordField.text) @@ -97,12 +97,12 @@ Kirigami.ScrollablePage { title: i18n("Edit device") Kirigami.FormLayout { - Controls.TextField { + QQC2.TextField { id: nameField Kirigami.FormData.label: i18n("Name:") text: renameSheet.name } - Controls.Button { + QQC2.Button { text: i18n("Save") onClicked: { devices.setName(renameSheet.index, nameField.text)