Mercurial Repositories > eric / file diff

--- a/UI/DiffDialog.ui	Sun Sep 04 17:57:49 2011 +0200
+++ b/UI/DiffDialog.ui	Sun Sep 04 18:02:38 2011 +0200
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>DiffDialog</class>
- <widget class="QWidget" name="DiffDialog" >
-  <property name="geometry" >
+ <widget class="QWidget" name="DiffDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,35 +10,35 @@
     <height>600</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>File Differences</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QLabel" name="textLabel1" >
-       <property name="text" >
+      <widget class="QLabel" name="textLabel1">
+       <property name="text">
         <string>File &amp;1:</string>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>file1Edit</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="file1Edit" >
-       <property name="toolTip" >
+      <widget class="QLineEdit" name="file1Edit">
+       <property name="toolTip">
         <string>Enter the name of the first file</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="file1Button" >
-       <property name="toolTip" >
+      <widget class="QPushButton" name="file1Button">
+       <property name="toolTip">
         <string>Press to select the file via a file selection dialog</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>...</string>
        </property>
       </widget>
@@ -45,30 +46,30 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
-      <widget class="QLabel" name="textLabel2" >
-       <property name="text" >
+      <widget class="QLabel" name="textLabel2">
+       <property name="text">
         <string>File &amp;2:</string>
        </property>
-       <property name="buddy" >
+       <property name="buddy">
         <cstring>file1Edit</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="file2Edit" >
-       <property name="toolTip" >
+      <widget class="QLineEdit" name="file2Edit">
+       <property name="toolTip">
         <string>Enter the name of the second file</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="file2Button" >
-       <property name="toolTip" >
+      <widget class="QPushButton" name="file2Button">
+       <property name="toolTip">
         <string>Press to select the file via a file selection dialog</string>
        </property>
-       <property name="text" >
+       <property name="text">
         <string>...</string>
        </property>
       </widget>
@@ -76,49 +77,49 @@
     </layout>
    </item>
    <item>
-    <widget class="QGroupBox" name="diffFormatGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="diffFormatGroup">
+     <property name="title">
       <string/>
      </property>
-     <layout class="QHBoxLayout" >
+     <layout class="QHBoxLayout">
       <item>
-       <widget class="QRadioButton" name="unifiedRadioButton" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="unifiedRadioButton">
+        <property name="toolTip">
          <string>Select to generate a unified diff</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Unified Diff</string>
         </property>
-        <property name="shortcut" >
+        <property name="shortcut">
          <string>Alt+U</string>
         </property>
-        <property name="checked" >
+        <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QRadioButton" name="contextRadioButton" >
-        <property name="toolTip" >
+       <widget class="QRadioButton" name="contextRadioButton">
+        <property name="toolTip">
          <string>Select to generate a context diff</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>Co&amp;ntext Diff</string>
         </property>
-        <property name="shortcut" >
+        <property name="shortcut">
          <string>Alt+N</string>
         </property>
        </widget>
       </item>
       <item>
        <spacer>
-        <property name="orientation" >
+        <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeType" >
+        <property name="sizeType">
          <enum>QSizePolicy::Expanding</enum>
         </property>
-        <property name="sizeHint" stdset="0" >
+        <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
           <height>20</height>
@@ -130,30 +131,27 @@
     </widget>
    </item>
    <item>
-    <widget class="QTextEdit" name="contents" >
-     <property name="focusPolicy" >
-      <enum>Qt::NoFocus</enum>
-     </property>
-     <property name="lineWrapMode" >
+    <widget class="QTextEdit" name="contents">
+     <property name="lineWrapMode">
       <enum>QTextEdit::NoWrap</enum>
      </property>
-     <property name="readOnly" >
+     <property name="readOnly">
       <bool>true</bool>
      </property>
-     <property name="tabStopWidth" >
+     <property name="tabStopWidth">
       <number>8</number>
      </property>
-     <property name="acceptRichText" >
+     <property name="acceptRichText">
       <bool>false</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
+     <property name="standardButtons">
       <set>QDialogButtonBox::Close</set>
      </property>
     </widget>
@@ -176,11 +174,11 @@
    <receiver>DiffDialog</receiver>
    <slot>close()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>80</x>
      <y>578</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>82</x>
      <y>594</y>
     </hint>