src/eric7/UI/DiffDialog.ui

Tue, 18 Oct 2022 16:06:21 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 18 Oct 2022 16:06:21 +0200
branch
eric7
changeset 9413
80c06d472826
parent 9209
b99e7fd55fd3
permissions
-rw-r--r--

Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.

1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
1 <?xml version="1.0" encoding="UTF-8"?>
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
2 <ui version="4.0">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
3 <class>DiffDialog</class>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
4 <widget class="QWidget" name="DiffDialog">
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
5 <property name="geometry">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
6 <rect>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
7 <x>0</x>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
8 <y>0</y>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
9 <width>750</width>
4039
661167a99aef Added the capability to search in the output to the Diff dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3186
diff changeset
10 <height>800</height>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
11 </rect>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
12 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
13 <property name="windowTitle">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
14 <string>File Differences</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
15 </property>
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
16 <layout class="QVBoxLayout" name="verticalLayout">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
17 <item>
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
18 <layout class="QHBoxLayout" name="horizontalLayout_2">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
19 <item>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
20 <widget class="QLabel" name="textLabel1">
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
21 <property name="text">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
22 <string>File &amp;1:</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
23 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
24 <property name="buddy">
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
25 <cstring>file1Picker</cstring>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
26 </property>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
27 </widget>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
28 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
29 <item>
8356
68ec9c3d4de5 Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
30 <widget class="EricPathPicker" name="file1Picker" native="true">
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
31 <property name="sizePolicy">
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
32 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
33 <horstretch>0</horstretch>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
34 <verstretch>0</verstretch>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
35 </sizepolicy>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
36 </property>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
37 <property name="focusPolicy">
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
38 <enum>Qt::StrongFocus</enum>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
39 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
40 <property name="toolTip">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
41 <string>Enter the name of the first file</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
42 </property>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
43 </widget>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
44 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
45 </layout>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
46 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
47 <item>
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
48 <layout class="QHBoxLayout" name="horizontalLayout">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
49 <item>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
50 <widget class="QLabel" name="textLabel2">
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
51 <property name="text">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
52 <string>File &amp;2:</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
53 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
54 <property name="buddy">
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
55 <cstring>file2Picker</cstring>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
56 </property>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
57 </widget>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
58 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
59 <item>
8356
68ec9c3d4de5 Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
60 <widget class="EricPathPicker" name="file2Picker" native="true">
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
61 <property name="sizePolicy">
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
62 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
63 <horstretch>0</horstretch>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
64 <verstretch>0</verstretch>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
65 </sizepolicy>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
66 </property>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
67 <property name="focusPolicy">
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
68 <enum>Qt::StrongFocus</enum>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
69 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
70 <property name="toolTip">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
71 <string>Enter the name of the second file</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
72 </property>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
73 </widget>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
74 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
75 </layout>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
76 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
77 <item>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
78 <widget class="QGroupBox" name="diffFormatGroup">
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
79 <property name="title">
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
80 <string>Select Diff Kind</string>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
81 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
82 <layout class="QHBoxLayout">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
83 <item>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
84 <widget class="QRadioButton" name="unifiedRadioButton">
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
85 <property name="toolTip">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
86 <string>Select to generate a unified diff</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
87 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
88 <property name="text">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
89 <string>&amp;Unified Diff</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
90 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
91 <property name="shortcut">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
92 <string>Alt+U</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
93 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
94 <property name="checked">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
95 <bool>true</bool>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
96 </property>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
97 </widget>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
98 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
99 <item>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
100 <widget class="QRadioButton" name="contextRadioButton">
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
101 <property name="toolTip">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
102 <string>Select to generate a context diff</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
103 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
104 <property name="text">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
105 <string>Co&amp;ntext Diff</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
106 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
107 <property name="shortcut">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
108 <string>Alt+N</string>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
109 </property>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
110 </widget>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
111 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
112 <item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
113 <spacer>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
114 <property name="orientation">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
115 <enum>Qt::Horizontal</enum>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
116 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
117 <property name="sizeType">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
118 <enum>QSizePolicy::Expanding</enum>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
119 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
120 <property name="sizeHint" stdset="0">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
121 <size>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
122 <width>40</width>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
123 <height>20</height>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
124 </size>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
125 </property>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
126 </spacer>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
127 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
128 </layout>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
129 </widget>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
130 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
131 <item>
8356
68ec9c3d4de5 Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
132 <widget class="EricTextEditSearchWidget" name="searchWidget" native="true">
4052
17d8069de085 Added capability to search in the output of Diff dialogs of the various VCS interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4039
diff changeset
133 <property name="focusPolicy">
17d8069de085 Added capability to search in the output of Diff dialogs of the various VCS interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4039
diff changeset
134 <enum>Qt::WheelFocus</enum>
17d8069de085 Added capability to search in the output of Diff dialogs of the various VCS interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4039
diff changeset
135 </property>
17d8069de085 Added capability to search in the output of Diff dialogs of the various VCS interfaces.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4039
diff changeset
136 </widget>
4039
661167a99aef Added the capability to search in the output to the Diff dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3186
diff changeset
137 </item>
661167a99aef Added the capability to search in the output to the Diff dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3186
diff changeset
138 <item>
7779
757334671130 Optimized the various diff panes by using QPlainTextEdit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6942
diff changeset
139 <widget class="QPlainTextEdit" name="contents">
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
140 <property name="lineWrapMode">
7779
757334671130 Optimized the various diff panes by using QPlainTextEdit.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6942
diff changeset
141 <enum>QPlainTextEdit::NoWrap</enum>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
142 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
143 <property name="readOnly">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
144 <bool>true</bool>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
145 </property>
8318
962bce857696 Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8312
diff changeset
146 <property name="tabStopDistance">
962bce857696 Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8312
diff changeset
147 <double>8.000000000000000</double>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
148 </property>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
149 </widget>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
150 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
151 <item>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
152 <widget class="QDialogButtonBox" name="buttonBox">
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
153 <property name="orientation">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
154 <enum>Qt::Horizontal</enum>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
155 </property>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
156 <property name="standardButtons">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
157 <set>QDialogButtonBox::Close</set>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
158 </property>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
159 </widget>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
160 </item>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
161 </layout>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
162 </widget>
4039
661167a99aef Added the capability to search in the output to the Diff dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3186
diff changeset
163 <customwidgets>
661167a99aef Added the capability to search in the output to the Diff dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3186
diff changeset
164 <customwidget>
8356
68ec9c3d4de5 Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
165 <class>EricPathPicker</class>
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
166 <extends>QWidget</extends>
9413
80c06d472826 Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
167 <header>eric7/EricWidgets/EricPathPicker.h</header>
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
168 <container>1</container>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
169 </customwidget>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
170 <customwidget>
8356
68ec9c3d4de5 Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8318
diff changeset
171 <class>EricTextEditSearchWidget</class>
4039
661167a99aef Added the capability to search in the output to the Diff dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3186
diff changeset
172 <extends>QWidget</extends>
9413
80c06d472826 Changed the eric7 import statements to include the package name (i.e. eric7) in order to not fiddle with sys.path.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 9209
diff changeset
173 <header>eric7/EricWidgets/EricTextEditSearchWidget.h</header>
4039
661167a99aef Added the capability to search in the output to the Diff dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3186
diff changeset
174 <container>1</container>
661167a99aef Added the capability to search in the output to the Diff dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3186
diff changeset
175 </customwidget>
661167a99aef Added the capability to search in the output to the Diff dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3186
diff changeset
176 </customwidgets>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
177 <tabstops>
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
178 <tabstop>file1Picker</tabstop>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
179 <tabstop>file2Picker</tabstop>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
180 <tabstop>unifiedRadioButton</tabstop>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
181 <tabstop>contextRadioButton</tabstop>
4589
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
182 <tabstop>searchWidget</tabstop>
b648ccbdbef9 Modified more dialogs to use the path picker widgets.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4052
diff changeset
183 <tabstop>contents</tabstop>
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
184 </tabstops>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
185 <resources/>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
186 <connections>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
187 <connection>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
188 <sender>buttonBox</sender>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
189 <signal>rejected()</signal>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
190 <receiver>DiffDialog</receiver>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
191 <slot>close()</slot>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
192 <hints>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
193 <hint type="sourcelabel">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
194 <x>80</x>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
195 <y>578</y>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
196 </hint>
1280
44512c4eb555 Changed focus handling of the various diff dialogs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 0
diff changeset
197 <hint type="destinationlabel">
0
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
198 <x>82</x>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
199 <y>594</y>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
200 </hint>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
201 </hints>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
202 </connection>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
203 </connections>
de9c2efb9d02 Started porting eric4 to Python3
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
204 </ui>

eric ide

mercurial