forked from cwtch.im/ui
Merge branch 'alpha-updates' of cwtch.im/ui into master
This commit is contained in:
commit
7a9022bac1
|
@ -13,6 +13,7 @@ ColumnLayout {
|
||||||
id: overlay
|
id: overlay
|
||||||
property string name
|
property string name
|
||||||
property bool accepted
|
property bool accepted
|
||||||
|
property bool inGroup
|
||||||
|
|
||||||
|
|
||||||
StackToolbar {
|
StackToolbar {
|
||||||
|
@ -143,12 +144,14 @@ ColumnLayout {
|
||||||
|
|
||||||
onResetMessagePane: function() {
|
onResetMessagePane: function() {
|
||||||
overlayStack.overlay = overlayStack.chatOverlay
|
overlayStack.overlay = overlayStack.chatOverlay
|
||||||
|
overlay.inGroup = false
|
||||||
}
|
}
|
||||||
|
|
||||||
onSupplyGroupSettings: function(gid, name, server, invite, accepted, addrbooknames, addrbookaddrs) {
|
onSupplyGroupSettings: function(gid, name, server, invite, accepted, addrbooknames, addrbookaddrs) {
|
||||||
console.log("Supplied " + gid + " " + name + "Accepted " + accepted)
|
console.log("Supplied " + gid + " " + name + "Accepted " + accepted)
|
||||||
overlay.name = name
|
overlay.name = name
|
||||||
overlay.accepted = accepted
|
overlay.accepted = accepted
|
||||||
|
overlay.inGroup = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -16,13 +16,21 @@ Item {
|
||||||
property int status
|
property int status
|
||||||
property bool isGroup
|
property bool isGroup
|
||||||
property bool showStatus
|
property bool showStatus
|
||||||
|
property bool highlight
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
id: mainImage
|
||||||
width: 48
|
width: 48
|
||||||
height: 48
|
height: 48
|
||||||
|
color: highlight ? windowItem.cwtch_dark_color: "#FFFFFF"
|
||||||
|
radius: width / 2
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
width: highlight ? 44 : 48
|
||||||
|
height: highlight ? 44 : 48
|
||||||
color: "#FFFFFF"
|
color: "#FFFFFF"
|
||||||
radius: width / 2
|
radius: width / 2
|
||||||
|
anchors.centerIn:parent
|
||||||
|
|
||||||
|
|
||||||
Image { // PROFILE IMAGE
|
Image { // PROFILE IMAGE
|
||||||
|
@ -45,6 +53,8 @@ Item {
|
||||||
maskSource: mask
|
maskSource: mask
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
Rectangle { // PRESENCE INDICATOR
|
Rectangle { // PRESENCE INDICATOR
|
||||||
visible: showStatus
|
visible: showStatus
|
||||||
color: "#FFFFFF"
|
color: "#FFFFFF"
|
||||||
|
@ -66,5 +76,6 @@ Item {
|
||||||
anchors.margins: 1.5
|
anchors.margins: 1.5
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -48,9 +48,17 @@ RowLayout {
|
||||||
handle: root.from
|
handle: root.from
|
||||||
visible: !fromMe
|
visible: !fromMe
|
||||||
showStatus: false
|
showStatus: false
|
||||||
|
highlight: ima.containsMouse
|
||||||
|
|
||||||
|
ToolTip.visible: ima.containsMouse
|
||||||
|
ToolTip.text: qsTr("Click to DM")
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
|
id: ima
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
hoverEnabled: overlay.inGroup
|
||||||
|
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
gcd.broadcast("ResetMessagePane")
|
gcd.broadcast("ResetMessagePane")
|
||||||
theStack.pane = theStack.messagePane
|
theStack.pane = theStack.messagePane
|
||||||
|
|
Loading…
Reference in New Issue