rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

6
src/timeline/TimelineViewManager.cpp
View File

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