Sharing: Handle "Enforce password" for public shares properly.

If a 403 is received from the attempt to create a public link, the
dialog shows the password field, as this is server enforced.

This fixes #2774

1 files changed, 65 insertions, 55 deletions

diff --git a/src/gui/sharedialog.ui b/src/gui/sharedialog.ui
index 7c66f14cf..fe5f012da 100644
--- a/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@ -6,15 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>281</width>
-    <height>385</height>
+    <width>362</width>
+    <height>401</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Share NewDocument.odt</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3">
-   <item row="0" column="0" colspan="2">
+  <layout class="QGridLayout" name="gridLayout_4">
+   <item row="0" column="0">
     <widget class="QGroupBox" name="groupBox">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -81,84 +81,101 @@
      </layout>
     </widget>
    </item>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_shareLink">
-     <item>
-      <widget class="QCheckBox" name="checkBox_shareLink">
-       <property name="text">
-        <string>Share link</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="0" colspan="2">
+   <item row="2" column="0">
     <widget class="QWidget" name="widget_shareLink" native="true">
-     <layout class="QVBoxLayout" name="verticalLayout_6">
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <property name="sizeConstraint">
-         <enum>QLayout::SetDefaultConstraint</enum>
-        </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="4" column="0">
+       <widget class="QCalendarWidget" name="calendar"/>
+      </item>
+      <item row="1" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_password">
         <item>
-         <widget class="QLineEdit" name="lineEdit_shareLink">
-          <property name="readOnly">
-           <bool>true</bool>
+         <widget class="QCheckBox" name="checkBox_password">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string/>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QPushButton" name="pushButton_copy">
+         <widget class="QLabel" name="label_password">
           <property name="text">
-           <string/>
+           <string>Set password</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_password">
+      <item row="3" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_expire">
         <item>
-         <widget class="QCheckBox" name="checkBox_password">
+         <widget class="QCheckBox" name="checkBox_expire">
           <property name="text">
-           <string>Set password</string>
+           <string>Set expiry date</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_14">
+      <item row="0" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetDefaultConstraint</enum>
+        </property>
         <item>
-         <widget class="QLineEdit" name="lineEdit_password">
-          <property name="echoMode">
-           <enum>QLineEdit::Password</enum>
+         <widget class="QLineEdit" name="lineEdit_shareLink">
+          <property name="readOnly">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_expire">
         <item>
-         <widget class="QCheckBox" name="checkBox_expire">
+         <widget class="QPushButton" name="pushButton_copy">
           <property name="text">
-           <string>Set expiry date</string>
+           <string/>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
-       <widget class="QCalendarWidget" name="calendar"/>
+      <item row="2" column="0">
+       <layout class="QHBoxLayout" name="horizontalLayout_14">
+        <item>
+         <widget class="QLineEdit" name="lineEdit_password">
+          <property name="echoMode">
+           <enum>QLineEdit::Password</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_shareLink">
+     <item>
+      <widget class="QCheckBox" name="checkBox_shareLink">
+       <property name="text">
+        <string>Share link</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="4" column="0">
+    <widget class="QLabel" name="errorLabel">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -171,13 +188,6 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="0">
-    <widget class="QLabel" name="errorLabel">
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>