From 7d3242077b5b657cacb226da8b8284e183764cd0 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 15 Nov 2018 20:26:09 +0100
Subject: [PATCH 01/15] ShareDialog: align the left margin

All other margins are 10px.
---
 src/gui/sharedialog.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui
index 4191615d96..e11b89e903 100644
--- a/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@ -39,7 +39,7 @@
     <enum>QLayout::SetFixedSize</enum>
    </property>
    <property name="leftMargin">
-    <number>15</number>
+    <number>10</number>
    </property>
    <property name="topMargin">
     <number>10</number>

From cd58850f5b4e0ef8faece8a3a20ee4586c920a03 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 15 Nov 2018 20:28:55 +0100
Subject: [PATCH 02/15] ShareUserGroupWidget: remove nested content margins

---
 src/gui/shareusergroupwidget.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 14fa90a3e1..bd85654345 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -187,6 +187,7 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
 
     auto newViewPort = new QWidget(scrollArea);
     auto layout = new QVBoxLayout(newViewPort);
+    layout->setContentsMargins(0, 0, 0, 0);
     QSize minimumSize = newViewPort->sizeHint();
     int x = 0;
 

From b546e7c2249747d0808af14cfe36a47bde95f0ef Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 15 Nov 2018 10:21:52 +0100
Subject: [PATCH 03/15] ElidedLabel: add default constructor

Makes it possible to promote QLabel to an ElidedLabel in Qt Designer.
---
 src/gui/elidedlabel.cpp | 6 ++++++
 src/gui/elidedlabel.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/src/gui/elidedlabel.cpp b/src/gui/elidedlabel.cpp
