Commit 811c22bc authored by armin's avatar armin
Browse files

Merge branch 'master' into 56-leave-room

parents ec1d3869 be9b58e3
Pipeline #35 passed with stage
in 3 minutes
Subproject commit c2498be8744a2a219418006740a377b2dd495da2
Subproject commit 46ea7e9c8799473df7601c334424d2640620e967
......@@ -54,9 +54,9 @@ Page {
anchors.top: parent.top
anchors.bottom: bottomLine.top
onPressAndHold: {
if(model.type === "d"){
// if(model.type === "d"){
menu.open()
}
// }
}
}
......@@ -85,8 +85,9 @@ Page {
}
Menu{
id: menu
x: 50
background: Rectangle{
implicitWidth: 80
implicitWidth: 120
implicitHeight: 25
radius: 2
border.color: Colors.grey
......@@ -95,6 +96,14 @@ Page {
MenuItem{
id: blockUser
visible: model.type === "d"
height: {
if( model.type === "d"){
}else{
return 0
}
}
onPressed: {
if(!model.blocked){
console.log("pressed "+model.roomId)
......@@ -114,6 +123,14 @@ Page {
verticalAlignment: Text.AlignVCenter
}
}
MenuItem{
id:leaveChannel
visible: true
text: qsTr("leave room")
onPressed: {
rocketChatController.leaveChannel(model.roomId)
}
}
}
}
......
Supports Markdown
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