merged with upstream/master

This commit is contained in:
csoler 2019-01-19 15:56:33 +01:00
commit e34b8e109f
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
35 changed files with 211 additions and 425 deletions

View file

@ -236,11 +236,6 @@ 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);