diff --git a/.gitignore b/.gitignore index 2c51d94..be88cd4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ deploy moc* rcc* *.qmlc +*.jsc diff --git a/go/gothings/gcd.go b/go/gothings/gcd.go index edc3214..d67f873 100644 --- a/go/gothings/gcd.go +++ b/go/gothings/gcd.go @@ -161,6 +161,12 @@ func (this *GrandCentralDispatcher) loadMessagesPane(handle string) { func (this *GrandCentralDispatcher) requestGroupSettings() { log.Debugf("requestGroupSettings()") group := the.Peer.GetGroup(this.CurrentOpenConversation()) + + if group == nil { + log.Errorf("requested group settings for a p2p contact") + return + } + nick, _ := group.GetAttribute("nick") invite, _ := the.Peer.ExportGroup(this.CurrentOpenConversation()) this.SupplyGroupSettings(nick, group.GroupServer, invite) diff --git a/qml/fonts/Twemoji.jsc b/qml/fonts/Twemoji.jsc deleted file mode 100644 index a1b9c24..0000000 Binary files a/qml/fonts/Twemoji.jsc and /dev/null differ diff --git a/qml/panes/SettingsPane.qml b/qml/panes/SettingsPane.qml index ac74200..f0f7a4d 100644 --- a/qml/panes/SettingsPane.qml +++ b/qml/panes/SettingsPane.qml @@ -25,6 +25,9 @@ ColumnLayout { // settingsPane id: zoomSlider from: 0.5 to: 2.4 + onValueChanged: { + gcd.themeScale = zoomSlider.value + } } ScalingLabel { diff --git a/qml/widgets/ContactRow.qml b/qml/widgets/ContactRow.qml index acd33c0..ccd7d06 100644 --- a/qml/widgets/ContactRow.qml +++ b/qml/widgets/ContactRow.qml @@ -52,6 +52,7 @@ RowLayout { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY textFormat: Text.PlainText //fontSizeMode: Text.HorizontalFit elide: Text.ElideRight + color: "#000000" } Rectangle { // UNREAD MESSAGES? diff --git a/qml/widgets/MyProfile.qml b/qml/widgets/MyProfile.qml index 0535f9c..da189a6 100644 --- a/qml/widgets/MyProfile.qml +++ b/qml/widgets/MyProfile.qml @@ -138,9 +138,9 @@ ColumnLayout { } } - Label { // ONION ADDRESS + ScalingLabel { // ONION ADDRESS id: lblOnion - font.pixelSize: 6 + //font.pixelSize: 6 Layout.fillWidth: true padding: 3 horizontalAlignment: Text.AlignHCenter diff --git a/qml/widgets/MyProfile.qmlc b/qml/widgets/MyProfile.qmlc deleted file mode 100644 index 5715500..0000000 Binary files a/qml/widgets/MyProfile.qmlc and /dev/null differ diff --git a/qml/widgets/ScalingLabel.qml b/qml/widgets/ScalingLabel.qml index 4547eac..4870bb4 100644 --- a/qml/widgets/ScalingLabel.qml +++ b/qml/widgets/ScalingLabel.qml @@ -9,6 +9,7 @@ import QtQuick.Window 2.11 Label { font.pixelSize: gcd.themeScale * size wrapMode: Text.WordWrap + color: "#000000" property real size: 12 } \ No newline at end of file diff --git a/qml/widgets/SimpleButton.qmlc b/qml/widgets/SimpleButton.qmlc deleted file mode 100644 index 0702cbc..0000000 Binary files a/qml/widgets/SimpleButton.qmlc and /dev/null differ