Commit 68e08296 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/Applications/16.04'

parents e34e5ac2 c0fd0809
......@@ -44,16 +44,13 @@ ContactSelectionDialog::ContactSelectionDialog(QItemSelectionModel *selectionMod
connect(buttonBox, &QDialogButtonBox::accepted, this, &ContactSelectionDialog::accept);
connect(buttonBox, &QDialogButtonBox::rejected, this, &ContactSelectionDialog::reject);
QVBoxLayout *layout = new QVBoxLayout;
mainWidget->setLayout(layout);
mSelectionWidget = new ContactSelectionWidget(selectionModel, this);
if (allowToSelectTypeToExport) {
layout->addWidget(mSelectionWidget);
mainLayout->addWidget(mSelectionWidget);
mVCardExport = new VCardExportSelectionWidget;
layout->addWidget(mVCardExport);
mainLayout->addWidget(mVCardExport);
} else {
layout->addWidget(mSelectionWidget);
mainLayout->addWidget(mSelectionWidget);
}
mainLayout->addWidget(buttonBox);
......
......@@ -101,6 +101,7 @@ void ContactSelectionWidget::setAddGroupContact(bool addGroupContact)
void ContactSelectionWidget::initGui()
{
QVBoxLayout *layout = new QVBoxLayout(this);
layout->setMargin(0);
mMessageLabel = new QLabel;
layout->addWidget(mMessageLabel);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment