src/settings/diffmergesettings.ui


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251

<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>DiffMergeSettings</class>
<widget class="TQWidget">
    <property name="name">
        <cstring>DiffMergeSettings</cstring>
    </property>
    <property name="tqgeometry">
        <rect>
            <x>0</x>
            <y>0</y>
            <width>260</width>
            <height>308</height>
        </rect>
    </property>
    <property name="caption">
        <string>DiffMergeSettings</string>
    </property>
    <vbox>
        <property name="name">
            <cstring>unnamed</cstring>
        </property>
        <widget class="TQCheckBox">
            <property name="name">
                <cstring>kcfg_diff_ignore_content</cstring>
            </property>
            <property name="text">
                <string>Diff ignores content type</string>
            </property>
        </widget>
        <widget class="TQCheckBox">
            <property name="name">
                <cstring>kcfg_tree_diff_rec</cstring>
            </property>
            <property name="text">
                <string>Diff in revisiontree is recursive</string>
            </property>
        </widget>
        <widget class="TQCheckBox">
            <property name="name">
                <cstring>kcfg_diff_ignore_spaces</cstring>
            </property>
            <property name="text">
                <string>Diff ignores white space changes</string>
            </property>
        </widget>
        <widget class="TQCheckBox">
            <property name="name">
                <cstring>kcfg_diff_ignore_all_white_spaces</cstring>
            </property>
            <property name="text">
                <string>Diff ignores all white spaces</string>
            </property>
        </widget>
        <widget class="TQCheckBox">
            <property name="name">
                <cstring>kcfg_use_external_diff</cstring>
            </property>
            <property name="text">
                <string>Use external diff display</string>
            </property>
            <property name="toolTip" stdset="0">
                <string>If kdesvn should use an external diff display and/or generator. If not checked use internal display.</string>
            </property>
        </widget>
        <widget class="TQCheckBox">
            <property name="name">
                <cstring>kcfg_extern_merge_default</cstring>
            </property>
            <property name="text">
                <string>Prefer external merge program</string>
            </property>
            <property name="toolTip" stdset="0">
                <string>Set if merge with external program is prefered and not subversions merge</string>
            </property>
        </widget>
        <widget class="TQLayoutWidget">
            <property name="name">
                <cstring>tqlayout2</cstring>
            </property>
            <grid>
                <property name="name">
                    <cstring>unnamed</cstring>
                </property>
                <widget class="TQLabel" row="0" column="0">
                    <property name="name">
                        <cstring>m_extern_hint</cstring>
                    </property>
                    <property name="text">
                        <string>see "Whats this" for details</string>
                    </property>
                    <property name="tqalignment">
                        <set>WordBreak|AlignCenter</set>
                    </property>
                </widget>
                <widget class="TQLayoutWidget" row="1" column="0">
                    <property name="name">
                        <cstring>tqlayout2</cstring>
                    </property>
                    <grid>
                        <property name="name">
                            <cstring>unnamed</cstring>
                        </property>
                        <widget class="TQLabel" row="2" column="0">
                            <property name="name">
                                <cstring>resolveLabel</cstring>
                            </property>
                            <property name="text">
                                <string>Conflict resolver program:</string>
                            </property>
                            <property name="tqalignment">
                                <set>AlignVCenter|AlignRight</set>
                            </property>
                        </widget>
                        <widget class="TQLabel" row="1" column="0">
                            <property name="name">
                                <cstring>textLabel1</cstring>
                            </property>
                            <property name="text">
                                <string>External merge program:</string>
                            </property>
                            <property name="tqalignment">
                                <set>AlignVCenter|AlignRight</set>
                            </property>
                        </widget>
                        <widget class="KLineEdit" row="2" column="1">
                            <property name="name">
                                <cstring>kcfg_conflict_resolver</cstring>
                            </property>
                            <property name="toolTip" stdset="0">
                                <string>Setup an external program for conflict resolving</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>&lt;p&gt;
