summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2020-03-31 00:47:56 +0200
committerCH Chethan Reddy <40890937+Chethan2k1@users.noreply.github.com>2020-07-30 22:10:27 +0530
commitb1362ca69fe2c028546b1e4bab5506395f431e07 (patch)
treeb4db9a063c937962e116c589da4b5da375abb7a7
parentMake emojis a bit smaller (diff)
downloadnheko-b1362ca69fe2c028546b1e4bab5506395f431e07.tar.xz
Use label in device verification dialogs (for proper theming)
-rw-r--r--resources/qml/device-verification/DeviceVerification.qml28
-rw-r--r--resources/qml/device-verification/EmojiElement.qml4
2 files changed, 16 insertions, 16 deletions
diff --git a/resources/qml/device-verification/DeviceVerification.qml b/resources/qml/device-verification/DeviceVerification.qml

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