[Pkg-owncloud-commits] [owncloud-client] 403/484: Share dialog: Adjust layout #4119

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit bcfdcec3ee60e440e1ba0133dee2125b6a4e0091
Author: Christian Kamm <mail at ckamm.de>
Date:   Tue Nov 24 12:30:53 2015 +0100

    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 c85ffc8..e66b90c 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 6f82913..a0829cc 100644
--- a/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@ -24,12 +24,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
        <property name="text">
         <string>share label</string>
        </property>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git