diff -r f0e48b3e31d4 -r 46be8d9c4dd8 Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui
--- a/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui Mon Nov 30 18:52:18 2015 +0100
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui Mon Nov 30 19:52:30 2015 +0100
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>562</width>
- <height>200</height>
+ <height>170</height>
</rect>
</property>
<property name="windowTitle">
@@ -21,122 +21,122 @@
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <layout class="QVBoxLayout">
- <item>
- <layout class="QGridLayout">
- <item row="2" column="1">
- <widget class="QLineEdit" name="vcsTagEdit">
- <property name="toolTip">
- <string>Enter the tag the new project should be generated from</string>
- </property>
- <property name="whatsThis">
- <string><b>Tag in VCS</b>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
+ <string>&Protocol:</string>
+ </property>
+ <property name="buddy">
+ <cstring>protocolCombo</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="protocolCombo">
+ <property name="toolTip">
+ <string>Select the protocol to access the repository</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="vcsUrlLabel">
+ <property name="text">
+ <string>&URL:</string>
+ </property>
+ <property name="buddy">
+ <cstring>vcsUrlPicker</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <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 module in the repository (without protocol part)</string>
+ </property>
+ <property name="whatsThis">
+ <string><b>URL</b><p>Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.</p></string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="vcsTagLabel">
+ <property name="text">
+ <string>&Tag:</string>
+ </property>
+ <property name="buddy">
+ <cstring>vcsTagEdit</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="vcsTagEdit">
+ <property name="toolTip">
+ <string>Enter the tag the new project should be generated from</string>
+ </property>
+ <property name="whatsThis">
+ <string><b>Tag in VCS</b>
<p>Enter the tag name the new project shall be generated from. Leave empty to retrieve the latest data from the repository.</p></string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="protocolCombo">
- <property name="toolTip">
- <string>Select the protocol to access the repository</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="textLabel1">
- <property name="text">
- <string>&Protocol:</string>
- </property>
- <property name="buddy">
- <cstring>protocolCombo</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="vcsUrlEdit">
- <property name="toolTip">
- <string>Enter the url path of the module in the repository (without protocol part)</string>
- </property>
- <property name="whatsThis">
- <string><b>URL</b><p>Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.</p></string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="vcsUrlLabel">
- <property name="text">
- <string>&URL:</string>
- </property>
- <property name="buddy">
- <cstring>vcsUrlEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="vcsProjectDirEdit">
- <property name="toolTip">
- <string>Enter the directory of the new project.</string>
- </property>
- <property name="whatsThis">
- <string><b>Project Directory</b>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="TextLabel4">
+ <property name="text">
+ <string>Project &Directory:</string>
+ </property>
+ <property name="buddy">
+ <cstring>vcsProjectDirPicker</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <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>
+ <property name="whatsThis">
+ <string><b>Project Directory</b>
<p>Enter the directory of the new project. It will be retrieved from
the repository and be placed in this directory.</p></string>
- </property>
- </widget>
- </item>
- <item row="4" column="0" colspan="2">
- <widget class="QCheckBox" name="layoutCheckBox">
- <property name="toolTip">
- <string>Select to indicate, that the repository has a standard layout (projectdir/trunk, projectdir/tags, projectdir/branches)</string>
- </property>
- <property name="text">
- <string>Repository has standard &layout</string>
- </property>
- <property name="shortcut">
- <string>Alt+L</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="TextLabel4">
- <property name="text">
- <string>Project &Directory:</string>
- </property>
- <property name="buddy">
- <cstring>vcsProjectDirEdit</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="vcsTagLabel">
- <property name="text">
- <string>&Tag:</string>
- </property>
- <property name="buddy">
- <cstring>vcsTagEdit</cstring>
- </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 or the repository browser</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QToolButton" name="projectDirButton">
- <property name="toolTip">
- <string>Select the project directory via a directory selection dialog</string>
- </property>
- </widget>
- </item>
- </layout>
+ </property>
+ </widget>
</item>
- <item>
+ <item row="4" column="0" colspan="2">
+ <widget class="QCheckBox" name="layoutCheckBox">
+ <property name="toolTip">
+ <string>Select to indicate, that the repository has a standard layout (projectdir/trunk, projectdir/tags, projectdir/branches)</string>
+ </property>
+ <property name="text">
+ <string>Repository has standard &layout</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+L</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -150,13 +150,19 @@
</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>vcsTagEdit</tabstop>
- <tabstop>vcsProjectDirEdit</tabstop>
- <tabstop>projectDirButton</tabstop>
+ <tabstop>vcsProjectDirPicker</tabstop>
<tabstop>layoutCheckBox</tabstop>
</tabstops>
<resources/>
