Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 01:16:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Friend recommendation message

Browse Source 
- renamed subject
- added to system message
Recompile needed


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5145 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-05-05 22:20:05 +00:00
parent 1b80207fbe
commit b81a911793
11 changed files with 107 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libretroshare/src/retroshare/rsmsgs.h
View File

@ -48,15 +48,16 @@
#define RS_MSG_OUTBOX 0x03 /* Outbox */
#define RS_MSG_DRAFTBOX 0x05 /* Draftbox */
#define RS_MSG_NEW 0x0010 /* New */
#define RS_MSG_TRASH 0x0020 /* Trash */
#define RS_MSG_UNREAD_BY_USER 0x0040 /* Unread by user */
#define RS_MSG_REPLIED 0x0080 /* Message is replied */
#define RS_MSG_FORWARDED 0x0100 /* Message is forwarded */
#define RS_MSG_STAR 0x0200 /* Message is marked with a star */
#define RS_MSG_NEW 0x0010 /* New */
#define RS_MSG_TRASH 0x0020 /* Trash */
#define RS_MSG_UNREAD_BY_USER 0x0040 /* Unread by user */
#define RS_MSG_REPLIED 0x0080 /* Message is replied */
#define RS_MSG_FORWARDED 0x0100 /* Message is forwarded */
#define RS_MSG_STAR 0x0200 /* Message is marked with a star */
// system message
#define RS_MSG_USER_REQUEST 0x0400 /* user request */
#define RS_MSG_SYSTEM (RS_MSG_USER_REQUEST)
#define RS_MSG_USER_REQUEST 0x0400 /* user request */
#define RS_MSG_FRIEND_RECOMMENDATION 0x0800 /* friend recommendation */
#define RS_MSG_SYSTEM (RS_MSG_USER_REQUEST | RS_MSG_FRIEND_RECOMMENDATION)
#define RS_CHAT_LOBBY_EVENT_PEER_LEFT 0x01
#define RS_CHAT_LOBBY_EVENT_PEER_STATUS 0x02

25
libretroshare/src/serialiser/rsmsgitems.h
View File

