diff -r 9482a0ded319 -r b940eafe6984 Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui --- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui Sat Feb 11 15:35:07 2017 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui Sat Feb 11 17:20:39 2017 +0100 @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>950</width> - <height>650</height> + <width>1000</width> + <height>700</height> </rect> </property> <property name="windowTitle"> @@ -19,6 +19,43 @@ </property> <layout class="QVBoxLayout" name="verticalLayout_3"> <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>&Filter on Status:</string> + </property> + <property name="buddy"> + <cstring>statusFilterCombo</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="statusFilterCombo"> + <property name="toolTip"> + <string>Select the status of entries to be shown</string> + </property> + <property name="sizeAdjustPolicy"> + <enum>QComboBox::AdjustToContents</enum> + </property> + </widget> + </item> + </layout> + </item> + <item> <widget class="QSplitter" name="diffSplitter"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> @@ -29,63 +66,17 @@ <property name="orientation"> <enum>Qt::Vertical</enum> </property> - <widget class="QWidget" name="statusWidget" native="true"> + <property name="childrenCollapsible"> + <bool>false</bool> + </property> + <widget class="QWidget" name=""> <layout class="QVBoxLayout" name="verticalLayout"> - <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> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>&Filter on Status:</string> - </property> - <property name="buddy"> - <cstring>statusFilterCombo</cstring> - </property> - </widget> - </item> - <item> - <widget class="QComboBox" name="statusFilterCombo"> - <property name="toolTip"> - <string>Select the status of entries to be shown</string> - </property> - <property name="sizeAdjustPolicy"> - <enum>QComboBox::AdjustToContents</enum> - </property> - </widget> - </item> - </layout> - </item> <item> <widget class="QTreeWidget" name="statusList"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> - <verstretch>3</verstretch> + <verstretch>0</verstretch> </sizepolicy> </property> <property name="alternatingRowColors"> @@ -212,24 +203,9 @@ </layout> </item> </layout> - <zorder>statusList</zorder> - <zorder></zorder> - <zorder></zorder> </widget> - <widget class="QWidget" name="diffWidget" native="true"> + <widget class="QWidget" name=""> <layout class="QVBoxLayout" name="verticalLayout_2"> - <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> <widget class="QLabel" name="label_2"> <property name="text"> @@ -242,7 +218,7 @@ <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> - <verstretch>1</verstretch> + <verstretch>0</verstretch> </sizepolicy> </property> <property name="tabChangesFocus"> @@ -358,7 +334,6 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> <tabstop>statusFilterCombo</tabstop>