diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2014-12-02 15:37:22 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2014-12-02 15:37:22 +0300 |
| commit | 3016844dd7a2889ef8a24e6e3352b060907f439d (patch) | |
| tree | 92dc48f91db231fc341aa3f4d1b7a5e3ae33d398 /src/gui/settingsdialog.ui | |
| parent | 281c0e155348c5e1da2d08f3147107d0bc32ff9f (diff) | |
| parent | 3f5887cc0305c9d5d6824604a1aabdda4f36b727 (diff) | |
Merge branch 'master' into rename_client
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
Diffstat (limited to 'src/gui/settingsdialog.ui')
| -rw-r--r-- | src/gui/settingsdialog.ui | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/gui/settingsdialog.ui b/src/gui/settingsdialog.ui index 4acc77fb2..cdabf661f 100644 --- a/src/gui/settingsdialog.ui +++ b/src/gui/settingsdialog.ui @@ -14,26 +14,22 @@ <string>Settings</string> </property> <layout class="QGridLayout" name="gridLayout"> - <property name="margin"> + <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> <property name="spacing"> <number>0</number> </property> - <item row="0" column="0" rowspan="2"> - <widget class="QListWidget" name="labelWidget"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Expanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QStackedWidget" name="stack"/> - </item> - <item row="1" column="1"> + <item row="1" column="0"> <widget class="QWidget" name="widget" native="true"> <layout class="QVBoxLayout" name="verticalLayout"> <property name="leftMargin"> @@ -55,6 +51,9 @@ </layout> </widget> </item> + <item row="0" column="0"> + <widget class="QStackedWidget" name="stack"/> + </item> </layout> </widget> <resources/> |