author | Jan Vrany <jan.vrany@labware.com> |
Thu, 14 Oct 2021 11:55:23 +0200 | |
branch | jv |
changeset 19614 | 0d756d4c5298 |
parent 19604 | b02a518e2c70 |
permissions | -rw-r--r-- |
10194 | 1 |
" |
2 |
Copyright (c) 2007-2010 Jan Vrany |
|
3 |
Copyright (c) 2009-2010 eXept Software AG |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
4 |
Copyright (c) 2021 LabWare |
10194 | 5 |
|
6 |
Permission is hereby granted, free of charge, to any person |
|
7 |
obtaining a copy of this software and associated documentation |
|
8 |
files (the 'Software'), to deal in the Software without |
|
9 |
restriction, including without limitation the rights to use, |
|
10 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
11 |
copies of the Software, and to permit persons to whom the |
|
12 |
Software is furnished to do so, subject to the following |
|
13 |
conditions: |
|
14 |
||
15 |
The above copyright notice and this permission notice shall be |
|
16 |
included in all copies or substantial portions of the Software. |
|
17 |
||
18 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
19 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
20 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
21 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
22 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
23 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
24 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
25 |
OTHER DEALINGS IN THE SOFTWARE. |
|
26 |
" |
|
10741
e4645cbb0958
Fix package def libbasic3->libtool
Stefan Vogel <sv@exept.de>
parents:
10194
diff
changeset
|
27 |
"{ Package: 'stx:libtool' }" |
10194 | 28 |
|
29 |
"{ NameSpace: Tools }" |
|
30 |
||
31 |
ApplicationModel subclass:#ChangeSetDiffTool |
|
13880 | 32 |
instanceVariableNames:'infoPanel diffInfoHolder listHolder singleSelectionHolder |
33 |
diffsetHolder titleHolder firstColSelectionHolder |
|
34 |
navigatorPanelSpecHolder diffMenuHolder diffsetHolderPrivate |
|
35 |
selectionHolder versionATextHolder versionBTextHolder |
|
36 |
versionBaseTextHolder textDiffToolHolder |
|
37 |
textDiffToolWindowSpecHolder mergeHolder mergeData |
|
38 |
mergeDataHolder showVersionMethodDiffsHolder |
|
39 |
showCopyrightMethodDiffsHolder highlightConflictsHolder |
|
40 |
hasDiffsetHolder mergeSavedHolder canSaveHolder |
|
41 |
autoMoveToNextConflictHolder textDiff2App textDiff3App list1App |
|
42 |
list2App alreadyWarnedAboutUnsavedMerge labelSpecHolder |
|
43 |
labelsView navigatorAndDiffPanelView codeAspectHolder' |
|
44 |
classVariableNames:'LastDiffInfo AutoMoveToNextConflict' |
|
10194 | 45 |
poolDictionaries:'' |
46 |
category:'Interface-Diff' |
|
47 |
! |
|
48 |
||
49 |
SimpleDialog subclass:#OpenDialog |
|
13880 | 50 |
instanceVariableNames:'doAcceptEnabled changesetSpecAHolder changesetSpecBHolder |
51 |
changesetSpecBaseHolder changesetSpecBaseEnabledHolder |
|
52 |
changesetSpecMergedHolder changesetSpecMergedEnabledHolder' |
|
10194 | 53 |
classVariableNames:'LastDirectory' |
54 |
poolDictionaries:'' |
|
55 |
privateIn:ChangeSetDiffTool |
|
56 |
! |
|
57 |
||
58 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
59 |
||
60 |
copyright |
|
61 |
" |
|
62 |
Copyright (c) 2007-2010 Jan Vrany |
|
63 |
Copyright (c) 2009-2010 eXept Software AG |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
64 |
Copyright (c) 2021 LabWare |
10194 | 65 |
|
66 |
Permission is hereby granted, free of charge, to any person |
|
67 |
obtaining a copy of this software and associated documentation |
|
68 |
files (the 'Software'), to deal in the Software without |
|
69 |
restriction, including without limitation the rights to use, |
|
70 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
71 |
copies of the Software, and to permit persons to whom the |
|
72 |
Software is furnished to do so, subject to the following |
|
73 |
conditions: |
|
74 |
||
75 |
The above copyright notice and this permission notice shall be |
|
76 |
included in all copies or substantial portions of the Software. |
|
77 |
||
78 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
79 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
80 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
81 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
82 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
83 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
84 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
85 |
OTHER DEALINGS IN THE SOFTWARE. |
|
86 |
||
87 |
" |
|
13880 | 88 |
! |
89 |
||
90 |
documentation |
|
91 |
" |
|
92 |
Tool for viewing/merging differences between two change sets |
|
93 |
||
94 |
[author:] |
|
95 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
|
96 |
||
97 |
[instance variables:] |
|
98 |
||
99 |
[class variables:] |
|
100 |
||
101 |
[see also:] |
|
102 |
||
103 |
" |
|
104 |
! |
|
105 |
||
106 |
examples |
|
107 |
" |
|
108 |
Starting the application: |
|
109 |
[exBegin] |
|
110 |
Tools::ChangeSetDiffTool open |
|
111 |
||
112 |
[exEnd] |
|
113 |
||
114 |
Show differences between CVS HEAD and SVN jv-branch |
|
115 |
NewSystemBrowser: |
|
116 |
[exBegin] |
|
117 |
| cvsCs svnCs | |
|
118 |
||
119 |
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'. |
|
120 |
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'. |
|
121 |
||
122 |
Tools::ChangeSetDiffTool new |
|
123 |
open; |
|
124 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs. |
|
125 |
||
126 |
[exEnd] |
|
127 |
||
128 |
Show differences between CVS HEAD and SVN jv-branch and |
|
129 |
base version of NewSystemBrowser: |
|
130 |
||
131 |
[exBegin] |
|
132 |
| cvsBaseCs cvsCs svnCs | |
|
133 |
||
134 |
cvsBaseCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@2012-01-01/stx/libtool/Tools__NewSystemBrowser.st'. |
|
135 |
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'. |
|
136 |
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'. |
|
137 |
||
138 |
Tools::ChangeSetDiffTool new |
|
139 |
open; |
|
140 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs |
|
141 |
||
142 |
[exEnd] |
|
143 |
||
144 |
||
145 |
||
146 |
" |
|
147 |
! ! |
|
148 |
||
149 |
!ChangeSetDiffTool class methodsFor:'accessing'! |
|
150 |
||
151 |
autoMoveToNextConflict |
|
152 |
^AutoMoveToNextConflict == true |
|
153 |
||
154 |
"Created: / 17-01-2013 / 19:49:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
155 |
! |
|
156 |
||
157 |
autoMoveToNextConflict: aBoolean |
|
158 |
AutoMoveToNextConflict := aBoolean |
|
159 |
||
160 |
"Created: / 17-01-2013 / 19:49:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 161 |
! ! |
162 |
||
163 |
!ChangeSetDiffTool class methodsFor:'accessing - defaults'! |
|
164 |
||
165 |
versionAColor |
|
166 |
||
167 |
^Color green lightened lightened |
|
168 |
||
169 |
"Created: / 01-11-2009 / 10:14:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
170 |
! |
|
171 |
||
172 |
versionBColor |
|
173 |
||
174 |
^Color blue lightened lightened |
|
175 |
||
176 |
"Created: / 01-11-2009 / 10:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
177 |
! |
|
178 |
||
179 |
versionBaseColor |
|
180 |
||
181 |
^Color yellow lightened lightened |
|
182 |
||
183 |
"Created: / 01-11-2009 / 10:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
184 |
! |
|
185 |
||
186 |
versionNotPresentText |
|
16502 | 187 |
^ 'Not present' allItalic withColor:Color gray lighter |
10194 | 188 |
! ! |
189 |
||
190 |
!ChangeSetDiffTool class methodsFor:'image specs'! |
|
191 |
||
13880 | 192 |
mergeDiff3AToMergedArrow30x30 |
193 |
||
194 |
^ToolbarIconLibrary mergeDiff3AToMergedArrow30x30 |
|
195 |
||
196 |
"Created: / 17-01-2013 / 23:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
197 |
! |
|
198 |
||
199 |
mergeDiff3BToMergedArrow30x30 |
|
200 |
||
201 |
^ToolbarIconLibrary mergeDiff3BToMergedArrow30x30 |
|
202 |
||
203 |
"Created: / 17-01-2013 / 23:51:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
204 |
! |
|
205 |
||
206 |
mergeDiff3BaseToAArrow30x30 |
|
207 |
||
208 |
^ToolbarIconLibrary mergeDiff3BaseToAArrow30x30 |
|
209 |
||
210 |
"Created: / 17-01-2013 / 23:52:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
211 |
! |
|
212 |
||
213 |
mergeDiff3BaseToBArrow30x30 |
|
214 |
||
215 |
^ToolbarIconLibrary mergeDiff3BaseToBArrow30x30 |
|
216 |
||
217 |
"Created: / 17-01-2013 / 23:51:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
218 |
! |
|
219 |
||
10194 | 220 |
versionA24x24 |
221 |
||
222 |
^ToolbarIconLibrary versionA24x24 |
|
223 |
||
224 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
225 |
! |
|
226 |
||
227 |
versionB24x24 |
|
228 |
||
229 |
^ToolbarIconLibrary versionB24x24 |
|
230 |
||
231 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 232 |
! |
233 |
||
234 |
versionBase24x24 |
|
235 |
||
236 |
^ToolbarIconLibrary versionBase24x24 |
|
237 |
||
238 |
"Created: / 17-01-2013 / 22:53:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
239 |
! |
|
240 |
||
241 |
versionMerged24x24 |
|
242 |
||
243 |
^ToolbarIconLibrary versionMerged24x24 |
|
244 |
||
245 |
"Created: / 17-01-2013 / 22:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
246 |
! ! |
|
247 |
||
248 |
!ChangeSetDiffTool class methodsFor:'interface opening'! |
|
249 |
||
250 |
open |
|
251 |
| tool | |
|
252 |
||
253 |
tool := self new. |
|
254 |
tool open. |
|
255 |
tool window sensor pushUserEvent: #fileMenuOpen for: tool. |
|
256 |
||
257 |
"Created: / 01-08-2012 / 15:13:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 258 |
! ! |
259 |
||
260 |
!ChangeSetDiffTool class methodsFor:'interface specs'! |
|
261 |
||
13880 | 262 |
labelDiff2Spec |
263 |
"This resource specification was automatically generated |
|
264 |
by the UIPainter of ST/X." |
|
265 |
||
266 |
"Do not manually edit this!! If it is corrupted, |
|
267 |
the UIPainter may not be able to read the specification." |
|
268 |
||
269 |
" |
|
270 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelDiff2Spec |
|
271 |
Tools::ChangeSetDiffTool new openInterface:#labelDiff2Spec |
|
272 |
" |
|
273 |
||
274 |
<resource: #canvas> |
|
275 |
||
276 |
^ |
|
277 |
#(FullSpec |
|
278 |
name: labelDiff2Spec |
|
279 |
window: |
|
280 |
(WindowSpec |
|
281 |
label: 'Label' |
|
282 |
name: 'Label' |
|
283 |
min: (Point 10 10) |
|
284 |
bounds: (Rectangle 0 0 600 60) |
|
285 |
) |
|
286 |
component: |
|
287 |
(SpecCollection |
|
288 |
collection: ( |
|
289 |
(UISubSpecification |
|
290 |
name: 'LabelA' |
|
291 |
layout: (LayoutFrame 0 0 0 0 0 1 0 0.5) |
|
292 |
minorKey: versionALabelSpec |
|
293 |
) |
|
294 |
(UISubSpecification |
|
295 |
name: 'LabelB' |
|
296 |
layout: (LayoutFrame 0 0 0 0.5 0 1 0 1) |
|
297 |
minorKey: versionBLabelSpec |
|
298 |
) |
|
299 |
) |
|
300 |
||
301 |
) |
|
302 |
) |
|
303 |
! |
|
304 |
||
305 |
labelDiff3Spec |
|
306 |
"This resource specification was automatically generated |
|
307 |
by the UIPainter of ST/X." |
|
308 |
||
309 |
"Do not manually edit this!! If it is corrupted, |
|
310 |
the UIPainter may not be able to read the specification." |
|
311 |
||
312 |
" |
|
313 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelDiff3Spec |
|
314 |
Tools::ChangeSetDiffTool new openInterface:#labelDiff3Spec |
|
315 |
" |
|
316 |
||
317 |
<resource: #canvas> |
|
318 |
||
319 |
^ |
|
320 |
#(FullSpec |
|
321 |
name: labelDiff3Spec |
|
322 |
window: |
|
323 |
(WindowSpec |
|
324 |
label: 'Label' |
|
325 |
name: 'Label' |
|
326 |
min: (Point 10 10) |
|
327 |
bounds: (Rectangle 0 0 600 90) |
|
328 |
) |
|
329 |
component: |
|
330 |
(SpecCollection |
|
331 |
collection: ( |
|
332 |
(UISubSpecification |
|
333 |
name: 'LabelBase' |
|
334 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
335 |
minorKey: versionBaseLabelSpec |
|
336 |
) |
|
337 |
(UISubSpecification |
|
338 |
name: 'LabelA' |
|
339 |
layout: (LayoutFrame 0 0 30 0 0 1 60 0) |
|
340 |
minorKey: versionALabelSpec |
|
341 |
) |
|
342 |
(UISubSpecification |
|
343 |
name: 'LabelB' |
|
344 |
layout: (LayoutFrame 0 0 60 0 0 1 0 1) |
|
345 |
minorKey: versionBLabelSpec |
|
346 |
) |
|
347 |
) |
|
348 |
||
349 |
) |
|
350 |
) |
|
351 |
! |
|
352 |
||
353 |
labelMergeSpec |
|
354 |
"This resource specification was automatically generated |
|
355 |
by the UIPainter of ST/X." |
|
356 |
||
357 |
"Do not manually edit this!! If it is corrupted, |
|
358 |
the UIPainter may not be able to read the specification." |
|
359 |
||
360 |
" |
|
361 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelMergeSpec |
|
362 |
Tools::ChangeSetDiffTool new openInterface:#labelMergeSpec |
|
363 |
" |
|
364 |
||
365 |
<resource: #canvas> |
|
366 |
||
367 |
^ |
|
368 |
#(FullSpec |
|
369 |
name: labelMergeSpec |
|
370 |
window: |
|
371 |
(WindowSpec |
|
372 |
label: 'Label' |
|
373 |
name: 'Label' |
|
374 |
min: (Point 10 10) |
|
375 |
bounds: (Rectangle 0 0 600 120) |
|
376 |
) |
|
377 |
component: |
|
378 |
(SpecCollection |
|
379 |
collection: ( |
|
380 |
(UISubSpecification |
|
381 |
name: 'LabelBase' |
|
382 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
383 |
minorKey: mergeBaseLabelSpec |
|
384 |
) |
|
385 |
(UISubSpecification |
|
386 |
name: 'LabelA' |
|
387 |
layout: (LayoutFrame 0 0 30 0 0 1 60 0) |
|
388 |
minorKey: mergeALabelSpec |
|
389 |
) |
|
390 |
(UISubSpecification |
|
391 |
name: 'LabelB' |
|
392 |
layout: (LayoutFrame 0 0 60 0 0 1 90 0) |
|
393 |
minorKey: mergeBLabelSpec |
|
394 |
) |
|
395 |
(UISubSpecification |
|
396 |
name: 'SubSpecification1' |
|
397 |
layout: (LayoutFrame 0 0 90 0 0 1 0 1) |
|
398 |
minorKey: mergeMergeLabelSpec |
|
399 |
) |
|
400 |
) |
|
401 |
||
402 |
) |
|
403 |
) |
|
404 |
||
405 |
"Modified: / 17-01-2013 / 23:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
406 |
! |
|
407 |
||
10194 | 408 |
labelSpec |
409 |
"This resource specification was automatically generated |
|
410 |
by the UIPainter of ST/X." |
|
411 |
||
412 |
"Do not manually edit this!! If it is corrupted, |
|
413 |
the UIPainter may not be able to read the specification." |
|
414 |
||
415 |
" |
|
416 |
UIPainter new openOnClass:SVN::DiffBrowser andSelector:#labelSpec |
|
417 |
SVN::DiffBrowser new openInterface:#labelSpec |
|
418 |
" |
|
419 |
||
420 |
<resource: #canvas> |
|
421 |
||
422 |
^ |
|
423 |
#(FullSpec |
|
424 |
name: labelSpec |
|
425 |
window: |
|
426 |
(WindowSpec |
|
427 |
label: 'Label' |
|
428 |
name: 'Label' |
|
429 |
min: (Point 10 10) |
|
430 |
bounds: (Rectangle 0 0 600 48) |
|
431 |
) |
|
432 |
component: |
|
433 |
(SpecCollection |
|
434 |
collection: ( |
|
435 |
(UISubSpecification |
|
436 |
name: 'LabelA' |
|
437 |
layout: (LayoutFrame 0 0 0 0 0 1 0 0.5) |
|
438 |
minorKey: versionALabelSpec |
|
439 |
) |
|
440 |
(UISubSpecification |
|
441 |
name: 'LabelB' |
|
442 |
layout: (LayoutFrame 0 0 0 0.5 0 1 0 1) |
|
443 |
minorKey: versionBLabelSpec |
|
444 |
) |
|
445 |
) |
|
446 |
||
447 |
) |
|
448 |
) |
|
449 |
! |
|
450 |
||
451 |
oneColumnNavigatorSpec |
|
452 |
"This resource specification was automatically generated |
|
453 |
by the UIPainter of ST/X." |
|
454 |
||
455 |
"Do not manually edit this!! If it is corrupted, |
|
456 |
the UIPainter may not be able to read the specification." |
|
457 |
||
458 |
" |
|
13880 | 459 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#oneColumnNavigatorSpec |
460 |
Tools::ChangeSetDiffTool new openInterface:#oneColumnNavigatorSpec |
|
10194 | 461 |
" |
462 |
||
463 |
<resource: #canvas> |
|
464 |
||
13880 | 465 |
^ |
10194 | 466 |
#(FullSpec |
13880 | 467 |
name: oneColumnNavigatorSpec |
468 |
window: |
|
10194 | 469 |
(WindowSpec |
13880 | 470 |
label: 'One Column Navigator' |
471 |
name: 'One Column Navigator' |
|
472 |
min: (Point 10 10) |
|
473 |
bounds: (Rectangle 0 0 300 300) |
|
474 |
) |
|
475 |
component: |
|
10194 | 476 |
(SpecCollection |
13880 | 477 |
collection: ( |
478 |
(SubCanvasSpec |
|
479 |
name: 'DiffList' |
|
480 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
481 |
hasHorizontalScrollBar: false |
|
482 |
hasVerticalScrollBar: false |
|
483 |
majorKey: #'Tools::ChangeSetDiffList' |
|
484 |
subAspectHolders: |
|
485 |
(Array |
|
486 |
||
487 |
(SubChannelInfoSpec |
|
488 |
subAspect: highlightConflictsHolder |
|
489 |
aspect: highlightConflictsHolder |
|
490 |
) |
|
491 |
(SubChannelInfoSpec |
|
492 |
subAspect: inGeneratorHolder |
|
493 |
aspect: diffsetHolderPrivate |
|
494 |
) |
|
495 |
||
496 |
(SubChannelInfoSpec |
|
497 |
subAspect: listEntryLabelGenerator |
|
498 |
aspect: diffListEntryLabelGeneratorAspect |
|
499 |
) |
|
500 |
(SubChannelInfoSpec |
|
501 |
subAspect: menuHolder |
|
502 |
aspect: listMenuHolder |
|
503 |
) |
|
504 |
||
505 |
(SubChannelInfoSpec |
|
506 |
subAspect: outGeneratorHolder |
|
507 |
aspect: selectionHolder |
|
508 |
) |
|
509 |
(SubChannelInfoSpec |
|
510 |
subAspect: showCopyrightMethodDiffsHolder |
|
511 |
aspect: showCopyrightMethodDiffsHolder |
|
512 |
) |
|
513 |
||
514 |
(SubChannelInfoSpec |
|
515 |
subAspect: showVersionMethodDiffsHolder |
|
516 |
aspect: showVersionMethodDiffsHolder |
|
517 |
) |
|
518 |
) |
|
519 |
createNewApplication: true |
|
520 |
createNewBuilder: false |
|
521 |
postBuildCallback: list1View: |
|
522 |
) |
|
523 |
) |
|
524 |
||
525 |
) |
|
10194 | 526 |
) |
527 |
! |
|
528 |
||
529 |
twoColumnNavigatorSpec |
|
530 |
"This resource specification was automatically generated |
|
531 |
by the UIPainter of ST/X." |
|
532 |
||
533 |
"Do not manually edit this!! If it is corrupted, |
|
534 |
the UIPainter may not be able to read the specification." |
|
535 |
||
536 |
" |
|
13880 | 537 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#twoColumnNavigatorSpec |
538 |
Tools::ChangeSetDiffTool new openInterface:#twoColumnNavigatorSpec |
|
10194 | 539 |
" |
540 |
||
541 |
<resource: #canvas> |
|
542 |
||
13880 | 543 |
^ |
10194 | 544 |
#(FullSpec |
13880 | 545 |
name: twoColumnNavigatorSpec |
546 |
window: |
|
10194 | 547 |
(WindowSpec |
13880 | 548 |
label: 'Two Column Navigator' |
549 |
name: 'Two Column Navigator' |
|
550 |
min: (Point 10 10) |
|
551 |
bounds: (Rectangle 0 0 300 300) |
|
552 |
) |
|
553 |
component: |
|
10194 | 554 |
(SpecCollection |
13880 | 555 |
collection: ( |
556 |
(VariableHorizontalPanelSpec |
|
557 |
name: 'Columns' |
|
558 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
559 |
component: |
|
560 |
(SpecCollection |
|
561 |
collection: ( |
|
562 |
(SubCanvasSpec |
|
563 |
name: 'LeftList' |
|
564 |
hasHorizontalScrollBar: false |
|
565 |
hasVerticalScrollBar: false |
|
566 |
majorKey: #'Tools::ChangeSetDiffList' |
|
567 |
subAspectHolders: |
|
568 |
(Array |
|
569 |
||
570 |
(SubChannelInfoSpec |
|
571 |
subAspect: highlightConflictsHolder |
|
572 |
aspect: highlightConflictsHolder |
|
573 |
) |
|
574 |
(SubChannelInfoSpec |
|
575 |
subAspect: inGeneratorHolder |
|
576 |
aspect: diffsetHolderPrivate |
|
577 |
) |
|
578 |
||
579 |
(SubChannelInfoSpec |
|
580 |
subAspect: listEntryLabelGenerator |
|
581 |
aspect: diffListEntryLabelGeneratorAspect |
|
582 |
) |
|
583 |
(SubChannelInfoSpec |
|
584 |
subAspect: menuHolder |
|
585 |
aspect: listMenuHolder |
|
586 |
) |
|
587 |
||
588 |
(SubChannelInfoSpec |
|
589 |
subAspect: outGeneratorHolder |
|
590 |
aspect: firstColSelectionHolder |
|
591 |
) |
|
592 |
(SubChannelInfoSpec |
|
593 |
subAspect: showCopyrightMethodDiffsHolder |
|
594 |
aspect: showCopyrightMethodDiffsHolder |
|
595 |
) |
|
596 |
||
597 |
(SubChannelInfoSpec |
|
598 |
subAspect: showVersionMethodDiffsHolder |
|
599 |
aspect: showVersionMethodDiffsHolder |
|
600 |
) |
|
601 |
) |
|
602 |
createNewApplication: true |
|
603 |
createNewBuilder: true |
|
604 |
postBuildCallback: list1View: |
|
605 |
) |
|
606 |
(SubCanvasSpec |
|
607 |
name: 'RightList' |
|
608 |
hasHorizontalScrollBar: false |
|
609 |
hasVerticalScrollBar: false |
|
610 |
majorKey: #'Tools::ChangeSetDiffList' |
|
611 |
subAspectHolders: |
|
612 |
(Array |
|
613 |
||
614 |
(SubChannelInfoSpec |
|
615 |
subAspect: highlightConflictsHolder |
|
616 |
aspect: highlightConflictsHolder |
|
617 |
) |
|
618 |
(SubChannelInfoSpec |
|
619 |
subAspect: inGeneratorHolder |
|
620 |
aspect: firstColSelectionHolder |
|
621 |
) |
|
622 |
||
623 |
(SubChannelInfoSpec |
|
624 |
subAspect: listEntryLabelGenerator |
|
625 |
aspect: diffListEntryLabelGeneratorAspect |
|
626 |
) |
|
627 |
(SubChannelInfoSpec |
|
628 |
subAspect: menuHolder |
|
629 |
aspect: listMenuHolder |
|
630 |
) |
|
631 |
||
632 |
(SubChannelInfoSpec |
|
633 |
subAspect: outGeneratorHolder |
|
634 |
aspect: selectionHolder |
|
635 |
) |
|
636 |
(SubChannelInfoSpec |
|
637 |
subAspect: showCopyrightMethodDiffsHolder |
|
638 |
aspect: showCopyrightMethodDiffsHolder |
|
639 |
) |
|
640 |
||
641 |
(SubChannelInfoSpec |
|
642 |
subAspect: showVersionMethodDiffsHolder |
|
643 |
aspect: showVersionMethodDiffsHolder |
|
644 |
) |
|
645 |
) |
|
646 |
createNewApplication: true |
|
647 |
createNewBuilder: true |
|
648 |
postBuildCallback: list2View: |
|
649 |
) |
|
650 |
) |
|
651 |
||
652 |
) |
|
653 |
handles: (Any 0.5 1.0) |
|
654 |
) |
|
655 |
) |
|
656 |
||
657 |
) |
|
10194 | 658 |
) |
659 |
! |
|
660 |
||
661 |
windowSpec |
|
662 |
"This resource specification was automatically generated |
|
663 |
by the UIPainter of ST/X." |
|
664 |
||
665 |
"Do not manually edit this!! If it is corrupted, |
|
666 |
the UIPainter may not be able to read the specification." |
|
667 |
||
668 |
" |
|
669 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#windowSpec |
|
670 |
Tools::ChangeSetDiffTool new openInterface:#windowSpec |
|
671 |
Tools::ChangeSetDiffTool open |
|
672 |
" |
|
673 |
||
674 |
<resource: #canvas> |
|
675 |
||
13880 | 676 |
^ |
10194 | 677 |
#(FullSpec |
13880 | 678 |
name: windowSpec |
679 |
window: |
|
10194 | 680 |
(WindowSpec |
13880 | 681 |
label: 'Diff Browser' |
682 |
name: 'Diff Browser' |
|
683 |
min: (Point 10 10) |
|
684 |
bounds: (Rectangle 0 0 1024 768) |
|
685 |
menu: mainMenu |
|
686 |
) |
|
687 |
component: |
|
10194 | 688 |
(SpecCollection |
13880 | 689 |
collection: ( |
690 |
(MenuPanelSpec |
|
691 |
name: 'ToolBar' |
|
692 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
693 |
menu: toolbarMenu |
|
694 |
textDefault: true |
|
695 |
) |
|
696 |
(SubCanvasSpec |
|
697 |
name: 'InfoPanel' |
|
698 |
layout: (LayoutFrame 0 0 30 0 0 1 70 0) |
|
699 |
level: 0 |
|
700 |
initiallyInvisible: true |
|
701 |
hasHorizontalScrollBar: false |
|
702 |
hasVerticalScrollBar: false |
|
703 |
clientKey: infoPanel |
|
704 |
createNewBuilder: false |
|
705 |
) |
|
706 |
(ViewSpec |
|
707 |
name: 'Content' |
|
708 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
709 |
component: |
|
710 |
(SpecCollection |
|
711 |
collection: ( |
|
712 |
(SubCanvasSpec |
|
713 |
name: 'Labels' |
|
714 |
layout: (LayoutFrame 0 0 0 0 0 1 60 0) |
|
715 |
hasHorizontalScrollBar: false |
|
716 |
hasVerticalScrollBar: false |
|
717 |
specHolder: labelSpecHolder |
|
718 |
createNewBuilder: false |
|
719 |
postBuildCallback: labelsView: |
|
720 |
) |
|
721 |
(VariableVerticalPanelSpec |
|
722 |
name: 'NavigatorAndDiffPanel' |
|
723 |
layout: (LayoutFrame 0 0 60 0 0 1 0 1) |
|
724 |
initiallyInvisible: true |
|
725 |
visibilityChannel: hasDiffsetHolder |
|
726 |
showHandle: true |
|
727 |
component: |
|
728 |
(SpecCollection |
|
729 |
collection: ( |
|
730 |
(SubCanvasSpec |
|
731 |
name: 'NavigatorPanel' |
|
732 |
hasHorizontalScrollBar: false |
|
733 |
hasVerticalScrollBar: false |
|
734 |
specHolder: navigatorPanelSpecHolder |
|
735 |
createNewBuilder: false |
|
736 |
) |
|
737 |
(SubCanvasSpec |
|
738 |
name: 'SubCanvas1' |
|
739 |
specHolder: textDiffToolWindowSpecHolder |
|
740 |
clientHolder: textDiffToolHolder |
|
741 |
createNewBuilder: false |
|
742 |
) |
|
743 |
) |
|
744 |
||
745 |
) |
|
746 |
handles: (Any 0.3 1.0) |
|
747 |
postBuildCallback: navigatorAndDiffPanelView: |
|
748 |
) |
|
749 |
) |
|
750 |
||
751 |
) |
|
752 |
) |
|
753 |
) |
|
754 |
||
755 |
) |
|
10194 | 756 |
) |
13880 | 757 |
|
758 |
"Modified: / 18-01-2013 / 00:07:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 759 |
! ! |
760 |
||
761 |
!ChangeSetDiffTool class methodsFor:'interface specs - labels'! |
|
762 |
||
13880 | 763 |
mergeALabelSpec |
764 |
"This resource specification was automatically generated |
|
765 |
by the UIPainter of ST/X." |
|
766 |
||
767 |
"Do not manually edit this!! If it is corrupted, |
|
768 |
the UIPainter may not be able to read the specification." |
|
769 |
||
770 |
" |
|
771 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeALabelSpec |
|
772 |
Tools::ChangeSetDiffTool new openInterface:#mergeALabelSpec |
|
773 |
" |
|
774 |
||
775 |
<resource: #canvas> |
|
776 |
||
777 |
^ |
|
778 |
#(FullSpec |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
779 |
name: mergeALabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
780 |
window: |
13880 | 781 |
(WindowSpec |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
782 |
label: 'Version A' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
783 |
name: 'Version A' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
784 |
min: (Point 10 10) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
785 |
bounds: (Rectangle 0 0 300 30) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
786 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
787 |
forceRecursiveBackground: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
788 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
789 |
component: |
13880 | 790 |
(SpecCollection |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
791 |
collection: ( |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
792 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
793 |
label: 'mergeDiff3BaseToAArrow30x30' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
794 |
name: 'Label1' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
795 |
layout: (LayoutFrame 0 0 0 0 30 0 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
796 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
797 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
798 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
799 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
800 |
label: 'versionA24x24' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
801 |
name: 'VersionAIcon' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
802 |
layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
803 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
804 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
805 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
806 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
807 |
label: 'mergeDiff3AToMergedArrow30x30' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
808 |
name: 'Label2' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
809 |
layout: (LayoutFrame 60 0 0 0 90 0 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
810 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
811 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
812 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
813 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
814 |
label: 'Version A' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
815 |
name: 'VersionALabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
816 |
layout: (LayoutFrame 90 0 0 0 0 1 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
817 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
818 |
labelChannel: versionALabelHolder |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
819 |
foregroundColor: (Color 0.0 0.0 0.0) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
820 |
resizeForLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
821 |
adjust: left |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
822 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
823 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
824 |
label: '(A)' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
825 |
name: 'ALabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
826 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
827 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
828 |
foregroundColor: (Color 0.0 0.0 0.0) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
829 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
830 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
831 |
|
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
832 |
) |
13880 | 833 |
) |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
834 |
|
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
835 |
"Modified: / 19-08-2021 / 23:26:43 / Jan Vrany <jan.vrany@labware.com>" |
13880 | 836 |
! |
837 |
||
838 |
mergeBLabelSpec |
|
839 |
"This resource specification was automatically generated |
|
840 |
by the UIPainter of ST/X." |
|
841 |
||
842 |
"Do not manually edit this!! If it is corrupted, |
|
843 |
the UIPainter may not be able to read the specification." |
|
844 |
||
845 |
" |
|
846 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec |
|
847 |
Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec |
|
848 |
" |
|
849 |
||
850 |
<resource: #canvas> |
|
851 |
||
852 |
^ |
|
853 |
#(FullSpec |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
854 |
name: versionBLabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
855 |
window: |
13880 | 856 |
(WindowSpec |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
857 |
label: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
858 |
name: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
859 |
min: (Point 10 10) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
860 |
bounds: (Rectangle 0 0 300 30) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
861 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
862 |
forceRecursiveBackground: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
863 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
864 |
component: |
13880 | 865 |
(SpecCollection |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
866 |
collection: ( |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
867 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
868 |
label: 'mergeDiff3BaseToBArrow30x30' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
869 |
name: 'Label1' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
870 |
layout: (LayoutFrame 0 0 0 0 30 0 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
871 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
872 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
873 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
874 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
875 |
label: 'versionB24x24' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
876 |
name: 'VersionBIcon' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
877 |
layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
878 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
879 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
880 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
881 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
882 |
label: 'mergeDiff3BToMergedArrow30x30' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
883 |
name: 'Label2' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
884 |
layout: (LayoutFrame 60 0 0 0 90 0 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
885 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
886 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
887 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
888 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
889 |
label: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
890 |
name: 'VersionBLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
891 |
layout: (LayoutFrame 90 0 0 0 167 0 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
892 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
893 |
labelChannel: versionBLabelHolder |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
894 |
resizeForLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
895 |
adjust: left |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
896 |
useDynamicPreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
897 |
usePreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
898 |
foregroundColor: (Color 0.0 0.0 0.0) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
899 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
900 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
901 |
label: '(B)' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
902 |
name: 'BLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
903 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
904 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
905 |
foregroundColor: (Color 0.0 0.0 0.0) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
906 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
907 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
908 |
|
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
909 |
) |
13880 | 910 |
) |
911 |
||
912 |
"Created: / 17-01-2013 / 23:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
913 |
"Modified: / 19-08-2021 / 23:26:54 / Jan Vrany <jan.vrany@labware.com>" |
13880 | 914 |
! |
915 |
||
916 |
mergeBaseLabelSpec |
|
917 |
"This resource specification was automatically generated |
|
918 |
by the UIPainter of ST/X." |
|
919 |
||
920 |
"Do not manually edit this!! If it is corrupted, |
|
921 |
the UIPainter may not be able to read the specification." |
|
922 |
||
923 |
" |
|
924 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec |
|
925 |
Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec |
|
926 |
" |
|
927 |
||
928 |
<resource: #canvas> |
|
929 |
||
930 |
^ |
|
931 |
#(FullSpec |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
932 |
name: versionBaseLabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
933 |
window: |
13880 | 934 |
(WindowSpec |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
935 |
label: 'Version Base' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
936 |
name: 'Version Base' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
937 |
min: (Point 10 10) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
938 |
bounds: (Rectangle 0 0 300 30) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
939 |
backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
940 |
forceRecursiveBackground: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
941 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
942 |
component: |
13880 | 943 |
(SpecCollection |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
944 |
collection: ( |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
945 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
946 |
label: 'versionBase24x24' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
947 |
name: 'VersionBIcon' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
948 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
949 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
950 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
951 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
952 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
953 |
label: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
954 |
name: 'VersionBLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
955 |
layout: (LayoutFrame 90 0 0 0 190 0 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
956 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
957 |
labelChannel: versionBaseLabelHolder |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
958 |
resizeForLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
959 |
adjust: left |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
960 |
useDynamicPreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
961 |
usePreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
962 |
foregroundColor: (Color 0.0 0.0 0.0) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
963 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
964 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
965 |
label: '(Base)' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
966 |
name: 'BaseLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
967 |
layout: (LayoutFrame -50 1 0 0 0 1 0 1) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
968 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
969 |
foregroundColor: (Color 0.0 0.0 0.0) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
970 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
971 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
972 |
|
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
973 |
) |
13880 | 974 |
) |
975 |
||
976 |
"Created: / 17-01-2013 / 23:44:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
977 |
"Modified: / 19-08-2021 / 23:27:05 / Jan Vrany <jan.vrany@labware.com>" |
13880 | 978 |
! |
979 |
||
980 |
mergeMergeLabelSpec |
|
981 |
"This resource specification was automatically generated |
|
982 |
by the UIPainter of ST/X." |
|
983 |
||
984 |
"Do not manually edit this!! If it is corrupted, |
|
985 |
the UIPainter may not be able to read the specification." |
|
986 |
||
987 |
" |
|
988 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeMergeLabelSpec |
|
989 |
Tools::ChangeSetDiffTool new openInterface:#mergeMergeLabelSpec |
|
990 |
" |
|
991 |
||
992 |
<resource: #canvas> |
|
993 |
||
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
994 |
^ |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
995 |
#(FullSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
996 |
name: mergeMergeLabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
997 |
uuid: '57a41780-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
998 |
window: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
999 |
(WindowSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1000 |
label: 'Version Merged' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1001 |
name: 'Version Merged' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1002 |
uuid: '57a41781-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1003 |
min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 96.25 72.75 96.0) forceRecursiveBackground: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1004 |
) component: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1005 |
(SpecCollection |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1006 |
collection: ( |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1007 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1008 |
label: 'versionMerged24x24' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1009 |
name: 'VersionMergedIcon' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1010 |
layout: (LayoutFrame 60 0 -12 0.5 87 0 12 0.5) uuid: '57a41782-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1011 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1012 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1013 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1014 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1015 |
label: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1016 |
name: 'VersionMergedLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1017 |
layout: (LayoutFrame 90 0 0 0 276 0 0 1) uuid: '57a43e90-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1018 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1019 |
labelChannel: versionMergedLabelHolder |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1020 |
resizeForLabelHorizontal: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1021 |
resizeForLabelVertical: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1022 |
adjust: left |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1023 |
usePreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1024 |
useDynamicPreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1025 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1026 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1027 |
label: '(Merge)' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1028 |
name: 'MergedLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1029 |
layout: (LayoutFrame -70 1 0 0 0 1 0 1) uuid: '57a43e91-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1030 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1031 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1032 |
) |
13880 | 1033 |
) |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1034 |
) |
13880 | 1035 |
! |
1036 |
||
10194 | 1037 |
versionALabelSpec |
1038 |
"This resource specification was automatically generated |
|
1039 |
by the UIPainter of ST/X." |
|
1040 |
||
1041 |
"Do not manually edit this!! If it is corrupted, |
|
1042 |
the UIPainter may not be able to read the specification." |
|
1043 |
||
1044 |
" |
|
1045 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionALabelSpec |
|
1046 |
Tools::ChangeSetDiffTool new openInterface:#versionALabelSpec |
|
1047 |
" |
|
1048 |
||
1049 |
<resource: #canvas> |
|
1050 |
||
1051 |
^ |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1052 |
#(FullSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1053 |
name: versionALabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1054 |
uuid: 'fa4cfb10-013b-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1055 |
window: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1056 |
(WindowSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1057 |
label: 'Version A' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1058 |
name: 'Version A' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1059 |
uuid: 'fa4d2220-013b-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1060 |
min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 79.5 90.5 69.5) forceRecursiveBackground: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1061 |
) component: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1062 |
(SpecCollection |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1063 |
collection: ( |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1064 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1065 |
label: 'versionA24x24' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1066 |
name: 'VersionAIcon' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1067 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) uuid: 'fa4d2221-013b-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1068 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1069 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1070 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1071 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1072 |
label: 'Version A' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1073 |
name: 'VersionALabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1074 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) uuid: 'fa4d2222-013b-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1075 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1076 |
labelChannel: versionALabelHolder |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1077 |
resizeForLabelHorizontal: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1078 |
resizeForLabelVertical: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1079 |
adjust: left |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1080 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1081 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1082 |
label: '(A)' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1083 |
name: 'ALabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1084 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) uuid: 'fa4d2223-013b-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1085 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1086 |
) |
10194 | 1087 |
) |
1088 |
) |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1089 |
) |
10194 | 1090 |
! |
1091 |
||
1092 |
versionBLabelSpec |
|
1093 |
"This resource specification was automatically generated |
|
1094 |
by the UIPainter of ST/X." |
|
1095 |
||
1096 |
"Do not manually edit this!! If it is corrupted, |
|
1097 |
the UIPainter may not be able to read the specification." |
|
1098 |
||
1099 |
" |
|
1100 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec |
|
1101 |
Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec |
|
1102 |
" |
|
1103 |
||
1104 |
<resource: #canvas> |
|
1105 |
||
1106 |
^ |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1107 |
#(FullSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1108 |
name: versionBLabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1109 |
uuid: '22ea2ac0-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1110 |
window: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1111 |
(WindowSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1112 |
label: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1113 |
name: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1114 |
uuid: '22ea2ac1-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1115 |
min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 100.0 90.5 60.0) forceRecursiveBackground: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1116 |
) component: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1117 |
(SpecCollection |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1118 |
collection: ( |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1119 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1120 |
label: 'versionB24x24' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1121 |
name: 'VersionBIcon' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1122 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) uuid: '22ea2ac2-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1123 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1124 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1125 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1126 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1127 |
label: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1128 |
name: 'VersionBLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1129 |
layout: (LayoutFrame 30 0 0 0 175 0 0 1) uuid: '22ea51d0-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1130 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1131 |
labelChannel: versionBLabelHolder |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1132 |
resizeForLabelHorizontal: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1133 |
resizeForLabelVertical: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1134 |
adjust: left |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1135 |
usePreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1136 |
useDynamicPreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1137 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1138 |
(LabelSpec |
10975 | 1139 |
label: '(B)' |
1140 |
name: 'BLabel' |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1141 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) uuid: '22ea51d1-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1142 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1143 |
) |
10194 | 1144 |
) |
1145 |
) |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1146 |
) |
13880 | 1147 |
! |
1148 |
||
1149 |
versionBaseLabelSpec |
|
1150 |
"This resource specification was automatically generated |
|
1151 |
by the UIPainter of ST/X." |
|
1152 |
||
1153 |
"Do not manually edit this!! If it is corrupted, |
|
1154 |
the UIPainter may not be able to read the specification." |
|
1155 |
||
1156 |
" |
|
1157 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec |
|
1158 |
Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec |
|
1159 |
" |
|
1160 |
||
1161 |
<resource: #canvas> |
|
1162 |
||
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1163 |
^ |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1164 |
#(FullSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1165 |
name: versionBaseLabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1166 |
uuid: '3a0081a0-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1167 |
window: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1168 |
(WindowSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1169 |
label: 'Version Base' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1170 |
name: 'Version Base' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1171 |
uuid: '3a0081a1-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1172 |
min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 67.75 87.75 96.5) forceRecursiveBackground: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1173 |
) component: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1174 |
(SpecCollection |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1175 |
collection: ( |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1176 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1177 |
label: 'versionBase24x24' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1178 |
name: 'VersionBIcon' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1179 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) uuid: '3a00a8b0-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1180 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1181 |
translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1182 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1183 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1184 |
label: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1185 |
name: 'VersionBLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1186 |
layout: (LayoutFrame 30 0 0 0 198 0 0 1) uuid: '3a00a8b1-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1187 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1188 |
labelChannel: versionBaseLabelHolder |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1189 |
resizeForLabelHorizontal: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1190 |
resizeForLabelVertical: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1191 |
adjust: left |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1192 |
usePreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1193 |
useDynamicPreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1194 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1195 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1196 |
label: '(Base)' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1197 |
name: 'BaseLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1198 |
layout: (LayoutFrame -50 1 0 0 0 1 0 1) uuid: '3a00a8b2-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1199 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1200 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1201 |
) |
13880 | 1202 |
) |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1203 |
) |
13880 | 1204 |
! |
1205 |
||
1206 |
versionMergeLabelSpec |
|
1207 |
"This resource specification was automatically generated |
|
1208 |
by the UIPainter of ST/X." |
|
1209 |
||
1210 |
"Do not manually edit this!! If it is corrupted, |
|
1211 |
the UIPainter may not be able to read the specification." |
|
1212 |
||
1213 |
" |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1214 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionMergeLabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1215 |
Tools::ChangeSetDiffTool new openInterface:#versionMergeLabelSpec |
13880 | 1216 |
" |
1217 |
||
1218 |
<resource: #canvas> |
|
1219 |
||
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1220 |
^ |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1221 |
#(FullSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1222 |
name: versionMergeLabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1223 |
uuid: '4910dc30-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1224 |
window: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1225 |
(WindowSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1226 |
label: 'Version Merged' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1227 |
name: 'Version Merged' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1228 |
uuid: '4910dc31-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1229 |
min: (Point 10 10) bounds: (Rectangle 0 0 300 30) backgroundColor: (Color 96.25 72.75 96.0) forceRecursiveBackground: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1230 |
) component: |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1231 |
(SpecCollection |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1232 |
collection: ( |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1233 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1234 |
label: 'versionMerged24x24' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1235 |
name: 'VersionMergedIcon' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1236 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) uuid: '4910dc32-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1237 |
hasCharacterOrientedLabel: false |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1238 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1239 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1240 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1241 |
label: 'Version B' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1242 |
name: 'VersionMergedLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1243 |
layout: (LayoutFrame 30 0 0 0 216 0 0 1) uuid: '4910dc33-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1244 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1245 |
labelChannel: versionMergedLabelHolder |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1246 |
resizeForLabelHorizontal: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1247 |
resizeForLabelVertical: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1248 |
adjust: left |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1249 |
usePreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1250 |
useDynamicPreferredWidth: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1251 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1252 |
(LabelSpec |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1253 |
label: '(Merge)' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1254 |
name: 'MergedLabel' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1255 |
layout: (LayoutFrame -70 1 0 0 0 1 0 1) uuid: '49110340-013c-11ec-9f3c-606720e43e2c' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1256 |
foregroundColor: (Color 0.0 0.0 0.0) translateLabel: true |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1257 |
) |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1258 |
) |
13880 | 1259 |
) |
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
1260 |
) |
10194 | 1261 |
! ! |
1262 |
||
1263 |
!ChangeSetDiffTool class methodsFor:'menu specs'! |
|
1264 |
||
1265 |
listMenu |
|
1266 |
"This resource specification was automatically generated |
|
1267 |
by the MenuEditor of ST/X." |
|
1268 |
||
1269 |
"Do not manually edit this!! If it is corrupted, |
|
1270 |
the MenuEditor may not be able to read the specification." |
|
1271 |
||
1272 |
" |
|
1273 |
MenuEditor new openOnClass:SVN::DiffBrowser andSelector:#listMenu |
|
1274 |
(Menu new fromLiteralArrayEncoding:(SVN::DiffBrowser listMenu)) startUp |
|
1275 |
" |
|
1276 |
||
1277 |
<resource: #menu> |
|
1278 |
||
1279 |
^ |
|
1280 |
#(Menu |
|
1281 |
( |
|
1282 |
(MenuItem |
|
1283 |
label: 'Browse' |
|
1284 |
itemValue: listMenuBrowse |
|
1285 |
translateLabel: true |
|
1286 |
) |
|
1287 |
(MenuItem |
|
1288 |
label: '-' |
|
1289 |
) |
|
1290 |
(MenuItem |
|
1291 |
label: 'Load version A' |
|
1292 |
itemValue: listMenuLoadVersionA |
|
1293 |
nameKey: LoadVersionA |
|
1294 |
translateLabel: true |
|
1295 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A') |
|
1296 |
) |
|
1297 |
(MenuItem |
|
1298 |
label: 'Load version B' |
|
1299 |
itemValue: listMenuLoadVersionB |
|
1300 |
nameKey: LoadVersionB |
|
1301 |
translateLabel: true |
|
1302 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B') |
|
1303 |
) |
|
1304 |
(MenuItem |
|
1305 |
label: '-' |
|
1306 |
) |
|
1307 |
(MenuItem |
|
1308 |
enabled: hasSelection |
|
1309 |
label: 'Inspect' |
|
1310 |
itemValue: listMenuInspect |
|
1311 |
translateLabel: true |
|
1312 |
) |
|
1313 |
) |
|
1314 |
nil |
|
1315 |
nil |
|
1316 |
) |
|
1317 |
! |
|
1318 |
||
13880 | 1319 |
listMenuDiff |
1320 |
"This resource specification was automatically generated |
|
1321 |
by the MenuEditor of ST/X." |
|
1322 |
||
1323 |
"Do not manually edit this!! If it is corrupted, |
|
1324 |
the MenuEditor may not be able to read the specification." |
|
1325 |
||
1326 |
||
1327 |
" |
|
1328 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#listMenu |
|
1329 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenu)) startUp |
|
1330 |
" |
|
1331 |
||
1332 |
<resource: #menu> |
|
1333 |
||
1334 |
^ |
|
1335 |
#(Menu |
|
1336 |
( |
|
1337 |
(MenuItem |
|
1338 |
enabled: hasSelection |
|
1339 |
label: 'Browse' |
|
1340 |
itemValue: listMenuBrowse |
|
1341 |
translateLabel: true |
|
1342 |
) |
|
1343 |
(MenuItem |
|
1344 |
label: '-' |
|
1345 |
) |
|
1346 |
(MenuItem |
|
1347 |
enabled: hasSelection |
|
1348 |
label: 'Load version A' |
|
1349 |
itemValue: listMenuLoadVersionA |
|
1350 |
nameKey: LoadVersionA |
|
1351 |
translateLabel: true |
|
1352 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A') |
|
1353 |
) |
|
1354 |
(MenuItem |
|
1355 |
enabled: hasSelection |
|
1356 |
label: 'Load version B' |
|
1357 |
itemValue: listMenuLoadVersionB |
|
1358 |
nameKey: LoadVersionB |
|
1359 |
translateLabel: true |
|
1360 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B') |
|
1361 |
) |
|
1362 |
(MenuItem |
|
1363 |
label: '-' |
|
1364 |
) |
|
1365 |
(MenuItem |
|
1366 |
label: 'Open in...' |
|
1367 |
translateLabel: true |
|
1368 |
submenu: |
|
1369 |
(Menu |
|
1370 |
( |
|
1371 |
(MenuItem |
|
1372 |
enabled: hasSelection |
|
1373 |
label: 'Inspector' |
|
1374 |
itemValue: listMenuInspect |
|
1375 |
translateLabel: true |
|
1376 |
) |
|
1377 |
(MenuItem |
|
1378 |
enabled: hasSelection |
|
1379 |
label: 'kdiff3' |
|
1380 |
itemValue: listMenuOpenInExternal: |
|
1381 |
translateLabel: true |
|
1382 |
argument: 'kdiff3' |
|
1383 |
) |
|
1384 |
(MenuItem |
|
1385 |
enabled: hasSelection |
|
1386 |
label: 'meld' |
|
1387 |
itemValue: listMenuOpenInExternal: |
|
1388 |
translateLabel: true |
|
1389 |
argument: 'meld' |
|
1390 |
) |
|
1391 |
) |
|
1392 |
nil |
|
1393 |
nil |
|
1394 |
) |
|
1395 |
) |
|
1396 |
) |
|
1397 |
nil |
|
1398 |
nil |
|
1399 |
) |
|
1400 |
||
1401 |
"Created: / 16-01-2013 / 15:47:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1402 |
! |
|
1403 |
||
1404 |
listMenuMerge |
|
1405 |
"This resource specification was automatically generated |
|
1406 |
by the MenuEditor of ST/X." |
|
1407 |
||
1408 |
"Do not manually edit this!! If it is corrupted, |
|
1409 |
the MenuEditor may not be able to read the specification." |
|
1410 |
||
1411 |
||
1412 |
" |
|
1413 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#listMenuMerge |
|
1414 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenuMerge)) startUp |
|
1415 |
" |
|
1416 |
||
1417 |
<resource: #menu> |
|
1418 |
||
1419 |
^ |
|
1420 |
#(Menu |
|
1421 |
( |
|
1422 |
(MenuItem |
|
1423 |
enabled: hasSelection |
|
1424 |
label: 'Browse' |
|
1425 |
itemValue: listMenuBrowse |
|
1426 |
) |
|
1427 |
(MenuItem |
|
1428 |
label: '-' |
|
1429 |
) |
|
1430 |
(MenuItem |
|
1431 |
enabled: hasSelection |
|
1432 |
label: 'Merge using A' |
|
1433 |
itemValue: listMenuMergeUsingA |
|
1434 |
shortcutKey: Cmd2 |
|
1435 |
) |
|
1436 |
(MenuItem |
|
1437 |
enabled: hasSelection |
|
1438 |
label: 'Merge using B' |
|
1439 |
itemValue: listMenuMergeUsingB |
|
1440 |
shortcutKey: Cmd3 |
|
1441 |
) |
|
1442 |
(MenuItem |
|
1443 |
enabled: hasSelection |
|
1444 |
label: 'Merge using Base' |
|
1445 |
itemValue: listMenuMergeUsingBase |
|
1446 |
shortcutKey: Cmd1 |
|
1447 |
) |
|
1448 |
(MenuItem |
|
1449 |
label: '-' |
|
1450 |
) |
|
1451 |
(MenuItem |
|
1452 |
label: 'Open in...' |
|
1453 |
submenu: |
|
1454 |
(Menu |
|
1455 |
( |
|
1456 |
(MenuItem |
|
1457 |
enabled: hasSelection |
|
1458 |
label: 'Inspector' |
|
1459 |
itemValue: listMenuInspect |
|
1460 |
) |
|
1461 |
(MenuItem |
|
1462 |
enabled: hasSelection |
|
1463 |
label: 'kdiff3' |
|
1464 |
itemValue: listMenuOpenInExternal: |
|
1465 |
argument: 'kdiff3' |
|
1466 |
) |
|
1467 |
(MenuItem |
|
1468 |
enabled: hasSelection |
|
1469 |
label: 'meld' |
|
1470 |
itemValue: listMenuOpenInExternal: |
|
1471 |
argument: 'meld' |
|
1472 |
) |
|
1473 |
) |
|
1474 |
nil |
|
1475 |
nil |
|
1476 |
) |
|
1477 |
) |
|
1478 |
) |
|
1479 |
nil |
|
1480 |
nil |
|
1481 |
) |
|
1482 |
! |
|
1483 |
||
10194 | 1484 |
mainMenu |
1485 |
"This resource specification was automatically generated |
|
1486 |
by the MenuEditor of ST/X." |
|
1487 |
||
1488 |
"Do not manually edit this!! If it is corrupted, |
|
1489 |
the MenuEditor may not be able to read the specification." |
|
1490 |
||
10975 | 1491 |
|
10194 | 1492 |
" |
10975 | 1493 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#mainMenu |
1494 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool mainMenu)) startUp |
|
10194 | 1495 |
" |
1496 |
||
1497 |
<resource: #menu> |
|
1498 |
||
13880 | 1499 |
^ |
10194 | 1500 |
#(Menu |
13880 | 1501 |
( |
1502 |
(MenuItem |
|
1503 |
label: 'File' |
|
1504 |
submenu: |
|
1505 |
(Menu |
|
1506 |
( |
|
1507 |
(MenuItem |
|
1508 |
label: 'Open...' |
|
1509 |
itemValue: fileMenuOpen |
|
1510 |
shortcutKey: Ctrlo |
|
1511 |
) |
|
1512 |
(MenuItem |
|
1513 |
enabled: canSave |
|
1514 |
label: 'Save' |
|
1515 |
itemValue: fileMenuSave |
|
1516 |
shortcutKey: Ctrls |
|
1517 |
) |
|
1518 |
(MenuItem |
|
1519 |
enabled: canSaveAs |
|
1520 |
label: 'Save As...' |
|
1521 |
itemValue: fileMenuSaveAs |
|
1522 |
) |
|
1523 |
(MenuItem |
|
1524 |
enabled: canSaveAsPatch |
|
1525 |
label: 'Save As Patch ' |
|
1526 |
itemValue: fileMenuSaveAsPatch |
|
1527 |
isVisible: false |
|
1528 |
) |
|
1529 |
(MenuItem |
|
1530 |
enabled: canSaveMergedAs |
|
1531 |
label: 'Save Merged as... ' |
|
1532 |
itemValue: fileMenuSaveMergedAs |
|
1533 |
) |
|
1534 |
(MenuItem |
|
1535 |
label: '-' |
|
1536 |
) |
|
1537 |
(MenuItem |
|
1538 |
label: 'Exit' |
|
1539 |
itemValue: closeRequest |
|
1540 |
shortcutKey: Ctrlq |
|
1541 |
) |
|
1542 |
) |
|
1543 |
nil |
|
1544 |
nil |
|
1545 |
) |
|
1546 |
) |
|
1547 |
(MenuItem |
|
1548 |
label: 'Changeset' |
|
1549 |
submenu: |
|
1550 |
(Menu |
|
1551 |
( |
|
1552 |
(MenuItem |
|
1553 |
enabled: isDiff2Or3 |
|
1554 |
label: 'Browse changes (A)' |
|
1555 |
itemValue: changesetMenuBrowseA |
|
1556 |
) |
|
1557 |
(MenuItem |
|
1558 |
enabled: isDiff2Or3 |
|
1559 |
label: 'Browse changes (B)' |
|
1560 |
itemValue: changesetMenuBrowseB |
|
1561 |
) |
|
1562 |
(MenuItem |
|
1563 |
enabled: isDiff3 |
|
1564 |
label: 'Browse changes (Base)' |
|
1565 |
itemValue: changesetMenuBrowseBase |
|
1566 |
) |
|
1567 |
(MenuItem |
|
1568 |
enabled: isMerge |
|
1569 |
label: 'Browse changes (Merge)' |
|
1570 |
itemValue: changesetMenuBrowseMerge |
|
1571 |
) |
|
1572 |
) |
|
1573 |
nil |
|
1574 |
nil |
|
1575 |
) |
|
1576 |
) |
|
1577 |
(MenuItem |
|
1578 |
label: 'Movement' |
|
1579 |
submenu: |
|
1580 |
(Menu |
|
1581 |
( |
|
1582 |
(MenuItem |
|
1583 |
label: 'Go to Previous Delta' |
|
1584 |
itemValue: menuMoveUp |
|
1585 |
) |
|
1586 |
(MenuItem |
|
1587 |
label: 'Go To Next Delta' |
|
1588 |
itemValue: menuMoveDown |
|
1589 |
) |
|
1590 |
(MenuItem |
|
1591 |
label: 'Go to Previous Conflict' |
|
1592 |
itemValue: menuMoveUpConflict |
|
1593 |
shortcutKey: CmdCursorUp |
|
1594 |
) |
|
1595 |
(MenuItem |
|
1596 |
label: 'Go to Next Conflict' |
|
1597 |
itemValue: menuMoveDownConflict |
|
1598 |
shortcutKey: CmdCursorDown |
|
1599 |
) |
|
1600 |
(MenuItem |
|
1601 |
label: '-' |
|
1602 |
) |
|
1603 |
(MenuItem |
|
1604 |
label: 'Automatically Go to Next Conflict' |
|
1605 |
indication: autoMoveToNextConflictHolder |
|
1606 |
) |
|
1607 |
) |
|
1608 |
nil |
|
1609 |
nil |
|
1610 |
) |
|
1611 |
) |
|
1612 |
(MenuItem |
|
1613 |
label: 'Change' |
|
1614 |
submenuChannel: listMenu |
|
1615 |
) |
|
1616 |
(MenuItem |
|
1617 |
label: 'View' |
|
1618 |
submenu: |
|
1619 |
(Menu |
|
1620 |
( |
|
1621 |
(MenuItem |
|
1622 |
label: 'Show Diffs in Version Methods' |
|
1623 |
indication: showVersionMethodDiffsHolder |
|
1624 |
) |
|
1625 |
(MenuItem |
|
1626 |
label: 'Show Diff in #copyright Methods' |
|
1627 |
indication: showCopyrightMethodDiffsHolder |
|
1628 |
) |
|
1629 |
(MenuItem |
|
1630 |
label: 'Highlight Conflicts' |
|
1631 |
indication: highlightConflictsHolder |
|
1632 |
) |
|
1633 |
) |
|
1634 |
nil |
|
1635 |
nil |
|
1636 |
) |
|
1637 |
) |
|
1638 |
) |
|
1639 |
nil |
|
1640 |
nil |
|
10194 | 1641 |
) |
13880 | 1642 |
! |
1643 |
||
1644 |
toolbarMenu |
|
1645 |
"This resource specification was automatically generated |
|
1646 |
by the MenuEditor of ST/X." |
|
1647 |
||
1648 |
"Do not manually edit this!! If it is corrupted, |
|
1649 |
the MenuEditor may not be able to read the specification." |
|
1650 |
||
1651 |
||
1652 |
" |
|
1653 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#toolbarMenu |
|
1654 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool toolbarMenu)) startUp |
|
1655 |
" |
|
1656 |
||
1657 |
<resource: #menu> |
|
1658 |
||
1659 |
^ |
|
1660 |
#(Menu |
|
1661 |
( |
|
1662 |
(MenuItem |
|
1663 |
label: 'Open' |
|
1664 |
itemValue: fileMenuOpen |
|
1665 |
isButton: true |
|
1666 |
labelImage: (ResourceRetriever ToolbarIconLibrary loadFromFile22x22Icon) |
|
1667 |
) |
|
1668 |
(MenuItem |
|
1669 |
enabled: canSaveHolder |
|
1670 |
label: 'Save' |
|
1671 |
itemValue: fileMenuSave |
|
1672 |
isButton: true |
|
1673 |
labelImage: (ResourceRetriever ToolbarIconLibrary saveImageIcon) |
|
1674 |
) |
|
1675 |
(MenuItem |
|
1676 |
label: '-' |
|
1677 |
) |
|
1678 |
(MenuItem |
|
1679 |
label: 'Go to Previous Delta' |
|
1680 |
itemValue: menuMoveUp |
|
1681 |
isButton: true |
|
1682 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergePrev24x24) |
|
1683 |
) |
|
1684 |
(MenuItem |
|
1685 |
label: 'Go to Next Delta' |
|
1686 |
itemValue: menuMoveDown |
|
1687 |
isButton: true |
|
1688 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeNext24x24) |
|
1689 |
) |
|
1690 |
(MenuItem |
|
1691 |
label: 'Go to Previous Conflict' |
|
1692 |
itemValue: menuMoveUpConflict |
|
1693 |
isButton: true |
|
1694 |
isVisible: mergeHolder |
|
1695 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergePrevConflict24x24) |
|
1696 |
) |
|
1697 |
(MenuItem |
|
1698 |
label: 'Go to Next Conflict' |
|
1699 |
itemValue: menuMoveDownConflict |
|
1700 |
isButton: true |
|
1701 |
isVisible: mergeHolder |
|
1702 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeNextConflict24x24) |
|
1703 |
) |
|
1704 |
(MenuItem |
|
1705 |
label: '-' |
|
1706 |
isVisible: mergeHolder |
|
1707 |
) |
|
1708 |
(MenuItem |
|
1709 |
label: 'Merge using Base' |
|
1710 |
itemValue: listMenuMergeUsingBase |
|
1711 |
isButton: true |
|
1712 |
isVisible: mergeHolder |
|
1713 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBaseAll24x24) |
|
1714 |
) |
|
1715 |
(MenuItem |
|
1716 |
label: 'Merge using A' |
|
1717 |
itemValue: listMenuMergeUsingA |
|
1718 |
isButton: true |
|
1719 |
isVisible: mergeHolder |
|
1720 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingAAll24x24) |
|
1721 |
) |
|
1722 |
(MenuItem |
|
1723 |
label: 'Merge using B' |
|
1724 |
itemValue: listMenuMergeUsingB |
|
1725 |
isButton: true |
|
1726 |
isVisible: mergeHolder |
|
1727 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBAll24x24) |
|
1728 |
) |
|
1729 |
) |
|
1730 |
nil |
|
1731 |
nil |
|
1732 |
) |
|
10194 | 1733 |
! ! |
1734 |
||
1735 |
!ChangeSetDiffTool class methodsFor:'plugIn spec'! |
|
1736 |
||
1737 |
aspectSelectors |
|
1738 |
"This resource specification was automatically generated |
|
1739 |
by the UIPainter of ST/X." |
|
1740 |
||
1741 |
"Do not manually edit this. If it is corrupted, |
|
1742 |
the UIPainter may not be able to read the specification." |
|
1743 |
||
1744 |
"Return a description of exported aspects; |
|
1745 |
these can be connected to aspects of an embedding application |
|
1746 |
(if this app is embedded in a subCanvas)." |
|
1747 |
||
1748 |
^ #( |
|
1749 |
#diffsetHolder |
|
1750 |
). |
|
1751 |
||
1752 |
! ! |
|
1753 |
||
1754 |
!ChangeSetDiffTool methodsFor:'accessing'! |
|
1755 |
||
1756 |
beSingleColumn |
|
1757 |
||
1758 |
self navigatorPanelSpecHolder value: #oneColumnNavigatorSpec |
|
1759 |
||
1760 |
"Created: / 20-11-2009 / 20:41:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1761 |
! |
|
1762 |
||
1763 |
beTwoColumn |
|
1764 |
||
1765 |
self navigatorPanelSpecHolder value: #twoColumnNavigatorSpec |
|
1766 |
||
1767 |
"Created: / 20-11-2009 / 20:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1768 |
! |
|
1769 |
||
1770 |
beTwoColumn: aBoolean |
|
1771 |
||
1772 |
aBoolean |
|
1773 |
ifTrue:[self beTwoColumn] |
|
1774 |
ifFalse:[self beSingleColumn] |
|
1775 |
||
1776 |
"Created: / 20-11-2009 / 20:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1777 |
! |
|
1778 |
||
13880 | 1779 |
codeAspect |
1780 |
^self codeAspectHolder value |
|
1781 |
||
1782 |
"Created: / 04-04-2013 / 18:23:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1783 |
! |
|
1784 |
||
1785 |
diffInfo |
|
1786 |
||
1787 |
^self diffInfoHolder value |
|
1788 |
||
1789 |
"Created: / 20-03-2012 / 11:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1790 |
! |
|
1791 |
||
10194 | 1792 |
diffset |
1793 |
||
1794 |
^self diffsetHolder value |
|
1795 |
||
1796 |
"Created: / 05-12-2009 / 11:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1797 |
! |
|
1798 |
||
1799 |
diffset: aDiff3Set |
|
1800 |
||
1801 |
self diffsetHolder value: aDiff3Set |
|
1802 |
||
1803 |
"Created: / 01-11-2009 / 09:33:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1804 |
! |
|
1805 |
||
1806 |
patchset |
|
1807 |
||
1808 |
| patchset | |
|
1809 |
patchset := ChangeSet new. |
|
1810 |
self diffset do: |
|
1811 |
[:diff|patchset add:diff versionA]. |
|
1812 |
^patchset |
|
1813 |
||
1814 |
"Created: / 05-12-2009 / 11:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1815 |
! |
|
1816 |
||
1817 |
selection |
|
1818 |
||
1819 |
^self selectionHolder value |
|
1820 |
||
1821 |
"Created: / 22-10-2008 / 11:30:03 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1822 |
! |
|
1823 |
||
13880 | 1824 |
showCopyrightMethodDiffs |
1825 |
^self showCopyrightMethodDiffsHolder value |
|
1826 |
||
1827 |
"Created: / 10-08-2012 / 16:07:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1828 |
! |
|
1829 |
||
1830 |
showCopyrightMethodDiffs: aBoolean |
|
1831 |
self showCopyrightMethodDiffsHolder value: aBoolean |
|
1832 |
||
1833 |
"Created: / 10-08-2012 / 16:07:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1834 |
! |
|
1835 |
||
1836 |
showVersionMethodDiffs |
|
1837 |
^ self showVersionMethodDiffsHolder value |
|
1838 |
||
1839 |
"Created: / 10-08-2012 / 16:07:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1840 |
! |
|
1841 |
||
1842 |
showVersionMethodDiffs: aBoolean |
|
1843 |
self showVersionMethodDiffsHolder value: aBoolean |
|
1844 |
||
1845 |
"Created: / 10-08-2012 / 16:08:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 1846 |
! |
1847 |
||
1848 |
title: aString |
|
1849 |
||
1850 |
self titleHolder value: aString |
|
1851 |
||
1852 |
"Created: / 19-11-2009 / 15:44:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1853 |
! ! |
|
1854 |
||
13880 | 1855 |
!ChangeSetDiffTool methodsFor:'accessing-menus'! |
1856 |
||
1857 |
listMenu |
|
1858 |
| spec | |
|
1859 |
||
1860 |
spec := self isMerge ifTrue:[self class listMenuMerge] ifFalse:[self class listMenuDiff]. |
|
1861 |
^Menu decodeFromLiteralArray: spec. |
|
1862 |
||
1863 |
"Created: / 16-01-2013 / 15:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1864 |
! ! |
|
1865 |
||
1866 |
!ChangeSetDiffTool methodsFor:'accessing-selection'! |
|
1867 |
||
1868 |
selection: entry |
|
1869 |
||
1870 |
||
1871 |
self isOneColumnBrowser ifTrue:[ |
|
1872 |
list1App selection: entry |
|
1873 |
] ifFalse:[ |
|
1874 |
| parent | |
|
1875 |
||
1876 |
parent := self diffsetHolderPrivate value diffs |
|
1877 |
detect:[:each|each diffs includes: entry] ifNone:[nil]. |
|
1878 |
parent notNil ifTrue:[ |
|
1879 |
list1App selection: parent. |
|
1880 |
list1App updateOutputGenerator. |
|
1881 |
list2App updateList. |
|
1882 |
list2App selection: entry. |
|
1883 |
||
1884 |
] |
|
1885 |
] |
|
1886 |
||
1887 |
"Created: / 22-10-2008 / 11:30:11 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1888 |
"Modified: / 17-01-2013 / 16:28:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1889 |
! |
|
1890 |
||
1891 |
theFirstSelectedEntry |
|
1892 |
| selection | |
|
1893 |
||
1894 |
selection := self selectionHolder value. |
|
1895 |
selection isNil ifTrue:[ ^ nil ]. |
|
1896 |
selection := selection collect:[:e|e]. "/selection might be an Iterator |
|
1897 |
selection isEmpty ifTrue:[ ^nil ]. |
|
1898 |
^selection first |
|
1899 |
||
1900 |
"Created: / 17-01-2013 / 16:58:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1901 |
! |
|
1902 |
||
1903 |
theLastSelectedEntry |
|
1904 |
| selection | |
|
1905 |
||
1906 |
selection := self selectionHolder value. |
|
1907 |
selection isNil ifTrue:[ ^ nil ]. |
|
1908 |
selection := selection collect:[:e|e]. "/selection might be an Iterator |
|
1909 |
selection isEmpty ifTrue:[ ^nil ]. |
|
1910 |
^selection last |
|
1911 |
||
1912 |
"Created: / 17-01-2013 / 13:22:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
15227
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1913 |
! |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1914 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1915 |
theSingleSelectedObject |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1916 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1917 |
| sel selSize obj | |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1918 |
sel := self selection. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1919 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1920 |
(sel isCollection and:[self isString not]) |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1921 |
ifFalse:[^sel]. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1922 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1923 |
selSize := 0. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1924 |
obj := nil. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1925 |
sel do: |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1926 |
[:each| |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1927 |
selSize := selSize + 1. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1928 |
selSize > 1 ifTrue:[^nil]. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1929 |
obj := each]. |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1930 |
^obj |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1931 |
|
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1932 |
"Created: / 10-11-2009 / 11:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
764ae01ccfe1
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
14409
diff
changeset
|
1933 |
"Modified: / 20-11-2009 / 19:54:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13880 | 1934 |
! ! |
1935 |
||
15231
37bdad4551ec
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
15227
diff
changeset
|
1936 |
!ChangeSetDiffTool methodsFor:'accessing-subApps'! |
13880 | 1937 |
|
1938 |
textDiff2Tool |
|
1939 |
textDiff2App isNil ifTrue:[ |
|
1940 |
textDiff2App := TextDiff2Tool new |
|
1941 |
labelAHolder: self versionALabelHolder; |
|
1942 |
textAHolder: self versionATextHolder; |
|
1943 |
||
1944 |
labelBHolder: self versionBLabelHolder; |
|
1945 |
textBHolder: self versionBTextHolder; |
|
1946 |
||
1947 |
codeAspectHolder: self codeAspectHolder; |
|
1948 |
||
1949 |
yourself |
|
1950 |
]. |
|
1951 |
^textDiff2App |
|
1952 |
||
1953 |
"Created: / 16-03-2012 / 13:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1954 |
"Modified: / 04-04-2013 / 18:17:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1955 |
! |
|
1956 |
||
1957 |
textDiff3Tool |
|
1958 |
textDiff3App isNil ifTrue:[ |
|
1959 |
textDiff3App := TextDiff3Tool new |
|
1960 |
mergeHolder: self mergeHolder; |
|
1961 |
mergeDataHolder: self mergeDataHolder; |
|
1962 |
||
1963 |
labelCHolder: self versionBaseLabelHolder; |
|
1964 |
textCHolder: self versionBaseTextHolder; |
|
1965 |
||
1966 |
labelBHolder: self versionBLabelHolder; |
|
1967 |
textBHolder: self versionBTextHolder; |
|
1968 |
||
1969 |
labelAHolder: self versionALabelHolder; |
|
1970 |
textAHolder: self versionATextHolder; |
|
1971 |
||
1972 |
codeAspectHolder: self codeAspectHolder; |
|
1973 |
||
1974 |
||
1975 |
yourself |
|
1976 |
]. |
|
1977 |
^textDiff3App |
|
1978 |
||
1979 |
"Created: / 16-03-2012 / 15:16:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1980 |
"Modified: / 04-04-2013 / 18:17:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1981 |
! ! |
|
1982 |
||
1983 |
!ChangeSetDiffTool methodsFor:'accessing-subviews'! |
|
1984 |
||
1985 |
labelsView:something |
|
1986 |
labelsView := something. |
|
1987 |
! |
|
1988 |
||
1989 |
list1View: aView |
|
1990 |
list1App := aView application. |
|
1991 |
||
1992 |
"Created: / 17-01-2013 / 13:44:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1993 |
! |
|
1994 |
||
1995 |
list2View: aView |
|
1996 |
list2App := aView application. |
|
1997 |
||
1998 |
"Created: / 17-01-2013 / 13:44:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1999 |
! |
|
2000 |
||
2001 |
navigatorAndDiffPanelView:something |
|
2002 |
navigatorAndDiffPanelView := something. |
|
2003 |
! ! |
|
2004 |
||
10194 | 2005 |
!ChangeSetDiffTool methodsFor:'aspects'! |
2006 |
||
13880 | 2007 |
autoMoveToNextConflictHolder |
2008 |
||
2009 |
autoMoveToNextConflictHolder isNil ifTrue:[ |
|
2010 |
autoMoveToNextConflictHolder := AspectAdaptor forAspect: #autoMoveToNextConflict. |
|
2011 |
autoMoveToNextConflictHolder subject: self class. |
|
2012 |
]. |
|
2013 |
^autoMoveToNextConflictHolder |
|
2014 |
||
2015 |
"Created: / 17-01-2013 / 19:51:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2016 |
! |
|
2017 |
||
2018 |
canSaveHolder |
|
2019 |
"return/create the 'canSaveHolder' value holder (automatically generated)" |
|
2020 |
||
2021 |
canSaveHolder isNil ifTrue:[ |
|
2022 |
canSaveHolder := false asValue |
|
2023 |
]. |
|
2024 |
^ canSaveHolder |
|
2025 |
||
2026 |
"Modified: / 17-01-2013 / 21:00:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2027 |
! |
|
2028 |
||
2029 |
codeAspectHolder |
|
2030 |
"return/create the valueHolder 'codeAspectHolder'" |
|
2031 |
||
2032 |
codeAspectHolder isNil ifTrue:[ |
|
2033 |
codeAspectHolder := ValueHolder with:nil "defaultValue here". |
|
2034 |
]. |
|
2035 |
^ codeAspectHolder |
|
2036 |
! |
|
2037 |
||
2038 |
diffInfoHolder |
|
2039 |
"return/create the 'diffInfoHolder' value holder (automatically generated)" |
|
2040 |
||
2041 |
diffInfoHolder isNil ifTrue:[ |
|
2042 |
diffInfoHolder := ValueHolder new. |
|
2043 |
diffInfoHolder addDependent:self. |
|
2044 |
]. |
|
2045 |
^ diffInfoHolder |
|
2046 |
! |
|
2047 |
||
2048 |
diffInfoHolder:something |
|
2049 |
"set the 'diffInfoHolder' value holder (automatically generated)" |
|
2050 |
||
2051 |
|oldValue newValue| |
|
2052 |
||
2053 |
diffInfoHolder notNil ifTrue:[ |
|
2054 |
oldValue := diffInfoHolder value. |
|
2055 |
diffInfoHolder removeDependent:self. |
|
2056 |
]. |
|
2057 |
diffInfoHolder := something. |
|
2058 |
diffInfoHolder notNil ifTrue:[ |
|
2059 |
diffInfoHolder addDependent:self. |
|
2060 |
]. |
|
2061 |
newValue := diffInfoHolder value. |
|
2062 |
oldValue ~~ newValue ifTrue:[ |
|
2063 |
self update:#value with:newValue from:diffInfoHolder. |
|
2064 |
]. |
|
2065 |
! |
|
2066 |
||
10194 | 2067 |
diffListEntryLabelGeneratorAspect |
2068 |
||
2069 |
^nil |
|
2070 |
||
2071 |
"Created: / 24-11-2009 / 10:01:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2072 |
! |
|
2073 |
||
2074 |
diffsetHolder |
|
2075 |
"return/create the 'diffsetHolder' value holder (automatically generated)" |
|
2076 |
||
2077 |
diffsetHolder isNil ifTrue:[ |
|
2078 |
diffsetHolder := ValueHolder new. |
|
2079 |
diffsetHolder addDependent:self. |
|
2080 |
]. |
|
2081 |
^ diffsetHolder |
|
2082 |
! |
|
2083 |
||
2084 |
diffsetHolder:aValueHolder |
|
2085 |
"set the 'diffsetHolder' value holder (automatically generated)" |
|
2086 |
||
2087 |
|oldValue newValue| |
|
2088 |
||
2089 |
diffsetHolder notNil ifTrue:[ |
|
2090 |
oldValue := diffsetHolder value. |
|
2091 |
diffsetHolder removeDependent:self. |
|
2092 |
]. |
|
2093 |
diffsetHolder := aValueHolder. |
|
2094 |
diffsetHolder notNil ifTrue:[ |
|
2095 |
diffsetHolder addDependent:self. |
|
2096 |
]. |
|
2097 |
newValue := diffsetHolder value. |
|
2098 |
oldValue ~~ newValue ifTrue:[ |
|
2099 |
self update:#value with:newValue from:diffsetHolder. |
|
2100 |
]. |
|
2101 |
! |
|
2102 |
||
2103 |
diffsetHolderPrivate |
|
2104 |
"return/create the 'diffSetHolderPrivate' value holder (automatically generated)" |
|
2105 |
||
2106 |
diffsetHolderPrivate isNil ifTrue:[ |
|
2107 |
diffsetHolderPrivate := ValueHolder with: (self diffsetHolder value). |
|
2108 |
]. |
|
2109 |
^ diffsetHolderPrivate |
|
2110 |
||
2111 |
"Created: / 05-12-2009 / 11:03:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2112 |
! |
|
2113 |
||
2114 |
firstColSelectionHolder |
|
2115 |
"return/create the valueHolder 'firstColSelectionHolder'" |
|
2116 |
||
2117 |
firstColSelectionHolder isNil ifTrue:[ |
|
2118 |
firstColSelectionHolder := ValueHolder with:nil "defaultValue here". |
|
2119 |
]. |
|
2120 |
^ firstColSelectionHolder |
|
2121 |
! |
|
2122 |
||
13880 | 2123 |
hasDiffsetHolder |
2124 |
"return/create the 'hasDiffsetHolder' value holder (automatically generated)" |
|
2125 |
||
2126 |
hasDiffsetHolder isNil ifTrue:[ |
|
2127 |
hasDiffsetHolder := false asValue |
|
2128 |
]. |
|
2129 |
^ hasDiffsetHolder |
|
2130 |
||
2131 |
"Modified: / 01-08-2012 / 17:16:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2132 |
! |
|
2133 |
||
2134 |
hasDiffsetHolder:something |
|
2135 |
"set the 'hasDiffsetHolder' value holder (automatically generated)" |
|
2136 |
||
2137 |
hasDiffsetHolder := something. |
|
2138 |
! |
|
2139 |
||
10194 | 2140 |
hasSelectionHolder |
2141 |
||
2142 |
|holder| |
|
2143 |
||
2144 |
(holder := builder bindingAt:#hasSelectionHolder) isNil ifTrue:[ |
|
2145 |
holder := (AspectAdaptor forAspect: #notEmptyOrNil) |
|
2146 |
subjectChannel: self selectionHolder. |
|
2147 |
builder aspectAt:#hasSelectionHolder put: holder |
|
2148 |
]. |
|
2149 |
^ holder. |
|
2150 |
||
2151 |
"Created: / 22-10-2008 / 11:34:36 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2152 |
"Modified: / 22-10-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2153 |
! |
|
2154 |
||
13880 | 2155 |
highlightConflictsHolder |
2156 |
"return/create the 'highlightConflictsHolder' value holder (automatically generated)" |
|
2157 |
||
2158 |
highlightConflictsHolder isNil ifTrue:[ |
|
2159 |
highlightConflictsHolder := true asValue |
|
2160 |
]. |
|
2161 |
^ highlightConflictsHolder |
|
2162 |
||
2163 |
"Modified: / 01-08-2012 / 17:07:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2164 |
! |
|
2165 |
||
2166 |
highlightConflictsHolder:something |
|
2167 |
"set the 'highlightConflictsHolder' value holder (automatically generated)" |
|
2168 |
||
2169 |
highlightConflictsHolder := something. |
|
2170 |
! |
|
2171 |
||
2172 |
infoPanel |
|
2173 |
infoPanel isNil ifTrue:[ |
|
2174 |
infoPanel := InlineMessageDialog new |
|
2175 |
]. |
|
2176 |
^ infoPanel |
|
2177 |
||
2178 |
"Created: / 09-02-2012 / 19:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2179 |
! |
|
2180 |
||
2181 |
labelSpecHolder |
|
2182 |
"return/create the 'labelSpecHolder' value holder (automatically generated)" |
|
2183 |
||
2184 |
labelSpecHolder isNil ifTrue:[ |
|
2185 |
labelSpecHolder := nil asValue |
|
2186 |
||
2187 |
]. |
|
2188 |
^ labelSpecHolder |
|
2189 |
||
2190 |
"Modified: / 17-01-2013 / 23:32:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2191 |
! |
|
2192 |
||
10194 | 2193 |
listHolder |
2194 |
"return/create the 'listHolder' value holder (automatically generated)" |
|
2195 |
||
2196 |
listHolder isNil ifTrue:[ |
|
2197 |
listHolder := ValueHolder new. |
|
2198 |
]. |
|
2199 |
^ listHolder |
|
2200 |
||
2201 |
"Modified: / 01-11-2009 / 16:57:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2202 |
! |
|
2203 |
||
2204 |
listMenuHolder |
|
13880 | 2205 |
diffMenuHolder isNil ifTrue:[ |
2206 |
"/ diffMenuHolder := ValueHolder with:self listMenu |
|
2207 |
diffMenuHolder := BlockValue with:[:v|self listMenu] argument: self mergeHolder |
|
10879 | 2208 |
]. |
10194 | 2209 |
^ diffMenuHolder |
2210 |
||
2211 |
"Created: / 21-11-2009 / 18:52:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10879 | 2212 |
"Modified: / 18-11-2011 / 14:57:47 / cg" |
13880 | 2213 |
"Modified: / 16-01-2013 / 15:59:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2214 |
! |
|
2215 |
||
2216 |
mergeDataHolder |
|
2217 |
"return/create the 'mergeDataHolder' value holder (automatically generated)" |
|
2218 |
||
2219 |
mergeDataHolder isNil ifTrue:[ |
|
2220 |
mergeDataHolder := ValueHolder new. |
|
2221 |
mergeDataHolder addDependent:self. |
|
2222 |
]. |
|
2223 |
^ mergeDataHolder |
|
2224 |
! |
|
2225 |
||
2226 |
mergeDataHolder:something |
|
2227 |
"set the 'mergeDataHolder' value holder (automatically generated)" |
|
2228 |
||
2229 |
|oldValue newValue| |
|
2230 |
||
2231 |
mergeDataHolder notNil ifTrue:[ |
|
2232 |
oldValue := mergeDataHolder value. |
|
2233 |
mergeDataHolder removeDependent:self. |
|
2234 |
]. |
|
2235 |
mergeDataHolder := something. |
|
2236 |
mergeDataHolder notNil ifTrue:[ |
|
2237 |
mergeDataHolder addDependent:self. |
|
2238 |
]. |
|
2239 |
newValue := mergeDataHolder value. |
|
2240 |
oldValue ~~ newValue ifTrue:[ |
|
2241 |
self update:#value with:newValue from:mergeDataHolder. |
|
2242 |
]. |
|
2243 |
! |
|
2244 |
||
2245 |
mergeHolder |
|
2246 |
"return/create the 'mergeHolder' value holder (automatically generated)" |
|
2247 |
||
2248 |
mergeHolder isNil ifTrue:[ |
|
2249 |
mergeHolder := ValueHolder with: false. |
|
2250 |
]. |
|
2251 |
^ mergeHolder |
|
2252 |
||
2253 |
"Modified: / 19-03-2012 / 14:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2254 |
! |
|
2255 |
||
2256 |
mergeHolder:something |
|
2257 |
"set the 'mergeHolder' value holder (automatically generated)" |
|
2258 |
||
2259 |
mergeHolder := something. |
|
2260 |
! |
|
2261 |
||
2262 |
mergeSavedHolder |
|
2263 |
"return/create the 'mergeSavedHolder' value holder (automatically generated)" |
|
2264 |
||
2265 |
mergeSavedHolder isNil ifTrue:[ |
|
2266 |
mergeSavedHolder := false asValue |
|
2267 |
]. |
|
2268 |
^ mergeSavedHolder |
|
2269 |
||
2270 |
"Modified: / 15-01-2013 / 11:39:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2271 |
! |
2272 |
||
2273 |
nameAspect |
|
2274 |
||
2275 |
^(AspectAdaptor forAspect: #name) |
|
2276 |
subjectChannel: self diffsetHolder |
|
2277 |
||
2278 |
"Created: / 01-11-2009 / 11:14:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2279 |
! |
|
2280 |
||
2281 |
navigatorPanelSpecHolder |
|
2282 |
<resource: #uiAspect> |
|
2283 |
||
2284 |
navigatorPanelSpecHolder isNil ifTrue:[ |
|
2285 |
navigatorPanelSpecHolder := ValueHolder with: #twoColumnNavigatorSpec. |
|
2286 |
]. |
|
2287 |
^ navigatorPanelSpecHolder. |
|
2288 |
||
2289 |
"Modified: / 20-11-2009 / 20:12:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2290 |
! |
|
2291 |
||
13880 | 2292 |
secondColSelectionHolder |
2293 |
"return/create the valueHolder 'firstColSelectionHolder'" |
|
2294 |
||
2295 |
^self selectionHolder |
|
2296 |
||
2297 |
"Created: / 17-01-2013 / 12:49:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2298 |
! |
|
2299 |
||
10194 | 2300 |
selectionHolder |
2301 |
"return/create the 'selectionHolder' value holder (automatically generated)" |
|
2302 |
||
2303 |
selectionHolder isNil ifTrue:[ |
|
2304 |
||
2305 |
selectionHolder := ValueHolder new. |
|
2306 |
selectionHolder addDependent:self. |
|
2307 |
]. |
|
2308 |
^ selectionHolder |
|
2309 |
||
2310 |
"Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2311 |
! |
|
2312 |
||
13880 | 2313 |
showCopyrightMethodDiffsHolder |
2314 |
"return/create the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)" |
|
2315 |
||
2316 |
showCopyrightMethodDiffsHolder isNil ifTrue:[ |
|
2317 |
showCopyrightMethodDiffsHolder := true asValue |
|
2318 |
]. |
|
2319 |
^ showCopyrightMethodDiffsHolder |
|
2320 |
||
2321 |
"Modified: / 01-08-2012 / 17:06:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2322 |
! |
|
2323 |
||
2324 |
showCopyrightMethodDiffsHolder:something |
|
2325 |
"set the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)" |
|
2326 |
||
2327 |
showCopyrightMethodDiffsHolder := something. |
|
2328 |
! |
|
2329 |
||
2330 |
showVersionMethodDiffsHolder |
|
2331 |
"return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)" |
|
2332 |
||
2333 |
showVersionMethodDiffsHolder isNil ifTrue:[ |
|
2334 |
showVersionMethodDiffsHolder := true asValue. |
|
2335 |
]. |
|
2336 |
^ showVersionMethodDiffsHolder |
|
2337 |
||
2338 |
"Modified: / 18-04-2012 / 19:02:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2339 |
! |
|
2340 |
||
2341 |
showVersionMethodDiffsHolder:something |
|
2342 |
"set the 'showVersionMethodDiffsHolder' value holder (automatically generated)" |
|
2343 |
||
2344 |
showVersionMethodDiffsHolder := something. |
|
2345 |
! |
|
2346 |
||
10194 | 2347 |
singleSelectionHolder |
2348 |
"return/create the 'singleSelectionHolder' value holder (automatically generated)" |
|
2349 |
||
2350 |
singleSelectionHolder isNil ifTrue:[ |
|
2351 |
singleSelectionHolder := ValueHolder new. |
|
2352 |
]. |
|
2353 |
^ singleSelectionHolder |
|
2354 |
||
2355 |
"Modified: / 10-11-2009 / 11:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2356 |
! |
|
2357 |
||
13880 | 2358 |
textDiffToolHolder |
2359 |
"return/create the 'textDiffToolHolder' value holder (automatically generated)" |
|
2360 |
||
2361 |
textDiffToolHolder isNil ifTrue:[ |
|
2362 |
textDiffToolHolder := ValueHolder with: self textDiff2Tool. |
|
2363 |
]. |
|
2364 |
^ textDiffToolHolder |
|
2365 |
||
2366 |
"Modified: / 16-03-2012 / 13:57:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2367 |
! |
|
2368 |
||
2369 |
textDiffToolHolder:something |
|
2370 |
"set the 'textDiffToolHolder' value holder (automatically generated)" |
|
2371 |
||
2372 |
textDiffToolHolder := something. |
|
2373 |
! |
|
2374 |
||
2375 |
textDiffToolWindowSpecHolder |
|
2376 |
"return/create the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
|
2377 |
||
2378 |
textDiffToolWindowSpecHolder isNil ifTrue:[ |
|
2379 |
textDiffToolWindowSpecHolder := #windowSpecForEmbedding asValue. |
|
2380 |
]. |
|
2381 |
^ textDiffToolWindowSpecHolder |
|
2382 |
||
2383 |
"Modified: / 16-03-2012 / 13:57:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2384 |
! |
|
2385 |
||
2386 |
textDiffToolWindowSpecHolder:something |
|
2387 |
"set the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
|
2388 |
||
2389 |
textDiffToolWindowSpecHolder := something. |
|
2390 |
! |
|
2391 |
||
10194 | 2392 |
titleHolder |
2393 |
"return/create the 'titleHolder' value holder (automatically generated)" |
|
2394 |
||
2395 |
titleHolder isNil ifTrue:[ |
|
2396 |
titleHolder := ValueHolder with: 'Diff Browser'. |
|
2397 |
]. |
|
2398 |
^ titleHolder |
|
2399 |
||
2400 |
"Modified: / 01-11-2009 / 14:04:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2401 |
! |
|
2402 |
||
2403 |
versionALabelHolder |
|
2404 |
||
2405 |
^(AspectAdaptor forAspect: #versionALabel) |
|
2406 |
subjectChannel: self diffsetHolder |
|
2407 |
||
2408 |
"Created: / 09-04-2011 / 23:30:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2409 |
! |
|
2410 |
||
2411 |
versionATextHolder |
|
2412 |
||
10879 | 2413 |
versionATextHolder isNil ifTrue:[ |
10194 | 2414 |
versionATextHolder := ValueHolder new |
2415 |
]. |
|
2416 |
^versionATextHolder |
|
2417 |
||
2418 |
"Created: / 06-07-2011 / 12:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10879 | 2419 |
"Modified: / 18-11-2011 / 14:57:56 / cg" |
10194 | 2420 |
! |
2421 |
||
2422 |
versionBLabelHolder |
|
2423 |
||
2424 |
^(AspectAdaptor forAspect: #versionBLabel) |
|
2425 |
subjectChannel: self diffsetHolder |
|
2426 |
||
2427 |
"Created: / 09-04-2011 / 23:30:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2428 |
! |
|
2429 |
||
2430 |
versionBTextHolder |
|
2431 |
||
10879 | 2432 |
versionBTextHolder isNil ifTrue:[ |
10194 | 2433 |
versionBTextHolder := ValueHolder new |
2434 |
]. |
|
2435 |
^versionBTextHolder |
|
2436 |
||
2437 |
"Created: / 06-07-2011 / 12:05:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10879 | 2438 |
"Modified: / 18-11-2011 / 14:57:59 / cg" |
13880 | 2439 |
! |
2440 |
||
2441 |
versionBaseLabelHolder |
|
2442 |
||
2443 |
^(AspectAdaptor forAspect: #versionBaseLabel) |
|
2444 |
subjectChannel: self diffsetHolder |
|
2445 |
||
2446 |
"Created: / 16-03-2012 / 15:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2447 |
! |
|
2448 |
||
2449 |
versionBaseTextHolder |
|
2450 |
||
2451 |
versionBaseTextHolder isNil ifTrue:[ |
|
2452 |
versionBaseTextHolder := ValueHolder new |
|
2453 |
]. |
|
2454 |
^versionBaseTextHolder |
|
2455 |
||
2456 |
"Modified: / 18-11-2011 / 14:57:59 / cg" |
|
2457 |
"Created: / 16-03-2012 / 15:19:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2458 |
! ! |
2459 |
||
2460 |
!ChangeSetDiffTool methodsFor:'change & update'! |
|
2461 |
||
13880 | 2462 |
diffInfoChanged |
2463 |
||
2464 |
| info | |
|
2465 |
info := self diffInfoHolder value. |
|
2466 |
self hasDiffsetHolder value: false. |
|
2467 |
self mergeSavedHolder value: false. |
|
2468 |
self canSaveHolder value: false. |
|
2469 |
info notNil ifTrue:[ |
|
2470 |
self infoPanel showProgressLabeled: (resources string:'Reading changesets') while: [ |
|
2471 |
info read. |
|
2472 |
self diffset: info diffset. |
|
2473 |
]. |
|
2474 |
]. |
|
2475 |
||
2476 |
"Created: / 19-03-2012 / 23:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2477 |
"Modified: / 21-01-2013 / 21:12:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2478 |
! |
|
2479 |
||
10194 | 2480 |
diffsetChanged |
2481 |
||
2482 |
| ds | |
|
2483 |
||
2484 |
ds := self diffsetHolder value. |
|
13880 | 2485 |
ds depth = 2 ifTrue:[ |
2486 |
self beTwoColumn. |
|
2487 |
] ifFalse:[ |
|
2488 |
self beSingleColumn. |
|
2489 |
]. |
|
2490 |
self hasDiffsetHolder value: ds notNil. |
|
2491 |
self canSaveHolder value: self canSave. |
|
2492 |
alreadyWarnedAboutUnsavedMerge := false. |
|
2493 |
||
2494 |
||
2495 |
self diffsetHolderPrivate value: |
|
2496 |
(self isOneColumnBrowser |
|
2497 |
ifTrue:[ds flattened sort] |
|
2498 |
ifFalse:[ds value sort]). |
|
2499 |
self autoMoveToNextConflictHolder value ifTrue:[ |
|
2500 |
self menuMoveDownConflict. |
|
2501 |
]. |
|
10194 | 2502 |
self versionALabelHolder value: ds versionALabel. |
2503 |
self versionBLabelHolder value: ds versionBLabel. |
|
13880 | 2504 |
self versionBaseLabelHolder value: ds versionBaseLabel. |
2505 |
self updateViews. |
|
10194 | 2506 |
|
2507 |
"Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2508 |
"Modified: / 29-06-2011 / 08:24:18 / Jan Vrany <enter your email here>" |
|
13880 | 2509 |
"Modified: / 21-01-2013 / 21:13:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2510 |
! |
|
2511 |
||
2512 |
mergeDataChanged |
|
2513 |
"Resolution has been changed..." |
|
2514 |
||
2515 |
self canSaveHolder value: self canSave. |
|
2516 |
alreadyWarnedAboutUnsavedMerge := false. |
|
2517 |
(self autoMoveToNextConflictHolder value and:[mergeData isMerged]) ifTrue:[ |
|
2518 |
self menuMoveDownConflict |
|
2519 |
] |
|
2520 |
||
2521 |
"Created: / 17-01-2013 / 20:06:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2522 |
"Modified: / 17-01-2013 / 21:20:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2523 |
! |
|
2524 |
||
2525 |
mergeDataHolderChanged |
|
2526 |
mergeData notNil ifTrue:[mergeData removeDependent: self]. |
|
2527 |
mergeData := self mergeDataHolder value. |
|
2528 |
mergeData notNil ifTrue:[mergeData addDependent: self]. |
|
2529 |
||
2530 |
"Created: / 16-01-2013 / 09:24:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2531 |
"Modified: / 17-01-2013 / 20:06:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2532 |
! |
2533 |
||
2534 |
selectionChanged |
|
2535 |
||
13880 | 2536 |
| diffItem mergeData | |
10194 | 2537 |
|
2538 |
diffItem := self theSingleSelectedObject. |
|
2539 |
self singleSelectionHolder value: diffItem. |
|
2540 |
diffItem isNil ifTrue:[^self]. |
|
2541 |
||
13880 | 2542 |
self isMerge ifTrue:[ |
2543 |
self mergeDataHolder setValue: (mergeData := diffItem mergeInfo). |
|
2544 |
]. |
|
10194 | 2545 |
self versionATextHolder setValue: diffItem versionAText. |
2546 |
self versionBTextHolder setValue: diffItem versionBText. |
|
13880 | 2547 |
self versionBaseTextHolder setValue: diffItem versionBaseText. |
2548 |
||
10194 | 2549 |
|
2550 |
self versionATextHolder changed: #value. |
|
2551 |
self versionBTextHolder changed: #value. |
|
13880 | 2552 |
self versionBaseTextHolder changed: #value. |
2553 |
self isMerge ifTrue:[ |
|
2554 |
self mergeDataHolder changed: #value. |
|
2555 |
"Maybe, there was no merge data beforehand. In that case, |
|
2556 |
update" |
|
2557 |
mergeData isNil ifTrue:[ |
|
2558 |
diffItem mergeInfo: (self mergeDataHolder value). |
|
2559 |
] |
|
2560 |
] |
|
10194 | 2561 |
|
2562 |
"Created: / 22-10-2008 / 11:29:24 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
13880 | 2563 |
"Modified: / 19-03-2012 / 14:59:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2564 |
! |
2565 |
||
2566 |
update: aspect with: param from: sender |
|
2567 |
||
2568 |
sender == selectionHolder ifTrue:[ |
|
13880 | 2569 |
self selectionChanged. |
2570 |
^self. |
|
10194 | 2571 |
]. |
2572 |
||
2573 |
sender == diffsetHolder ifTrue:[ |
|
13880 | 2574 |
self diffsetChanged. |
2575 |
^self. |
|
2576 |
]. |
|
2577 |
||
2578 |
sender == diffInfoHolder ifTrue:[ |
|
2579 |
self diffInfoChanged. |
|
2580 |
^self. |
|
2581 |
]. |
|
2582 |
||
2583 |
sender == mergeDataHolder ifTrue:[ |
|
2584 |
self mergeDataHolderChanged. |
|
2585 |
^self. |
|
2586 |
]. |
|
2587 |
||
2588 |
sender == mergeData ifTrue:[ |
|
2589 |
"Resolution has been changed..." |
|
2590 |
self mergeDataChanged. |
|
2591 |
^self. |
|
10194 | 2592 |
]. |
2593 |
||
2594 |
^super update: aspect with: param from: sender |
|
2595 |
||
2596 |
"Created: / 05-12-2009 / 11:02:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 2597 |
"Modified (format): / 17-01-2013 / 20:06:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2598 |
! |
2599 |
||
2600 |
updateListMenu |
|
2601 |
|menu diffs loadA loadB| |
|
2602 |
||
2603 |
menu := self listMenuHolder value. |
|
2604 |
diffs := self selection ? #(). |
|
2605 |
loadA := menu atNameKey:#LoadVersionA. |
|
2606 |
loadA disable. |
|
2607 |
loadB := menu atNameKey:#LoadVersionB. |
|
2608 |
loadB disable. |
|
16916 | 2609 |
|
2610 |
diffs do:[:diff | |
|
10194 | 2611 |
diff versionA |
2612 |
ifNotNil:[ |
|
14409
4814f7144ad0
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
13880
diff
changeset
|
2613 |
loadA |
4814f7144ad0
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
13880
diff
changeset
|
2614 |
label:('Load version ' , diff versionALabel); |
4814f7144ad0
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
13880
diff
changeset
|
2615 |
enable. |
10194 | 2616 |
]. |
2617 |
diff versionB |
|
2618 |
ifNotNil:[ |
|
2619 |
loadB |
|
14409
4814f7144ad0
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
13880
diff
changeset
|
2620 |
label:('Load version ' , diff versionBLabel); |
10194 | 2621 |
enable |
2622 |
]. |
|
2623 |
]. |
|
13880 | 2624 |
! |
2625 |
||
2626 |
updateViews |
|
2627 |
||
2628 |
(self diffInfo notNil and:[self diffInfo isDiff3]) ifTrue:[ |
|
2629 |
self diffInfo isMerge ifTrue:[ |
|
2630 |
self mergeHolder value: true. |
|
2631 |
self labelSpecHolder value: #labelMergeSpec. |
|
2632 |
self labelHeight: 120. |
|
2633 |
] ifFalse:[ |
|
2634 |
self mergeHolder value: false. |
|
2635 |
self labelSpecHolder value: #labelDiff3Spec. |
|
2636 |
self labelHeight: 90. |
|
2637 |
]. |
|
2638 |
self textDiffToolHolder value isDiff3 ifFalse:[ |
|
2639 |
textDiffToolHolder value: self textDiff3Tool. |
|
2640 |
]. |
|
2641 |
||
2642 |
||
2643 |
] ifFalse:[ |
|
2644 |
self mergeHolder value: false. |
|
2645 |
self labelSpecHolder value: #labelDiff2Spec. |
|
2646 |
self labelHeight: 60. |
|
2647 |
||
2648 |
self textDiffToolHolder value isDiff2 ifFalse:[ |
|
2649 |
textDiffToolHolder value: self textDiff2Tool. |
|
2650 |
]. |
|
2651 |
]. |
|
2652 |
||
2653 |
"Created: / 20-03-2012 / 10:21:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2654 |
"Modified: / 21-01-2013 / 21:16:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2655 |
! ! |
|
2656 |
||
2657 |
!ChangeSetDiffTool methodsFor:'hooks'! |
|
2658 |
||
2659 |
commonPostOpen |
|
2660 |
self updateViews |
|
2661 |
||
2662 |
"Created: / 21-01-2013 / 21:18:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2663 |
! ! |
2664 |
||
2665 |
!ChangeSetDiffTool methodsFor:'initialization'! |
|
2666 |
||
2667 |
initialize |
|
2668 |
||
2669 |
super initialize. |
|
2670 |
self createBuilder |
|
2671 |
||
2672 |
"Created: / 22-10-2008 / 12:37:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
2673 |
! ! |
|
2674 |
||
2675 |
!ChangeSetDiffTool methodsFor:'menu actions'! |
|
2676 |
||
10975 | 2677 |
changesetMenuBrowse: changeset |
2678 |
||
13880 | 2679 |
(Tools::ChangeSetBrowser2 on: (changeset , self diffInfo same)) |
2680 |
allowRemove: true; |
|
2681 |
open |
|
10975 | 2682 |
|
2683 |
"Created: / 16-12-2011 / 14:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 2684 |
"Modified: / 12-11-2013 / 17:19:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10975 | 2685 |
! |
2686 |
||
2687 |
changesetMenuBrowseA |
|
2688 |
||
13880 | 2689 |
self changesetMenuBrowse: self diffInfo diffset changesetA |
10975 | 2690 |
|
2691 |
"Created: / 16-12-2011 / 14:23:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2692 |
! |
|
2693 |
||
2694 |
changesetMenuBrowseB |
|
2695 |
||
13880 | 2696 |
self changesetMenuBrowse: self diffInfo diffset changesetB |
10975 | 2697 |
|
2698 |
"Created: / 16-12-2011 / 14:27:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2699 |
! |
|
2700 |
||
13880 | 2701 |
changesetMenuBrowseBase |
2702 |
||
2703 |
self changesetMenuBrowse: self diffInfo diffset changesetBase |
|
2704 |
||
2705 |
"Created: / 20-03-2012 / 13:34:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2706 |
! |
|
2707 |
||
2708 |
changesetMenuBrowseMerge |
|
2709 |
||
2710 |
self changesetMenuBrowse: self diffInfo diffset changesetMerged |
|
2711 |
||
2712 |
"Created: / 20-03-2012 / 14:34:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2713 |
! |
|
2714 |
||
10194 | 2715 |
fileMenuOpen |
2716 |
||
13880 | 2717 |
| dlg info | |
10194 | 2718 |
dlg := OpenDialog new. |
13880 | 2719 |
info := LastDiffInfo. |
2720 |
info isNil ifTrue:[ |
|
2721 |
info := ChangeSetDiffInfo new. |
|
2722 |
info specMerge: ChangeSetSpec changeSet |
|
2723 |
] ifFalse:[ |
|
2724 |
info := info deepCopy. |
|
2725 |
]. |
|
2726 |
dlg diffInfo: info. |
|
10194 | 2727 |
dlg open ifFalse:[^self]. |
13880 | 2728 |
info := dlg diffInfo. |
2729 |
||
2730 |
^self fileMenuOpenOnDiffInfo: info |
|
2731 |
||
2732 |
"Modified: / 13-11-2013 / 11:54:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2733 |
! |
2734 |
||
2735 |
fileMenuOpenOnDiffBetween: a and: b |
|
2736 |
||
2737 |
self diffset: (ChangeSetDiff versionA: a versionB: b). |
|
2738 |
||
2739 |
"Created: / 21-03-2011 / 23:23:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2740 |
"Modified: / 29-06-2011 / 08:10:17 / Jan Vrany <enter your email here>" |
|
2741 |
"Modified: / 06-07-2011 / 12:56:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2742 |
! |
|
2743 |
||
13880 | 2744 |
fileMenuOpenOnDiffInfo: info |
2745 |
||
2746 |
LastDiffInfo := info. |
|
2747 |
self diffInfoHolder value: info |
|
2748 |
||
2749 |
"Created: / 20-03-2012 / 00:04:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2750 |
! |
|
2751 |
||
2752 |
fileMenuSave |
|
2753 |
self fileMenuSaveAs: self diffInfo specMergeFile. |
|
2754 |
||
2755 |
"Modified: / 20-03-2012 / 15:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2756 |
! |
|
2757 |
||
2758 |
fileMenuSaveAs |
|
2759 |
| info file suggestion | |
|
2760 |
||
2761 |
info := self diffInfo. |
|
2762 |
suggestion := (info specMerge isFile ifTrue:['merged.chg'] ifFalse:[info specMergeFile]). |
|
2763 |
file := Dialog requestFileName:'Select File for Save' default: (suggestion) pattern:('*.chg;*.st'). |
|
2764 |
file isNil ifTrue:[^self]. |
|
2765 |
self fileMenuSaveAs: file. |
|
2766 |
||
2767 |
"Modified: / 20-03-2012 / 15:07:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2768 |
! |
|
2769 |
||
2770 |
fileMenuSaveAs: aFilename |
|
2771 |
||
2772 |
self fileMenuSaveAs: aFilename format: #classSource |
|
2773 |
||
2774 |
"Created: / 20-03-2012 / 15:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2775 |
! |
|
2776 |
||
2777 |
fileMenuSaveAs: aFilename format: format |
|
2778 |
||
2779 |
| changesToSave | |
|
2780 |
||
2781 |
changesToSave := (self diffInfo diffset changesetMerged) , (self diffInfo same). |
|
2782 |
changesToSave := changesToSave reject:[:chg|chg isDoIt]. |
|
2783 |
changesToSave saveToFile: aFilename format: format. |
|
2784 |
self mergeSavedHolder value: true |
|
2785 |
||
2786 |
"Created: / 20-03-2012 / 15:09:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2787 |
"Modified: / 15-01-2013 / 11:40:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2788 |
! |
|
2789 |
||
10194 | 2790 |
fileMenuSaveAsPatch |
2791 |
| filename | |
|
15929 | 2792 |
|
2793 |
filename := Dialog requestFileName: 'Enter filename' default:'patch.chg' ifFail:[^self]. |
|
10194 | 2794 |
self patchset fileOutAs: filename. |
2795 |
||
2796 |
"Modified: / 05-12-2009 / 12:37:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2797 |
! |
|
2798 |
||
13880 | 2799 |
fileMenuSaveMergedAs |
2800 |
||
2801 |
self halt. |
|
2802 |
||
2803 |
"Modified: / 03-08-2012 / 15:39:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2804 |
! |
|
2805 |
||
10939 | 2806 |
listMenuBrowse |
2807 |
||
2808 |
| items | |
|
2809 |
items := self selection collect:[:e|e]. "/must do collect as selection is an iterator..." |
|
2810 |
items size == 1 ifTrue:[ |
|
2811 |
| item cls sel | |
|
2812 |
item:= items anElement. |
|
2813 |
cls := item changeClass. |
|
2814 |
sel := item changeSelector. |
|
2815 |
cls notNil ifTrue:[ |
|
2816 |
sel notNil ifTrue:[ |
|
13017
62a2cd2d8b70
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
10975
diff
changeset
|
2817 |
UserPreferences systemBrowserClass |
10939 | 2818 |
openInClass:cls selector:sel |
2819 |
||
2820 |
] ifFalse:[ |
|
13017
62a2cd2d8b70
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
10975
diff
changeset
|
2821 |
UserPreferences systemBrowserClass |
10939 | 2822 |
browseClass: cls |
2823 |
] |
|
2824 |
] ifFalse:[ |
|
2825 |
Dialog warn: (self class resources at: 'Oops, class is gone') |
|
2826 |
] |
|
2827 |
] ifFalse:[ |
|
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
2828 |
Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool » listMenuBrowse)'. |
10939 | 2829 |
] |
2830 |
||
2831 |
"Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2832 |
! |
|
2833 |
||
10194 | 2834 |
listMenuInspect |
2835 |
||
2836 |
(self selection collect:[:e|e]) inspect |
|
2837 |
||
2838 |
"Modified: / 24-11-2009 / 12:51:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2839 |
! |
|
2840 |
||
2841 |
listMenuLoadVersionA |
|
2842 |
||
2843 |
self selection do: |
|
2844 |
[:diff|diff versionA apply] |
|
2845 |
||
2846 |
"Modified: / 09-12-2009 / 23:09:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2847 |
! |
|
2848 |
||
2849 |
listMenuLoadVersionB |
|
2850 |
||
2851 |
self selection do: |
|
2852 |
[:diff|diff versionB apply] |
|
2853 |
||
2854 |
"Modified: / 09-12-2009 / 23:10:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 2855 |
! |
2856 |
||
2857 |
listMenuMergeUsingA |
|
2858 |
self textDiffToolHolder value doMergeAllUsingA |
|
2859 |
||
2860 |
"Modified: / 16-01-2013 / 15:57:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2861 |
! |
|
2862 |
||
2863 |
listMenuMergeUsingB |
|
2864 |
self textDiffToolHolder value doMergeAllUsingB |
|
2865 |
||
2866 |
"Created: / 16-01-2013 / 15:57:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2867 |
! |
|
2868 |
||
2869 |
listMenuMergeUsingBase |
|
2870 |
self textDiffToolHolder value doMergeAllUsingBase |
|
2871 |
||
2872 |
"Created: / 16-01-2013 / 15:57:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2873 |
! |
|
2874 |
||
2875 |
listMenuOpenInExternal: command |
|
2876 |
||
2877 |
(OperatingSystem canExecuteCommand: command) ifFalse:[ |
|
2878 |
Dialog warn: 'Sorry. ', command , ' is not installed or not in PATH' |
|
2879 |
]. |
|
2880 |
||
2881 |
self selection do:[:item| |
|
2882 |
| base a b cmd | |
|
2883 |
item versionBase notNil ifTrue:[ |
|
2884 |
base := Filename newTemporary. |
|
2885 |
base writingFileDo:[:s|s nextPutAll: item versionBase source]. |
|
2886 |
]. |
|
2887 |
a := Filename newTemporary. |
|
2888 |
a writingFileDo:[:s|s nextPutAll: item versionA source]. |
|
2889 |
b := Filename newTemporary. |
|
2890 |
b writingFileDo:[:s|s nextPutAll: item versionB source]. |
|
2891 |
||
2892 |
base isNil ifTrue:[ |
|
2893 |
cmd := '%1 %2 %3' bindWith: command with: a pathName with: b pathName |
|
2894 |
] ifFalse:[ |
|
2895 |
cmd := '%1 %4 %2 %3 ' bindWith: command with: a pathName with: b pathName with: base pathName. |
|
2896 |
]. |
|
2897 |
[ OperatingSystem executeCommand: cmd. |
|
2898 |
a remove. |
|
2899 |
b remove. |
|
2900 |
base notNil ifTrue:[base remove]. ] fork |
|
2901 |
] |
|
2902 |
||
2903 |
"Modified: / 17-03-2012 / 08:55:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2904 |
! |
|
2905 |
||
2906 |
menuMoveDown |
|
2907 |
self menuMoveDownToSuchThat: [:entry|true] |
|
2908 |
||
2909 |
"Modified: / 17-01-2013 / 16:53:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2910 |
! |
|
2911 |
||
2912 |
menuMoveDownConflict |
|
2913 |
self menuMoveDownToSuchThat: [:entry|entry isMerged not] |
|
2914 |
||
2915 |
"Modified: / 17-01-2013 / 16:53:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2916 |
! |
|
2917 |
||
2918 |
menuMoveDownToSuchThat: aBlock |
|
2919 |
| oldSel newSel | |
|
2920 |
oldSel := self theLastSelectedEntry. |
|
2921 |
newSel := self diffsetHolderPrivate value nextEntryAfter: oldSel suchThat: aBlock. |
|
2922 |
self menuMoveTo: newSel. |
|
2923 |
||
2924 |
"Created: / 17-01-2013 / 16:52:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2925 |
! |
|
2926 |
||
2927 |
menuMoveTo: entry |
|
2928 |
||
2929 |
"/ self window sensor pushUserEvent:#selection: for: self withArgument: entry |
|
2930 |
self selection: entry. |
|
2931 |
||
2932 |
"Created: / 17-01-2013 / 13:03:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2933 |
"Modified: / 17-01-2013 / 16:27:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2934 |
! |
|
2935 |
||
2936 |
menuMoveUp |
|
2937 |
self menuMoveUpToSuchThat: [:entry|true] |
|
2938 |
||
2939 |
"Created: / 17-01-2013 / 16:58:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2940 |
! |
|
2941 |
||
2942 |
menuMoveUpConflict |
|
2943 |
self menuMoveUpToSuchThat: [:entry|entry isMerged not] |
|
2944 |
||
2945 |
"Created: / 17-01-2013 / 17:00:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2946 |
! |
|
2947 |
||
2948 |
menuMoveUpToSuchThat: aBlock |
|
2949 |
| oldSel newSel | |
|
2950 |
oldSel := self theFirstSelectedEntry. |
|
2951 |
newSel := self diffsetHolderPrivate value nextEntryBefore: oldSel suchThat: aBlock. |
|
2952 |
self menuMoveTo: newSel. |
|
2953 |
||
2954 |
"Created: / 17-01-2013 / 16:58:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2955 |
! ! |
|
2956 |
||
2957 |
!ChangeSetDiffTool methodsFor:'private'! |
|
2958 |
||
2959 |
labelHeight: height |
|
2960 |
(labelsView notNil and:[navigatorAndDiffPanelView notNil]) ifTrue:[ |
|
2961 |
labelsView layout: (labelsView layout copy bottomOffset: height). |
|
2962 |
navigatorAndDiffPanelView layout: (navigatorAndDiffPanelView layout copy topOffset: height). |
|
2963 |
]. |
|
2964 |
||
2965 |
"Created: / 17-01-2013 / 23:38:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2966 |
"Modified: / 21-01-2013 / 21:17:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 2967 |
! ! |
2968 |
||
2969 |
!ChangeSetDiffTool methodsFor:'queries'! |
|
2970 |
||
2971 |
canBrowse |
|
2972 |
||
2973 |
^true |
|
2974 |
||
2975 |
"^[self selection notNil |
|
2976 |
and:[self selection versionA notNil]]" |
|
2977 |
||
2978 |
"Created: / 02-11-2009 / 18:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2979 |
"Modified: / 21-11-2009 / 18:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2980 |
! |
|
2981 |
||
13880 | 2982 |
canSave |
2983 |
"Returns true, if a merged file can be saved" |
|
2984 |
||
2985 |
^self canSaveAs and:[self diffInfo specMerge isFile] |
|
2986 |
||
2987 |
"Created: / 20-03-2012 / 15:00:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2988 |
"Modified: / 17-01-2013 / 21:09:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2989 |
! |
|
2990 |
||
2991 |
canSaveAs |
|
2992 |
"Returns true, if a merged file can be saved" |
|
2993 |
||
2994 |
| info | |
|
2995 |
info := self diffInfo. |
|
2996 |
info isNil ifTrue:[^false]. |
|
2997 |
^info isMerge and:[info diffset notNil and:[info diffset isMerged]] |
|
2998 |
||
2999 |
"Created: / 20-03-2012 / 15:03:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3000 |
"Modified: / 17-01-2013 / 20:57:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3001 |
! |
|
3002 |
||
3003 |
canSaveAsPatch |
|
3004 |
||
3005 |
^false |
|
3006 |
||
3007 |
"Created: / 20-03-2012 / 14:55:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3008 |
! |
|
3009 |
||
3010 |
canSaveMergedAs |
|
3011 |
"Returns true, if a merged file can be saved" |
|
3012 |
||
3013 |
| info | |
|
3014 |
info := self diffInfo. |
|
3015 |
info isNil ifTrue:[^false]. |
|
3016 |
^info isMerge |
|
3017 |
||
3018 |
"Created: / 03-08-2012 / 15:25:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3019 |
! |
|
3020 |
||
10194 | 3021 |
hasSelection |
3022 |
||
3023 |
^[self selection notNil] |
|
3024 |
||
3025 |
"Created: / 03-11-2009 / 10:48:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3026 |
! |
|
3027 |
||
3028 |
isOneColumnBrowser |
|
3029 |
||
3030 |
^self navigatorPanelSpecHolder value = #oneColumnNavigatorSpec |
|
3031 |
||
3032 |
"Created: / 05-12-2009 / 11:04:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3033 |
! ! |
|
3034 |
||
13880 | 3035 |
!ChangeSetDiffTool methodsFor:'startup & release'! |
3036 |
||
3037 |
closeRequest |
|
3038 |
||
3039 |
"/Warn about unsaved merge..." |
|
3040 |
(alreadyWarnedAboutUnsavedMerge not and:[self canSave and:[mergeSavedHolder value not]]) ifTrue:[ |
|
3041 |
alreadyWarnedAboutUnsavedMerge := true. |
|
3042 |
self infoPanel |
|
3043 |
reset; |
|
3044 |
beInformation; |
|
3045 |
message: (self resources string:'Output file (merge) has not been saved. Save?'); |
|
3046 |
addButtonWithLabel: (self resources string:'Save') action: [ |
|
3047 |
self fileMenuSave. |
|
3048 |
self closeDownViews. |
|
3049 |
]; |
|
3050 |
addButtonWithLabel: (self resources string:'Cancel') action:[self infoPanel hide]; |
|
3051 |
show. |
|
3052 |
^self. |
|
3053 |
]. |
|
3054 |
self closeDownViews. |
|
3055 |
||
3056 |
"Created: / 17-01-2013 / 21:02:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3057 |
! ! |
|
3058 |
||
3059 |
!ChangeSetDiffTool methodsFor:'testing'! |
|
3060 |
||
3061 |
isDiff2 |
|
3062 |
^self diffInfo notNil and:[self diffInfo isDiff2] |
|
3063 |
||
3064 |
"Created: / 20-03-2012 / 13:27:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3065 |
! |
|
3066 |
||
3067 |
isDiff2Or3 |
|
3068 |
^self diffInfo notNil and:[self diffInfo isDiff2 or:[self diffInfo isDiff3]] |
|
3069 |
||
3070 |
"Created: / 20-03-2012 / 13:29:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3071 |
! |
|
3072 |
||
3073 |
isDiff3 |
|
3074 |
^self diffInfo notNil and:[self diffInfo isDiff3] |
|
3075 |
||
3076 |
"Created: / 20-03-2012 / 13:27:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3077 |
! |
|
3078 |
||
3079 |
isMerge |
|
3080 |
^self diffInfo notNil and:[self diffInfo isMerge] |
|
3081 |
||
3082 |
"Created: / 19-03-2012 / 11:53:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3083 |
! ! |
|
3084 |
||
10194 | 3085 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'image specs'! |
3086 |
||
3087 |
versionA24x24 |
|
3088 |
||
3089 |
^ToolbarIconLibrary versionA24x24 |
|
3090 |
||
3091 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3092 |
! |
|
3093 |
||
3094 |
versionB24x24 |
|
3095 |
||
3096 |
^ToolbarIconLibrary versionB24x24 |
|
3097 |
||
3098 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 3099 |
! |
3100 |
||
3101 |
versionBase24x24 |
|
3102 |
||
3103 |
^ToolbarIconLibrary versionBase24x24 |
|
3104 |
||
3105 |
"Created: / 19-03-2012 / 23:11:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3106 |
! |
|
3107 |
||
3108 |
versionMerged24x24 |
|
3109 |
||
3110 |
^ToolbarIconLibrary versionMerged24x24 |
|
3111 |
||
3112 |
"Created: / 19-03-2012 / 23:34:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 3113 |
! ! |
3114 |
||
3115 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs'! |
|
3116 |
||
3117 |
windowSpec |
|
3118 |
"This resource specification was automatically generated |
|
3119 |
by the UIPainter of ST/X." |
|
3120 |
||
3121 |
"Do not manually edit this!! If it is corrupted, |
|
3122 |
the UIPainter may not be able to read the specification." |
|
3123 |
||
3124 |
" |
|
13880 | 3125 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#windowSpec |
3126 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#windowSpec |
|
3127 |
Tools::ChangeSetDiffTool::OpenDialog open |
|
3128 |
" |
|
3129 |
||
3130 |
<resource: #canvas> |
|
3131 |
||
3132 |
^ |
|
3133 |
#(FullSpec |
|
3134 |
name: windowSpec |
|
3135 |
window: |
|
3136 |
(WindowSpec |
|
3137 |
label: 'Open...' |
|
3138 |
name: 'Open...' |
|
3139 |
min: (Point 10 10) |
|
3140 |
bounds: (Rectangle 0 0 640 457) |
|
3141 |
) |
|
3142 |
component: |
|
3143 |
(SpecCollection |
|
3144 |
collection: ( |
|
3145 |
(VerticalPanelViewSpec |
|
3146 |
name: 'VerticalPanel1' |
|
3147 |
layout: (LayoutFrame 0 0 0 0 0 1 -30 1) |
|
3148 |
horizontalLayout: fit |
|
3149 |
verticalLayout: top |
|
3150 |
horizontalSpace: 3 |
|
3151 |
verticalSpace: 3 |
|
3152 |
component: |
|
3153 |
(SpecCollection |
|
3154 |
collection: ( |
|
3155 |
(ViewSpec |
|
3156 |
name: 'B' |
|
3157 |
component: |
|
3158 |
(SpecCollection |
|
3159 |
collection: ( |
|
3160 |
(UISubSpecification |
|
3161 |
name: 'SubSpecification2' |
|
3162 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3163 |
minorKey: versionBLabelSpec |
|
3164 |
) |
|
3165 |
(SubCanvasSpec |
|
3166 |
name: 'SubCanvas1' |
|
3167 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
|
3168 |
level: 0 |
|
3169 |
hasHorizontalScrollBar: false |
|
3170 |
hasVerticalScrollBar: false |
|
3171 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3172 |
minorKey: windowSpecForEmbedding |
|
3173 |
subAspectHolders: |
|
3174 |
(Array |
|
3175 |
||
3176 |
(SubChannelInfoSpec |
|
3177 |
subAspect: specHolder |
|
3178 |
aspect: changesetSpecBHolder |
|
3179 |
) |
|
3180 |
) |
|
3181 |
createNewApplication: true |
|
3182 |
createNewBuilder: true |
|
3183 |
) |
|
3184 |
) |
|
3185 |
||
3186 |
) |
|
3187 |
extent: (Point 640 99) |
|
3188 |
) |
|
3189 |
(ViewSpec |
|
3190 |
name: 'A' |
|
3191 |
component: |
|
3192 |
(SpecCollection |
|
3193 |
collection: ( |
|
3194 |
(UISubSpecification |
|
3195 |
name: 'SubSpecification1' |
|
3196 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3197 |
minorKey: versionALabelSpec |
|
3198 |
) |
|
3199 |
(SubCanvasSpec |
|
3200 |
name: 'ChangesetASpec' |
|
3201 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
|
3202 |
level: 0 |
|
3203 |
hasHorizontalScrollBar: false |
|
3204 |
hasVerticalScrollBar: false |
|
3205 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3206 |
minorKey: windowSpecForEmbedding |
|
3207 |
subAspectHolders: |
|
3208 |
(Array |
|
3209 |
||
3210 |
(SubChannelInfoSpec |
|
3211 |
subAspect: specHolder |
|
3212 |
aspect: changesetSpecAHolder |
|
3213 |
) |
|
3214 |
) |
|
3215 |
createNewApplication: true |
|
3216 |
createNewBuilder: true |
|
3217 |
) |
|
3218 |
) |
|
3219 |
||
3220 |
) |
|
3221 |
extent: (Point 640 99) |
|
3222 |
) |
|
3223 |
(ViewSpec |
|
3224 |
name: 'Base' |
|
3225 |
component: |
|
3226 |
(SpecCollection |
|
3227 |
collection: ( |
|
3228 |
(UISubSpecification |
|
3229 |
name: 'SubSpecification3' |
|
3230 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3231 |
minorKey: versionBaseLabelSpec |
|
3232 |
) |
|
3233 |
(SubCanvasSpec |
|
3234 |
name: 'SubCanvas2' |
|
3235 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
|
3236 |
level: 0 |
|
3237 |
hasHorizontalScrollBar: false |
|
3238 |
hasVerticalScrollBar: false |
|
3239 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3240 |
minorKey: windowSpecForEmbedding |
|
3241 |
subAspectHolders: |
|
3242 |
(Array |
|
3243 |
||
3244 |
(SubChannelInfoSpec |
|
3245 |
subAspect: enabledHolder |
|
3246 |
aspect: changesetSpecBaseEnabledHolder |
|
3247 |
) |
|
3248 |
(SubChannelInfoSpec |
|
3249 |
subAspect: specHolder |
|
3250 |
aspect: changesetSpecBaseHolder |
|
3251 |
) |
|
3252 |
) |
|
3253 |
createNewApplication: true |
|
3254 |
createNewBuilder: true |
|
3255 |
) |
|
3256 |
) |
|
3257 |
||
3258 |
) |
|
3259 |
extent: (Point 640 98) |
|
3260 |
) |
|
3261 |
(ViewSpec |
|
3262 |
name: 'Merge' |
|
3263 |
component: |
|
3264 |
(SpecCollection |
|
3265 |
collection: ( |
|
3266 |
(UISubSpecification |
|
3267 |
name: 'SubSpecification4' |
|
3268 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3269 |
minorKey: versionMergedLabelSpec |
|
3270 |
) |
|
3271 |
(SubCanvasSpec |
|
3272 |
name: 'SubCanvas3' |
|
3273 |
layout: (LayoutFrame 30 0 30 0 0 1 -25 1) |
|
3274 |
level: 0 |
|
3275 |
hasHorizontalScrollBar: false |
|
3276 |
hasVerticalScrollBar: false |
|
3277 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3278 |
minorKey: windowSpecForEmbedding |
|
3279 |
subAspectHolders: |
|
3280 |
(Array |
|
3281 |
||
3282 |
(SubChannelInfoSpec |
|
3283 |
subAspect: enabledHolder |
|
3284 |
aspect: changesetSpecMergedEnabledHolder |
|
3285 |
) |
|
3286 |
(SubChannelInfoSpec |
|
3287 |
subAspect: specHolder |
|
3288 |
aspect: changesetSpecMergedHolder |
|
3289 |
) |
|
3290 |
) |
|
3291 |
createNewApplication: true |
|
3292 |
createNewBuilder: true |
|
3293 |
) |
|
3294 |
) |
|
3295 |
||
3296 |
) |
|
3297 |
extent: (Point 640 123) |
|
3298 |
) |
|
3299 |
) |
|
3300 |
||
3301 |
) |
|
3302 |
) |
|
3303 |
(HorizontalPanelViewSpec |
|
3304 |
name: 'ButtonPanel' |
|
3305 |
layout: (LayoutFrame 3 0 -30 1 -3 1 0 1) |
|
3306 |
horizontalLayout: right |
|
3307 |
verticalLayout: center |
|
3308 |
horizontalSpace: 3 |
|
3309 |
verticalSpace: 3 |
|
3310 |
reverseOrderIfOKAtLeft: true |
|
3311 |
component: |
|
3312 |
(SpecCollection |
|
3313 |
collection: ( |
|
3314 |
(ActionButtonSpec |
|
3315 |
label: 'OK' |
|
3316 |
name: 'Button1' |
|
3317 |
translateLabel: true |
|
3318 |
model: doAccept |
|
3319 |
enableChannel: doAcceptEnabled |
|
3320 |
extent: (Point 125 22) |
|
3321 |
) |
|
3322 |
(ActionButtonSpec |
|
3323 |
label: 'Cancel' |
|
3324 |
name: 'Button2' |
|
3325 |
translateLabel: true |
|
3326 |
model: doCancel |
|
3327 |
extent: (Point 125 22) |
|
3328 |
) |
|
3329 |
) |
|
3330 |
||
3331 |
) |
|
3332 |
) |
|
3333 |
) |
|
3334 |
||
3335 |
) |
|
3336 |
) |
|
3337 |
! |
|
3338 |
||
3339 |
windowSpec_old |
|
3340 |
"This resource specification was automatically generated |
|
3341 |
by the UIPainter of ST/X." |
|
3342 |
||
3343 |
"Do not manually edit this!! If it is corrupted, |
|
3344 |
the UIPainter may not be able to read the specification." |
|
3345 |
||
3346 |
" |
|
10194 | 3347 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#windowSpec |
3348 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#windowSpec |
|
3349 |
Tools::ChangeSetDiffBrowser::OpenDialog open |
|
3350 |
" |
|
3351 |
||
3352 |
<resource: #canvas> |
|
3353 |
||
13880 | 3354 |
^ |
10194 | 3355 |
#(FullSpec |
13880 | 3356 |
name: windowSpec |
3357 |
window: |
|
10194 | 3358 |
(WindowSpec |
13880 | 3359 |
label: 'Open...' |
3360 |
name: 'Open...' |
|
3361 |
min: (Point 10 10) |
|
3362 |
bounds: (Rectangle 0 0 640 130) |
|
3363 |
) |
|
3364 |
component: |
|
10194 | 3365 |
(SpecCollection |
13880 | 3366 |
collection: ( |
3367 |
(VariableHorizontalPanelSpec |
|
3368 |
name: 'ChangeSetsSpecPanel' |
|
3369 |
layout: (LayoutFrame 0 0 0 0 0 1 -30 1) |
|
3370 |
barWidth: 3 |
|
3371 |
showHandle: true |
|
3372 |
component: |
|
3373 |
(SpecCollection |
|
3374 |
collection: ( |
|
3375 |
(ViewSpec |
|
3376 |
name: 'A' |
|
3377 |
component: |
|
3378 |
(SpecCollection |
|
3379 |
collection: ( |
|
3380 |
(UISubSpecification |
|
3381 |
name: 'SubSpecification1' |
|
3382 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3383 |
minorKey: versionALabelSpec |
|
3384 |
) |
|
3385 |
(SubCanvasSpec |
|
3386 |
name: 'ChangesetASpec' |
|
3387 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
3388 |
hasHorizontalScrollBar: false |
|
3389 |
hasVerticalScrollBar: false |
|
3390 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3391 |
minorKey: windowSpecForEmbedding |
|
3392 |
subAspectHolders: |
|
3393 |
(Array |
|
3394 |
||
3395 |
(SubChannelInfoSpec |
|
3396 |
subAspect: specHolder |
|
3397 |
aspect: changesetSpecAHolder |
|
3398 |
) |
|
3399 |
) |
|
3400 |
createNewApplication: true |
|
3401 |
createNewBuilder: true |
|
3402 |
) |
|
3403 |
) |
|
3404 |
||
3405 |
) |
|
3406 |
) |
|
3407 |
(ViewSpec |
|
3408 |
name: 'B' |
|
3409 |
component: |
|
3410 |
(SpecCollection |
|
3411 |
collection: ( |
|
3412 |
(UISubSpecification |
|
3413 |
name: 'SubSpecification2' |
|
3414 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
3415 |
minorKey: versionBLabelSpec |
|
3416 |
) |
|
3417 |
(SubCanvasSpec |
|
3418 |
name: 'SubCanvas1' |
|
3419 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
3420 |
hasHorizontalScrollBar: false |
|
3421 |
hasVerticalScrollBar: false |
|
3422 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
3423 |
minorKey: windowSpecForEmbedding |
|
3424 |
subAspectHolders: |
|
3425 |
(Array |
|
3426 |
||
3427 |
(SubChannelInfoSpec |
|
3428 |
subAspect: specHolder |
|
3429 |
aspect: changesetSpecBHolder |
|
3430 |
) |
|
3431 |
) |
|
3432 |
createNewApplication: true |
|
3433 |
createNewBuilder: true |
|
3434 |
) |
|
3435 |
) |
|
3436 |
||
3437 |
) |
|
3438 |
) |
|
3439 |
) |
|
3440 |
||
3441 |
) |
|
3442 |
handles: (Any 0.5 1.0) |
|
3443 |
) |
|
3444 |
(HorizontalPanelViewSpec |
|
3445 |
name: 'ButtonPanel' |
|
3446 |
layout: (LayoutFrame 3 0 -30 1 -3 1 0 1) |
|
3447 |
horizontalLayout: right |
|
3448 |
verticalLayout: center |
|
3449 |
horizontalSpace: 3 |
|
3450 |
verticalSpace: 3 |
|
3451 |
reverseOrderIfOKAtLeft: true |
|
3452 |
component: |
|
3453 |
(SpecCollection |
|
3454 |
collection: ( |
|
3455 |
(ActionButtonSpec |
|
3456 |
label: 'OK' |
|
3457 |
name: 'Button1' |
|
3458 |
translateLabel: true |
|
3459 |
model: doAccept |
|
3460 |
enableChannel: doAcceptEnabled |
|
3461 |
extent: (Point 125 22) |
|
3462 |
) |
|
3463 |
(ActionButtonSpec |
|
3464 |
label: 'Cancel' |
|
3465 |
name: 'Button2' |
|
3466 |
translateLabel: true |
|
3467 |
model: doCancel |
|
3468 |
extent: (Point 125 22) |
|
3469 |
) |
|
3470 |
) |
|
3471 |
||
3472 |
) |
|
3473 |
) |
|
3474 |
) |
|
3475 |
||
3476 |
) |
|
10194 | 3477 |
) |
3478 |
||
3479 |
"Modified: / 06-07-2011 / 11:32:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 3480 |
"Created: / 19-03-2012 / 22:21:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 3481 |
! ! |
3482 |
||
3483 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs - labels'! |
|
3484 |
||
3485 |
versionALabelSpec |
|
3486 |
"This resource specification was automatically generated |
|
3487 |
by the UIPainter of ST/X." |
|
3488 |
||
3489 |
"Do not manually edit this!! If it is corrupted, |
|
3490 |
the UIPainter may not be able to read the specification." |
|
3491 |
||
3492 |
" |
|
3493 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionALabelSpec |
|
3494 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionALabelSpec |
|
3495 |
" |
|
3496 |
||
3497 |
<resource: #canvas> |
|
3498 |
||
13880 | 3499 |
^ |
10194 | 3500 |
#(FullSpec |
13880 | 3501 |
name: versionALabelSpec |
3502 |
window: |
|
10194 | 3503 |
(WindowSpec |
13880 | 3504 |
label: 'Version A' |
3505 |
name: 'Changeset A' |
|
3506 |
min: (Point 10 10) |
|
3507 |
bounds: (Rectangle 0 0 300 30) |
|
3508 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
3509 |
forceRecursiveBackground: true |
|
3510 |
) |
|
3511 |
component: |
|
10194 | 3512 |
(SpecCollection |
13880 | 3513 |
collection: ( |
3514 |
(LabelSpec |
|
3515 |
label: 'versionA24x24' |
|
3516 |
name: 'VersionAIcon' |
|
3517 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
3518 |
hasCharacterOrientedLabel: false |
|
3519 |
translateLabel: true |
|
3520 |
) |
|
3521 |
(LabelSpec |
|
3522 |
label: 'Version A (working copy)' |
|
3523 |
name: 'VersionALabel' |
|
3524 |
layout: (LayoutFrame 30 0 5 0 0 1 0 1) |
|
3525 |
translateLabel: true |
|
3526 |
resizeForLabel: true |
|
3527 |
adjust: left |
|
3528 |
) |
|
3529 |
) |
|
3530 |
||
3531 |
) |
|
10194 | 3532 |
) |
3533 |
||
13880 | 3534 |
"Modified: / 19-03-2012 / 22:15:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 3535 |
! |
3536 |
||
3537 |
versionBLabelSpec |
|
3538 |
"This resource specification was automatically generated |
|
3539 |
by the UIPainter of ST/X." |
|
3540 |
||
3541 |
"Do not manually edit this!! If it is corrupted, |
|
3542 |
the UIPainter may not be able to read the specification." |
|
3543 |
||
3544 |
" |
|
3545 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionBLabelSpec |
|
3546 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionBLabelSpec |
|
3547 |
" |
|
3548 |
||
3549 |
<resource: #canvas> |
|
3550 |
||
13880 | 3551 |
^ |
10194 | 3552 |
#(FullSpec |
13880 | 3553 |
name: versionBLabelSpec |
3554 |
window: |
|
10194 | 3555 |
(WindowSpec |
13880 | 3556 |
label: 'Version B' |
3557 |
name: 'Changeset B' |
|
3558 |
min: (Point 10 10) |
|
3559 |
bounds: (Rectangle 0 0 300 30) |
|
3560 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
3561 |
forceRecursiveBackground: true |
|
3562 |
) |
|
3563 |
component: |
|
3564 |
(SpecCollection |
|
3565 |
collection: ( |
|
3566 |
(LabelSpec |
|
3567 |
label: 'versionB24x24' |
|
3568 |
name: 'VersionBIcon' |
|
3569 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
3570 |
hasCharacterOrientedLabel: false |
|
3571 |
translateLabel: true |
|
3572 |
) |
|
3573 |
(LabelSpec |
|
3574 |
label: 'Version B (to be merged)' |
|
3575 |
name: 'VersionBLabel' |
|
3576 |
layout: (LayoutFrame 30 0 5 0 97 0 0 1) |
|
3577 |
translateLabel: true |
|
3578 |
resizeForLabel: true |
|
3579 |
adjust: left |
|
3580 |
useDynamicPreferredWidth: true |
|
3581 |
usePreferredWidth: true |
|
3582 |
) |
|
3583 |
) |
|
3584 |
||
3585 |
) |
|
3586 |
) |
|
3587 |
||
3588 |
"Modified: / 19-03-2012 / 22:15:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3589 |
! |
|
3590 |
||
3591 |
versionBaseLabelSpec |
|
3592 |
"This resource specification was automatically generated |
|
3593 |
by the UIPainter of ST/X." |
|
3594 |
||
3595 |
"Do not manually edit this!! If it is corrupted, |
|
3596 |
the UIPainter may not be able to read the specification." |
|
3597 |
||
3598 |
" |
|
3599 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionBaseLabelSpec |
|
3600 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionBaseLabelSpec |
|
3601 |
" |
|
3602 |
||
3603 |
<resource: #canvas> |
|
3604 |
||
3605 |
^ |
|
3606 |
#(FullSpec |
|
3607 |
name: versionBaseLabelSpec |
|
3608 |
window: |
|
3609 |
(WindowSpec |
|
3610 |
label: 'Version B' |
|
3611 |
name: 'Version B' |
|
3612 |
min: (Point 10 10) |
|
3613 |
bounds: (Rectangle 0 0 300 30) |
|
3614 |
backgroundColor: (Color 57.2182803082322 81.2832837415122 91.0872053101396) |
|
3615 |
forceRecursiveBackground: true |
|
3616 |
) |
|
3617 |
component: |
|
10194 | 3618 |
(SpecCollection |
13880 | 3619 |
collection: ( |
3620 |
(LabelSpec |
|
3621 |
label: 'versionBase24x24' |
|
3622 |
name: 'VersionBaseIcon' |
|
3623 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
3624 |
hasCharacterOrientedLabel: false |
|
3625 |
translateLabel: true |
|
3626 |
) |
|
3627 |
(LabelSpec |
|
3628 |
label: 'Base' |
|
3629 |
name: 'VersionBLabel' |
|
3630 |
layout: (LayoutFrame 30 0 5 0 68 0 0 1) |
|
3631 |
translateLabel: true |
|
3632 |
resizeForLabel: true |
|
3633 |
adjust: left |
|
3634 |
useDynamicPreferredWidth: true |
|
3635 |
usePreferredWidth: true |
|
3636 |
) |
|
3637 |
(CheckBoxSpec |
|
3638 |
label: '' |
|
3639 |
name: 'CheckBox1' |
|
3640 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
3641 |
model: changesetSpecBaseEnabledHolder |
|
3642 |
translateLabel: true |
|
3643 |
) |
|
3644 |
) |
|
3645 |
||
3646 |
) |
|
10194 | 3647 |
) |
13880 | 3648 |
! |
3649 |
||
3650 |
versionMergedLabelSpec |
|
3651 |
"This resource specification was automatically generated |
|
3652 |
by the UIPainter of ST/X." |
|
3653 |
||
3654 |
"Do not manually edit this!! If it is corrupted, |
|
3655 |
the UIPainter may not be able to read the specification." |
|
3656 |
||
3657 |
" |
|
3658 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionMergedLabelSpec |
|
3659 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionMergedLabelSpec |
|
3660 |
" |
|
3661 |
||
3662 |
<resource: #canvas> |
|
3663 |
||
3664 |
^ |
|
3665 |
#(FullSpec |
|
3666 |
name: versionMergedLabelSpec |
|
3667 |
window: |
|
3668 |
(WindowSpec |
|
3669 |
label: 'Merge' |
|
3670 |
name: 'Merge' |
|
3671 |
min: (Point 10 10) |
|
3672 |
bounds: (Rectangle 0 0 300 30) |
|
3673 |
backgroundColor: (Color 92.6909285114824 62.388036926833 93.2265201800565) |
|
3674 |
forceRecursiveBackground: true |
|
3675 |
) |
|
3676 |
component: |
|
3677 |
(SpecCollection |
|
3678 |
collection: ( |
|
3679 |
(LabelSpec |
|
3680 |
label: 'versionMerged24x24' |
|
3681 |
name: 'VersionMergedIcon' |
|
3682 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
3683 |
hasCharacterOrientedLabel: false |
|
3684 |
translateLabel: true |
|
3685 |
) |
|
3686 |
(LabelSpec |
|
3687 |
label: 'Merge' |
|
3688 |
name: 'VersionBLabel' |
|
3689 |
layout: (LayoutFrame 30 0 5 0 68 0 0 1) |
|
3690 |
translateLabel: true |
|
3691 |
resizeForLabel: true |
|
3692 |
adjust: left |
|
3693 |
useDynamicPreferredWidth: true |
|
3694 |
usePreferredWidth: true |
|
3695 |
) |
|
3696 |
(CheckBoxSpec |
|
3697 |
label: '' |
|
3698 |
name: 'CheckBox1' |
|
3699 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
3700 |
model: changesetSpecMergedEnabledHolder |
|
3701 |
translateLabel: true |
|
3702 |
) |
|
3703 |
) |
|
3704 |
||
3705 |
) |
|
3706 |
) |
|
3707 |
||
3708 |
"Modified: / 19-03-2012 / 23:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 3709 |
! ! |
3710 |
||
3711 |
!ChangeSetDiffTool::OpenDialog methodsFor:'accessing'! |
|
3712 |
||
3713 |
changeSetA |
|
3714 |
||
3715 |
| specA | |
|
3716 |
||
3717 |
specA := self changesetSpecAHolder value. |
|
3718 |
^specA ifNil:[nil] ifNotNil:[specA changeSet] |
|
3719 |
||
3720 |
"Created: / 06-07-2011 / 11:36:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3721 |
! |
|
3722 |
||
13880 | 3723 |
changeSetASpec |
3724 |
^self changesetSpecAHolder value. |
|
3725 |
||
3726 |
"Created: / 20-03-2012 / 00:01:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3727 |
! |
|
3728 |
||
3729 |
changeSetASpec: spec |
|
3730 |
^self changesetSpecAHolder value: spec |
|
3731 |
||
3732 |
"Created: / 01-08-2012 / 15:38:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3733 |
! |
|
3734 |
||
10194 | 3735 |
changeSetB |
3736 |
||
3737 |
| specB | |
|
3738 |
||
3739 |
specB := self changesetSpecBHolder value. |
|
3740 |
^specB ifNil:[nil] ifNotNil:[specB changeSet] |
|
3741 |
||
3742 |
"Created: / 06-07-2011 / 11:36:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
13880 | 3743 |
! |
3744 |
||
3745 |
changeSetBSpec |
|
3746 |
^self changesetSpecBHolder value. |
|
3747 |
||
3748 |
"Created: / 20-03-2012 / 00:01:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3749 |
! |
|
3750 |
||
3751 |
changeSetBSpec: spec |
|
3752 |
^self changesetSpecBHolder value: spec |
|
3753 |
||
3754 |
"Created: / 01-08-2012 / 15:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3755 |
! |
|
3756 |
||
3757 |
changeSetBase |
|
3758 |
||
3759 |
| specBase | |
|
3760 |
||
3761 |
specBase := self changesetSpecBaseHolder value. |
|
3762 |
^specBase ifNil:[nil] ifNotNil:[specBase changeSet] |
|
3763 |
||
3764 |
"Created: / 16-03-2012 / 13:48:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3765 |
! |
|
3766 |
||
3767 |
changeSetBaseSpec |
|
3768 |
^self changesetSpecBaseHolder value. |
|
3769 |
||
3770 |
"Created: / 20-03-2012 / 00:01:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3771 |
! |
|
3772 |
||
3773 |
changeSetBaseSpec: spec |
|
3774 |
^self changesetSpecBaseHolder value: spec |
|
3775 |
||
3776 |
"Created: / 01-08-2012 / 15:38:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3777 |
! |
|
3778 |
||
3779 |
changeSetMerged |
|
3780 |
||
3781 |
| specMerged | |
|
3782 |
||
3783 |
specMerged := self changesetSpecMergedHolder value. |
|
3784 |
^specMerged ifNil:[nil] ifNotNil:[specMerged changeSet] |
|
3785 |
||
3786 |
"Created: / 20-03-2012 / 00:01:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3787 |
! |
|
3788 |
||
3789 |
changeSetMergedSpec |
|
3790 |
^self changesetSpecMergedHolder value. |
|
3791 |
||
3792 |
"Created: / 20-03-2012 / 00:01:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3793 |
! |
|
3794 |
||
3795 |
changeSetMergedSpec: spec |
|
3796 |
^self changesetSpecMergedHolder value: spec |
|
3797 |
||
3798 |
"Created: / 01-08-2012 / 15:38:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3799 |
! |
|
3800 |
||
3801 |
diffInfo |
|
3802 |
"Returns a ChangeSetDiffInfo based on current data" |
|
3803 |
||
3804 |
| info | |
|
3805 |
info := ChangeSetDiffInfo new. |
|
3806 |
info specA: self changeSetASpec. |
|
3807 |
info specB: self changeSetBSpec. |
|
3808 |
self changesetSpecBaseEnabledHolder value ifTrue:[ |
|
3809 |
info specBase: self changeSetBaseSpec. |
|
3810 |
]. |
|
3811 |
changesetSpecMergedEnabledHolder value ifTrue:[ |
|
3812 |
info specMerge: self changeSetMergedSpec. |
|
3813 |
]. |
|
3814 |
^info |
|
3815 |
||
3816 |
"Created: / 01-08-2012 / 15:41:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3817 |
! |
|
3818 |
||
3819 |
diffInfo: info |
|
3820 |
"Sets up dialog for given diff info" |
|
3821 |
||
3822 |
info isNil ifTrue:[ ^ self ]. |
|
3823 |
||
3824 |
self changeSetASpec: info specA. |
|
3825 |
self changeSetBSpec: info specB. |
|
3826 |
self changeSetBaseSpec: info specBase. |
|
3827 |
self changeSetMergedSpec: info specMerge. |
|
3828 |
||
3829 |
"Created: / 01-08-2012 / 15:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 3830 |
! ! |
3831 |
||
3832 |
!ChangeSetDiffTool::OpenDialog methodsFor:'aspects'! |
|
3833 |
||
3834 |
changesetSpecAHolder |
|
3835 |
"return/create the 'changesetSpecAHolder' value holder (automatically generated)" |
|
3836 |
||
3837 |
changesetSpecAHolder isNil ifTrue:[ |
|
3838 |
changesetSpecAHolder := ValueHolder new. |
|
3839 |
]. |
|
3840 |
^ changesetSpecAHolder |
|
3841 |
! |
|
3842 |
||
3843 |
changesetSpecAHolder:something |
|
3844 |
"set the 'changesetSpecAHolder' value holder (automatically generated)" |
|
3845 |
||
3846 |
changesetSpecAHolder := something. |
|
3847 |
! |
|
3848 |
||
3849 |
changesetSpecBHolder |
|
3850 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3851 |
||
3852 |
changesetSpecBHolder isNil ifTrue:[ |
|
3853 |
changesetSpecBHolder := ValueHolder new. |
|
3854 |
]. |
|
3855 |
^ changesetSpecBHolder |
|
3856 |
! |
|
3857 |
||
3858 |
changesetSpecBHolder:something |
|
3859 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3860 |
||
3861 |
changesetSpecBHolder := something. |
|
3862 |
! |
|
3863 |
||
13880 | 3864 |
changesetSpecBaseEnabledHolder |
3865 |
"return/create the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)" |
|
3866 |
||
3867 |
changesetSpecBaseEnabledHolder isNil ifTrue:[ |
|
3868 |
changesetSpecBaseEnabledHolder := false asValue |
|
3869 |
]. |
|
3870 |
^ changesetSpecBaseEnabledHolder |
|
3871 |
||
3872 |
"Modified: / 19-03-2012 / 23:20:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3873 |
! |
|
3874 |
||
3875 |
changesetSpecBaseEnabledHolder:something |
|
3876 |
"set the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)" |
|
3877 |
||
3878 |
changesetSpecBaseEnabledHolder := something. |
|
3879 |
! |
|
3880 |
||
3881 |
changesetSpecBaseHolder |
|
3882 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3883 |
||
3884 |
changesetSpecBaseHolder isNil ifTrue:[ |
|
3885 |
changesetSpecBaseHolder := ValueHolder new. |
|
3886 |
]. |
|
3887 |
^ changesetSpecBaseHolder |
|
3888 |
||
3889 |
"Created: / 16-03-2012 / 13:48:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3890 |
! |
|
3891 |
||
3892 |
changesetSpecBaseHolder:something |
|
3893 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3894 |
||
3895 |
changesetSpecBaseHolder := something. |
|
3896 |
||
3897 |
"Created: / 16-03-2012 / 13:49:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3898 |
! |
|
3899 |
||
3900 |
changesetSpecMergedEnabledHolder |
|
3901 |
"return/create the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)" |
|
3902 |
||
3903 |
changesetSpecMergedEnabledHolder isNil ifTrue:[ |
|
3904 |
changesetSpecMergedEnabledHolder := false asValue |
|
3905 |
]. |
|
3906 |
^ changesetSpecMergedEnabledHolder |
|
3907 |
||
3908 |
"Modified: / 19-03-2012 / 23:20:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3909 |
! |
|
3910 |
||
3911 |
changesetSpecMergedEnabledHolder:something |
|
3912 |
"set the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)" |
|
3913 |
||
3914 |
changesetSpecMergedEnabledHolder := something. |
|
3915 |
! |
|
3916 |
||
3917 |
changesetSpecMergedHolder |
|
3918 |
"return/create the 'changesetSpecMergedHolder' value holder (automatically generated)" |
|
3919 |
||
3920 |
changesetSpecMergedHolder isNil ifTrue:[ |
|
3921 |
changesetSpecMergedHolder := ValueHolder new. |
|
3922 |
]. |
|
3923 |
^ changesetSpecMergedHolder |
|
3924 |
! |
|
3925 |
||
3926 |
changesetSpecMergedHolder:something |
|
3927 |
"set the 'changesetSpecMergedHolder' value holder (automatically generated)" |
|
3928 |
||
3929 |
changesetSpecMergedHolder := something. |
|
3930 |
! |
|
3931 |
||
10194 | 3932 |
doAcceptEnabled |
3933 |
<resource: #uiAspect> |
|
3934 |
||
3935 |
^BlockValue |
|
3936 |
with:[:a :b|a value notNil and:[b value notNil]] |
|
3937 |
argument:self changesetSpecAHolder |
|
3938 |
argument:self changesetSpecAHolder. |
|
3939 |
||
3940 |
"Modified: / 06-07-2011 / 11:26:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3941 |
! ! |
|
3942 |
||
3943 |
!ChangeSetDiffTool::OpenDialog methodsFor:'events'! |
|
3944 |
||
3945 |
closeAccept |
|
3946 |
||
3947 |
^super closeAccept |
|
3948 |
||
3949 |
"Created: / 06-07-2011 / 12:09:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3950 |
! ! |
|
3951 |
||
3952 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
3953 |
||
15231
37bdad4551ec
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
15227
diff
changeset
|
3954 |
version |
15929 | 3955 |
^ '$Header$' |
15231
37bdad4551ec
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
15227
diff
changeset
|
3956 |
! |
37bdad4551ec
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
15227
diff
changeset
|
3957 |
|
10194 | 3958 |
version_CVS |
15929 | 3959 |
^ '$Header$' |
10194 | 3960 |
! |
3961 |
||
19604
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
3962 |
version_HG |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
3963 |
|
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
3964 |
^ '$Changeset: <not expanded> $' |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
3965 |
! |
b02a518e2c70
`CodeView2`: use constracting color when drawing text that differs
Jan Vrany <jan.vrany@labware.com>
parents:
18532
diff
changeset
|
3966 |
|
10194 | 3967 |
version_SVN |
15929 | 3968 |
^ '$Id$' |
10194 | 3969 |
! ! |
13017
62a2cd2d8b70
class: Tools::ChangeSetDiffTool
Claus Gittinger <cg@exept.de>
parents:
10975
diff
changeset
|
3970 |