Commit 3c827ab4 authored by armin's avatar armin
Browse files

Merge branch 'master' into 'production'

Master

See merge request !44
parents a892ba7c e500e7e3
Pipeline #117 passed with stage
in 3 minutes and 3 seconds
Subproject commit d2b3560e036b302dc71403bb4386f327575ff8fc
Subproject commit ae67df7f380b389b35f33640399da4e6b16a27c0
......@@ -25,7 +25,7 @@ else:unix: PRE_TARGETDEPS += $$OUT_PWD/../engine/libengine.a
TARGET = fairchat
VER_MAJ = 1
VER_MIN = 1
VER_PAT = 4
VER_PAT = 5
VERSION = $$sprintf("%1.%2.%3",$$VER_MAJ,$$VER_MIN,$$VER_PAT)
DEFINES += VERSION=\\\"$$VERSION\\\"
......
File mode changed from 100644 to 100755
......@@ -160,13 +160,10 @@ Page {
id: header
}
onDragEnded: if (header.refresh) {
messageView.resetView = true
messageView.prevCount= messageView.count - messageView.currentIndex
rocketChatController.loadRecentHistory(currentChannel)
}
//onModelChanged: {
//scrollDownTimer.restart()
// }
messageView.prevCount= messageView.count
rocketChatController.loadRecentHistory(currentChannel)
}
onMovementEnded: {
if (messageView.atYEnd) {
autoScroll = true
......@@ -195,9 +192,6 @@ Page {
}
// footer:
Timer {
id: waitTimer
interval: 100
......@@ -211,39 +205,20 @@ Page {
}
}
Timer {
id: scrollDownTimer
interval: 10
running: false
repeat: false
onTriggered: {
messageView.autoScroll = true
messageView.positionViewAtEnd()
}
}
Timer {
id: fixTimer
interval: 100
running: false
repeat: false
onTriggered: {
messageInput.focus = true
messageView.interactive = true
}
}
Connections {
target: cmessagesModel
onCountChanged:{
messageView.forceLayout();
if(messageView.resetView){
var oldindex = messageView.prevCount;
var count = messageView.count;
var diff = count - oldindex;
var diff = count - messageView.prevCount;
messageView.positionViewAtIndex(diff, ListView.Center)
messageView.currentIndex = diff
messageView.resetView = false
}else{
if(messageView.autoScroll)
if(messageView.autoScroll){
messageView.positionViewAtEnd();
}
}
}
}
......
......@@ -251,7 +251,7 @@ Page {
mainStack.toMainView()
}
onHashLoggedIn: {
welcomePopup.open()
// welcomePopup.open()
}
onLoginError: {
......
......@@ -96,7 +96,7 @@ Page {
if(idpWebView.loadProgress == 100){
idpWebView.runJavaScript("document.getElementById(\"config\").textContent",function(result){
rocketChatController.loginWithMethod(loginMethod, result)
mainStack.pop()
})
}else{
timer.start()
......
......@@ -28,6 +28,9 @@ Item {
width: 50
height: 50
anchors.centerIn: parent
signal blockUser();
signal reportContent();
Text{
text: "Video Anruf"
}
......
......@@ -28,6 +28,9 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
height: messageText.implicitHeight
signal blockUser();
signal reportContent();
Text {
anchors.left: parent.left
anchors.right: parent.right
......
......@@ -32,6 +32,8 @@ Rectangle {
anchors.right: parent.right
height: childrenRect.height
color:model.ownMessage?Colors.ownMessage:Colors.white
signal blockUser();
signal reportContent();
function getTimeString(msecs){
var secs = msecs/1000
......
......@@ -29,6 +29,8 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
height: childrenRect.height
signal blockUser();
signal reportContent();
Row {
anchors.left: parent.left
......
......@@ -33,6 +33,8 @@ Item {
anchors.right: parent.right
height: childrenRect.height
id:imageContainer
signal blockUser();
signal reportContent();
Column{
width: parent.width
......
......@@ -33,6 +33,8 @@ Item {
anchors.left: parent.left
anchors.right: parent.right
height: childrenRect.height
signal blockUser();
signal reportContent();
Column {
width: parent.width
......
......@@ -58,7 +58,7 @@ Popup {
focus: true
placeholderText: qsTr("server name")
background: Rectangle {
implicitWidth: parent.width
implicitWidth: 150
implicitHeight: 30
color: "transparent"
Rectangle {
......@@ -89,7 +89,7 @@ Popup {
focus: true
placeholderText: qsTr("server address")
background: Rectangle {
implicitWidth: parent.width
implicitWidth: 150
implicitHeight: 30
color: "transparent"
Rectangle {
......
......@@ -67,8 +67,8 @@ Popup {
text: qsTr("To answer this video call, the Jitsi Meet app needs to be installed on your device")
}
StdButton {
anchors.left: parent.left
anchors.right: parent.right
// anchors.left: parent.left
//anchors.right: parent.right
anchors.horizontalCenter: parent.horizontalCenter
text: qsTr("install jitsi meet app from your app store")
textColor: Colors.white
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment