Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-10 15:20:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

manual merge with upstream/master

Browse source
This commit is contained in:
csoler 2019-01-22 21:32:18 +01:00
commit bf1c433849
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
35 changed files with 425 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/Identity/IdDialog.cpp
View file

@ -236,6 +236,11 @@ IdDialog::IdDialog(QWidget *parent) :
connect( ui->idTreeWidget, &RSTreeWidget::itemDoubleClicked,
this, &IdDialog::chatIdentityItem );
ui->avlabel_Circles->setPixmap(QPixmap(":/icons/png/circles.png"));
ui->headerTextLabel_Circles->setText(tr("Circles"));
/* Initialize splitter */
ui->mainSplitter->setStretchFactor(0, 0);
ui->mainSplitter->setStretchFactor(1, 1);