Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 08:59:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert context menu changes

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2015-01-25 14:14:03 +00:00
parent f02948c54c
commit b321953789
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
retroshare-gui/src/gui/Identity/IdDialog.cpp
View File

@ -290,8 +290,8 @@ void IdDialog::updateSelection()
void IdDialog::requestIdList() void IdDialog::requestIdList()
{ {
//Disable by default, will be enable by insertIdDetails() //Disable by default, will be enable by insertIdDetails()
ui->removeIdentity->setVisible(false); ui->removeIdentity->setEnabled(false);
ui->editIdentity->setVisible(false); ui->editIdentity->setEnabled(false);
if (!mIdQueue) if (!mIdQueue)
return; return;
@ -634,16 +634,16 @@ void IdDialog::insertIdDetails(uint32_t token)
if (isOwnId) if (isOwnId)
{ {
mStateHelper->setWidgetEnabled(ui->toolButton_Reputation, false); mStateHelper->setWidgetEnabled(ui->toolButton_Reputation, false);
ui->editIdentity->setVisible(true); ui->editIdentity->setEnabled(true);
ui->removeIdentity->setVisible(true); ui->removeIdentity->setEnabled(true);
ui->chatIdentity->setEnabled(false); ui->chatIdentity->setEnabled(false);
} }
else else
{ {
// No Reputation yet! // No Reputation yet!
mStateHelper->setWidgetEnabled(ui->toolButton_Reputation, /*true*/ false); mStateHelper->setWidgetEnabled(ui->toolButton_Reputation, /*true*/ false);
ui->editIdentity->setVisible(false); ui->editIdentity->setEnabled(false);
ui->removeIdentity->setVisible(false); ui->removeIdentity->setEnabled(false);
ui->chatIdentity->setEnabled(true); ui->chatIdentity->setEnabled(true);
} }
@ -931,9 +931,6 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
{ {
QMenu contextMnu( this ); QMenu contextMnu( this );
contextMnu.addAction(ui->editIdentity);
contextMnu.addAction(ui->removeIdentity);
std::list<RsGxsId> own_identities ; std::list<RsGxsId> own_identities ;
rsIdentity->getOwnIds(own_identities) ; rsIdentity->getOwnIds(own_identities) ;
@ -965,6 +962,10 @@ void IdDialog::IdListCustomPopupMenu( QPoint )
contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Send message to this person"), this, SLOT(sendMsg())); contextMnu.addAction(QIcon(":/images/mail_new.png"), tr("Send message to this person"), this, SLOT(sendMsg()));
contextMnu.addSeparator();
contextMnu.addAction(ui->editIdentity);
contextMnu.addAction(ui->removeIdentity);
contextMnu.exec(QCursor::pos()); contextMnu.exec(QCursor::pos());
} }

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

@ -600,10 +600,10 @@ void MessageComposer::contextMenuMsgSendList(QPoint)
contextMnu.addSeparator(); contextMnu.addSeparator();
action = contextMnu.addAction(QIcon(IMAGE_FRIENDINFO), tr("Friend Details"), this, SLOT(friendDetails())); action = contextMnu.addAction(QIcon(IMAGE_FRIENDINFO), tr("Friend Details"), this, SLOT(friendDetails()));
action->setVisible(selectedCount == 1 && idType == FriendSelectionWidget::IDTYPE_SSL); action->setEnabled(selectedCount == 1 && idType == FriendSelectionWidget::IDTYPE_SSL);
action = contextMnu.addAction(QIcon(), tr("Person Details"), this, SLOT(identityDetails())); action = contextMnu.addAction(QIcon(), tr("Person Details"), this, SLOT(identityDetails()));
action->setVisible(selectedCount == 1 && idType == FriendSelectionWidget::IDTYPE_GXS); action->setEnabled(selectedCount == 1 && idType == FriendSelectionWidget::IDTYPE_GXS);
contextMnu.exec(QCursor::pos()); contextMnu.exec(QCursor::pos());
} }