index a5ce9bb227..f397e7edd6 100644
--- a/src/gui/elidedlabel.cpp
+++ b/src/gui/elidedlabel.cpp
@@ -18,6 +18,12 @@
 
 namespace OCC {
 
+ElidedLabel::ElidedLabel(QWidget *parent)
+    : QLabel(parent)
+    , _elideMode(Qt::ElideNone)
+{
+}
+
 ElidedLabel::ElidedLabel(const QString &text, QWidget *parent)
     : QLabel(text, parent)
     , _text(text)
diff --git a/src/gui/elidedlabel.h b/src/gui/elidedlabel.h
index 1101dc16bb..968628c8f1 100644
--- a/src/gui/elidedlabel.h
+++ b/src/gui/elidedlabel.h
@@ -24,6 +24,7 @@ class ElidedLabel : public QLabel
 {
     Q_OBJECT
 public:
+    explicit ElidedLabel(QWidget *parent = nullptr);
     explicit ElidedLabel(const QString &text, QWidget *parent = nullptr);
 
     void setText(const QString &text);

From fae1c0dbdd2ad66e532ef9e6c58d8f77b1c68947 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Thu, 15 Nov 2018 10:23:07 +0100
Subject: [PATCH 04/15] ShareUserLine: fix eliding

The widget doesn't have its final size at construction time, so the
width for eliding is not yet known. Let ElidedLabel do the job.
---
 src/gui/shareusergroupwidget.cpp |  6 ++----
 src/gui/shareuserline.ui         | 11 +++++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index bd85654345..c428bd440d 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -371,10 +371,8 @@ ShareUserLine::ShareUserLine(QSharedPointer<Share> share,
 {
     _ui->setupUi(this);
 
-    QString sharedWithText(share->getShareWith()->format());
-    QFontMetrics metrics(_ui->sharedWith->font());
-    QString elidedText = metrics.elidedText(sharedWithText, Qt::ElideRight, _ui->sharedWith->width());
-    _ui->sharedWith->setText(elidedText);
+    _ui->sharedWith->setElideMode(Qt::ElideRight);
+    _ui->sharedWith->setText(share->getShareWith()->format());
 
     // adds permissions
     // can edit permission
diff --git a/src/gui/shareuserline.ui b/src/gui/shareuserline.ui
index 4cab568394..4632f162f3 100644
--- a/src/gui/shareuserline.ui
+++ b/src/gui/shareuserline.ui
@@ -97,9 +97,9 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="sharedWith">
+    <widget class="OCC::ElidedLabel" name="sharedWith">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+      <sizepolicy hsizetype="Ignored" vsizetype="Maximum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -204,6 +204,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>OCC::ElidedLabel</class>
+   <extends>QLabel</extends>
+   <header>elidedlabel.h</header>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../../client.qrc"/>
  </resources>

From 94750a5ea1920c56b9dbb52d4c8541c338b3399a Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 16 Nov 2018 20:23:32 +0100
Subject: [PATCH 05/15] ShareUserGroupWidget: sync the share confirm button
 size with others

This keeps also the total width of the share dialog constant.
---
 src/gui/shareusergroupwidget.ui | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gui/shareusergroupwidget.ui b/src/gui/shareusergroupwidget.ui
index 8d01fa9663..f7f1697162 100644
--- a/src/gui/shareusergroupwidget.ui
+++ b/src/gui/shareusergroupwidget.ui
@@ -109,7 +109,13 @@
        <property name="minimumSize">
         <size>
          <width>18</width>
-         <height>0</height>
+         <height>26</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>18</width>
+         <height>16777215</height>
         </size>
        </property>
        <property name="styleSheet">

From df802472cb77b272a8d6c502fe9aca4de196f4fd Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 16 Nov 2018 20:25:34 +0100
Subject: [PATCH 06/15] ShareLinkWidget: sync the confirm button size

---
 src/gui/sharelinkwidget.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/sharelinkwidget.ui b/src/gui/sharelinkwidget.ui
index 174ba1537f..5a6edb54e6 100644
--- a/src/gui/sharelinkwidget.ui
+++ b/src/gui/sharelinkwidget.ui
@@ -307,7 +307,7 @@
         </property>
         <property name="maximumSize">
          <size>
-          <width>16777215</width>
+          <width>18</width>
           <height>16777215</height>
          </size>
         </property>

From 96d0059ca4cd37a42b4c2722dcadcf0804ebc027 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 16 Nov 2018 21:11:55 +0100
Subject: [PATCH 07/15] ShareDialog: use auto-raising tool buttons as confirm
 buttons

---
 src/gui/sharelinkwidget.ui       | 56 +++-----------------------------
 src/gui/shareusergroupwidget.cpp |  2 +-
 src/gui/shareusergroupwidget.ui  | 28 ++--------------
 3 files changed, 7 insertions(+), 79 deletions(-)

diff --git a/src/gui/sharelinkwidget.ui b/src/gui/sharelinkwidget.ui
index 5a6edb54e6..64d0fd594f 100644
--- a/src/gui/sharelinkwidget.ui
+++ b/src/gui/sharelinkwidget.ui
@@ -292,39 +292,12 @@
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="confirmPassword">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>18</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>18</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="autoFillBackground">
-         <bool>false</bool>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">background-color: rgba(255, 255, 255, 0);</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
+       <widget class="QToolButton" name="confirmPassword">
         <property name="icon">
          <iconset resource="../../client.qrc">
           <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset>
         </property>
-        <property name="flat">
+        <property name="autoRaise">
          <bool>true</bool>
         </property>
        </widget>
@@ -413,33 +386,12 @@
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="confirmExpirationDate">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>18</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>18</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
+       <widget class="QToolButton" name="confirmExpirationDate">
         <property name="icon">
          <iconset resource="../../client.qrc">
           <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset>
         </property>
-        <property name="flat">
+        <property name="autoRaise">
          <bool>true</bool>
         </property>
        </widget>
diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index c428bd440d..246cc4a5a9 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -87,7 +87,7 @@ ShareUserGroupWidget::ShareUserGroupWidget(AccountPtr account,
     connect(_manager, &ShareManager::shareCreated, this, &ShareUserGroupWidget::getShares);
     connect(_manager, &ShareManager::serverError, this, &ShareUserGroupWidget::displayError);
     connect(_ui->shareeLineEdit, &QLineEdit::returnPressed, this, &ShareUserGroupWidget::slotLineEditReturn);
-    connect(_ui->confirmShare, &QPushButton::clicked, this, &ShareUserGroupWidget::slotLineEditReturn);
+    connect(_ui->confirmShare, &QAbstractButton::clicked, this, &ShareUserGroupWidget::slotLineEditReturn);
     //TODO connect(_ui->privateLinkText, &QLabel::linkActivated, this, &ShareUserGroupWidget::slotPrivateLinkShare);
 
     // By making the next two QueuedConnections we can override
diff --git a/src/gui/shareusergroupwidget.ui b/src/gui/shareusergroupwidget.ui
index f7f1697162..69a23d334d 100644
--- a/src/gui/shareusergroupwidget.ui
+++ b/src/gui/shareusergroupwidget.ui
@@ -99,36 +99,12 @@
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="confirmShare">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>18</width>
-         <height>26</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>18</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">background-color: rgb(255, 255, 255);</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
+      <widget class="QToolButton" name="confirmShare">
        <property name="icon">
         <iconset resource="../../client.qrc">
          <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset>
        </property>
-       <property name="flat">
+       <property name="autoRaise">
         <bool>true</bool>
        </property>
       </widget>

From bd93489b146c32f97e1726e8616d2a86b2ae535a Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 16 Nov 2018 21:23:50 +0100
Subject: [PATCH 08/15] Cleanup shareusergroupwidget.ui

Remove hard-coded fixed sizes, size constraints, and other unnecessary
property assignments. This works with any dialog width, meaning that
the width can be defined in one place higher up in the widget hierachy.
---
 src/gui/shareusergroupwidget.ui | 74 ++-------------------------------
 1 file changed, 4 insertions(+), 70 deletions(-)

diff --git a/src/gui/shareusergroupwidget.ui b/src/gui/shareusergroupwidget.ui
index 69a23d334d..51682bb056 100644
--- a/src/gui/shareusergroupwidget.ui
+++ b/src/gui/shareusergroupwidget.ui
@@ -11,33 +11,15 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>350</width>
-    <height>55</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>350</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Share NewDocument.odt</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
    </property>
-   <property name="sizeConstraint">
-    <enum>QLayout::SetFixedSize</enum>
-   </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -51,13 +33,7 @@
     <number>0</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="shareeHorizontalLayout" stretch="0,0">
-     <property name="spacing">
-      <number>0</number>
-     </property>
-     <property name="sizeConstraint">
-      <enum>QLayout::SetFixedSize</enum>
-     </property>
+    <layout class="QHBoxLayout" name="shareeHorizontalLayout">
      <property name="leftMargin">
       <number>0</number>
      </property>
@@ -72,27 +48,6 @@
      </property>
      <item>
       <widget class="QLineEdit" name="shareeLineEdit">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>332</width>
-         <height>26</height>
-        </size>
-       </property>
-       <property name="maximumSize">
-        <size>
-         <width>16777215</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
        <property name="placeholderText">
         <string>Share with users or groups ...</string>
        </property>
@@ -114,23 +69,11 @@
    <item>
     <widget class="QLabel" name="errorLabel">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Maximum">
+      <sizepolicy hsizetype="Ignored" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize">
-      <size>
-       <width>350</width>
-       <height>26</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <property name="palette">
       <palette>
        <active>
@@ -168,9 +111,6 @@
        </disabled>
       </palette>
      </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
      <property name="text">
       <string notr="true">Placeholder for Error text</string>
      </property>
@@ -180,12 +120,6 @@
      <property name="wordWrap">
       <bool>true</bool>
      </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <property name="indent">
-      <number>0</number>
-     </property>
     </widget>
    </item>
   </layout>

From 847706432ba8be608b89d482995806b2e480fa9c Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Fri, 16 Nov 2018 23:02:34 +0100
Subject: [PATCH 09/15] ShareLinkWidget: redo the layout

NOTE: The progress indicator is temporarily moved one line up to avoid
inserting it on its own line, which would cause the content pushed down
and the dialog size jump back and forth.
---
 src/gui/sharelinkwidget.cpp |  58 ++--
 src/gui/sharelinkwidget.h   |   4 +-
 src/gui/sharelinkwidget.ui  | 533 ++++++++++--------------------------
 3 files changed, 186 insertions(+), 409 deletions(-)

diff --git a/src/gui/sharelinkwidget.cpp b/src/gui/sharelinkwidget.cpp
index 6eb4c25926..34ac9a84c1 100644
--- a/src/gui/sharelinkwidget.cpp
+++ b/src/gui/sharelinkwidget.cpp
@@ -58,18 +58,16 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
     , _unshareLinkAction(nullptr)
 {
     _ui->setupUi(this);
+
+    QSizePolicy sp = _ui->shareLinkToolButton->sizePolicy();
+    sp.setRetainSizeWhenHidden(true);
+    _ui->shareLinkToolButton->setSizePolicy(sp);
     _ui->shareLinkToolButton->hide();
 
     //Is this a file or folder?
     QFileInfo fi(localPath);
     _isFile = fi.isFile();
 
-    // the following progress indicator widgets are added to layouts which makes them
-    // automatically deleted once the dialog dies.
-    _pi_indicator = new QProgressIndicator();
-    _ui->horizontalLayout->insertWidget(1, _pi_indicator, Qt::AlignCenter);
-    _ui->indicatorWidget->hide();
-
     connect(_ui->enableShareLink, &QCheckBox::toggled, this, &ShareLinkWidget::slotCreateOrDeleteShareLink);
     connect(_ui->lineEdit_password, &QLineEdit::returnPressed, this, &ShareLinkWidget::slotCreatePassword);
     connect(_ui->confirmPassword, &QAbstractButton::clicked, this, &ShareLinkWidget::slotCreatePassword);
@@ -87,18 +85,17 @@ ShareLinkWidget::ShareLinkWidget(AccountPtr account,
         sharingPossible = false;
     }
 
-    if (!sharingPossible)
-        _ui->shareLinkWidget->hide();
-    else
-        _ui->shareLinkWidget->show();
+    _ui->createShareButton->setVisible(sharingPossible);
+    _ui->enableShareLink->setVisible(sharingPossible);
+    _ui->shareLinkToolButton->setVisible(sharingPossible);
 
     // Older servers don't support multiple public link shares
     if (!_account->capabilities().sharePublicLinkMultiple()) {
         _namesSupported = false;
     }
 
-    _ui->passwordShareProperty->hide();
-    _ui->expirationShareProperty->hide();
+    togglePasswordOptions(false);
+    toggleExpireDateOptions(false);
     _ui->calendar->setMinimumDate(QDate::currentDate().addDays(1));
 
     // check if the file is already inside of a synced folder
@@ -139,12 +136,12 @@ ShareLinkWidget::~ShareLinkWidget()
 }
 
 void ShareLinkWidget::toggleAnimation(bool start){
-    if(start && !_pi_indicator->isAnimated())
-        _pi_indicator->startAnimation();
-    else
-        _pi_indicator->stopAnimation();
-
-    _ui->indicatorWidget->setVisible(start);
+    if (start) {
+        if (!_ui->progressIndicator->isAnimated())
+            _ui->progressIndicator->startAnimation();
+    } else {
+        _ui->progressIndicator->stopAnimation();
+    }
 }
 
 void ShareLinkWidget::getShares()
@@ -231,7 +228,7 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
         if(_linkShare->isPasswordSet()){
             _passwordProtectLinkAction->setChecked(true);
             _ui->lineEdit_password->setPlaceholderText("********");
-            _ui->passwordShareProperty->show();
+            showPasswordOptions(true);
         }
 
         // If password is enforced then don't allow users to disable it
@@ -247,7 +244,7 @@ void ShareLinkWidget::slotSharesFetched(const QList<QSharedPointer<Share>> &shar
         if(_linkShare->getExpireDate().isValid()){
             _ui->calendar->setDate(_linkShare->getExpireDate());
             _expirationDateLinkAction->setChecked(true);
-            _ui->expirationShareProperty->show();
+            showExpireDateOptions(true);
         }
 
 
@@ -401,7 +398,7 @@ void ShareLinkWidget::slotCreateShareRequiresPassword(const QString &message)
 {
     toggleAnimation(true);
 
-    _ui->passwordShareProperty->show();
+    showPasswordOptions(true);
     if (!message.isEmpty()) {
         _ui->errorLabel->setText(message);
         _ui->errorLabel->show();
@@ -412,9 +409,16 @@ void ShareLinkWidget::slotCreateShareRequiresPassword(const QString &message)
     togglePasswordOptions(true);
 }
 
+void ShareLinkWidget::showPasswordOptions(bool show)
+{
+    _ui->passwordLabel->setVisible(show);
+    _ui->lineEdit_password->setVisible(show);
+    _ui->confirmPassword->setVisible(show);
+}
+
 void ShareLinkWidget::togglePasswordOptions(bool enable)
 {
-    _ui->passwordShareProperty->setVisible(enable);
+    showPasswordOptions(enable);
 
     if(enable) {
         _ui->lineEdit_password->setFocus();
@@ -425,9 +429,17 @@ void ShareLinkWidget::togglePasswordOptions(bool enable)
     }
 }
 
+void ShareLinkWidget::showExpireDateOptions(bool show)
+{
+    _ui->expirationLabel->setVisible(show);
+    _ui->calendar->setVisible(show);
+    _ui->confirmExpirationDate->setVisible(show);
+}
+
 void ShareLinkWidget::toggleExpireDateOptions(bool enable)
 {
-    _ui->expirationShareProperty->setVisible(enable);
+    showExpireDateOptions(enable);
+
     if (enable) {
         const QDate date = QDate::currentDate().addDays(1);
         _ui->calendar->setDate(date);
diff --git a/src/gui/sharelinkwidget.h b/src/gui/sharelinkwidget.h
index 6f860c4aad..8094a9789c 100644
--- a/src/gui/sharelinkwidget.h
+++ b/src/gui/sharelinkwidget.h
@@ -83,9 +83,11 @@ private slots:
 private:
     void displayError(const QString &errMsg);
 
+    void showPasswordOptions(bool show);
     void togglePasswordOptions(bool enable);
     void setPassword(const QString &password);
 
+    void showExpireDateOptions(bool show);
     void toggleExpireDateOptions(bool enable);
     void setExpireDate(const QDate &date);
 
@@ -105,8 +107,6 @@ private:
     QString _localPath;
     QString _shareUrl;
 
-    QProgressIndicator *_pi_indicator;
-
     ShareManager *_manager;
     QSharedPointer<LinkShare> _linkShare;
 
diff --git a/src/gui/sharelinkwidget.ui b/src/gui/sharelinkwidget.ui
index 64d0fd594f..8affe169ae 100644
--- a/src/gui/sharelinkwidget.ui
+++ b/src/gui/sharelinkwidget.ui
@@ -11,33 +11,12 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>350</width>
-    <height>110</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Share NewDocument.odt</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>10</number>
-   </property>
-   <property name="sizeConstraint">
-    <enum>QLayout::SetFixedSize</enum>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -50,375 +29,162 @@
    <property name="bottomMargin">
     <number>0</number>
    </property>
-   <item>
-    <widget class="QWidget" name="shareLinkWidget" native="true">
+   <item row="0" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="createShareButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">text-align: left</string>
+       </property>
+       <property name="text">
+        <string>&amp;Share link</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../client.qrc">
+         <normaloff>:/client/resources/public.svg</normaloff>:/client/resources/public.svg</iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>25</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QProgressIndicator" name="progressIndicator"/>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>25</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="enableShareLink">
+       <property name="text">
+        <string>Enable</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="3">
+    <widget class="QToolButton" name="shareLinkToolButton">
      <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="icon">
+      <iconset resource="../../client.qrc">
+       <normaloff>:/client/resources/more.svg</normaloff>:/client/resources/more.svg</iconset>
+     </property>
+     <property name="popupMode">
+      <enum>QToolButton::InstantPopup</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="passwordLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Password:</string>
+     </property>
+     <property name="indent">
+      <number>20</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="lineEdit_password">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>1</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="echoMode">
+      <enum>QLineEdit::Password</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QToolButton" name="confirmPassword">
+     <property name="icon">
+      <iconset resource="../../client.qrc">
+       <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset>
+     </property>
+     <property name="autoRaise">
       <bool>true</bool>
      </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="expirationLabel">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>1</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize">
-      <size>
-       <width>350</width>
-       <height>0</height>
-      </size>
+     <property name="text">
+      <string>Expiration date:</string>
+     </property>
+     <property name="indent">
+      <number>20</number>
      </property>
-     <layout class="QHBoxLayout" name="shareLinkLayout">
-      <property name="spacing">
-       <number>3</number>
-      </property>
-      <property name="sizeConstraint">
-       <enum>QLayout::SetFixedSize</enum>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QPushButton" name="createShareButton">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>242</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>350</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="layoutDirection">
-         <enum>Qt::LeftToRight</enum>
-        </property>
-        <property name="autoFillBackground">
-         <bool>false</bool>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">text-align: left</string>
-        </property>
-        <property name="text">
-         <string>&amp;Share link</string>
-        </property>
-        <property name="icon">
-         <iconset resource="../../client.qrc">
-          <normaloff>:/client/resources/public.svg</normaloff>:/client/resources/public.svg</iconset>
-        </property>
-        <property name="checkable">
-         <bool>false</bool>
-        </property>
-        <property name="flat">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="enableShareLink">
-        <property name="minimumSize">
-         <size>
-          <width>82</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Enable</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="shareLinkToolButton">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>26</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="contextMenuPolicy">
-         <enum>Qt::ActionsContextMenu</enum>
-        </property>
-        <property name="styleSheet">
-         <string notr="true"/>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="icon">
-         <iconset resource="../../client.qrc">
-          <normaloff>:/client/resources/more.svg</normaloff>:/client/resources/more.svg</iconset>
-        </property>
-        <property name="popupMode">
-         <enum>QToolButton::InstantPopup</enum>
-        </property>
-        <property name="toolButtonStyle">
-         <enum>Qt::ToolButtonIconOnly</enum>
-        </property>
-       </widget>
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QWidget" name="indicatorWidget" native="true">
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="passwordShareProperty" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>300</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <layout class="QHBoxLayout" name="passwordHorizontalLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="sizeConstraint">
-       <enum>QLayout::SetFixedSize</enum>
-      </property>
-      <property name="leftMargin">
-       <number>18</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="label">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>162</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Password:</string>
-        </property>
-        <property name="indent">
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLineEdit" name="lineEdit_password">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>120</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>100</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="echoMode">
-         <enum>QLineEdit::Password</enum>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="confirmPassword">
-        <property name="icon">
-         <iconset resource="../../client.qrc">
-          <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset>
-        </property>
-        <property name="autoRaise">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="expirationShareProperty" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>300</width>
-       <height>0</height>
-      </size>
-     </property>
-     <layout class="QHBoxLayout" name="expirationShareLayout" stretch="0,0,0">
-      <property name="spacing">
-       <number>0</number>
-      </property>
-      <property name="sizeConstraint">
-       <enum>QLayout::SetFixedSize</enum>
-      </property>
-      <property name="leftMargin">
-       <number>18</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QLabel" name="expirationLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>162</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="text">
-         <string>Expiration date:</string>
-        </property>
-        <property name="indent">
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QDateEdit" name="calendar">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>120</width>
-          <height>26</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="calendarPopup">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QToolButton" name="confirmExpirationDate">
-        <property name="icon">
-         <iconset resource="../../client.qrc">
-          <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset>
-        </property>
-        <property name="autoRaise">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="errorLabel">
+   <item row="2" column="1">
+    <widget class="QDateEdit" name="calendar">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-       <horstretch>0</horstretch>
+       <horstretch>1</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QToolButton" name="confirmExpirationDate">
+     <property name="icon">
+      <iconset resource="../../client.qrc">
+       <normaloff>:/client/resources/confirm.svg</normaloff>:/client/resources/confirm.svg</iconset>
      </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
+     <property name="autoRaise">
+      <bool>true</bool>
      </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="4">
+    <widget class="QLabel" name="errorLabel">
      <property name="palette">
       <palette>
        <active>
@@ -462,23 +228,22 @@
      <property name="textFormat">
       <enum>Qt::PlainText</enum>
      </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-     </property>
      <property name="wordWrap">
       <bool>true</bool>
      </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
-     <property name="indent">
-      <number>0</number>
-     </property>
     </widget>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+  <customwidget>
+   <class>QProgressIndicator</class>
+   <extends>QWidget</extends>
+   <header>QProgressIndicator.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources>
   <include location="../../client.qrc"/>
  </resources>

From f0f691fffc10a6c609d4bd4d01827427e51fd4ab Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sat, 17 Nov 2018 08:12:48 +0100
Subject: [PATCH 10/15] Cleanup shareuserline.ui

---
 src/gui/shareuserline.ui | 107 +--------------------------------------
 1 file changed, 2 insertions(+), 105 deletions(-)

diff --git a/src/gui/shareuserline.ui b/src/gui/shareuserline.ui
index 4632f162f3..0de3009300 100644
--- a/src/gui/shareuserline.ui
+++ b/src/gui/shareuserline.ui
@@ -2,9 +2,6 @@
 <ui version="4.0">
  <class>OCC::ShareUserLine</class>
  <widget class="QWidget" name="OCC::ShareUserLine">
-  <property name="enabled">
-   <bool>true</bool>
-  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -14,36 +11,18 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>350</width>
-    <height>45</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>46</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
   <property name="autoFillBackground">
    <bool>true</bool>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,3,2,2,2">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,2,2,2">
    <property name="spacing">
     <number>5</number>
    </property>
-   <property name="sizeConstraint">
-    <enum>QLayout::SetFixedSize</enum>
-   </property>
    <property name="leftMargin">
     <number>5</number>
    </property>
@@ -70,30 +49,9 @@
        <height>40</height>
       </size>
      </property>
-     <property name="sizeIncrement">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-     <property name="acceptDrops">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="scaledContents">
-      <bool>false</bool>
-     </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-     <property name="indent">
-      <number>0</number>
-     </property>
     </widget>
    </item>
    <item>
@@ -104,39 +62,14 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize">
-      <size>
-       <width>100</width>
-       <height>26</height>
-      </size>
-     </property>
      <property name="text">
       <string>User name</string>
      </property>
      <property name="textFormat">
       <enum>Qt::PlainText</enum>
      </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
     </widget>
    </item>
-   <item>
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>50</width>
-       <height>15</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item>
     <widget class="QCheckBox" name="permissionsEdit">
      <property name="sizePolicy">
@@ -145,12 +78,6 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
      <property name="text">
       <string>can edit</string>
      </property>
@@ -158,21 +85,6 @@
    </item>
    <item>
     <widget class="QToolButton" name="permissionToolButton">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>26</width>
-       <height>26</height>
-      </size>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
      <property name="icon">
       <iconset resource="../../client.qrc">
        <normaloff>:/client/resources/more.svg</normaloff>:/client/resources/more.svg</iconset>
@@ -181,21 +93,6 @@
    </item>
    <item>
     <widget class="QToolButton" name="deleteShareButton">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>26</width>
-       <height>26</height>
-      </size>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
      <property name="icon">
       <iconset theme="user-trash">
        <normaloff>.</normaloff>.</iconset>

From a8cce41f354258b7037ec3c12bcc5f1b1dac1107 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sat, 17 Nov 2018 08:19:12 +0100
Subject: [PATCH 11/15] sharedialog.ui: fix scroll area size

---
 src/gui/sharedialog.ui | 72 ++----------------------------------------
 1 file changed, 3 insertions(+), 69 deletions(-)

diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui
index e11b89e903..6635bfc4fb 100644
--- a/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@ -174,32 +174,14 @@
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Maximum">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="minimumSize">
-      <size>
-       <width>350</width>
-       <height>45</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>16777215</width>
-       <height>16777215</height>
-      </size>
-     </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
-     </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
      <property name="horizontalScrollBarPolicy">
       <enum>Qt::ScrollBarAlwaysOff</enum>
      </property>
@@ -207,58 +189,10 @@
       <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
      </property>
      <property name="widgetResizable">
-      <bool>false</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+      <bool>true</bool>
      </property>
      <widget class="QWidget" name="scrollAreaWidgetContents">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>340</width>
-        <height>45</height>
-       </rect>
-      </property>
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize">
-       <size>
-        <width>340</width>
-        <height>45</height>
-       </size>
-      </property>
-      <property name="maximumSize">
-       <size>
-        <width>16777215</width>
-        <height>16777215</height>
-       </size>
-      </property>
-      <layout class="QVBoxLayout" name="scrollAreaVerticalLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
-       <property name="sizeConstraint">
-        <enum>QLayout::SetFixedSize</enum>
-       </property>
-       <property name="leftMargin">
-        <number>0</number>
-       </property>
-       <property name="topMargin">
-        <number>0</number>
-       </property>
-       <property name="rightMargin">
-        <number>0</number>
-       </property>
-       <property name="bottomMargin">
-        <number>0</number>
-       </property>
-      </layout>
+      <layout class="QVBoxLayout" name="scrollAreaVerticalLayout"/>
      </widget>
     </widget>
    </item>

From b25e15347babeecdd14b88de346c3579e10848dc Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sat, 17 Nov 2018 08:34:28 +0100
Subject: [PATCH 12/15] ShareUserGroupWidget: fix scroll area size management

---
 src/gui/shareusergroupwidget.cpp | 41 +++++++-------------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index 246cc4a5a9..ebdf24e62d 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -188,8 +188,8 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
     auto newViewPort = new QWidget(scrollArea);
     auto layout = new QVBoxLayout(newViewPort);
     layout->setContentsMargins(0, 0, 0, 0);
-    QSize minimumSize = newViewPort->sizeHint();
     int x = 0;
+    int height = 0;
 
     foreach (const auto &share, shares) {
         // We don't handle link shares, only TypeUser or TypeGroup
@@ -205,22 +205,12 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
 
         x++;
         if (x <= 3) {
-            minimumSize = newViewPort->sizeHint();
-        } else {
-            minimumSize.rwidth() = qMax(newViewPort->sizeHint().width(), minimumSize.width());
+            height = newViewPort->sizeHint().height();
         }
     }
 
-    if (!layout->isEmpty()) {
-        _parentScrollArea->setVisible(true);
-        layout->addStretch(1);
-    } else {
-        _parentScrollArea->setVisible(false);
-    }
-
-    minimumSize.rwidth() += layout->spacing();
-    minimumSize.rheight() += layout->spacing();
-    scrollArea->setMinimumSize(minimumSize);
+    scrollArea->setVisible(!shares.isEmpty());
+    scrollArea->setFixedHeight(height);
     scrollArea->setWidget(newViewPort);
 
     _disableCompleterActivated = false;
@@ -230,13 +220,10 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
 void ShareUserGroupWidget::slotAdjustScrollWidgetSize()
 {
     QScrollArea *scrollArea = _parentScrollArea;
-    if (scrollArea->findChildren<ShareUserLine *>().count() <= 3 &&
-            scrollArea->findChildren<ShareUserLine *>().count() > 0) {
-        auto minimumSize = scrollArea->widget()->sizeHint();
-        auto spacing = scrollArea->widget()->layout()->spacing();
-        minimumSize.rwidth() += spacing;
-        minimumSize.rheight() += spacing;
-        scrollArea->setMinimumSize(minimumSize);
+    int count = scrollArea->findChildren<ShareUserLine *>().count();
+    scrollArea->setVisible(count > 0);
+    if (count > 0 && count <= 3) {
+        scrollArea->setFixedHeight(scrollArea->widget()->sizeHint().height());
     }
 }
 
@@ -270,16 +257,9 @@ void ShareUserGroupWidget::slotCompleterActivated(const QModelIndex &index)
     // model proxying the _completerModel
     auto sharee = qvariant_cast<QSharedPointer<Sharee>>(index.data(Qt::UserRole));
     if (sharee.isNull()) {
-        _parentScrollArea->setVisible(false);
         return;
     }
 
-    /*
-     * Add spinner to the bottom of the widget list
-     */
-    auto viewPort = _parentScrollArea->widget();
-    auto layout = qobject_cast<QVBoxLayout *>(viewPort->layout());
-
 // TODO Progress Indicator where should it go?
 //    auto indicator = new QProgressIndicator(viewPort);
 //    indicator->startAnimation();
@@ -313,11 +293,6 @@ void ShareUserGroupWidget::slotCompleterActivated(const QModelIndex &index)
 
     _ui->shareeLineEdit->setEnabled(false);
     _ui->shareeLineEdit->setText(QString());
-
-    if(layout->isEmpty())
-        _parentScrollArea->setVisible(false);
-    else
-        _parentScrollArea->setVisible(true);
 }
 
 void ShareUserGroupWidget::slotCompleterHighlighted(const QModelIndex &index)

From 3c193143f2add8004853d7b1ca176a68fdd6d8fb Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sat, 17 Nov 2018 08:47:01 +0100
Subject: [PATCH 13/15] Cleanup sharedialog.ui

---
 src/gui/sharedialog.ui | 57 ++++++++----------------------------------
 1 file changed, 10 insertions(+), 47 deletions(-)

diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui
index 6635bfc4fb..82b5053835 100644
--- a/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@ -10,27 +10,6 @@
     <height>120</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>360</width>
-    <height>120</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>360</width>
-    <height>16777215</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>10</number>
@@ -52,9 +31,6 @@
    </property>
    <item>
     <layout class="QGridLayout" name="gridLayout" rowstretch="0,0" columnstretch="0,0">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetFixedSize</enum>
-     </property>
      <property name="leftMargin">
       <number>0</number>
      </property>
@@ -77,7 +53,7 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>210</width>
+         <width>300</width>
          <height>0</height>
         </size>
        </property>
@@ -93,15 +69,9 @@
        <property name="textFormat">
         <enum>Qt::PlainText</enum>
        </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
        <property name="wordWrap">
         <bool>true</bool>
        </property>
-       <property name="indent">
-        <number>0</number>
-       </property>
       </widget>
      </item>
      <item row="0" column="1">
@@ -114,28 +84,19 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>210</width>
+         <width>300</width>
          <height>0</height>
         </size>
        </property>
-       <property name="lineWidth">
-        <number>0</number>
-       </property>
        <property name="text">
         <string>share label</string>
        </property>
        <property name="textFormat">
         <enum>Qt::PlainText</enum>
        </property>
-       <property name="alignment">
-        <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-       </property>
        <property name="wordWrap">
         <bool>true</bool>
        </property>
-       <property name="indent">
-        <number>0</number>
-       </property>
       </widget>
      </item>
      <item row="0" column="0" rowspan="2">
@@ -161,12 +122,6 @@
        <property name="text">
         <string>Icon</string>
        </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <property name="indent">
-        <number>0</number>
-       </property>
       </widget>
      </item>
     </layout>
@@ -192,6 +147,14 @@
       <bool>true</bool>
      </property>
      <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>340</width>
+        <height>45</height>
+       </rect>
+      </property>
       <layout class="QVBoxLayout" name="scrollAreaVerticalLayout"/>
      </widget>
     </widget>

From 6f145e3a801d57371365162a36134aba8a03e076 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sat, 17 Nov 2018 08:52:28 +0100
Subject: [PATCH 14/15] ShareUserGroupWidget: allow frame when scrollable

---
 src/gui/shareusergroupwidget.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/shareusergroupwidget.cpp b/src/gui/shareusergroupwidget.cpp
index ebdf24e62d..6f85809d91 100644
--- a/src/gui/shareusergroupwidget.cpp
+++ b/src/gui/shareusergroupwidget.cpp
@@ -209,6 +209,7 @@ void ShareUserGroupWidget::slotSharesFetched(const QList<QSharedPointer<Share>>
         }
     }
 
+    scrollArea->setFrameShape(x > 3 ? QFrame::StyledPanel : QFrame::NoFrame);
     scrollArea->setVisible(!shares.isEmpty());
     scrollArea->setFixedHeight(height);
     scrollArea->setWidget(newViewPort);
@@ -225,6 +226,7 @@ void ShareUserGroupWidget::slotAdjustScrollWidgetSize()
     if (count > 0 && count <= 3) {
         scrollArea->setFixedHeight(scrollArea->widget()->sizeHint().height());
     }
+    scrollArea->setFrameShape(count > 3 ? QFrame::StyledPanel : QFrame::NoFrame);
 }
 
 void ShareUserGroupWidget::slotPrivateLinkShare()

From d6170271e909a7f6313f0ed43c96ce4cd1841d52 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sat, 17 Nov 2018 09:24:45 +0100
Subject: [PATCH 15/15] ShareDialog: increase the width

To match the old width it had before the alignment work.
---
 src/gui/sharedialog.ui | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui
index 82b5053835..033c419a08 100644
--- a/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>360</width>
-    <height>120</height>
+    <width>372</width>
+    <height>150</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
@@ -53,7 +53,7 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>300</width>
+         <width>315</width>
          <height>0</height>
         </size>
        </property>
@@ -84,7 +84,7 @@
        </property>
        <property name="minimumSize">
         <size>
-         <width>300</width>
+         <width>315</width>
          <height>0</height>
         </size>
        </property>
@@ -151,8 +151,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>340</width>
-        <height>45</height>
+        <width>352</width>
+        <height>68</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="scrollAreaVerticalLayout"/>