history warning and beginnings of new zoom system and listoverlay fixes
This commit is contained in:
parent
38923ef814
commit
473e0a02d0
72
go/ui/gcd.go
72
go/ui/gcd.go
|
@ -12,6 +12,7 @@ import (
|
||||||
"github.com/therecipe/qt/qml"
|
"github.com/therecipe/qt/qml"
|
||||||
"strconv"
|
"strconv"
|
||||||
"sync"
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"cwtch.im/ui/go/the"
|
"cwtch.im/ui/go/the"
|
||||||
"encoding/base32"
|
"encoding/base32"
|
||||||
|
@ -69,7 +70,7 @@ type GrandCentralDispatcher struct {
|
||||||
_ func(server string) `signal:"startServer,auto"`
|
_ func(server string) `signal:"startServer,auto"`
|
||||||
_ func(server string) `signal:"stopServer,auto"`
|
_ func(server string) `signal:"stopServer,auto"`
|
||||||
_ func(server string) `signal:"checkServer,auto"`
|
_ func(server string) `signal:"checkServer,auto"`
|
||||||
_ func(server string, enabled bool) `signal:"autostartServer",auto`
|
_ func(server string, enabled bool) `signal:"autostartServer,auto"`
|
||||||
|
|
||||||
// contact list stuff
|
// contact list stuff
|
||||||
_ func(handle, displayName, image string, badge, status int, authorization string, loading bool, lastMsgTime int) `signal:"AddContact"`
|
_ func(handle, displayName, image string, badge, status int, authorization string, loading bool, lastMsgTime int) `signal:"AddContact"`
|
||||||
|
@ -139,6 +140,11 @@ type GrandCentralDispatcher struct {
|
||||||
_ func(handle string) `signal:"requestServerSettings,auto"`
|
_ func(handle string) `signal:"requestServerSettings,auto"`
|
||||||
|
|
||||||
_ func() `constructor:"init"`
|
_ func() `constructor:"init"`
|
||||||
|
|
||||||
|
// legacy overlay model support
|
||||||
|
_ func(onion string, overlay int) `signal:"legacyLoadOverlay,auto"`
|
||||||
|
_ func(handle, from, displayName, message, image string, mID string, fromMe bool, ts int64, ackd bool, error bool) `signal:"AppendMessage"`
|
||||||
|
_ func(handle, from, displayName, message, image string, mID string, fromMe bool, ts int64, ackd bool, error bool) `signal:"PrependMessage"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *GrandCentralDispatcher) init() {
|
func (this *GrandCentralDispatcher) init() {
|
||||||
|
@ -326,6 +332,70 @@ func (this *GrandCentralDispatcher) loadMessagesPaneHelper(handle string) {
|
||||||
}
|
}
|
||||||
updateLastReadTime(contact.Onion)
|
updateLastReadTime(contact.Onion)
|
||||||
this.SetToolbarTitle(nick)
|
this.SetToolbarTitle(nick)
|
||||||
|
|
||||||
|
this.legacyLoadOverlay(handle, 4)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (this *GrandCentralDispatcher) legacyLoadOverlay(handle string, overlay int) {
|
||||||
|
go this.legacyLoadOverlay_helper(handle, overlay)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (this *GrandCentralDispatcher) legacyLoadOverlay_helper(handle string, overlay int) {
|
||||||
|
if isGroup(handle) {
|
||||||
|
group := the.CwtchApp.GetPeer(this.selectedProfile()).GetGroup(handle)
|
||||||
|
tl := group.GetTimeline()
|
||||||
|
|
||||||
|
for i := len(tl) - 1; i >= 0; i-- {
|
||||||
|
if tl[i].PeerID == the.Peer.GetOnion() {
|
||||||
|
handle = "me"
|
||||||
|
} else {
|
||||||
|
handle = tl[i].PeerID
|
||||||
|
}
|
||||||
|
|
||||||
|
name := GetNick(tl[i].PeerID)
|
||||||
|
image := GetProfilePic(tl[i].PeerID)
|
||||||
|
|
||||||
|
this.PrependMessage(
|
||||||
|
handle,
|
||||||
|
tl[i].PeerID,
|
||||||
|
name,
|
||||||
|
tl[i].Message,
|
||||||
|
image,
|
||||||
|
string(tl[i].Signature),
|
||||||
|
tl[i].PeerID == the.Peer.GetOnion(),
|
||||||
|
tl[i].Timestamp.Unix(),
|
||||||
|
tl[i].Received.Equal(time.Unix(0, 0)) == false, // If the received timestamp is epoch, we have not yet received this message through an active server
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {// !isGroup
|
||||||
|
messages := the.CwtchApp.GetPeer(this.selectedProfile()).GetContact(handle).Timeline.GetMessages()
|
||||||
|
for i := len(messages) - 1; i >= 0; i-- {
|
||||||
|
from := messages[i].PeerID
|
||||||
|
fromMe := messages[i].PeerID == the.Peer.GetOnion()
|
||||||
|
if fromMe {
|
||||||
|
from = "me"
|
||||||
|
}
|
||||||
|
|
||||||
|
displayname := GetNick(messages[i].PeerID)
|
||||||
|
image := GetProfilePic(messages[i].PeerID)
|
||||||
|
|
||||||
|
this.PrependMessage(
|
||||||
|
from,
|
||||||
|
messages[i].PeerID,
|
||||||
|
displayname,
|
||||||
|
messages[i].Message,
|
||||||
|
image,
|
||||||
|
string(messages[i].Signature),
|
||||||
|
fromMe,
|
||||||
|
messages[i].Timestamp.Unix(),
|
||||||
|
messages[i].Acknowledged,
|
||||||
|
messages[i].Error != "",
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (this *GrandCentralDispatcher) requestSettings() {
|
func (this *GrandCentralDispatcher) requestSettings() {
|
||||||
|
|
|
@ -105,23 +105,38 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>BulletinOverlay</name>
|
<name>BulletinOverlay</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="203"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
|
||||||
<source>new-bulletin-label</source>
|
<source>new-bulletin-label</source>
|
||||||
<translation>Neue Meldung</translation>
|
<translation>Neue Meldung</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="215"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
|
||||||
<source>post-new-bulletin-label</source>
|
<source>post-new-bulletin-label</source>
|
||||||
<extracomment>Post a new Bulletin Post</extracomment>
|
<extracomment>Post a new Bulletin Post</extracomment>
|
||||||
<translation>Neue Meldung veröffentlichen</translation>
|
<translation>Neue Meldung veröffentlichen</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="221"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
|
||||||
<source>title-placeholder</source>
|
<source>title-placeholder</source>
|
||||||
<extracomment>title place holder text</extracomment>
|
<extracomment>title place holder text</extracomment>
|
||||||
<translation>Titel...</translation>
|
<translation>Titel...</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
<context>
|
||||||
|
<name>ChatOverlay</name>
|
||||||
|
<message>
|
||||||
|
<location filename="../qml/overlays/ChatOverlay.qml" line="66"/>
|
||||||
|
<source>chat-history-disabled</source>
|
||||||
|
<extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../qml/overlays/ChatOverlay.qml" line="68"/>
|
||||||
|
<source>chat-history-enabled</source>
|
||||||
|
<extracomment>Message history is enabled.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ContactList</name>
|
<name>ContactList</name>
|
||||||
<message>
|
<message>
|
||||||
|
@ -233,18 +248,18 @@ Name</extracomment>
|
||||||
<translation type="vanished">noch zu erledigen</translation>
|
<translation type="vanished">noch zu erledigen</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="33"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="32"/>
|
||||||
<source>search-list</source>
|
<source>search-list</source>
|
||||||
<extracomment>ex: "... paste an address here to add a contact ..."</extracomment>
|
<extracomment>ex: "... paste an address here to add a contact ..."</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="63"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="62"/>
|
||||||
<source>peer-not-online</source>
|
<source>peer-not-online</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="201"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="200"/>
|
||||||
<source>add-list-item-btn</source>
|
<source>add-list-item-btn</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -252,7 +267,7 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>MembershipOverlay</name>
|
<name>MembershipOverlay</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/MembershipOverlay.qml" line="22"/>
|
<location filename="../qml/overlays/MembershipOverlay.qml" line="21"/>
|
||||||
<source>membership-description</source>
|
<source>membership-description</source>
|
||||||
<extracomment>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</extracomment>
|
<extracomment>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</extracomment>
|
||||||
<translation>Unten steht eine Liste der Benutzer, die Nachrichten an die Gruppe gesendet haben. Möglicherweise enthält diese Benutzerzliste nicht alle, die Zugang zur Gruppe haben.</translation>
|
<translation>Unten steht eine Liste der Benutzer, die Nachrichten an die Gruppe gesendet haben. Möglicherweise enthält diese Benutzerzliste nicht alle, die Zugang zur Gruppe haben.</translation>
|
||||||
|
@ -267,18 +282,18 @@ Name</extracomment>
|
||||||
<translation>Klicken, um DM zu senden</translation>
|
<translation>Klicken, um DM zu senden</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>could-not-send-msg-error</source>
|
<source>could-not-send-msg-error</source>
|
||||||
<extracomment>Could not send this message</extracomment>
|
<extracomment>Could not send this message</extracomment>
|
||||||
<translation>Nachricht konnte nicht gesendet werden</translation>
|
<translation>Nachricht konnte nicht gesendet werden</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>acknowledged-label</source>
|
<source>acknowledged-label</source>
|
||||||
<translation>bestätigt</translation>
|
<translation>bestätigt</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>pending-label</source>
|
<source>pending-label</source>
|
||||||
<translation>Bestätigung ausstehend</translation>
|
<translation>Bestätigung ausstehend</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -286,13 +301,13 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>MessageEditor</name>
|
<name>MessageEditor</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/MessageEditor.qml" line="32"/>
|
<location filename="../qml/widgets/MessageEditor.qml" line="31"/>
|
||||||
<source>peer-blocked-message</source>
|
<source>peer-blocked-message</source>
|
||||||
<extracomment>Peer is blocked</extracomment>
|
<extracomment>Peer is blocked</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/MessageEditor.qml" line="49"/>
|
<location filename="../qml/widgets/MessageEditor.qml" line="48"/>
|
||||||
<source>peer-offline-message</source>
|
<source>peer-offline-message</source>
|
||||||
<extracomment>Peer is offline, messages can't be delivered right now</extracomment>
|
<extracomment>Peer is offline, messages can't be delivered right now</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
@ -719,7 +734,7 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>main</name>
|
<name>main</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/main.qml" line="286"/>
|
<location filename="../qml/main.qml" line="264"/>
|
||||||
<source>new-connection-pane-title</source>
|
<source>new-connection-pane-title</source>
|
||||||
<extracomment>New Connection</extracomment>
|
<extracomment>New Connection</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
|
Binary file not shown.
|
@ -118,23 +118,41 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>BulletinOverlay</name>
|
<name>BulletinOverlay</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="203"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
|
||||||
<source>new-bulletin-label</source>
|
<source>new-bulletin-label</source>
|
||||||
<translation>New Bulletin</translation>
|
<translation>New Bulletin</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="215"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
|
||||||
<source>post-new-bulletin-label</source>
|
<source>post-new-bulletin-label</source>
|
||||||
<extracomment>Post a new Bulletin Post</extracomment>
|
<extracomment>Post a new Bulletin Post</extracomment>
|
||||||
<translation>Post new bulletin</translation>
|
<translation>Post new bulletin</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="221"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
|
||||||
<source>title-placeholder</source>
|
<source>title-placeholder</source>
|
||||||
<extracomment>title place holder text</extracomment>
|
<extracomment>title place holder text</extracomment>
|
||||||
<translation>title...</translation>
|
<translation>title...</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
<context>
|
||||||
|
<name>ChatOverlay</name>
|
||||||
|
<message>
|
||||||
|
<location filename="../qml/overlays/ChatOverlay.qml" line="66"/>
|
||||||
|
<source>chat-history-disabled</source>
|
||||||
|
<extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
|
||||||
|
<!--
|
||||||
|
<translation>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</translation>
|
||||||
|
-->
|
||||||
|
<translation>Your history with this peer is ephemeral and will not be saved. If you would like to save history, please go to settings and turn it on.</translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../qml/overlays/ChatOverlay.qml" line="68"/>
|
||||||
|
<source>chat-history-enabled</source>
|
||||||
|
<extracomment>Message history is enabled.</extracomment>
|
||||||
|
<translation>Message history is enabled.</translation>
|
||||||
|
</message>
|
||||||
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ContactList</name>
|
<name>ContactList</name>
|
||||||
<message>
|
<message>
|
||||||
|
@ -326,18 +344,18 @@ Right-click to reset.</translation>
|
||||||
<context>
|
<context>
|
||||||
<name>ListOverlay</name>
|
<name>ListOverlay</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="33"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="32"/>
|
||||||
<source>search-list</source>
|
<source>search-list</source>
|
||||||
<extracomment>ex: "... paste an address here to add a contact ..."</extracomment>
|
<extracomment>ex: "... paste an address here to add a contact ..."</extracomment>
|
||||||
<translation>Search List</translation>
|
<translation>Search List</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="63"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="62"/>
|
||||||
<source>peer-not-online</source>
|
<source>peer-not-online</source>
|
||||||
<translation>Peer is Offline. Applications cannot be used right now.</translation>
|
<translation>Peer is Offline. Applications cannot be used right now.</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="201"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="200"/>
|
||||||
<source>add-list-item-btn</source>
|
<source>add-list-item-btn</source>
|
||||||
<translation>Add Item</translation>
|
<translation>Add Item</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -345,7 +363,7 @@ Right-click to reset.</translation>
|
||||||
<context>
|
<context>
|
||||||
<name>MembershipOverlay</name>
|
<name>MembershipOverlay</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/MembershipOverlay.qml" line="22"/>
|
<location filename="../qml/overlays/MembershipOverlay.qml" line="21"/>
|
||||||
<source>membership-description</source>
|
<source>membership-description</source>
|
||||||
<extracomment>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</extracomment>
|
<extracomment>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</extracomment>
|
||||||
<translation>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</translation>
|
<translation>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</translation>
|
||||||
|
@ -360,18 +378,18 @@ Right-click to reset.</translation>
|
||||||
<translation>Click to DM</translation>
|
<translation>Click to DM</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>could-not-send-msg-error</source>
|
<source>could-not-send-msg-error</source>
|
||||||
<extracomment>Could not send this message</extracomment>
|
<extracomment>Could not send this message</extracomment>
|
||||||
<translation>Could not send this message</translation>
|
<translation>Could not send this message</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>acknowledged-label</source>
|
<source>acknowledged-label</source>
|
||||||
<translation>Acknowledged</translation>
|
<translation>Acknowledged</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>pending-label</source>
|
<source>pending-label</source>
|
||||||
<translation>Pending</translation>
|
<translation>Pending</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -379,13 +397,13 @@ Right-click to reset.</translation>
|
||||||
<context>
|
<context>
|
||||||
<name>MessageEditor</name>
|
<name>MessageEditor</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/MessageEditor.qml" line="32"/>
|
<location filename="../qml/widgets/MessageEditor.qml" line="31"/>
|
||||||
<source>peer-blocked-message</source>
|
<source>peer-blocked-message</source>
|
||||||
<extracomment>Peer is blocked</extracomment>
|
<extracomment>Peer is blocked</extracomment>
|
||||||
<translation>Peer is blocked</translation>
|
<translation>Peer is blocked</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/MessageEditor.qml" line="49"/>
|
<location filename="../qml/widgets/MessageEditor.qml" line="48"/>
|
||||||
<source>peer-offline-message</source>
|
<source>peer-offline-message</source>
|
||||||
<extracomment>Peer is offline, messages can't be delivered right now</extracomment>
|
<extracomment>Peer is offline, messages can't be delivered right now</extracomment>
|
||||||
<translation>Peer is offline, messages can't be delivered right now</translation>
|
<translation>Peer is offline, messages can't be delivered right now</translation>
|
||||||
|
@ -855,7 +873,7 @@ Right-click to reset.</translation>
|
||||||
<context>
|
<context>
|
||||||
<name>main</name>
|
<name>main</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/main.qml" line="286"/>
|
<location filename="../qml/main.qml" line="264"/>
|
||||||
<source>new-connection-pane-title</source>
|
<source>new-connection-pane-title</source>
|
||||||
<extracomment>New Connection</extracomment>
|
<extracomment>New Connection</extracomment>
|
||||||
<translation>New Connection</translation>
|
<translation>New Connection</translation>
|
||||||
|
|
|
@ -105,23 +105,38 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>BulletinOverlay</name>
|
<name>BulletinOverlay</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="203"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
|
||||||
<source>new-bulletin-label</source>
|
<source>new-bulletin-label</source>
|
||||||
<translation>Nouveau bulletin</translation>
|
<translation>Nouveau bulletin</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="215"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
|
||||||
<source>post-new-bulletin-label</source>
|
<source>post-new-bulletin-label</source>
|
||||||
<extracomment>Post a new Bulletin Post</extracomment>
|
<extracomment>Post a new Bulletin Post</extracomment>
|
||||||
<translation>Envoyer un nouveau bulletin</translation>
|
<translation>Envoyer un nouveau bulletin</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="221"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
|
||||||
<source>title-placeholder</source>
|
<source>title-placeholder</source>
|
||||||
<extracomment>title place holder text</extracomment>
|
<extracomment>title place holder text</extracomment>
|
||||||
<translation>titre...</translation>
|
<translation>titre...</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
<context>
|
||||||
|
<name>ChatOverlay</name>
|
||||||
|
<message>
|
||||||
|
<location filename="../qml/overlays/ChatOverlay.qml" line="66"/>
|
||||||
|
<source>chat-history-disabled</source>
|
||||||
|
<extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../qml/overlays/ChatOverlay.qml" line="68"/>
|
||||||
|
<source>chat-history-enabled</source>
|
||||||
|
<extracomment>Message history is enabled.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ContactList</name>
|
<name>ContactList</name>
|
||||||
<message>
|
<message>
|
||||||
|
@ -233,18 +248,18 @@ Name</extracomment>
|
||||||
<translation type="vanished">A faire...</translation>
|
<translation type="vanished">A faire...</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="33"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="32"/>
|
||||||
<source>search-list</source>
|
<source>search-list</source>
|
||||||
<extracomment>ex: "... paste an address here to add a contact ..."</extracomment>
|
<extracomment>ex: "... paste an address here to add a contact ..."</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="63"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="62"/>
|
||||||
<source>peer-not-online</source>
|
<source>peer-not-online</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="201"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="200"/>
|
||||||
<source>add-list-item-btn</source>
|
<source>add-list-item-btn</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -252,7 +267,7 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>MembershipOverlay</name>
|
<name>MembershipOverlay</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/MembershipOverlay.qml" line="22"/>
|
<location filename="../qml/overlays/MembershipOverlay.qml" line="21"/>
|
||||||
<source>membership-description</source>
|
<source>membership-description</source>
|
||||||
<extracomment>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</extracomment>
|
<extracomment>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</extracomment>
|
||||||
<translation>Liste des utilisateurs ayant envoyés un ou plusieurs messages au groupe. Cette liste peut ne pas être representatives de l'ensemble des membres du groupe.</translation>
|
<translation>Liste des utilisateurs ayant envoyés un ou plusieurs messages au groupe. Cette liste peut ne pas être representatives de l'ensemble des membres du groupe.</translation>
|
||||||
|
@ -267,18 +282,18 @@ Name</extracomment>
|
||||||
<translation>Envoyer un message privé</translation>
|
<translation>Envoyer un message privé</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>could-not-send-msg-error</source>
|
<source>could-not-send-msg-error</source>
|
||||||
<extracomment>Could not send this message</extracomment>
|
<extracomment>Could not send this message</extracomment>
|
||||||
<translation>Impossible d'envoyer ce message</translation>
|
<translation>Impossible d'envoyer ce message</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>acknowledged-label</source>
|
<source>acknowledged-label</source>
|
||||||
<translation>Confirmé</translation>
|
<translation>Confirmé</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>pending-label</source>
|
<source>pending-label</source>
|
||||||
<translation>En attente</translation>
|
<translation>En attente</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -286,13 +301,13 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>MessageEditor</name>
|
<name>MessageEditor</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/MessageEditor.qml" line="32"/>
|
<location filename="../qml/widgets/MessageEditor.qml" line="31"/>
|
||||||
<source>peer-blocked-message</source>
|
<source>peer-blocked-message</source>
|
||||||
<extracomment>Peer is blocked</extracomment>
|
<extracomment>Peer is blocked</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/MessageEditor.qml" line="49"/>
|
<location filename="../qml/widgets/MessageEditor.qml" line="48"/>
|
||||||
<source>peer-offline-message</source>
|
<source>peer-offline-message</source>
|
||||||
<extracomment>Peer is offline, messages can't be delivered right now</extracomment>
|
<extracomment>Peer is offline, messages can't be delivered right now</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
@ -719,7 +734,7 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>main</name>
|
<name>main</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/main.qml" line="286"/>
|
<location filename="../qml/main.qml" line="264"/>
|
||||||
<source>new-connection-pane-title</source>
|
<source>new-connection-pane-title</source>
|
||||||
<extracomment>New Connection</extracomment>
|
<extracomment>New Connection</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
|
|
@ -105,23 +105,38 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>BulletinOverlay</name>
|
<name>BulletinOverlay</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="203"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
|
||||||
<source>new-bulletin-label</source>
|
<source>new-bulletin-label</source>
|
||||||
<translation>Novo Boletim</translation>
|
<translation>Novo Boletim</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="215"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
|
||||||
<source>post-new-bulletin-label</source>
|
<source>post-new-bulletin-label</source>
|
||||||
<extracomment>Post a new Bulletin Post</extracomment>
|
<extracomment>Post a new Bulletin Post</extracomment>
|
||||||
<translation>Postar novo boletim</translation>
|
<translation>Postar novo boletim</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/BulletinOverlay.qml" line="221"/>
|
<location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
|
||||||
<source>title-placeholder</source>
|
<source>title-placeholder</source>
|
||||||
<extracomment>title place holder text</extracomment>
|
<extracomment>title place holder text</extracomment>
|
||||||
<translation>título…</translation>
|
<translation>título…</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
<context>
|
||||||
|
<name>ChatOverlay</name>
|
||||||
|
<message>
|
||||||
|
<location filename="../qml/overlays/ChatOverlay.qml" line="66"/>
|
||||||
|
<source>chat-history-disabled</source>
|
||||||
|
<extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
<message>
|
||||||
|
<location filename="../qml/overlays/ChatOverlay.qml" line="68"/>
|
||||||
|
<source>chat-history-enabled</source>
|
||||||
|
<extracomment>Message history is enabled.</extracomment>
|
||||||
|
<translation type="unfinished"></translation>
|
||||||
|
</message>
|
||||||
|
</context>
|
||||||
<context>
|
<context>
|
||||||
<name>ContactList</name>
|
<name>ContactList</name>
|
||||||
<message>
|
<message>
|
||||||
|
@ -233,18 +248,18 @@ Name</extracomment>
|
||||||
<translation type="vanished">Afazer…</translation>
|
<translation type="vanished">Afazer…</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="33"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="32"/>
|
||||||
<source>search-list</source>
|
<source>search-list</source>
|
||||||
<extracomment>ex: "... paste an address here to add a contact ..."</extracomment>
|
<extracomment>ex: "... paste an address here to add a contact ..."</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="63"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="62"/>
|
||||||
<source>peer-not-online</source>
|
<source>peer-not-online</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/ListOverlay.qml" line="201"/>
|
<location filename="../qml/overlays/ListOverlay.qml" line="200"/>
|
||||||
<source>add-list-item-btn</source>
|
<source>add-list-item-btn</source>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -252,7 +267,7 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>MembershipOverlay</name>
|
<name>MembershipOverlay</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/overlays/MembershipOverlay.qml" line="22"/>
|
<location filename="../qml/overlays/MembershipOverlay.qml" line="21"/>
|
||||||
<source>membership-description</source>
|
<source>membership-description</source>
|
||||||
<extracomment>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</extracomment>
|
<extracomment>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</extracomment>
|
||||||
<translation>A lista abaixo é de usuários que enviaram mensagens ao grupo. Essa lista pode não refletir todos os usuários que têm acesso ao grupo.</translation>
|
<translation>A lista abaixo é de usuários que enviaram mensagens ao grupo. Essa lista pode não refletir todos os usuários que têm acesso ao grupo.</translation>
|
||||||
|
@ -267,18 +282,18 @@ Name</extracomment>
|
||||||
<translation>Clique para DM</translation>
|
<translation>Clique para DM</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>could-not-send-msg-error</source>
|
<source>could-not-send-msg-error</source>
|
||||||
<extracomment>Could not send this message</extracomment>
|
<extracomment>Could not send this message</extracomment>
|
||||||
<translation>Não deu para enviar esta mensagem</translation>
|
<translation>Não deu para enviar esta mensagem</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>acknowledged-label</source>
|
<source>acknowledged-label</source>
|
||||||
<translation>Confirmada</translation>
|
<translation>Confirmada</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/Message.qml" line="187"/>
|
<location filename="../qml/widgets/Message.qml" line="188"/>
|
||||||
<source>pending-label</source>
|
<source>pending-label</source>
|
||||||
<translation>Pendente</translation>
|
<translation>Pendente</translation>
|
||||||
</message>
|
</message>
|
||||||
|
@ -286,13 +301,13 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>MessageEditor</name>
|
<name>MessageEditor</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/MessageEditor.qml" line="32"/>
|
<location filename="../qml/widgets/MessageEditor.qml" line="31"/>
|
||||||
<source>peer-blocked-message</source>
|
<source>peer-blocked-message</source>
|
||||||
<extracomment>Peer is blocked</extracomment>
|
<extracomment>Peer is blocked</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/widgets/MessageEditor.qml" line="49"/>
|
<location filename="../qml/widgets/MessageEditor.qml" line="48"/>
|
||||||
<source>peer-offline-message</source>
|
<source>peer-offline-message</source>
|
||||||
<extracomment>Peer is offline, messages can't be delivered right now</extracomment>
|
<extracomment>Peer is offline, messages can't be delivered right now</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
@ -719,7 +734,7 @@ Name</extracomment>
|
||||||
<context>
|
<context>
|
||||||
<name>main</name>
|
<name>main</name>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../qml/main.qml" line="286"/>
|
<location filename="../qml/main.qml" line="264"/>
|
||||||
<source>new-connection-pane-title</source>
|
<source>new-connection-pane-title</source>
|
||||||
<extracomment>New Connection</extracomment>
|
<extracomment>New Connection</extracomment>
|
||||||
<translation type="unfinished"></translation>
|
<translation type="unfinished"></translation>
|
||||||
|
|
|
@ -238,7 +238,7 @@ ApplicationWindow {
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
OverlayPane { // messagePane
|
OverlayPane { // messagePane
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.topMargin: 10 * gcd.themeScale
|
anchors.topMargin: 10// * gcd.themeScale
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,12 +50,45 @@ W.Overlay {
|
||||||
spacing: 6
|
spacing: 6
|
||||||
|
|
||||||
clip: true
|
clip: true
|
||||||
ScrollBar.vertical: Opaque.ScrollBar {}
|
ScrollBar.vertical: Opaque.ScrollBar {id:scrollbar}
|
||||||
maximumFlickVelocity: 1250
|
maximumFlickVelocity: 1250
|
||||||
|
|
||||||
section.delegate: sectionHeading
|
section.delegate: sectionHeading
|
||||||
section.property: "Day"
|
section.property: "Day"
|
||||||
|
|
||||||
|
header: Component {
|
||||||
|
Column {
|
||||||
|
width: messagesListView.width
|
||||||
|
|
||||||
|
Label {
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
|
width: messagesListView.width
|
||||||
|
font.pointSize: Theme.textSmallPt
|
||||||
|
font.weight: Font.Bold
|
||||||
|
color: Theme.chatOverlayWarningTextColor
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
//: This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.
|
||||||
|
text: true ? qsTr("chat-history-disabled") :
|
||||||
|
//: Message history is enabled.
|
||||||
|
qsTr("chat-history-enabled")
|
||||||
|
}
|
||||||
|
|
||||||
|
Opaque.Icon {
|
||||||
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
backgroundColor: Theme.backgroundMainColor
|
||||||
|
iconColor: Theme.chatOverlayWarningTextColor
|
||||||
|
source: gcd.assetPath + "core/peer_settings-24px.webp"
|
||||||
|
size: Theme.uiIconSizeM
|
||||||
|
sourceWidth: 72
|
||||||
|
sourceHeight: 72
|
||||||
|
width: Theme.uiIconSizeM
|
||||||
|
height: Theme.uiIconSizeM
|
||||||
|
}
|
||||||
|
|
||||||
|
Opaque.HLine {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
delegate: W.Message {
|
delegate: W.Message {
|
||||||
handle: PeerID
|
handle: PeerID
|
||||||
|
@ -72,7 +105,7 @@ W.Overlay {
|
||||||
calendarEvent: PeerID == "calendar"
|
calendarEvent: PeerID == "calendar"
|
||||||
// listview doesnt do anchors right
|
// listview doesnt do anchors right
|
||||||
// https://stackoverflow.com/questions/31381997/why-does-anchors-fill-does-not-work-in-a-qml-listviews-delegates-subviews-and/31382307
|
// https://stackoverflow.com/questions/31381997/why-does-anchors-fill-does-not-work-in-a-qml-listviews-delegates-subviews-and/31382307
|
||||||
width: messagesListView.width
|
width: messagesListView.width - scrollbar.width
|
||||||
}
|
}
|
||||||
|
|
||||||
Component {
|
Component {
|
||||||
|
@ -83,7 +116,7 @@ W.Overlay {
|
||||||
property string txt: section
|
property string txt: section
|
||||||
color: Theme.backgroundMainColor
|
color: Theme.backgroundMainColor
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: texmet.height + 6 + 12 * gcd.themeScale
|
height: texmet.height + 6 + 12// * gcd.themeScale
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
|
|
||||||
|
|
||||||
|
|
Reference in New Issue