Do not show nodes in mail composer

This commit is contained in:
Gioacchino Mazzurco 2018-11-20 12:13:16 +01:00
parent 1699a6a25a
commit cf94037c10
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051

View file

@ -217,9 +217,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
/* initialize friends list */ /* initialize friends list */
ui.friendSelectionWidget->setHeaderText(tr("Send To:")); ui.friendSelectionWidget->setHeaderText(tr("Send To:"));
ui.friendSelectionWidget->setModus(FriendSelectionWidget::MODUS_MULTI); ui.friendSelectionWidget->setModus(FriendSelectionWidget::MODUS_MULTI);
ui.friendSelectionWidget->setShowType(//FriendSelectionWidget::SHOW_GROUP // removed this because it's too confusing. ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GXS);
FriendSelectionWidget::SHOW_SSL
| FriendSelectionWidget::SHOW_GXS);
ui.friendSelectionWidget->start(); ui.friendSelectionWidget->start();
QActionGroup *grp = new QActionGroup(this); QActionGroup *grp = new QActionGroup(this);
@ -263,11 +261,9 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
ui.respond_to_CB->setFlags(IDCHOOSER_ID_REQUIRED) ; ui.respond_to_CB->setFlags(IDCHOOSER_ID_REQUIRED) ;
/* Add filter types */ /* Add filter types */
ui.filterComboBox->addItem(tr("All addresses (mixed)"));
ui.filterComboBox->addItem(tr("Friend Nodes"));
ui.filterComboBox->addItem(tr("All people")); ui.filterComboBox->addItem(tr("All people"));
ui.filterComboBox->addItem(tr("My contacts")); ui.filterComboBox->addItem(tr("My contacts"));
ui.filterComboBox->setCurrentIndex(2); ui.filterComboBox->setCurrentIndex(0);
if(rsIdentity->nbRegularContacts() > 0) if(rsIdentity->nbRegularContacts() > 0)
ui.filterComboBox->setCurrentIndex(3); ui.filterComboBox->setCurrentIndex(3);
@ -2591,25 +2587,14 @@ void MessageComposer::filterComboBoxChanged(int i)
{ {
switch(i) switch(i)
{ {
case 0: ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP default:
| FriendSelectionWidget::SHOW_SSL case 0:
| FriendSelectionWidget::SHOW_GXS) ; ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GXS);
break ; break;
case 1:
case 1: ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_CONTACTS);
| FriendSelectionWidget::SHOW_SSL) ; break;
break ;
case 2: ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GXS) ;
break ;
case 3: ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_CONTACTS) ;
break ;
default: ;
} }
} }
void MessageComposer::friendSelectionChanged() void MessageComposer::friendSelectionChanged()