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

Make compatible with qt 5.12

Browse source
This commit is contained in:
kamathmanu 2020-11-14 16:38:17 -05:00
parent 57b4b606ce
commit eb72fd2cf9
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/ActiveCallBar.qml
View file

@ -50,7 +50,9 @@ Rectangle {
} }
Connections { Connections {
function onCallStateChanged(state) { target: TimelineManager
onCallStateChanged: {
switch (state) { switch (state) {
case WebRTCState.INITIATING: case WebRTCState.INITIATING:
callStateLabel.text = qsTr("Initiating..."); callStateLabel.text = qsTr("Initiating...");
@ -73,8 +75,6 @@ Rectangle {
stackLayout.currentIndex = 0; stackLayout.currentIndex = 0;
} }
} }
target: TimelineManager
} }
Timer { Timer {

6
resources/qml/MessageView.qml
View file

@ -180,13 +180,13 @@ ListView {
} }
Connections { Connections {
function onMovementEnded() { target: chat
onMovementEnded: {
if (y + height + 2 * chat.spacing > chat.contentY + chat.height && y < chat.contentY + chat.height) if (y + height + 2 * chat.spacing > chat.contentY + chat.height && y < chat.contentY + chat.height)
chat.model.currentIndex = index; chat.model.currentIndex = index;
} }
target: chat
} }
} }

12
resources/qml/TimelineView.qml
View file

@ -128,25 +128,25 @@ Page {
} }
Connections { Connections {
function onNewDeviceVerificationRequest(flow, transactionId, userId, deviceId, isRequest) { target: TimelineManager
onNewDeviceVerificationRequest: {
var dialog = deviceVerificationDialog.createObject(timelineRoot, { var dialog = deviceVerificationDialog.createObject(timelineRoot, {
"flow": flow "flow": flow
}); });
dialog.show(); dialog.show();
} }
target: TimelineManager
} }
Connections { Connections {
function onOpenProfile(profile) { target: TimelineManager.timeline
onOpenProfile: {
var userProfile = userProfileComponent.createObject(timelineRoot, { var userProfile = userProfileComponent.createObject(timelineRoot, {
"profile": profile "profile": profile
}); });
userProfile.show(); userProfile.show();
} }
target: TimelineManager.timeline
} }
Label { Label {