equal
deleted
inserted
replaced
712 ) |
712 ) |
713 (MenuItem |
713 (MenuItem |
714 label: 'Exit' |
714 label: 'Exit' |
715 itemValue: closeRequest |
715 itemValue: closeRequest |
716 translateLabel: true |
716 translateLabel: true |
|
717 shortcutKey: Ctrlq |
717 ) |
718 ) |
718 ) |
719 ) |
719 nil |
720 nil |
720 nil |
721 nil |
721 ) |
722 ) |
1338 updateViews |
1339 updateViews |
1339 |
1340 |
1340 self diffInfo isNil ifTrue:[ ^ self ]. |
1341 self diffInfo isNil ifTrue:[ ^ self ]. |
1341 |
1342 |
1342 self diffInfo isDiff3 ifTrue:[ |
1343 self diffInfo isDiff3 ifTrue:[ |
1343 textDiffToolHolder value isDiff3 ifFalse:[ |
1344 self textDiffToolHolder value isDiff3 ifFalse:[ |
1344 textDiffToolHolder value: self textDiff3Tool. |
1345 textDiffToolHolder value: self textDiff3Tool. |
1345 ]. |
1346 ]. |
1346 self mergeHolder value: self diffInfo isMerge. |
1347 self mergeHolder value: self diffInfo isMerge. |
1347 ] ifFalse:[ |
1348 ] ifFalse:[ |
1348 textDiffToolHolder value isDiff2 ifFalse:[ |
1349 self textDiffToolHolder value isDiff2 ifFalse:[ |
1349 textDiffToolHolder value: self textDiff2Tool. |
1350 textDiffToolHolder value: self textDiff2Tool. |
1350 ]. |
1351 ]. |
1351 self mergeHolder value: false. |
1352 self mergeHolder value: false. |
1352 ] |
1353 ] |
1353 |
1354 |
2448 version_CVS |
2449 version_CVS |
2449 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
2450 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
2450 ! |
2451 ! |
2451 |
2452 |
2452 version_SVN |
2453 version_SVN |
2453 ^ '$Id: Tools__ChangeSetDiffTool.st 7947 2012-03-20 16:59:54Z vranyj1 $' |
2454 ^ '$Id: Tools__ChangeSetDiffTool.st 7948 2012-03-21 01:52:35Z vranyj1 $' |
2454 ! ! |
2455 ! ! |