--- a/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui Sun Nov 29 17:25:42 2015 +0100 +++ b/Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui Sun Nov 29 19:29:34 2015 +0100 @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>562</width> - <height>221</height> + <height>191</height> </rect> </property> <property name="windowTitle"> @@ -32,7 +32,7 @@ </property> </widget> </item> - <item row="0" column="1" colspan="2"> + <item row="0" column="1"> <widget class="QComboBox" name="protocolCombo"> <property name="toolTip"> <string>Select the protocol to access the repository</string> @@ -45,24 +45,26 @@ <string>&URL:</string> </property> <property name="buddy"> - <cstring>vcsUrlEdit</cstring> + <cstring>vcsUrlPicker</cstring> </property> </widget> </item> <item row="1" column="1"> - <widget class="QLineEdit" name="vcsUrlEdit"> + <widget class="E5PathPicker" name="vcsUrlPicker" 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 url path of the repository (without protocol part)</string> </property> </widget> </item> - <item row="1" column="2"> - <widget class="QToolButton" name="vcsUrlButton"> - <property name="toolTip"> - <string>Select the repository url via a directory selection dialog</string> - </property> - </widget> - </item> <item row="2" column="0"> <widget class="QLabel" name="vcsRevisionLabel"> <property name="text"> @@ -73,7 +75,7 @@ </property> </widget> </item> - <item row="2" column="1" colspan="2"> + <item row="2" column="1"> <widget class="QLineEdit" name="vcsRevisionEdit"> <property name="toolTip"> <string>Enter the revision the new project should be generated from</string> @@ -89,12 +91,21 @@ <string>Project &Directory:</string> </property> <property name="buddy"> - <cstring>vcsProjectDirEdit</cstring> + <cstring>vcsProjectDirPicker</cstring> </property> </widget> </item> <item row="3" column="1"> - <widget class="QLineEdit" name="vcsProjectDirEdit"> + <widget class="E5PathPicker" name="vcsProjectDirPicker" 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 directory of the new project.</string> </property> @@ -105,17 +116,14 @@ </property> </widget> </item> - <item row="3" column="2"> - <widget class="QToolButton" name="projectDirButton"/> - </item> - <item row="4" column="0" colspan="3"> + <item row="4" column="0" colspan="2"> <widget class="QCheckBox" name="largeCheckBox"> <property name="text"> <string>Download all versions of all large files</string> </property> </widget> </item> - <item row="5" column="0" colspan="3"> + <item row="5" column="0" colspan="2"> <widget class="QLabel" name="lfNoteLabel"> <property name="text"> <string><b>Note:</b> This option increases the download time and volume.</string> @@ -125,7 +133,7 @@ </property> </widget> </item> - <item row="6" column="0" colspan="3"> + <item row="6" column="0" colspan="2"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="orientation"> <enum>Qt::Horizontal</enum> @@ -139,15 +147,20 @@ </widget> <layoutdefault spacing="6" margin="6"/> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction> + <customwidgets> + <customwidget> + <class>E5PathPicker</class> + <extends>QWidget</extends> + <header>E5Gui/E5PathPicker.h</header> + <container>1</container> + </customwidget> + </customwidgets> <tabstops> <tabstop>protocolCombo</tabstop> - <tabstop>vcsUrlEdit</tabstop> - <tabstop>vcsUrlButton</tabstop> + <tabstop>vcsUrlPicker</tabstop> <tabstop>vcsRevisionEdit</tabstop> - <tabstop>vcsProjectDirEdit</tabstop> - <tabstop>projectDirButton</tabstop> + <tabstop>vcsProjectDirPicker</tabstop> <tabstop>largeCheckBox</tabstop> - <tabstop>buttonBox</tabstop> </tabstops> <resources/> <connections>