mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-12-28 00:49:28 -05:00
fixed missing code in previous merge
This commit is contained in:
parent
0c1e6301b3
commit
11fb0bacc8
@ -81,6 +81,13 @@ IdDialog::IdDialog(QWidget *parent) :
|
|||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
mIdQueue = NULL;
|
mIdQueue = NULL;
|
||||||
|
|
||||||
|
contactsItem = new QTreeWidgetItem();
|
||||||
|
contactsItem->setText(0, tr("Contacts"));
|
||||||
|
|
||||||
|
allItem = new QTreeWidgetItem();
|
||||||
|
allItem->setText(0, tr("All"));
|
||||||
|
|
||||||
|
|
||||||
/* Setup UI helper */
|
/* Setup UI helper */
|
||||||
mStateHelper = new UIStateHelper(this);
|
mStateHelper = new UIStateHelper(this);
|
||||||
@ -449,12 +456,6 @@ void IdDialog::insertIdList(uint32_t token)
|
|||||||
|
|
||||||
int accept = ui->filterComboBox->itemData(ui->filterComboBox->currentIndex()).toInt();
|
int accept = ui->filterComboBox->itemData(ui->filterComboBox->currentIndex()).toInt();
|
||||||
|
|
||||||
contactsItem = new QTreeWidgetItem();
|
|
||||||
contactsItem->setText(0, tr("Contacts"));
|
|
||||||
|
|
||||||
allItem = new QTreeWidgetItem();
|
|
||||||
allItem->setText(0, tr("All"));
|
|
||||||
|
|
||||||
RsGxsIdGroup data;
|
RsGxsIdGroup data;
|
||||||
std::vector<RsGxsIdGroup> datavector;
|
std::vector<RsGxsIdGroup> datavector;
|
||||||
std::vector<RsGxsIdGroup>::iterator vit;
|
std::vector<RsGxsIdGroup>::iterator vit;
|
||||||
@ -511,9 +512,20 @@ void IdDialog::insertIdList(uint32_t token)
|
|||||||
ui->idTreeWidget->insertTopLevelItem(0, allItem);
|
ui->idTreeWidget->insertTopLevelItem(0, allItem);
|
||||||
|
|
||||||
if (fillIdListItem(*vit, item, ownPgpId, accept))
|
if (fillIdListItem(*vit, item, ownPgpId, accept))
|
||||||
|
{
|
||||||
|
RsIdentityDetails details;
|
||||||
|
std::string keyId = item->text(RSID_COL_KEYID).toStdString();
|
||||||
|
rsIdentity->getIdDetails(RsGxsId(keyId), details);
|
||||||
|
|
||||||
|
if(details.mFlags & RS_IDENTITY_FLAGS_IS_A_CONTACT)
|
||||||
{
|
{
|
||||||
ui->idTreeWidget->addTopLevelItem(item);
|
contactsItem->addChild(item);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
allItem->addChild(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* count items */
|
/* count items */
|
||||||
|
Loading…
Reference in New Issue
Block a user