Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/HelpViewersPage.ui	Thu Nov 26 19:47:09 2015 +0100
+++ b/Preferences/ConfigurationPages/HelpViewersPage.ui	Fri Nov 27 20:06:52 2015 +0100
@@ -36,38 +36,17 @@
      <property name="title">
       <string>Help Viewer</string>
      </property>
-     <layout class="QGridLayout">
-      <item row="1" column="0" colspan="4">
-       <layout class="QHBoxLayout">
-        <item>
-         <widget class="QLineEdit" name="customViewerEdit">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="toolTip">
-           <string>Enter the custom viewer to be used</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QToolButton" name="customViewerSelectionButton">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="toolTip">
-           <string>Press to select the custom viewer via a file selection dialog</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="3">
-       <widget class="QRadioButton" name="customViewerButton">
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="helpBrowserButton">
         <property name="toolTip">
-         <string>Select to use a custom viewer</string>
+         <string>Select to use the Eric Web Browser</string>
         </property>
         <property name="text">
-         <string>Custom</string>
+         <string>Eric Web Browser</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
@@ -81,19 +60,6 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="helpBrowserButton">
-        <property name="toolTip">
-         <string>Select to use the Eric Web Browser</string>
-        </property>
-        <property name="text">
-         <string>Eric Web Browser</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="2">
        <widget class="QRadioButton" name="webBrowserButton">
         <property name="toolTip">
@@ -104,6 +70,35 @@
         </property>
        </widget>
       </item>
+      <item row="0" column="3">
+       <widget class="QRadioButton" name="customViewerButton">
+        <property name="toolTip">
+         <string>Select to use a custom viewer</string>
+        </property>
+        <property name="text">
+         <string>Custom</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="4">
+       <widget class="E5PathPicker" name="customViewerPicker" native="true">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <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 custom viewer to be used</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -122,29 +117,35 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>E5PathPicker</class>
+   <extends>QWidget</extends>
+   <header>E5Gui/E5PathPicker.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>helpBrowserButton</tabstop>
   <tabstop>qtAssistantButton</tabstop>
   <tabstop>webBrowserButton</tabstop>
   <tabstop>customViewerButton</tabstop>
-  <tabstop>customViewerEdit</tabstop>
-  <tabstop>customViewerSelectionButton</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>customViewerButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>customViewerEdit</receiver>
+   <receiver>customViewerPicker</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>592</x>
-     <y>94</y>
+     <x>496</x>
+     <y>72</y>
     </hint>
     <hint type="destinationlabel">
-     <x>231</x>
-     <y>109</y>
+     <x>493</x>
+     <y>90</y>
     </hint>
    </hints>
   </connection>