--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui Sat Feb 26 14:28:21 2011 +0100 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui Sat Feb 26 18:14:12 2011 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnStatusDialog</class> - <widget class="QWidget" name="SvnStatusDialog" > - <property name="geometry" > + <widget class="QWidget" name="SvnStatusDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,120 +10,233 @@ <height>646</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Subversion Status</string> </property> - <property name="whatsThis" > - <string><b>Subversion Status</b> -<p>This dialog shows the status of the selected file or project.</p></string> + <property name="whatsThis"> + <string><b>Subversion 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> - <widget class="QTreeWidget" name="statusList" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <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> </sizepolicy> </property> - <property name="focusPolicy" > - <enum>Qt::NoFocus</enum> - </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="selectionMode" > + <property name="selectionMode"> <enum>QAbstractItemView::ExtendedSelection</enum> </property> - <property name="rootIsDecorated" > + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="sortingEnabled" > + <property name="sortingEnabled"> <bool>true</bool> </property> <column> - <property name="text" > + <property name="text"> + <string>Commit</string> + </property> + </column> + <column> + <property name="text"> <string>Changelist</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Status</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Prop. Status</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Locked</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>History</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Switched</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Lock Info</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Up to date</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Revision</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Last Change</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Author</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Path</string> </property> </column> </widget> </item> <item> - <widget class="QGroupBox" name="errorGroup" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > + <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="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"> <horstretch>0</horstretch> <verstretch>1</verstretch> </sizepolicy> </property> - <property name="title" > + <property name="title"> <string>Errors</string> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <widget class="QTextEdit" name="errors" > - <property name="focusPolicy" > + <widget class="QTextEdit" name="errors"> + <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> - <property name="acceptRichText" > + <property name="acceptRichText"> <bool>false</bool> </property> </widget> @@ -131,20 +245,20 @@ </widget> </item> <item> - <widget class="QGroupBox" name="inputGroup" > - <property name="title" > + <widget class="QGroupBox" name="inputGroup"> + <property name="title"> <string>Input</string> </property> - <layout class="QGridLayout" > - <item row="1" column="1" > + <layout class="QGridLayout"> + <item row="1" column="1"> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Expanding</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>327</width> <height>29</height> @@ -152,35 +266,35 @@ </property> </spacer> </item> - <item row="1" column="2" > - <widget class="QPushButton" name="sendButton" > - <property name="toolTip" > + <item row="1" column="2"> + <widget class="QPushButton" name="sendButton"> + <property name="toolTip"> <string>Press to send the input to the subversion process</string> </property> - <property name="text" > + <property name="text"> <string>&Send</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+S</string> </property> </widget> </item> - <item row="0" column="0" colspan="3" > - <widget class="QLineEdit" name="input" > - <property name="toolTip" > + <item row="0" column="0" colspan="3"> + <widget class="QLineEdit" name="input"> + <property name="toolTip"> <string>Enter data to be sent to the subversion process</string> </property> </widget> </item> - <item row="1" column="0" > - <widget class="QCheckBox" name="passwordCheckBox" > - <property name="toolTip" > + <item row="1" column="0"> + <widget class="QCheckBox" name="passwordCheckBox"> + <property name="toolTip"> <string>Select to switch the input field to password mode</string> </property> - <property name="text" > + <property name="text"> <string>&Password Mode</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+P</string> </property> </widget> @@ -189,23 +303,31 @@ </widget> </item> <item> - <widget class="QDialogButtonBox" name="buttonBox" > - <property name="orientation" > + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="standardButtons" > + <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Close</set> </property> </widget> </item> </layout> </widget> - <layoutdefault spacing="6" margin="11" /> + <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>restoreButton</tabstop> <tabstop>input</tabstop> + <tabstop>passwordCheckBox</tabstop> <tabstop>sendButton</tabstop> - <tabstop>passwordCheckBox</tabstop> + <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections/>