--- a/UI/DiffDialog.ui	Sun Nov 29 13:21:15 2015 +0100
+++ b/UI/DiffDialog.ui	Sun Nov 29 14:33:38 2015 +0100
@@ -13,67 +13,71 @@
   <property name="windowTitle">
    <string>File Differences</string>
   </property>
-  <layout class="QVBoxLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <layout class="QHBoxLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QLabel" name="textLabel1">
        <property name="text">
         <string>File &amp;1:</string>
        </property>
        <property name="buddy">
-        <cstring>file1Edit</cstring>
+        <cstring>file1Picker</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="file1Edit">
+      <widget class="E5PathPicker" name="file1Picker" 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 name of the first file</string>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QToolButton" name="file1Button">
-       <property name="toolTip">
-        <string>Press to select the file via a file selection dialog</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="textLabel2">
        <property name="text">
         <string>File &amp;2:</string>
        </property>
        <property name="buddy">
-        <cstring>file1Edit</cstring>
+        <cstring>file2Picker</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="file2Edit">
+      <widget class="E5PathPicker" name="file2Picker" 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 name of the second file</string>
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QToolButton" name="file2Button">
-       <property name="toolTip">
-        <string>Press to select the file via a file selection dialog</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
     <widget class="QGroupBox" name="diffFormatGroup">
      <property name="title">
-      <string/>
+      <string>Select Diff Kind</string>
      </property>
      <layout class="QHBoxLayout">
       <item>
@@ -161,6 +165,12 @@
  </widget>
  <customwidgets>
   <customwidget>
+   <class>E5PathPicker</class>
+   <extends>QWidget</extends>
+   <header>E5Gui/E5PathPicker.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
    <class>E5TextEditSearchWidget</class>
    <extends>QWidget</extends>
    <header>E5Gui/E5TextEditSearchWidget.h</header>
@@ -168,12 +178,12 @@
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>file1Edit</tabstop>
-  <tabstop>file1Button</tabstop>
-  <tabstop>file2Edit</tabstop>
-  <tabstop>file2Button</tabstop>
+  <tabstop>file1Picker</tabstop>
+  <tabstop>file2Picker</tabstop>
   <tabstop>unifiedRadioButton</tabstop>
   <tabstop>contextRadioButton</tabstop>
+  <tabstop>searchWidget</tabstop>
+  <tabstop>contents</tabstop>
  </tabstops>
  <resources/>
  <connections>