Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed html title bug in the forum message when answering to a message in ForumMsgItem.

Browse Source 
Fixed enabled sate of the new message buton in ForumsDialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-06-20 21:19:48 +00:00
parent dd17fcdcda
commit 886b366d5c
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retroshare-gui/src/gui/ForumsDialog.cpp
View File

@ -759,7 +759,6 @@ void ForumsDialog::fillThreadFinished()
insertPost (); insertPost ();
CalculateIconsAndFonts(); CalculateIconsAndFonts();
ui.newmessageButton->setEnabled (IS_FORUM_SUBSCRIBED(subscribeFlags));
ui.newthreadButton->setEnabled (IS_FORUM_SUBSCRIBED(subscribeFlags)); ui.newthreadButton->setEnabled (IS_FORUM_SUBSCRIBED(subscribeFlags));
} }

15
retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
View File

@ -351,7 +351,6 @@ void ForumMsgItem::sendMsg()
return; return;
} }
QString name = prevSubLabel->text();
QString desc = textEdit->toHtml(); QString desc = textEdit->toHtml();
if(textEdit->toPlainText().isEmpty()) if(textEdit->toPlainText().isEmpty())
@ -362,6 +361,10 @@ void ForumMsgItem::sendMsg()
return; //Don't add a empty Message!! return; //Don't add a empty Message!!
} }
ForumMsgInfo msg;
/* get message */
if (rsForums->getForumMessage(mForumId, mPostId, msg)) {
ForumMsgInfo msgInfo; ForumMsgInfo msgInfo;
msgInfo.forumId = mForumId; msgInfo.forumId = mForumId;
@ -369,7 +372,14 @@ void ForumMsgItem::sendMsg()
msgInfo.parentId = mPostId; msgInfo.parentId = mPostId;
msgInfo.msgId = ""; msgInfo.msgId = "";
msgInfo.title = name.toStdWString(); /* modify title */
QString text = QString::fromStdWString(msg.title);
if (text.startsWith("Re:", Qt::CaseInsensitive)) {
msgInfo.title = msg.title;
} else {
msgInfo.title = L"Re: " + msg.title;
}
msgInfo.msg = desc.toStdWString(); msgInfo.msg = desc.toStdWString();
msgInfo.msgflags = 0; msgInfo.msgflags = 0;
@ -384,6 +394,7 @@ void ForumMsgItem::sendMsg()
if (rsForums->ForumMessageSend(msgInfo) == true) { if (rsForums->ForumMessageSend(msgInfo) == true) {
textEdit->clear(); textEdit->clear();
} }
}
} }
void ForumMsgItem::updateAvatar(const QString &peer_id) void ForumMsgItem::updateAvatar(const QString &peer_id)