--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Mon Nov 12 17:46:11 2012 +0100 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.ui Mon Nov 12 19:04:11 2012 +0100 @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>SvnLogBrowserDialog</class> - <widget class="QDialog" name="SvnLogBrowserDialog" > - <property name="geometry" > + <widget class="QDialog" name="SvnLogBrowserDialog"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,267 +10,260 @@ <height>600</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Subversion Log</string> </property> - <property name="sizeGripEnabled" > + <property name="sizeGripEnabled"> <bool>true</bool> </property> - <layout class="QVBoxLayout" > + <layout class="QVBoxLayout"> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QLabel" name="label" > - <property name="text" > + <widget class="QLabel" name="label"> + <property name="text"> <string>From:</string> </property> </widget> </item> <item> - <widget class="QDateEdit" name="fromDate" > - <property name="toolTip" > + <widget class="QDateEdit" name="fromDate"> + <property name="toolTip"> <string>Enter the start date</string> </property> - <property name="calendarPopup" > + <property name="calendarPopup"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QLabel" name="label_2" > - <property name="text" > + <widget class="QLabel" name="label_2"> + <property name="text"> <string>To:</string> </property> </widget> </item> <item> - <widget class="QDateEdit" name="toDate" > - <property name="toolTip" > + <widget class="QDateEdit" name="toDate"> + <property name="toolTip"> <string>Enter the end date</string> </property> - <property name="calendarPopup" > + <property name="calendarPopup"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QComboBox" name="fieldCombo" > - <property name="toolTip" > + <widget class="QComboBox" name="fieldCombo"> + <property name="toolTip"> <string>Select the field to filter on</string> </property> <item> - <property name="text" > + <property name="text"> <string>Revision</string> </property> </item> <item> - <property name="text" > + <property name="text"> <string>Author</string> </property> </item> <item> - <property name="text" > + <property name="text"> <string>Message</string> </property> </item> </widget> </item> <item> - <widget class="QLineEdit" name="rxEdit" > - <property name="toolTip" > + <widget class="E5ClearableLineEdit" name="rxEdit"> + <property name="toolTip"> <string>Enter the regular expression to filter on</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="clearRxEditButton" > - <property name="text" > - <string/> - </property> - </widget> - </item> </layout> </item> <item> - <widget class="QTreeWidget" name="logTree" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <widget class="QTreeWidget" name="logTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>5</verstretch> </sizepolicy> </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="itemsExpandable" > + <property name="itemsExpandable"> <bool>false</bool> </property> - <property name="sortingEnabled" > + <property name="sortingEnabled"> <bool>true</bool> </property> - <property name="allColumnsShowFocus" > + <property name="allColumnsShowFocus"> <bool>true</bool> </property> <column> - <property name="text" > + <property name="text"> <string>Revision</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Author</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Date</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Message</string> </property> </column> </widget> </item> <item> - <widget class="QTextEdit" name="messageEdit" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <widget class="QTextEdit" name="messageEdit"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>2</verstretch> </sizepolicy> </property> - <property name="readOnly" > + <property name="readOnly"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QTreeWidget" name="filesTree" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > + <widget class="QTreeWidget" name="filesTree"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <horstretch>0</horstretch> <verstretch>3</verstretch> </sizepolicy> </property> - <property name="alternatingRowColors" > + <property name="alternatingRowColors"> <bool>true</bool> </property> - <property name="rootIsDecorated" > + <property name="rootIsDecorated"> <bool>false</bool> </property> - <property name="itemsExpandable" > + <property name="itemsExpandable"> <bool>false</bool> </property> - <property name="sortingEnabled" > + <property name="sortingEnabled"> <bool>true</bool> </property> - <property name="allColumnsShowFocus" > + <property name="allColumnsShowFocus"> <bool>true</bool> </property> <column> - <property name="text" > + <property name="text"> <string>Action</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Path</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Copy from</string> </property> </column> <column> - <property name="text" > + <property name="text"> <string>Copy from Rev</string> </property> </column> </widget> </item> <item> - <layout class="QHBoxLayout" > + <layout class="QHBoxLayout"> <item> - <widget class="QPushButton" name="nextButton" > - <property name="toolTip" > + <widget class="QPushButton" name="nextButton"> + <property name="toolTip"> <string>Press to get the next bunch of log entries</string> </property> - <property name="text" > + <property name="text"> <string>&Next</string> </property> </widget> </item> <item> - <widget class="QSpinBox" name="limitSpinBox" > - <property name="toolTip" > + <widget class="QSpinBox" name="limitSpinBox"> + <property name="toolTip"> <string>Enter the limit of entries to fetch</string> </property> - <property name="alignment" > + <property name="alignment"> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> - <property name="minimum" > + <property name="minimum"> <number>1</number> </property> - <property name="maximum" > + <property name="maximum"> <number>10000</number> </property> - <property name="value" > + <property name="value"> <number>100</number> </property> </widget> </item> <item> - <widget class="QCheckBox" name="stopCheckBox" > - <property name="toolTip" > + <widget class="QCheckBox" name="stopCheckBox"> + <property name="toolTip"> <string>Select to stop listing log messages at a copy or move</string> </property> - <property name="text" > + <property name="text"> <string>Stop on Copy/Move</string> </property> </widget> </item> <item> - <widget class="Line" name="line" > - <property name="orientation" > + <widget class="Line" name="line"> + <property name="orientation"> <enum>Qt::Vertical</enum> </property> </widget> </item> <item> - <widget class="QPushButton" name="diffPreviousButton" > - <property name="toolTip" > + <widget class="QPushButton" name="diffPreviousButton"> + <property name="toolTip"> <string>Press to generate a diff to the previous revision</string> </property> - <property name="text" > + <property name="text"> <string>&Diff to Previous</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="diffRevisionsButton" > - <property name="toolTip" > + <widget class="QPushButton" name="diffRevisionsButton"> + <property name="toolTip"> <string>Press to compare two revisions</string> </property> - <property name="text" > + <property name="text"> <string>&Compare Revisions</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeHint" stdset="0" > + <property name="sizeHint" stdset="0"> <size> <width>91</width> <height>29</height> @@ -280,17 +274,24 @@ </layout> </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> + <customwidgets> + <customwidget> + <class>E5ClearableLineEdit</class> + <extends>QLineEdit</extends> + <header>E5Gui/E5LineEdit.h</header> + </customwidget> + </customwidgets> <tabstops> <tabstop>fromDate</tabstop> <tabstop>toDate</tabstop> @@ -305,7 +306,6 @@ <tabstop>diffPreviousButton</tabstop> <tabstop>diffRevisionsButton</tabstop> <tabstop>buttonBox</tabstop> - <tabstop>clearRxEditButton</tabstop> </tabstops> <resources/> <connections/>