--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui Sat Feb 26 14:28:21 2011 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui Sat Feb 26 18:14:12 2011 +0100 @@ -17,7 +17,44 @@ <string><b>Mercurial Status</b> <p>This dialog shows the status of the selected file or project.</p></string> </property> - <layout class="QVBoxLayout"> + <layout class="QVBoxLayout" name="verticalLayout"> + <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"> @@ -26,9 +63,6 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <property name="focusPolicy"> - <enum>Qt::NoFocus</enum> - </property> <property name="alternatingRowColors"> <bool>true</bool> </property> @@ -43,6 +77,11 @@ </property> <column> <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> <string>Status</string> </property> </column> @@ -54,6 +93,90 @@ </widget> </item> <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="commitButton"> + <property name="toolTip"> + <string>Commit the selected changes</string> + </property> + <property name="text"> + <string>&Commit</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="addButton"> + <property name="toolTip"> + <string>Add the selected entries to the repository</string> + </property> + <property name="text"> + <string>&Add</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="diffButton"> + <property name="toolTip"> + <string>Show differences of the selected entries to the repository</string> + </property> + <property name="text"> + <string>&Differences</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="revertButton"> + <property name="toolTip"> + <string>Revert the selected entries to the last revision in the repository</string> + </property> + <property name="text"> + <string>Re&vert</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="forgetButton"> + <property name="toolTip"> + <string>Forget about the selected missing entries</string> + </property> + <property name="text"> + <string>For&get</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="restoreButton"> + <property name="toolTip"> + <string>Restore the selected missing entries from the repository</string> + </property> + <property name="text"> + <string>&Restore</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> <widget class="QGroupBox" name="errorGroup"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> @@ -154,9 +277,18 @@ <layoutdefault spacing="6" margin="11"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <tabstops> + <tabstop>statusFilterCombo</tabstop> + <tabstop>statusList</tabstop> + <tabstop>commitButton</tabstop> + <tabstop>addButton</tabstop> + <tabstop>diffButton</tabstop> + <tabstop>revertButton</tabstop> + <tabstop>forgetButton</tabstop> + <tabstop>restoreButton</tabstop> <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> <tabstop>sendButton</tabstop> - <tabstop>passwordCheckBox</tabstop> + <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/>