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

added setFlags method in Id combo box. Removed possibility to send anonymous distant messages (too risky). Improved the logic in message composer GUI. Fixed bug when key not available in message encryption/signing routine.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7705 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-11-24 21:02:18 +00:00
parent 2f547e4014
commit 30d9671ca6
6 changed files with 53 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

45
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -136,6 +136,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
ui.hashBox->hide();
ui.signMessage_CB->setChecked(true) ;
ui.signMessage_CB->setEnabled(false) ;
// connect up the buttons.
connect( ui.actionSend, SIGNAL( triggered (bool)), this, SLOT( sendMessage( ) ) );
@ -235,28 +236,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
setupFormatActions();
// std::list<RsGxsId> own_ids ;
// rsIdentity->getOwnIds(own_ids) ;
//
// ui.respond_to_CB->addItem(tr("[no identity]"), QVariant(QString::fromStdString(RsGxsId().toStdString()))) ;
//
// for(std::list<RsGxsId>::const_iterator it(own_ids.begin());it!=own_ids.end();++it)
// {
// RsIdentityDetails details ;
// rsIdentity->getIdDetails(*it,details) ;
//
// std::cerr << "Adding identity: id=" << (*it) << ", name=" << details.mNickname << std::endl;
//
// if(details.mNickname.empty()) // I don't know why, but that happens
// ui.respond_to_CB->addItem(QString::fromStdString((*it).toStdString()), QString::fromStdString((*it).toStdString())) ;
// else
// ui.respond_to_CB->addItem(QString::fromUtf8(details.mNickname.c_str()), QString::fromStdString((*it).toStdString())) ;
// }
QObject::connect(ui.respond_to_CB, SIGNAL(currentIndexChanged(int)), this, SLOT(updateSigningButton(int))) ;
// if(!own_ids.empty())
// ui.respond_to_CB->setCurrentIndex(1) ;
ui.respond_to_CB->setFlags(IDCHOOSER_ID_REQUIRED) ;
/*ui.comboStyle->addItem("Standard");
ui.comboStyle->addItem("Bullet List (Disc)");
@ -266,9 +246,9 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
ui.comboStyle->addItem("Ordered List (Alpha lower)");
ui.comboStyle->addItem("Ordered List (Alpha upper)");*/
//connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(textStyle(int)));
connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int)));
connect(ui.comboFont, SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &)));
connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int)));
connect(ui.comboFont, SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &)));
ui.comboSize->setEditable(true);
@ -353,13 +333,6 @@ MessageComposer::~MessageComposer()
{
delete(m_compareRole);
}
void MessageComposer::updateSigningButton(int n)
{
if(n == 0)
ui.signMessage_CB->setEnabled(false) ;
else
ui.signMessage_CB->setEnabled(true) ;
}
void MessageComposer::processSettings(bool bLoad)
{
@ -2354,8 +2327,14 @@ void MessageComposer::addContact(enumType type)
for (std::list<RsPeerId>::const_iterator idIt = peerIds.begin(); idIt != peerIds.end(); ++idIt)
addRecipient(type, *idIt);
std::list<RsGxsId> gxsIds ;
ui.friendSelectionWidget->selectedIds<RsGxsId,FriendSelectionWidget::IDTYPE_GXS>(gxsIds, false);
std::list<RsGxsId> gxsIds ;
ui.friendSelectionWidget->selectedIds<RsGxsId,FriendSelectionWidget::IDTYPE_GXS>(gxsIds, false);
if(!gxsIds.empty() && ui.respond_to_CB->count() == 0)
{
QMessageBox::warning(NULL,tr("Cannot send distant messages"),tr("In order to send distant messages, you need an identity to sign with. Please go to the Identities tab and create one first."));
return ;
}
for (std::list<RsGxsId>::const_iterator idIt = gxsIds.begin(); idIt != gxsIds.end(); ++idIt)
addRecipient(type, *idIt);
}

1
retroshare-gui/src/gui/msgs/MessageComposer.h
View file

@ -80,7 +80,6 @@ public slots:
void addImage();
void changeFormatType(int styleIndex );
void updateSigningButton(int) ;
protected:
void closeEvent (QCloseEvent * event);