Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-05 05:12:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

save/load public msg invites. Small bug fixes.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6358 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-05-05 19:13:27 +00:00
parent cc6555b93f
commit a8d4c02a6e
6 changed files with 196 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/gui/CreateMsgLinkDialog.cpp
View file

@ -122,7 +122,6 @@ void CreateMsgLinkDialog::update()
}
std::vector<DistantOfflineMessengingInvite> invites2 ;
rsMsgs->getDistantOfflineMessengingInvites(invites2) ;
for(uint32_t i=0;i<invites2.size();++i)
@ -134,7 +133,7 @@ void CreateMsgLinkDialog::update()
else
{
QListWidgetItem *item = new QListWidgetItem;
item->setData(Qt::DisplayRole,tr("Private chat invite to ")+QString::fromStdString(invites2[i].issuer_pgp_id)) ;
item->setData(Qt::DisplayRole,tr("Public message link")) ;
item->setData(Qt::UserRole,link.toString()) ;
_existing_links_LW->insertItem(0,item) ;

37
retroshare-gui/src/gui/CreateMsgLinkDialog.ui
View file

@ -17,7 +17,14 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QListWidget" name="_existing_links_LW"/>
<widget class="QListWidget" name="_existing_links_LW">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
@ -182,6 +189,13 @@
</item>
</widget>
</item>
<item>
<widget class="QPushButton" name="_create_link_PB">
<property name="text">
<string>Create!</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
@ -196,27 +210,6 @@
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QPushButton" name="_create_link_PB">
<property name="text">
<string>Create!</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Link:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="lineEdit"/>
</item>
</layout>
</item>
</layout>
</widget>
</item>

2
retroshare-gui/src/gui/MessagesDialog.cpp
View file

@ -1490,6 +1490,8 @@ void MessagesDialog::decryptSelectedMsg()
//setMsgAsReadUnread(currentIndex.row(), true);
updateMessageSummaryList();
insertMessages();
insertMsgTxtAndFiles();
}
bool MessagesDialog::getCurrentMsg(std::string &cid, std::string &mid)