Enter how kdesvn should call the conflict resolver program. The form is
&lt;p align="center"&gt;
&lt;b&gt;&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;programoptions&amp;gt;&lt;/tt&gt;&lt;/b&gt;
&lt;/p&gt;
&lt;p&gt;
Programoption may contain the place holders for substituting with filenames.
&lt;/p&gt;
The substitutions means:&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%o&lt;/tt&gt;&lt;/b&gt; Old version&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%m&lt;/tt&gt;&lt;/b&gt; Mine or local edit version&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%n&lt;/tt&gt;&lt;/b&gt; Newest version&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%t&lt;/tt&gt;&lt;/b&gt; The target to save as, kdesvn will use the orignal file name for it.
&lt;/p&gt;
&lt;p&gt;
Default: &lt;tt&gt;kdiff3 %o %m %n -o %t&lt;/tt&gt;
&lt;/p&gt;</string>
                            </property>
                        </widget>
                        <widget class="TQLabel" row="0" column="0">
                            <property name="name">
                                <cstring>mdiff_display_label</cstring>
                            </property>
                            <property name="text">
                                <string>External diff display:</string>
                            </property>
                            <property name="tqalignment">
                                <set>AlignVCenter|AlignRight</set>
                            </property>
                        </widget>
                        <widget class="KLineEdit" row="1" column="1">
                            <property name="name">
                                <cstring>kcfg_external_merge_program</cstring>
                            </property>
                            <property name="toolTip" stdset="0">
                                <string>Setup an external program for merging</string>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>&lt;p&gt;
Enter how kdesvn should call the external merge program. The form is
&lt;p align="center"&gt;
&lt;b&gt;&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;programoptions&amp;gt; %s1 %s2 %t&lt;/tt&gt;&lt;/b&gt;
&lt;/p&gt;
The substitutions means:&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%s1&lt;/tt&gt;&lt;/b&gt; Source one for merge&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%s2&lt;/tt&gt;&lt;/b&gt; Source two for merge, if it was not set equal to source one but other revision&lt;br&gt;
&lt;b&gt;&lt;tt&gt;%t&lt;/tt&gt;&lt;/b&gt; Local target for merge.
&lt;/p&gt;</string>
                            </property>
                        </widget>
                        <widget class="KLineEdit" row="0" column="1">
                            <property name="name">
                                <cstring>kcfg_external_diff_display</cstring>
                            </property>
                            <property name="whatsThis" stdset="0">
                                <string>&lt;p align="left"&gt;
Enter an external program in form
&lt;p align="center"&gt;
&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;param&amp;gt; %f&lt;/tt&gt;
&lt;/p&gt;
or
&lt;p align="center"&gt;
&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;param&amp;gt;&lt;/tt&gt;
&lt;/p&gt;
or
&lt;p align="center"&gt;
&lt;tt&gt;&amp;lt;program&amp;gt; &amp;lt;param&amp;gt; %1 %2&lt;/tt&gt;
&lt;/p&gt;
&lt;br&gt;
If using first or second form, svn itself will generate the diff. %f will replaced with a temporary filename. If %f is not given,
the diff-display should able reading data from stdin.
&lt;br&gt;
When %1 and %2 is given, kdesvn let this display make the diff. For that it it makes a temporary export or get (if needed) and fill out the parameters with the right value. %1 will filled with the content of start-revision, %2 with the endrevision. On large recoursive diffs this may get real slow!
&lt;/p&gt;</string>
                            </property>
                        </widget>
                    </grid>
                </widget>
            </grid>
        </widget>
        <spacer>
            <property name="name">
                <cstring>spacer3</cstring>
            </property>
            <property name="orientation">
                <enum>Vertical</enum>
            </property>
            <property name="sizeType">
                <enum>Expanding</enum>
            </property>
            <property name="tqsizeHint">
                <size>
                    <width>20</width>
                    <height>16</height>
                </size>
            </property>
        </spacer>
    </vbox>
</widget>
<customwidgets>
</customwidgets>
<connections>
    <connection>
        <sender>kcfg_use_external_diff</sender>
        <signal>toggled(bool)</signal>
        <receiver>DiffMergeSettings</receiver>
        <slot>diffDispChanged(bool)</slot>
    </connection>
</connections>
<Q_SLOTS>
    <slot access="protected">diffDispChanged(bool)</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<includehints>
    <includehint>klineedit.h</includehint>
    <includehint>klineedit.h</includehint>
    <includehint>klineedit.h</includehint>
</includehints>
</UI>