cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

Merge branch 'ebf201903051402' of cwtch.im/ui into master

This commit is contained in:
Sarah Jamie Lewis 2019-03-05 14:04:14 -08:00 committed by Gogs
parent c4b0eeccfb 202153bab2
commit eaa700ba57
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qml/main.qml
View File

@ -120,7 +120,7 @@ ApplicationWindow {
Layout.fillHeight: true Layout.fillHeight: true
Layout.minimumWidth: Layout.maximumWidth Layout.minimumWidth: Layout.maximumWidth
Layout.maximumWidth: theStack.pane == theStack.emptyPane ? parent.width : 450 Layout.maximumWidth: theStack.pane == theStack.emptyPane ? parent.width : 450
visible: (ratio <= 1.08 && windowItem.width >= 500) || theStack.pane == theStack.emptyPane visible: (ratio <= 1.08 && windowItem.width >= 700) || theStack.pane == theStack.emptyPane
ContactList{ ContactList{

45
qml/panes/OverlayPane.qml
View File

@ -14,9 +14,10 @@ ColumnLayout {
property string name property string name
property bool accepted property bool accepted
StackToolbar { StackToolbar {
id: toolbar id: toolbar
//text: "open privacy exec"
aux.onClicked: { aux.onClicked: {
if (gcd.currentOpenConversation.length == 32) { if (gcd.currentOpenConversation.length == 32) {
@ -32,9 +33,12 @@ ColumnLayout {
RowLayout { RowLayout {
visible:!overlay.accepted && (gcd.currentOpenConversation.length == 32) visible:!overlay.accepted && (gcd.currentOpenConversation.length == 32)
Text { Text {
text: "Do you want to accept the invitation to " + overlay.name + "?" text: "Do you want to accept the invitation to " + overlay.name + "?"
} }
SimpleButton { SimpleButton {
text: "Accept" text: "Accept"
icon: "regular/heart" icon: "regular/heart"
@ -43,6 +47,7 @@ ColumnLayout {
gcd.requestGroupSettings(gcd.currentOpenConversation) gcd.requestGroupSettings(gcd.currentOpenConversation)
} }
} }
SimpleButton { SimpleButton {
text: "Reject" text: "Reject"
icon: "regular/trash-alt" icon: "regular/trash-alt"
@ -93,6 +98,7 @@ ColumnLayout {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.top: switcher.bottom anchors.top: switcher.bottom
implicitHeight: height
currentIndex: 0 currentIndex: 0
property alias overlay: overlayStack.currentIndex property alias overlay: overlayStack.currentIndex
@ -102,22 +108,35 @@ ColumnLayout {
readonly property int game1Overlay: 3 readonly property int game1Overlay: 3
ChatOverlay {} //0 ChatOverlay { //0
Layout.maximumHeight: overlayStack.height
Layout.maximumWidth: overlayStack.width
}
ListOverlay{} //1 ListOverlay{ //1
Layout.maximumHeight: overlayStack.height
Layout.maximumWidth: overlayStack.width
}
BulletinOverlay{} //2 BulletinOverlay{ //2
Layout.maximumHeight: overlayStack.height
Layout.maximumWidth: overlayStack.width
}
Game1Overlay{} //3 Game1Overlay{ //3
Layout.maximumHeight: overlayStack.height
Layout.maximumWidth: overlayStack.width
}
} }
Connections { Connections {
target: gcd target: gcd
onSupplyGroupSettings: function(gid, name, server, invite, accepted, addrbooknames, addrbookaddrs) {
console.log("Supplied " + gid + " " + name + "Accepted " + accepted) onSupplyGroupSettings: function(gid, name, server, invite, accepted, addrbooknames, addrbookaddrs) {
overlay.name = name console.log("Supplied " + gid + " " + name + "Accepted " + accepted)
overlay.accepted = accepted overlay.name = name
} overlay.accepted = accepted
} }
}
} }