Mercurial Repositories > eric / file diff

diff -r a258569d44db -r e79a139aacc4 Preferences/ConfigurationPages/QtPage.ui
--- a/Preferences/ConfigurationPages/QtPage.ui	Thu Nov 26 19:47:09 2015 +0100
+++ b/Preferences/ConfigurationPages/QtPage.ui	Fri Nov 27 20:06:52 2015 +0100
@@ -10,7 +10,7 @@
     <height>614</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -36,22 +36,31 @@
      <property name="title">
       <string>Qt Translations Directory</string>
      </property>
-     <layout class="QGridLayout">
-      <item row="1" column="0">
-       <widget class="QLineEdit" name="qt4TransEdit">
-        <property name="toolTip">
-         <string>Enter the path of the Qt translations directory.</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" colspan="2">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
        <widget class="QLabel" name="TextLabel1_2_2_5">
         <property name="text">
          <string>&lt;font color=&quot;#FF0000&quot;&gt;&lt;b&gt;Note:&lt;/b&gt; This setting is activated at the next startup of the application.&lt;/font&gt;</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="2">
+      <item>
+       <widget class="E5PathPicker" name="qt4TransPicker" 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 path of the Qt translations directory.</string>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QLabel" name="textLabel1_2_4">
         <property name="text">
          <string>&lt;b&gt;Note:&lt;/b&gt; Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</string>
@@ -61,13 +70,6 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QToolButton" name="qt4TransButton">
-        <property name="toolTip">
-         <string>Press to select the Qt translations directory via a directory selection dialog</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -204,9 +206,16 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>E5PathPicker</class>
+   <extends>QWidget</extends>
+   <header>E5Gui/E5PathPicker.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
-  <tabstop>qt4TransEdit</tabstop>
-  <tabstop>qt4TransButton</tabstop>
+  <tabstop>qt4TransPicker</tabstop>
   <tabstop>qt4PrefixEdit</tabstop>
   <tabstop>qt4PostfixEdit</tabstop>
   <tabstop>pyuicIndentSpinBox</tabstop>