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

20
src/qml/Settings/AccountEditorPage.qml
View File

@@ -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

16
src/qml/Settings/AccountsPage.qml
View File

@@ -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

22
src/qml/Settings/DevicesPage.qml
View File

@@ -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)