@ -351,19 +351,20 @@ class RsChatSerialiser: public RsSerialType
/**************************************************************************/
const uint32_t RS_MSG_FLAGS_OUTGOING = 0x0001;
const uint32_t RS_MSG_FLAGS_PENDING = 0x0002;
const uint32_t RS_MSG_FLAGS_DRAFT = 0x0004;
const uint32_t RS_MSG_FLAGS_NEW = 0x0010;
const uint32_t RS_MSG_FLAGS_TRASH = 0x0020;
const uint32_t RS_MSG_FLAGS_UNREAD_BY_USER = 0x0040;
const uint32_t RS_MSG_FLAGS_REPLIED = 0x0080;
const uint32_t RS_MSG_FLAGS_FORWARDED = 0x0100;
const uint32_t RS_MSG_FLAGS_STAR = 0x0200;
const uint32_t RS_MSG_FLAGS_PARTIAL = 0x0400;
const uint32_t RS_MSG_FLAGS_OUTGOING = 0x0001;
const uint32_t RS_MSG_FLAGS_PENDING = 0x0002;
const uint32_t RS_MSG_FLAGS_DRAFT = 0x0004;
const uint32_t RS_MSG_FLAGS_NEW = 0x0010;
const uint32_t RS_MSG_FLAGS_TRASH = 0x0020;
const uint32_t RS_MSG_FLAGS_UNREAD_BY_USER = 0x0040;
const uint32_t RS_MSG_FLAGS_REPLIED = 0x0080;
const uint32_t RS_MSG_FLAGS_FORWARDED = 0x0100;
const uint32_t RS_MSG_FLAGS_STAR = 0x0200;
const uint32_t RS_MSG_FLAGS_PARTIAL = 0x0400;
// system message
const uint32_t RS_MSG_FLAGS_USER_REQUEST = 0x0800;
const uint32_t RS_MSG_FLAGS_SYSTEM = RS_MSG_FLAGS_USER_REQUEST;
const uint32_t RS_MSG_FLAGS_USER_REQUEST = 0x0800;
const uint32_t RS_MSG_FLAGS_FRIEND_RECOMMENDATION = 0x1000;
const uint32_t RS_MSG_FLAGS_SYSTEM = RS_MSG_FLAGS_USER_REQUEST | RS_MSG_FLAGS_FRIEND_RECOMMENDATION;
class RsMsgItem: public RsItem
{

15
libretroshare/src/services/p3msgservice.cc
View File

@ -954,6 +954,9 @@ bool p3MsgService::SystemMessage(const std::wstring &title, const std::wstring &
if (systemFlag & RS_MSG_USER_REQUEST) {
msg->msgFlags |= RS_MSG_FLAGS_USER_REQUEST;
}
if (systemFlag & RS_MSG_FRIEND_RECOMMENDATION) {
msg->msgFlags |= RS_MSG_FLAGS_FRIEND_RECOMMENDATION;
}
msg->msgId = 0;
msg->sendTime = time(NULL);
@ -1378,6 +1381,10 @@ void p3MsgService::initRsMI(RsMsgItem *msg, MessageInfo &mi)
{
mi.msgflags |= RS_MSG_USER_REQUEST;
}
if (msg->msgFlags & RS_MSG_FLAGS_FRIEND_RECOMMENDATION)
{
mi.msgflags |= RS_MSG_FRIEND_RECOMMENDATION;
}
mi.ts = msg->sendTime;
mi.srcId = msg->PeerId();
@ -1478,6 +1485,10 @@ void p3MsgService::initRsMIS(RsMsgItem *msg, MsgInfoSummary &mis)
{
mis.msgflags |= RS_MSG_USER_REQUEST;
}
if (msg->msgFlags & RS_MSG_FLAGS_FRIEND_RECOMMENDATION)
{
mis.msgflags |= RS_MSG_FRIEND_RECOMMENDATION;
}
mis.srcId = msg->PeerId();
{
@ -1542,6 +1553,10 @@ RsMsgItem *p3MsgService::initMIRsMsg(MessageInfo &info, const std::string &to)
{
msg->msgFlags |= RS_MSG_FLAGS_USER_REQUEST;
}
if (info.msgflags & RS_MSG_FRIEND_RECOMMENDATION)
{
msg->msgFlags |= RS_MSG_FLAGS_FRIEND_RECOMMENDATION;
}
//std::cerr << "p3MsgService::initMIRsMsg()" << std::endl;
//msg->print(std::cerr);

6
retroshare-gui/src/gui/MessagesDialog.cpp
View File

@ -44,7 +44,7 @@
#define IMAGE_MESSAGEREMOVE ":/images/message-mail-imapdelete.png"
#define IMAGE_STAR_ON ":/images/star-on-16.png"
#define IMAGE_STAR_OFF ":/images/star-off-16.png"
#define IMAGE_SYSTEM ":/images/user/user_request6.png"
#define IMAGE_SYSTEM ":/images/user/user_request16.png"
#define COLUMN_COUNT 8
#define COLUMN_STAR 0
@ -769,7 +769,9 @@ static void InitIconAndFont(QStandardItem *item[COLUMN_COUNT])
item[COLUMN_SUBJECT]->setIcon(QIcon(":/images/message-state-new.png"));
} else {
if (msgFlags & RS_MSG_USER_REQUEST) {
item[COLUMN_SUBJECT]->setIcon(QIcon(":/images/user/user_request6.png"));
item[COLUMN_SUBJECT]->setIcon(QIcon(":/images/user/user_request16.png"));
} else if (msgFlags & RS_MSG_FRIEND_RECOMMENDATION) {
item[COLUMN_SUBJECT]->setIcon(QIcon(":/images/user/friend_suggestion16.png"));
} else if (msgFlags & RS_MSG_UNREAD_BY_USER) {
if ((msgFlags & (RS_MSG_REPLIED | RS_MSG_FORWARDED)) == RS_MSG_REPLIED) {
item[COLUMN_SUBJECT]->setIcon(QIcon(":/images/message-mail-replied.png"));

3
retroshare-gui/src/gui/images.qrc
View File

@ -447,6 +447,7 @@
<file>images/user/add_user48.png</file>
<file>images/user/deny_user48.png</file>
<file>images/user/friends24.png</file>
<file>images/user/friend_suggestion16.png</file>
<file>images/user/identity16.png</file>
<file>images/user/identity24.png</file>
<file>images/user/identity24_low.png</file>
@ -468,7 +469,7 @@
<file>images/user/agt_forum128.png</file>
<file>images/user/group16.png</file>
<file>images/user/group24.png</file>
<file>images/user/user_request6.png</file>
<file>images/user/user_request16.png</file>
<file>images/user/user_request48.png</file>
<file>images/user/user_request_unknown48.png</file>
<file>images/up.png</file>

BIN
retroshare-gui/src/gui/images/user/friend_suggestion16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 847 B

0
retroshare-gui/src/gui/images/user/user_request6.png → retroshare-gui/src/gui/images/user/user_request16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 856 B

After

Width:  |  Height:  |  Size: 856 B

28
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View File

@ -115,7 +115,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WFlags flags)
m_msgType = NORMAL;
// needed to send system flags with reply
//systemFlags = 0;
msgFlags = 0;
setupFileActions();
setupEditActions();
@ -422,35 +422,36 @@ void MessageComposer::recommendFriend(const std::list <std::string> &sslIds, con
}
/* create a message */
MessageComposer *pMsgDialog = MessageComposer::newMsg();
MessageComposer *composer = MessageComposer::newMsg();
pMsgDialog->setTitleText(tr("Friend Recommendation(s)"));
composer->setTitleText(tr("You have a friend recommendation"));
composer->msgFlags |= RS_MSG_FRIEND_RECOMMENDATION;
if (!to.empty()) {
pMsgDialog->addRecipient(TO, to, false);
composer->addRecipient(TO, to, false);
}
QString sMsgText = msg.isEmpty() ? recommendMessage() : msg;
sMsgText += "<br><br>";
sMsgText += recommendHtml;
pMsgDialog->setMsgText(sMsgText);
composer->setMsgText(sMsgText);
std::list <std::string>::const_iterator peerIt;
for (peerIt = sslIds.begin(); peerIt != sslIds.end(); peerIt++) {
if (*peerIt == to) {
continue;
}
pMsgDialog->addRecipient(CC, *peerIt, false);
composer->addRecipient(CC, *peerIt, false);
}
if (autoSend) {
if (pMsgDialog->sendMessage_internal(false)) {
pMsgDialog->close();
if (composer->sendMessage_internal(false)) {
composer->close();
return;
}
}
pMsgDialog->show();
composer->show();
/* window will destroy itself! */
}
@ -858,7 +859,7 @@ MessageComposer *MessageComposer::newMsg(const std::string &msgId /* = ""*/)
}
// needed to send system flags with reply
//msgComposer->systemFlags = (msgInfo.msgflags & RS_MSG_SYSTEM);
msgComposer->msgFlags = (msgInfo.msgflags & RS_MSG_SYSTEM);
msgComposer->setTitleText(QString::fromStdWString(msgInfo.title));
msgComposer->setMsgText(QString::fromStdWString(msgInfo.msg), true);
@ -1030,7 +1031,7 @@ MessageComposer *MessageComposer::replyMsg(const std::string &msgId, bool all)
}
// needed to send system flags with reply
//msgComposer->systemFlags = (msgInfo.msgflags & RS_MSG_SYSTEM);
msgComposer->msgFlags = (msgInfo.msgflags & RS_MSG_SYSTEM);
msgComposer->calculateTitle();
@ -1060,7 +1061,7 @@ MessageComposer *MessageComposer::forwardMsg(const std::string &msgId)
msgComposer->setFileList(files_info);
// needed to send system flags with reply
//msgComposer->systemFlags = (msgInfo.msgflags & RS_MSG_SYSTEM);
msgComposer->msgFlags = (msgInfo.msgflags & RS_MSG_SYSTEM);
msgComposer->calculateTitle();
@ -1127,8 +1128,7 @@ bool MessageComposer::sendMessage_internal(bool bDraftbox)
mi.title = misc::removeNewLine(ui.titleEdit->text()).toStdWString();
// needed to send system flags with reply
//mi.msgflags = systemFlags;
mi.msgflags = 0;
mi.msgflags = msgFlags;
QString text;
RsHtml::optimizeHtml(ui.msgText, text);

2
retroshare-gui/src/gui/msgs/MessageComposer.h
View File

@ -210,7 +210,7 @@ private:
QList<QLabel*> tagLabels;
// needed to send system flags with reply
//unsigned systemFlags;
unsigned msgFlags;
RSTreeWidgetItemCompareRole *m_compareRole;
QCompleter *m_completer;

BIN
retroshare-gui/src/lang/retroshare_de.qm
View File

Binary file not shown.

80
retroshare-gui/src/lang/retroshare_de.ts
View File

@ -1132,12 +1132,17 @@ Bitte wähle einen zum chatten aus.</translation>
<translation>Thema: %1</translation>
</message>
<message>
<location line="+74"/>
<location line="+80"/>
<source>Please enter your new nick name</source>
<translation>Bitte gib deinen neuen Spitznamen ein</translation>
</message>
<message>
<location line="+52"/>
<location line="+68"/>
<source>Uncheck to mute participant</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+54"/>
<location line="+3"/>
<source>Lobby management</source>
<translation>Lobby Verwaltung</translation>
@ -1174,7 +1179,7 @@ Bitte wähle einen zum chatten aus.</translation>
</message>
<message>
<location filename="../gui/chat/ChatLobbyDialog.ui" line="+177"/>
<location filename="../gui/chat/ChatLobbyDialog.cpp" line="-105"/>
<location filename="../gui/chat/ChatLobbyDialog.cpp" line="-175"/>
<source>Change nick name</source>
<translation>Ändere Spitznamen</translation>
</message>
@ -5312,20 +5317,29 @@ p, li { white-space: pre-wrap; }
<context>
<name>FriendRequestToaster</name>
<message>
<location filename="../gui/toaster/FriendRequestToaster.ui" line="+196"/>
<source>Accept Friend Request</source>
<translation>Freundschaftsanfrage bestätigen</translation>
<translation type="obsolete">Freundschaftsanfrage bestätigen</translation>
</message>
<message>
<location filename="../gui/toaster/FriendRequestToaster.cpp" line="+49"/>
<location filename="../gui/toaster/FriendRequestToaster.cpp" line="+51"/>
<source>wants to be friend with you on RetroShare</source>
<translation>möchte mit dir in RetroShare befreundet sein</translation>
</message>
<message>
<location line="+4"/>
<location line="+3"/>
<source>Unknown (Incoming) Connect Attempt</source>
<translation>Unbekannter (eingehender) Verbindungsversuch</translation>
</message>
<message>
<location filename="../gui/toaster/FriendRequestToaster.ui" line="+138"/>
<source>Friend Request</source>
<translation type="unfinished">Freundschaftsanfrage</translation>
</message>
<message>
<location line="+45"/>
<source>Confirm Friend Request</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>FriendSelectionWidget</name>
@ -7653,7 +7667,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<name>MessageComposer</name>
<message>
<location filename="../gui/msgs/MessageComposer.ui" line="+17"/>
<location filename="../gui/msgs/MessageComposer.cpp" line="+743"/>
<location filename="../gui/msgs/MessageComposer.cpp" line="+744"/>
<source>Compose</source>
<translation>Verfassen</translation>
</message>
@ -7672,7 +7686,7 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<translation type="obsolete">Zurücksetzen</translation>
</message>
<message>
<location filename="../gui/msgs/MessageComposer.cpp" line="-537"/>
<location filename="../gui/msgs/MessageComposer.cpp" line="-538"/>
<source>Send To:</source>
<translation>Senden an:</translation>
</message>
@ -7803,14 +7817,14 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<translation>Setzt Schriftart auf Codestil</translation>
</message>
<message>
<location filename="../gui/msgs/MessageComposer.cpp" line="+648"/>
<location line="+413"/>
<location filename="../gui/msgs/MessageComposer.cpp" line="+649"/>
<location line="+412"/>
<source>To</source>
<translation>An</translation>
</message>
<message>
<location line="-410"/>
<location line="+411"/>
<location line="-409"/>
<location line="+410"/>
<source>Cc</source>
<translation>Cc</translation>
</message>
@ -7910,7 +7924,12 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
<translation>&amp;Blocksatz</translation>
</message>
<message>
<location line="+247"/>
<location line="+205"/>
<source>You have a friend recommendation</source>
<translation>Du hast eine Freundempfehlung</translation>
</message>
<message>
<location line="+43"/>
<source>wants to be friend with you on RetroShare</source>
<translation>möchte mit dir in RetroShare befreundet sein</translation>
</message>
@ -7921,12 +7940,12 @@ Bitte gib etwas Speicher frei und drücke OK.</translation>
</message>
<message>
<location line="+12"/>
<location line="+1560"/>
<location line="+1559"/>
<source>Save Message</source>
<translation>Nachricht speichern</translation>
</message>
<message>
<location line="-1559"/>
<location line="-1558"/>
<source>Message has not been Sent.
Do you want to save message to draft box?</source>
<translation>Nachricht wurde noch nicht gesendet.
@ -7999,7 +8018,7 @@ Möchtest Du die Nachricht in den Entwürfen speichern?</translation>
<translation>Fwd:</translation>
</message>
<message>
<location line="+48"/>
<location line="+47"/>
<location line="+122"/>
<source>RetroShare</source>
<translation></translation>
@ -8190,12 +8209,11 @@ Möchtest du die Nachricht speichern ?</translation>
<translation type="obsolete">Datei nicht gefunden oder Dateiname nicht akzeptiert.</translation>
</message>
<message>
<location line="-1774"/>
<source>Friend Recommendation(s)</source>
<translation>Freundempfehlung(en)</translation>
<translation type="obsolete">Freundempfehlung(en)</translation>
</message>
<message>
<location line="-19"/>
<location line="-1793"/>
<source>I recommend a good friend of me, you can trust him too when you trust me. &lt;br&gt; Copy friend link and paste to Friends list</source>
<translation>Ich empfehle Dir einen guten Freund von mir. Du kannst ihm vertrauen, wenn Du mir vertraust. &lt;br&gt; Kopiere den Link und füge ihn in der Freundesliste ein</translation>
</message>
@ -8581,7 +8599,7 @@ p, li { white-space: pre-wrap; }
<message>
<location line="-5"/>
<location filename="../gui/MessagesDialog.cpp" line="-1"/>
<location line="+749"/>
<location line="+751"/>
<source>From</source>
<translation>Von</translation>
</message>
@ -8725,7 +8743,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="-417"/>
<location filename="../gui/MessagesDialog.cpp" line="-697"/>
<location filename="../gui/MessagesDialog.cpp" line="-699"/>
<source>Subject</source>
<translation>Betreff</translation>
</message>
@ -8781,12 +8799,12 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+1"/>
<location line="+741"/>
<location line="+743"/>
<source>Click to sort by from</source>
<translation>Klicken, um nach Von zu sortieren</translation>
</message>
<message>
<location line="-740"/>
<location line="-742"/>
<source>Click to sort by date</source>
<translation>Klicken, um nach Datum zu sortieren</translation>
</message>
@ -8801,7 +8819,7 @@ p, li { white-space: pre-wrap; }
<translation>System</translation>
</message>
<message>
<location line="+489"/>
<location line="+491"/>
<source>No system messages available.</source>
<translation>Keine Systemnachrichten vorhanden.</translation>
</message>
@ -8812,7 +8830,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="../gui/MessagesDialog.ui" line="-9"/>
<location filename="../gui/MessagesDialog.cpp" line="-699"/>
<location filename="../gui/MessagesDialog.cpp" line="-701"/>
<source>Reply to All</source>
<translation>Allen antworten</translation>
</message>
@ -8838,7 +8856,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+178"/>
<location filename="../gui/MessagesDialog.cpp" line="+612"/>
<location filename="../gui/MessagesDialog.cpp" line="+614"/>
<location line="+885"/>
<location line="+5"/>
<source>Trash</source>
@ -8850,7 +8868,7 @@ p, li { white-space: pre-wrap; }
<translation>Ordner</translation>
</message>
<message>
<location filename="../gui/MessagesDialog.cpp" line="-1212"/>
<location filename="../gui/MessagesDialog.cpp" line="-1214"/>
<source>Mark as read</source>
<translation>Als gelesen markieren</translation>
</message>
@ -8875,7 +8893,7 @@ p, li { white-space: pre-wrap; }
<translation>Papierkorb leeren</translation>
</message>
<message>
<location line="+249"/>
<location line="+251"/>
<location line="+874"/>
<location line="+8"/>
<source>Drafts</source>
@ -8887,12 +8905,12 @@ p, li { white-space: pre-wrap; }
<translation>An</translation>
</message>
<message>
<location line="-740"/>
<location line="-742"/>
<source>Click to sort by star</source>
<translation>Klicken, um nach Kennzeichnung zu sortieren</translation>
</message>
<message>
<location line="+712"/>
<location line="+714"/>
<source>No starred messages available. Stars let you give messages a special status to make them easier to find. To star a message, click on the light grey star beside any message.</source>
<translation>Es sind keine gekennzeichneten Nachrichten vorhanden. Durch die Kennzeichnung kannst du Nachrichten mit einem speziellen Status versehen, sodass sie leichter zu finden sind. Klicke zum Kennzeichnen einer Nachricht auf den hellgrauen Stern neben der jeweiligen Nachricht.</translation>
</message>