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

Add DeviceVerificationFlow dummy and verification test button

Browse source
This commit is contained in:
Nicolas Werner 2020-03-13 21:05:18 +01:00 committed by CH Chethan Reddy
parent b1362ca69f
commit 707248fea3
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -267,7 +267,11 @@ ApplicationWindow {
model: 7
delegate: Rectangle {
color: "transparent"
<<<<<<< HEAD
implicitHeight: Qt.application.font.pixelSize * 3
=======
implicitHeight: Qt.application.font.pixelSize * 8
>>>>>>> Add DeviceVerificationFlow dummy and verification test button
implicitWidth: col.width
ColumnLayout {
id: col
@ -410,7 +414,11 @@ ApplicationWindow {
property string title: "Verification timed out"
ColumnLayout {
spacing: 16
<<<<<<< HEAD
Label {
=======
Text {
>>>>>>> Add DeviceVerificationFlow dummy and verification test button
Layout.maximumWidth: 400
Layout.fillHeight: true
Layout.fillWidth: true

6
src/timeline/TimelineViewManager.cpp
View file

@ -467,3 +467,9 @@ TimelineViewManager::startDummyVerification()
{
emit deviceVerificationRequest(new DeviceVerificationFlow(this));
}
void
TimelineViewManager::startDummyVerification()
{
emit deviceVerificationRequest(new DeviceVerificationFlow(this));
}