forked from cwtch.im/ui
Merge branch 'ebf2019011411' of cwtch.im/ui into master
This commit is contained in:
commit
61bad4775a
|
@ -3,3 +3,4 @@ deploy
|
||||||
moc*
|
moc*
|
||||||
rcc*
|
rcc*
|
||||||
*.qmlc
|
*.qmlc
|
||||||
|
*.jsc
|
||||||
|
|
|
@ -161,6 +161,12 @@ func (this *GrandCentralDispatcher) loadMessagesPane(handle string) {
|
||||||
func (this *GrandCentralDispatcher) requestGroupSettings() {
|
func (this *GrandCentralDispatcher) requestGroupSettings() {
|
||||||
log.Debugf("requestGroupSettings()")
|
log.Debugf("requestGroupSettings()")
|
||||||
group := the.Peer.GetGroup(this.CurrentOpenConversation())
|
group := the.Peer.GetGroup(this.CurrentOpenConversation())
|
||||||
|
|
||||||
|
if group == nil {
|
||||||
|
log.Errorf("requested group settings for a p2p contact")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
nick, _ := group.GetAttribute("nick")
|
nick, _ := group.GetAttribute("nick")
|
||||||
invite, _ := the.Peer.ExportGroup(this.CurrentOpenConversation())
|
invite, _ := the.Peer.ExportGroup(this.CurrentOpenConversation())
|
||||||
this.SupplyGroupSettings(nick, group.GroupServer, invite)
|
this.SupplyGroupSettings(nick, group.GroupServer, invite)
|
||||||
|
|
Binary file not shown.
|
@ -25,6 +25,9 @@ ColumnLayout { // settingsPane
|
||||||
id: zoomSlider
|
id: zoomSlider
|
||||||
from: 0.5
|
from: 0.5
|
||||||
to: 2.4
|
to: 2.4
|
||||||
|
onValueChanged: {
|
||||||
|
gcd.themeScale = zoomSlider.value
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ScalingLabel {
|
ScalingLabel {
|
||||||
|
|
|
@ -52,6 +52,7 @@ RowLayout { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
|
||||||
textFormat: Text.PlainText
|
textFormat: Text.PlainText
|
||||||
//fontSizeMode: Text.HorizontalFit
|
//fontSizeMode: Text.HorizontalFit
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
|
color: "#000000"
|
||||||
}
|
}
|
||||||
|
|
||||||
Rectangle { // UNREAD MESSAGES?
|
Rectangle { // UNREAD MESSAGES?
|
||||||
|
|
|
@ -138,9 +138,9 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Label { // ONION ADDRESS
|
ScalingLabel { // ONION ADDRESS
|
||||||
id: lblOnion
|
id: lblOnion
|
||||||
font.pixelSize: 6
|
//font.pixelSize: 6
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
padding: 3
|
padding: 3
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
|
Binary file not shown.
|
@ -9,6 +9,7 @@ import QtQuick.Window 2.11
|
||||||
Label {
|
Label {
|
||||||
font.pixelSize: gcd.themeScale * size
|
font.pixelSize: gcd.themeScale * size
|
||||||
wrapMode: Text.WordWrap
|
wrapMode: Text.WordWrap
|
||||||
|
color: "#000000"
|
||||||
|
|
||||||
property real size: 12
|
property real size: 12
|
||||||
}
|
}
|
Binary file not shown.
Loading…
Reference in New Issue