Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui	Thu Dec 03 19:11:22 2015 +0100
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui	Sat Dec 05 12:23:39 2015 +0100
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>565</width>
-    <height>169</height>
+    <height>149</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -21,96 +21,94 @@
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout">
-   <item>
-    <layout class="QGridLayout">
-     <item row="2" column="0">
-      <widget class="QLabel" name="TextLabel5">
-       <property name="text">
-        <string>Log &amp;Message:</string>
-       </property>
-       <property name="buddy">
-        <cstring>vcsLogEdit</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0" colspan="2">
-      <widget class="QCheckBox" name="layoutCheckBox">
-       <property name="toolTip">
-        <string>Select, if the standard repository layout (projectdir/trunk, projectdir/tags, projectdir/branches) should be generated</string>
-       </property>
-       <property name="text">
-        <string>Create standard repository &amp;layout</string>
-       </property>
-       <property name="shortcut">
-        <string>Alt+L</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </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>&amp;URL:</string>
-       </property>
-       <property name="buddy">
-        <cstring>vcsUrlEdit</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <widget class="QLineEdit" name="vcsLogEdit">
-       <property name="toolTip">
-        <string>Enter the log message for the new project.</string>
-       </property>
-       <property name="whatsThis">
-        <string>&lt;b&gt;Log Message&lt;/b&gt;
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="textLabel1">
+     <property name="text">
+      <string>&amp;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>&amp;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>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.&lt;/p&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="TextLabel5">
+     <property name="text">
+      <string>Log &amp;Message:</string>
+     </property>
+     <property name="buddy">
+      <cstring>vcsLogEdit</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="vcsLogEdit">
+     <property name="toolTip">
+      <string>Enter the log message for the new project.</string>
+     </property>
+     <property name="whatsThis">
+      <string>&lt;b&gt;Log Message&lt;/b&gt;
 &lt;p&gt;Enter the log message to be used for the new project.&lt;/p&gt;</string>
-       </property>
-       <property name="text">
-        <string>new project started</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QLabel" name="textLabel1">
-       <property name="text">
-        <string>&amp;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>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.&lt;/p&gt;</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 or the repository browser</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     </property>
+     <property name="text">
+      <string>new project started</string>
+     </property>
+    </widget>
    </item>
-   <item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QCheckBox" name="layoutCheckBox">
+     <property name="toolTip">
+      <string>Select, if the standard repository layout (projectdir/trunk, projectdir/tags, projectdir/branches) should be generated</string>
+     </property>
+     <property name="text">
+      <string>Create standard repository &amp;layout</string>
+     </property>
+     <property name="shortcut">
+      <string>Alt+L</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -124,10 +122,17 @@
  </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>vcsLogEdit</tabstop>
   <tabstop>layoutCheckBox</tabstop>
  </tabstops>