equal
deleted
inserted
replaced
31 instanceVariableNames:'diffInfoHolder listHolder singleSelectionHolder diffsetHolder |
31 instanceVariableNames:'diffInfoHolder listHolder singleSelectionHolder diffsetHolder |
32 titleHolder firstColSelectionHolder navigatorPanelSpecHolder |
32 titleHolder firstColSelectionHolder navigatorPanelSpecHolder |
33 diffMenuHolder diffsetHolderPrivate selectionHolder |
33 diffMenuHolder diffsetHolderPrivate selectionHolder |
34 versionATextHolder versionBTextHolder versionBaseTextHolder |
34 versionATextHolder versionBTextHolder versionBaseTextHolder |
35 textDiffToolHolder textDiffToolWindowSpecHolder mergeHolder |
35 textDiffToolHolder textDiffToolWindowSpecHolder mergeHolder |
36 mergeDataHolder' |
36 mergeDataHolder showVersionMethodDiffsHolder' |
37 classVariableNames:'' |
37 classVariableNames:'' |
38 poolDictionaries:'' |
38 poolDictionaries:'' |
39 category:'Interface-Diff' |
39 category:'Interface-Diff' |
40 ! |
40 ! |
41 |
41 |
232 |
232 |
233 "Do not manually edit this!! If it is corrupted, |
233 "Do not manually edit this!! If it is corrupted, |
234 the UIPainter may not be able to read the specification." |
234 the UIPainter may not be able to read the specification." |
235 |
235 |
236 " |
236 " |
237 UIPainter new openOnClass:Tools::ChangeSetDiffBrowser andSelector:#oneColumnNavigatorSpec |
237 UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#oneColumnNavigatorSpec |
238 Tools::ChangeSetDiffBrowser new openInterface:#oneColumnNavigatorSpec |
238 Tools::ChangeSetDiffTool new openInterface:#oneColumnNavigatorSpec |
239 " |
239 " |
240 |
240 |
241 <resource: #canvas> |
241 <resource: #canvas> |
242 |
242 |
243 ^ |
243 ^ |
277 ) |
277 ) |
278 (SubChannelInfoSpec |
278 (SubChannelInfoSpec |
279 subAspect: outGeneratorHolder |
279 subAspect: outGeneratorHolder |
280 aspect: selectionHolder |
280 aspect: selectionHolder |
281 ) |
281 ) |
|
282 |
|
283 (SubChannelInfoSpec |
|
284 subAspect: showVersionMethodDiffsHolder |
|
285 aspect: showVersionMethodDiffsHolder |
|
286 ) |
282 ) |
287 ) |
283 createNewApplication: true |
288 createNewApplication: true |
284 createNewBuilder: false |
289 createNewBuilder: false |
285 ) |
290 ) |
286 ) |
291 ) |
295 |
300 |
296 "Do not manually edit this!! If it is corrupted, |
301 "Do not manually edit this!! If it is corrupted, |
297 the UIPainter may not be able to read the specification." |
302 the UIPainter may not be able to read the specification." |
298 |
303 |
299 " |
304 " |
300 UIPainter new openOnClass:Tools::ChangeSetDiffBrowser andSelector:#twoColumnNavigatorSpec |
305 UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#twoColumnNavigatorSpec |
301 Tools::ChangeSetDiffBrowser new openInterface:#twoColumnNavigatorSpec |
306 Tools::ChangeSetDiffTool new openInterface:#twoColumnNavigatorSpec |
302 " |
307 " |
303 |
308 |
304 <resource: #canvas> |
309 <resource: #canvas> |
305 |
310 |
306 ^ |
311 ^ |
345 ) |
350 ) |
346 (SubChannelInfoSpec |
351 (SubChannelInfoSpec |
347 subAspect: outGeneratorHolder |
352 subAspect: outGeneratorHolder |
348 aspect: firstColSelectionHolder |
353 aspect: firstColSelectionHolder |
349 ) |
354 ) |
|
355 |
|
356 (SubChannelInfoSpec |
|
357 subAspect: showVersionMethodDiffsHolder |
|
358 aspect: showVersionMethodDiffsHolder |
|
359 ) |
350 ) |
360 ) |
351 createNewApplication: true |
361 createNewApplication: true |
352 createNewBuilder: true |
362 createNewBuilder: true |
353 ) |
363 ) |
354 (SubCanvasSpec |
364 (SubCanvasSpec |
374 ) |
384 ) |
375 (SubChannelInfoSpec |
385 (SubChannelInfoSpec |
376 subAspect: outGeneratorHolder |
386 subAspect: outGeneratorHolder |
377 aspect: selectionHolder |
387 aspect: selectionHolder |
378 ) |
388 ) |
|
389 |
|
390 (SubChannelInfoSpec |
|
391 subAspect: showVersionMethodDiffsHolder |
|
392 aspect: showVersionMethodDiffsHolder |
|
393 ) |
379 ) |
394 ) |
380 createNewApplication: true |
395 createNewApplication: true |
381 createNewBuilder: true |
396 createNewBuilder: true |
382 ) |
397 ) |
383 ) |
398 ) |
438 hasVerticalScrollBar: false |
453 hasVerticalScrollBar: false |
439 specHolder: navigatorPanelSpecHolder |
454 specHolder: navigatorPanelSpecHolder |
440 createNewBuilder: false |
455 createNewBuilder: false |
441 ) |
456 ) |
442 (SubCanvasSpec |
457 (SubCanvasSpec |
443 name: 'TextDiff' |
|
444 majorKey: #'Tools::TextDiffTool' |
|
445 minorKey: windowSpecForEmbedding |
|
446 specHolder: textDiffToolWindowSpecHolder |
458 specHolder: textDiffToolWindowSpecHolder |
447 clientHolder: textDiffToolHolder |
459 clientHolder: textDiffToolHolder |
448 createNewBuilder: false |
460 createNewBuilder: false |
449 ) |
461 ) |
450 ) |
462 ) |
759 (MenuItem |
771 (MenuItem |
760 label: 'Diff' |
772 label: 'Diff' |
761 translateLabel: true |
773 translateLabel: true |
762 submenuChannel: listMenu |
774 submenuChannel: listMenu |
763 ) |
775 ) |
|
776 (MenuItem |
|
777 label: 'View' |
|
778 translateLabel: true |
|
779 submenu: |
|
780 (Menu |
|
781 ( |
|
782 (MenuItem |
|
783 label: 'Show Diffs in Version Methods' |
|
784 translateLabel: true |
|
785 indication: showVersionMethodDiffsHolder |
|
786 ) |
|
787 ) |
|
788 nil |
|
789 nil |
|
790 ) |
|
791 ) |
764 ) |
792 ) |
765 nil |
793 nil |
766 nil |
794 nil |
767 ) |
795 ) |
768 ! ! |
796 ! ! |
1108 selectionHolder addDependent:self. |
1136 selectionHolder addDependent:self. |
1109 ]. |
1137 ]. |
1110 ^ selectionHolder |
1138 ^ selectionHolder |
1111 |
1139 |
1112 "Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1140 "Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1141 ! |
|
1142 |
|
1143 showVersionMethodDiffsHolder |
|
1144 "return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)" |
|
1145 |
|
1146 showVersionMethodDiffsHolder isNil ifTrue:[ |
|
1147 showVersionMethodDiffsHolder := true asValue. |
|
1148 ]. |
|
1149 ^ showVersionMethodDiffsHolder |
|
1150 |
|
1151 "Modified: / 18-04-2012 / 19:02:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1152 ! |
|
1153 |
|
1154 showVersionMethodDiffsHolder:something |
|
1155 "set the 'showVersionMethodDiffsHolder' value holder (automatically generated)" |
|
1156 |
|
1157 showVersionMethodDiffsHolder := something. |
1113 ! |
1158 ! |
1114 |
1159 |
1115 singleSelectionHolder |
1160 singleSelectionHolder |
1116 "return/create the 'singleSelectionHolder' value holder (automatically generated)" |
1161 "return/create the 'singleSelectionHolder' value holder (automatically generated)" |
1117 |
1162 |
2451 version_CVS |
2496 version_CVS |
2452 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
2497 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
2453 ! |
2498 ! |
2454 |
2499 |
2455 version_SVN |
2500 version_SVN |
2456 ^ '$Id: Tools__ChangeSetDiffTool.st 7963 2012-04-03 12:32:03Z vranyj1 $' |
2501 ^ '$Id: Tools__ChangeSetDiffTool.st 7981 2012-04-18 20:29:40Z vranyj1 $' |
2457 ! ! |
2502 ! ! |