Merge branch 'master' into recipientnote

diff --cc src/gui/sharedialog.ui
index cb49c7cb8f2a84a53b4b13ccf1d9185de1718aa4,7cdabd9386ccb422dd617eb094a5c24f5a776fd4..267c2cbd207a330e9f2760b2911161ca26fa4853
--- 1/src/gui/sharedialog.ui
--- 2/src/gui/sharedialog.ui
+++ b/src/gui/sharedialog.ui
@@@ -124,33 -82,83 +124,94 @@@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
 -       <property name="minimumSize">
 -        <size>
 -         <width>315</width>
 -         <height>0</height>
 -        </size>
 +       <property name="frameShape">
 +        <enum>QFrame::NoFrame</enum>
 +       </property>
 +       <property name="horizontalScrollBarPolicy">
 +        <enum>Qt::ScrollBarAlwaysOff</enum>
         </property>
 -       <property name="textFormat">
 -        <enum>Qt::PlainText</enum>
+        <property name="text">
+         <string notr="true">share label</string>
+        </property>
 +       <property name="sizeAdjustPolicy">
 +        <enum>QAbstractScrollArea::AdjustIgnored</enum>
         </property>
 -       <property name="wordWrap">
 +       <property name="widgetResizable">
          <bool>true</bool>
         </property>
 +       <widget class="QWidget" name="scrollAreaWidgetContents">
 +        <property name="geometry">
 +         <rect>
 +          <x>0</x>
 +          <y>0</y>
 +          <width>69</width>
 +          <height>69</height>
 +         </rect>
 +        </property>
 +        <layout class="QVBoxLayout" name="scrollAreaVerticalLayout"/>
 +       </widget>
        </widget>
       </item>
+      <item row="0" column="0" rowspan="2">
+       <widget class="QLabel" name="label_icon">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>40</width>
+          <height>40</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>16777215</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string notr="true">Icon</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </item>
+    <item>
+     <widget class="QScrollArea" name="scrollArea">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="horizontalScrollBarPolicy">
+       <enum>Qt::ScrollBarAlwaysOff</enum>
+      </property>
+      <property name="sizeAdjustPolicy">
+       <enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
+      </property>
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="scrollAreaWidgetContents">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>367</width>
+         <height>85</height>
+        </rect>
+       </property>
+       <layout class="QVBoxLayout" name="scrollAreaVerticalLayout"/>
+      </widget>
+     </widget>
+    </item>
    </layout>
   </widget>
   <resources/>

diff --cc src/gui/sharelinkwidget.ui
index 9f79dad7f115831cb2b2ffb95041efb3fb45d84e,b1a3dcf762b455dd5de805fdbea27e9af0687ebd..a525224bcb22cc0a6446539129d3567f9aef7644
--- 1/src/gui/sharelinkwidget.ui
--- 2/src/gui/sharelinkwidget.ui
+++ b/src/gui/sharelinkwidget.ui
@@@ -16,26 -16,166 +16,165 @@@
      <verstretch>0</verstretch>
     </sizepolicy>
    </property>
 +  <layout class="QVBoxLayout" name="verticalLayout">
 +   <item>
+   <layout class="QGridLayout" name="gridLayout">
+    <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 row="2" column="1">
+     <widget class="QDateEdit" name="calendar">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </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="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="3" column="0" colspan="4">
+     <widget class="QLabel" name="errorLabel">
+      <property name="palette">
+       <palette>
+        <active>
+         <colorrole role="WindowText">
+          <brush brushstyle="SolidPattern">
+           <color alpha="255">
+            <red>255</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </brush>
+         </colorrole>
+        </active>
+        <inactive>
+         <colorrole role="WindowText">
+          <brush brushstyle="SolidPattern">
+           <color alpha="255">
+            <red>255</red>
+            <green>0</green>
+            <blue>0</blue>
+           </color>
+          </brush>
+         </colorrole>
+        </inactive>
+        <disabled>
+         <colorrole role="WindowText">
+          <brush brushstyle="SolidPattern">
+           <color alpha="255">
+            <red>123</red>
+            <green>121</green>
+            <blue>134</blue>
+           </color>
+          </brush>
+         </colorrole>
+        </disabled>
+       </palette>
+      </property>
+      <property name="text">
+       <string notr="true">TextLabel</string>
+      </property>
+      <property name="textFormat">
+       <enum>Qt::PlainText</enum>
+      </property>
+      <property name="wordWrap">
+       <bool>true</bool>
+      </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="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="autoRaise">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <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>
 +      <widget class="QLabel" name="shareLinkIconLabel">
         <property name="text">
 -        <string>&amp;Share link</string>
 +        <string notr="true"/>
         </property>
 -       <property name="icon">
 -        <iconset resource="../../client.qrc">
 -         <normaloff>:/client/resources/public.svg</normaloff>:/client/resources/public.svg</iconset>
 +       <property name="pixmap">
 +        <pixmap resource="../../client.qrc">:/client/resources/public.svg</pixmap>
         </property>
 -       <property name="flat">
 -        <bool>true</bool>
 +       <property name="alignment">
 +        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
 +       </property>
 +      </widget>
 +     </item>
 +     <item>
 +      <widget class="QLabel" name="shareLinkLabel">
 +       <property name="text">
 +        <string>Share link</string>
         </property>
        </widget>
       </item>