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