diff options
author | Jonathan Klimt <jounathaen@mail.de> | 2016-11-17 17:28:50 +0100 |
---|---|---|
committer | Jonathan Klimt <jounathaen@mail.de> | 2016-11-17 17:28:50 +0100 |
commit | b6dc6fe69b697ca703220bec02a3b2e3ce7fd4c3 (patch) | |
tree | 247cfb9f23c828d8e530afe3147c73a13b94a7bc /mainwindow.ui | |
parent | 81287f0af4fe41328a9483a18f41c3d7a6bdbfe5 (diff) | |
parent | f79de899889e95c4f03e19eb03071ead572ce882 (diff) |
Merged with Master
Diffstat (limited to 'mainwindow.ui')
-rw-r--r-- | mainwindow.ui | 51 |
1 files changed, 9 insertions, 42 deletions
diff --git a/mainwindow.ui b/mainwindow.ui index 8f77a51f..37df3002 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -212,7 +212,7 @@ <enum>Qt::Horizontal</enum> </property> <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> + <enum>QSizePolicy::MinimumExpanding</enum> </property> <property name="sizeHint" stdset="0"> <size> @@ -223,40 +223,9 @@ </spacer> </item> <item> - <widget class="QToolButton" name="copyPasswordButton"> - <property name="toolTip"> - <string>Copy Password</string> - </property> - <property name="text"> - <string>Copy Password</string> - </property> - <property name="icon"> - <iconset theme="edit-copy"> - <normalon>:/icons/edit-copy.svg</normalon> - </iconset> - </property> - <property name="toolButtonStyle"> - <enum>Qt::ToolButtonTextBesideIcon</enum> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_4"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>100</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> <widget class="QComboBox" name="profileBox"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -267,6 +236,12 @@ <height>26</height> </size> </property> + <property name="maximumSize"> + <size> + <width>100000</width> + <height>16777215</height> + </size> + </property> </widget> </item> </layout> @@ -378,14 +353,7 @@ </spacer> </item> <item> - <layout class="QFormLayout" name="formLayout"> - <property name="fieldGrowthPolicy"> - <enum>QFormLayout::AllNonFixedFieldsGrow</enum> - </property> - <property name="labelAlignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> - </property> - </layout> + <layout class="QGridLayout" name="gridLayout"/> </item> <item> <widget class="QTextBrowser" name="textBrowser"> @@ -506,7 +474,6 @@ p, li { white-space: pre-wrap; } <tabstop>updateButton</tabstop> <tabstop>usersButton</tabstop> <tabstop>configButton</tabstop> - <tabstop>copyPasswordButton</tabstop> <tabstop>profileBox</tabstop> </tabstops> <resources> |