Mercurial Repositories > eric / changeset

changeset

Changed focus handling of the various diff dialogs. 5_1_x

Sun, 04 Sep 2011 18:02:38 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 04 Sep 2011 18:02:38 +0200
branch
5_1_x
changeset 1281
80a974cf4f14
parent 1278
fb0460fd00b9
child 1285
544520790fdd

Changed focus handling of the various diff dialogs.
(transplanted from 44512c4eb555276f41e8fd5a5179a8d3f84cc133)

Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui file | annotate | diff | comparison | revisions
Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui file | annotate | diff | comparison | revisions
UI/DiffDialog.ui file | annotate | diff | comparison | revisions 
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui	Sun Sep 04 16:06:54 2011 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.ui	Sun Sep 04 18:02:38 2011 +0200
@@ -28,9 +28,6 @@
      <layout class="QVBoxLayout">
       <item>
        <widget class="QTextEdit" name="contents">
-        <property name="focusPolicy">
-         <enum>Qt::NoFocus</enum>
-        </property>
         <property name="whatsThis">
          <string>&lt;b&gt;Mercurial Diff&lt;/b&gt;&lt;p&gt;This shows the output of the hg diff command.&lt;/p&gt;</string>
         </property>
--- a/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.ui	Sun Sep 04 16:06:54 2011 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.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>SvnDiffDialog</class>
- <widget class="QWidget" name="SvnDiffDialog" >
-  <property name="geometry" >
+ <widget class="QWidget" name="SvnDiffDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,40 +10,37 @@
     <height>646</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Subversion Diff</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QGroupBox" name="contentsGroup" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <widget class="QGroupBox" name="contentsGroup">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>4</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Difference</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QTextEdit" name="contents" >
-        <property name="focusPolicy" >
-         <enum>Qt::NoFocus</enum>
+       <widget class="QTextEdit" name="contents">
+        <property name="whatsThis">
+         <string>&lt;b&gt;Subversion Diff&lt;/b&gt;&lt;p&gt;This shows the output of the svn diff command.&lt;/p&gt;</string>
         </property>
-        <property name="whatsThis" >
-         <string>&lt;b>Subversion Diff&lt;/b>&lt;p>This shows the output of the svn diff command.&lt;/p></string>
-        </property>
-        <property name="lineWrapMode" >
+        <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>
@@ -51,26 +49,26 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="errorGroup" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
+    <widget class="QGroupBox" name="errorGroup">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Errors</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QTextEdit" name="errors" >
-        <property name="focusPolicy" >
+       <widget class="QTextEdit" name="errors">
+        <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
-        <property name="readOnly" >
+        <property name="readOnly">
          <bool>true</bool>
         </property>
-        <property name="acceptRichText" >
+        <property name="acceptRichText">
          <bool>false</bool>
         </property>
        </widget>
@@ -79,11 +77,11 @@
     </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::Cancel|QDialogButtonBox::Close|QDialogButtonBox::Save</set>
      </property>
     </widget>
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui	Sun Sep 04 16:06:54 2011 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.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>SvnDiffDialog</class>
- <widget class="QWidget" name="SvnDiffDialog" >
-  <property name="geometry" >
+ <widget class="QWidget" name="SvnDiffDialog">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,40 +10,37 @@
     <height>646</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Subversion Diff</string>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QGroupBox" name="contentsGroup" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+    <widget class="QGroupBox" name="contentsGroup">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>3</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Difference</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QTextEdit" name="contents" >
-        <property name="focusPolicy" >
-         <enum>Qt::NoFocus</enum>
+       <widget class="QTextEdit" name="contents">
+        <property name="whatsThis">
+         <string>&lt;b&gt;Subversion Diff&lt;/b&gt;&lt;p&gt;This shows the output of the svn diff command.&lt;/p&gt;</string>
         </property>
-        <property name="whatsThis" >
-         <string>&lt;b>Subversion Diff&lt;/b>&lt;p>This shows the output of the svn diff command.&lt;/p></string>
-        </property>
-        <property name="lineWrapMode" >
+        <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>
@@ -51,26 +49,26 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="errorGroup" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
+    <widget class="QGroupBox" name="errorGroup">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Errors</string>
      </property>
-     <layout class="QVBoxLayout" >
+     <layout class="QVBoxLayout">
       <item>
-       <widget class="QTextEdit" name="errors" >
-        <property name="focusPolicy" >
+       <widget class="QTextEdit" name="errors">
+        <property name="focusPolicy">
          <enum>Qt::NoFocus</enum>
         </property>
-        <property name="readOnly" >
+        <property name="readOnly">
          <bool>true</bool>
         </property>
-        <property name="acceptRichText" >
+        <property name="acceptRichText">
          <bool>false</bool>
         </property>
        </widget>
@@ -79,20 +77,20 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="inputGroup" >
-     <property name="title" >
+    <widget class="QGroupBox" name="inputGroup">
+     <property name="title">
       <string>Input</string>
      </property>
-     <layout class="QGridLayout" >
-      <item row="1" column="1" >
+     <layout class="QGridLayout">
+      <item row="1" column="1">
        <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>327</width>
           <height>29</height>
@@ -100,35 +98,35 @@
         </property>
        </spacer>
       </item>
-      <item row="1" column="2" >
-       <widget class="QPushButton" name="sendButton" >
-        <property name="toolTip" >
+      <item row="1" column="2">
+       <widget class="QPushButton" name="sendButton">
+        <property name="toolTip">
          <string>Press to send the input to the subversion process</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Send</string>
         </property>
-        <property name="shortcut" >
+        <property name="shortcut">
          <string>Alt+S</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" colspan="3" >
-       <widget class="QLineEdit" name="input" >
-        <property name="toolTip" >
+      <item row="0" column="0" colspan="3">
+       <widget class="QLineEdit" name="input">
+        <property name="toolTip">
          <string>Enter data to be sent to the subversion process</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QCheckBox" name="passwordCheckBox" >
-        <property name="toolTip" >
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="passwordCheckBox">
+        <property name="toolTip">
          <string>Select to switch the input field to password mode</string>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>&amp;Password Mode</string>
         </property>
-        <property name="shortcut" >
+        <property name="shortcut">
          <string>Alt+P</string>
         </property>
        </widget>
@@ -137,11 +135,11 @@
     </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|QDialogButtonBox::Save</set>
      </property>
     </widget>
@@ -156,11 +154,11 @@
    <receiver>SvnDiffDialog</receiver>
    <slot>close()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>197</x>
      <y>624</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>201</x>
      <y>645</y>
     </hint>
--- a/UI/DiffDialog.ui	Sun Sep 04 16:06:54 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>

Mercurial Repository: eric

eric ide

mercurial