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 completer for message composer. Still need to fix slot editingRecipientFinished()

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8088 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-03-27 22:57:58 +00:00
parent 5e50423915
commit d514b939b5
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
ui.recipientWidget->setColumnCount(COLUMN_RECIPIENT_COUNT); ui.recipientWidget->setColumnCount(COLUMN_RECIPIENT_COUNT);
QHeaderView *header = ui.recipientWidget->horizontalHeader(); QHeaderView *header = ui.recipientWidget->horizontalHeader();
header->resizeSection(COLUMN_RECIPIENT_TYPE, 120); header->resizeSection(COLUMN_RECIPIENT_TYPE, 60);
header->resizeSection(COLUMN_RECIPIENT_ICON, 22); header->resizeSection(COLUMN_RECIPIENT_ICON, 22);
QHeaderView_setSectionResizeMode(header, COLUMN_RECIPIENT_TYPE, QHeaderView::Fixed); QHeaderView_setSectionResizeMode(header, COLUMN_RECIPIENT_TYPE, QHeaderView::Fixed);
QHeaderView_setSectionResizeMode(header, COLUMN_RECIPIENT_ICON, QHeaderView::Fixed); QHeaderView_setSectionResizeMode(header, COLUMN_RECIPIENT_ICON, QHeaderView::Fixed);
@ -716,15 +716,22 @@ void MessageComposer::buildCompleter()
rsPeers->getFriendList(peers); rsPeers->getFriendList(peers);
std::list<RsGxsId> gxsIds; std::list<RsGxsId> gxsIds;
std::list<RsGxsId>::iterator idIt; QList<QTreeWidgetItem*> gxsitems ;
ui.friendSelectionWidget->items(gxsitems,FriendSelectionWidget::IDTYPE_GXS) ;
// create completer list for friends // create completer list for friends
QStringList completerList; QStringList completerList;
QStringList completerGroupList; QStringList completerGroupList;
/*for (std::list<RsGxsId>::const_iterator idIt = gxsIds.begin(); idIt != gxsIds.end(); ++idIt) { for (QList<QTreeWidgetItem*>::const_iterator idIt = gxsitems.begin(); idIt != gxsitems.end(); ++idIt)
completerList.append(*idIt); {
}*/ RsGxsId id ( ui.friendSelectionWidget->idFromItem( *idIt ) );
RsIdentityDetails detail;
if(rsIdentity->getIdDetails(id, detail))
completerList.append( getGxsRecipientName(id,detail)) ;
}
for (peerIt = peers.begin(); peerIt != peers.end(); ++peerIt) { for (peerIt = peers.begin(); peerIt != peers.end(); ++peerIt) {
RsPeerDetails detail; RsPeerDetails detail;
@ -750,6 +757,7 @@ void MessageComposer::buildCompleter()
m_completer = new QCompleter(completerList, this); m_completer = new QCompleter(completerList, this);
m_completer->setCaseSensitivity(Qt::CaseInsensitive); m_completer->setCaseSensitivity(Qt::CaseInsensitive);
setNewCompleter(ui.recipientWidget, m_completer); setNewCompleter(ui.recipientWidget, m_completer);
} }
@ -1489,6 +1497,10 @@ bool MessageComposer::getRecipientFromRow(int row, enumType &type, destinationTy
return true; return true;
} }
QString MessageComposer::getGxsRecipientName(const RsGxsId& id,const RsIdentityDetails& detail)
{
return QString("%2 <%2@%1>").arg(QString::fromStdString(id.toStdString())).arg(QString::fromUtf8(detail.mNickname.c_str())) ;
}
void MessageComposer::setRecipientToRow(int row, enumType type, destinationType dest_type, const std::string &id) void MessageComposer::setRecipientToRow(int row, enumType type, destinationType dest_type, const std::string &id)
{ {
if (row + 1 > ui.recipientWidget->rowCount()) { if (row + 1 > ui.recipientWidget->rowCount()) {
@ -1555,7 +1567,7 @@ void MessageComposer::setRecipientToRow(int row, enumType type, destinationType
QList<QIcon> icons ; QList<QIcon> icons ;
GxsIdDetails::getIcons(detail,icons,GxsIdDetails::ICON_TYPE_AVATAR) ; GxsIdDetails::getIcons(detail,icons,GxsIdDetails::ICON_TYPE_AVATAR) ;
name = tr("%2 <%2@%1>").arg(QString::fromStdString(gid.toStdString())).arg(QString::fromUtf8(detail.mNickname.c_str())) ; name = getGxsRecipientName(gid,detail) ;
if(!icons.empty()) if(!icons.empty())
icon = icons.front() ; icon = icons.front() ;

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

@ -30,6 +30,7 @@
#include "gui/msgs/MessageInterface.h" #include "gui/msgs/MessageInterface.h"
class QAction; class QAction;
class RsIdentityDetails;
class QComboBox; class QComboBox;
class QFontComboBox; class QFontComboBox;
class QTextEdit; class QTextEdit;
@ -164,6 +165,7 @@ private:
void processSettings(bool bLoad); void processSettings(bool bLoad);
QString getGxsRecipientName(const RsGxsId& id,const RsIdentityDetails& detail) ;
void addContact(enumType type); void addContact(enumType type);
void setTextColor(const QColor& col) ; void setTextColor(const QColor& col) ;
void setupFileActions(); void setupFileActions();