--- a/UI/CompareDialog.ui Sun Nov 29 13:21:15 2015 +0100 +++ b/UI/CompareDialog.ui Sun Nov 29 14:33:38 2015 +0100 @@ -17,72 +17,64 @@ <item> <widget class="QGroupBox" name="filesGroup"> <property name="title"> - <string/> + <string>Files to be compared:</string> </property> <property name="flat"> <bool>true</bool> </property> - <layout class="QHBoxLayout" name="horizontalLayout_3"> - <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> + <layout class="QHBoxLayout" name="horizontalLayout_2"> <item> <widget class="QLabel" name="textLabel1"> <property name="text"> <string>File &1:</string> </property> <property name="buddy"> - <cstring>file1Edit</cstring> + <cstring>file1Picker</cstring> </property> </widget> </item> <item> - <widget class="QLineEdit" name="file1Edit"> + <widget class="E5PathPicker" name="file1Picker" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> <property name="toolTip"> <string>Enter the name of the first file</string> </property> </widget> </item> <item> - <widget class="QToolButton" name="file1Button"> - <property name="toolTip"> - <string>Press to select the file via a file selection dialog</string> - </property> - </widget> - </item> - <item> <widget class="QLabel" name="textLabel2"> <property name="text"> <string>File &2:</string> </property> <property name="buddy"> - <cstring>file1Edit</cstring> + <cstring>file2Picker</cstring> </property> </widget> </item> <item> - <widget class="QLineEdit" name="file2Edit"> + <widget class="E5PathPicker" name="file2Picker" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> <property name="toolTip"> <string>Enter the name of the second file</string> </property> </widget> </item> - <item> - <widget class="QToolButton" name="file2Button"> - <property name="toolTip"> - <string>Press to select the file via a file selection dialog</string> - </property> - </widget> - </item> </layout> </widget> </item> @@ -290,16 +282,22 @@ </item> </layout> </widget> + <customwidgets> + <customwidget> + <class>E5PathPicker</class> + <extends>QWidget</extends> + <header>E5Gui/E5PathPicker.h</header> + <container>1</container> + </customwidget> + </customwidgets> <tabstops> - <tabstop>file1Edit</tabstop> - <tabstop>file1Button</tabstop> - <tabstop>file2Edit</tabstop> - <tabstop>file2Button</tabstop> - <tabstop>synchronizeCheckBox</tabstop> + <tabstop>file1Picker</tabstop> + <tabstop>file2Picker</tabstop> <tabstop>firstButton</tabstop> <tabstop>upButton</tabstop> <tabstop>downButton</tabstop> <tabstop>lastButton</tabstop> + <tabstop>synchronizeCheckBox</tabstop> </tabstops> <resources/> <connections>