d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-23 03:18:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use label in device verification dialogs (for proper theming)

Browse source
This commit is contained in:
Nicolas Werner 2020-03-31 00:47:56 +02:00 committed by CH Chethan Reddy
parent fed0463e57
commit b1362ca69f
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
resources/qml/device-verification/DeviceVerification.qml
View file

@ -50,7 +50,7 @@ ApplicationWindow {
property string title: "Device Verification Request" property string title: "Device Verification Request"
ColumnLayout { ColumnLayout {
spacing: 16 spacing: 16
Text { Label {
Layout.maximumWidth: 400 Layout.maximumWidth: 400
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@ -60,7 +60,7 @@ ApplicationWindow {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
} }
Text { Label {
Layout.maximumWidth: 400 Layout.maximumWidth: 400
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@ -95,7 +95,7 @@ ApplicationWindow {
property string title: "Waiting for other party" property string title: "Waiting for other party"
ColumnLayout { ColumnLayout {
spacing: 16 spacing: 16
Text { Label {
Layout.maximumWidth: 400 Layout.maximumWidth: 400
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@ -129,7 +129,7 @@ ApplicationWindow {
property string title: "Verification Code" property string title: "Verification Code"
ColumnLayout { ColumnLayout {
spacing: 16 spacing: 16
Text { Label {
Layout.maximumWidth: 400 Layout.maximumWidth: 400
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@ -141,15 +141,15 @@ ApplicationWindow {
RowLayout { RowLayout {
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Text { Label {
font.pixelSize: Qt.application.font.pixelSize * 2 font.pixelSize: Qt.application.font.pixelSize * 2
text: "1234" text: "1234"
} }
Text { Label {
font.pixelSize: Qt.application.font.pixelSize * 2 font.pixelSize: Qt.application.font.pixelSize * 2
text: "1234" text: "1234"
} }
Text { Label {
font.pixelSize: Qt.application.font.pixelSize * 2 font.pixelSize: Qt.application.font.pixelSize * 2
text: "1234" text: "1234"
} }
@ -180,7 +180,7 @@ ApplicationWindow {
property string title: "Verification Code" property string title: "Verification Code"
ColumnLayout { ColumnLayout {
spacing: 16 spacing: 16
Text { Label {
Layout.maximumWidth: 400 Layout.maximumWidth: 400
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@ -273,14 +273,14 @@ ApplicationWindow {
id: col id: col
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
property var emoji: emojis.mapping[Math.floor(Math.random()*64)] property var emoji: emojis.mapping[Math.floor(Math.random()*64)]
Text { Label {
//height: font.pixelSize * 2 //height: font.pixelSize * 2
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: col.emoji.emoji text: col.emoji.emoji
font.pixelSize: Qt.application.font.pixelSize * 2 font.pixelSize: Qt.application.font.pixelSize * 2
font.family: settings.emoji_font_family font.family: settings.emoji_font_family
} }
Text { Label {
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
text: col.emoji.description text: col.emoji.description
} }
@ -314,7 +314,7 @@ ApplicationWindow {
property string title: "Awaiting Confirmation" property string title: "Awaiting Confirmation"
ColumnLayout { ColumnLayout {
spacing: 16 spacing: 16
Text { Label {
Layout.maximumWidth: 400 Layout.maximumWidth: 400
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@ -348,7 +348,7 @@ ApplicationWindow {
property string title: "Successful Verification" property string title: "Successful Verification"
ColumnLayout { ColumnLayout {
spacing: 16 spacing: 16
Text { Label {
Layout.maximumWidth: 400 Layout.maximumWidth: 400
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@ -379,7 +379,7 @@ ApplicationWindow {
property string title: "Verification aborted!" property string title: "Verification aborted!"
ColumnLayout { ColumnLayout {
spacing: 16 spacing: 16
Text { Label {
Layout.maximumWidth: 400 Layout.maximumWidth: 400
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true
@ -410,7 +410,7 @@ ApplicationWindow {
property string title: "Verification timed out" property string title: "Verification timed out"
ColumnLayout { ColumnLayout {
spacing: 16 spacing: 16
Text { Label {
Layout.maximumWidth: 400 Layout.maximumWidth: 400
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true

4
resources/qml/device-verification/EmojiElement.qml
View file

@ -11,13 +11,13 @@ Rectangle {
id: col id: col
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
property var emoji: emojis.mapping[Math.floor(Math.random()*64)] property var emoji: emojis.mapping[Math.floor(Math.random()*64)]
Text { Label {
height: font.pixelSize * 2 height: font.pixelSize * 2
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
text: col.emoji.emoji text: col.emoji.emoji
font.pixelSize: Qt.application.font.pixelSize * 2 font.pixelSize: Qt.application.font.pixelSize * 2
} }
Text { Label {
Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
text: col.emoji.description text: col.emoji.description
} }