diff options
author | Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> | 2019-10-29 16:07:26 +0300 |
---|---|---|
committer | Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> | 2019-10-29 16:07:26 +0300 |
commit | 7ed03f1f29394b6e5ce26f96290ebc18a6b2b7c4 (patch) | |
tree | 9d362332f0c3dbbaea6d7e976b591ec399cf14c7 /src/gui/sharelinkwidget.ui | |
parent | 530147774732d2b83a02c5ed00b14da223ce9665 (diff) |
resolving conflict with current master
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
Diffstat (limited to 'src/gui/sharelinkwidget.ui')
-rw-r--r-- | src/gui/sharelinkwidget.ui | 139 |
1 files changed, 0 insertions, 139 deletions
diff --git a/src/gui/sharelinkwidget.ui b/src/gui/sharelinkwidget.ui index a525224bc..9f79dad7f 100644 --- a/src/gui/sharelinkwidget.ui +++ b/src/gui/sharelinkwidget.ui @@ -18,145 +18,6 @@ </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="QLabel" name="shareLinkIconLabel"> |