From bcfdcec3ee60e440e1ba0133dee2125b6a4e0091 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Tue, 24 Nov 2015 12:30:53 +0100 Subject: [PATCH] Share dialog: Adjust layout #4119 --- src/gui/sharedialog.cpp | 8 ++++++++ src/gui/sharedialog.ui | 6 ------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp index c85ffc8bbd..e66b90c447 100644 --- a/src/gui/sharedialog.cpp +++ b/src/gui/sharedialog.cpp @@ -71,9 +71,17 @@ ShareDialog::ShareDialog(AccountPtr account, const QString &sharePath, const QSt ocDir.replace(QRegExp("^/*"), ""); ocDir.replace(QRegExp("/*$"), ""); + + // Laying this out is complex because sharePath + // may be in use or not. + _ui->gridLayout->removeWidget(_ui->label_sharePath); + _ui->gridLayout->removeWidget(_ui->label_name); if( ocDir.isEmpty() ) { + _ui->gridLayout->addWidget(_ui->label_name, 0, 1, 2, 1); _ui->label_sharePath->setText(QString()); } else { + _ui->gridLayout->addWidget(_ui->label_name, 0, 1, 1, 1); + _ui->gridLayout->addWidget(_ui->label_sharePath, 1, 1, 1, 1); _ui->label_sharePath->setText(tr("Folder: %2").arg(ocDir)); } diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui index 6f829130ca..a0829ccd44 100644 --- a/src/gui/sharedialog.ui +++ b/src/gui/sharedialog.ui @@ -24,12 +24,6 @@ 0 - - - 75 - true - - share label