VersionDiffBrowser.st
branchjv
changeset 13609 8b400fde34ef
parent 13330 02d6c2d848a0
parent 13547 2b11f03e2ccb
child 15566 184cea584be5
equal deleted inserted replaced
13608:f0126e42bbef 13609:8b400fde34ef
  1706     leftView := diffTextView leftTextView.
  1706     leftView := diffTextView leftTextView.
  1707     rightView := diffTextView rightTextView.
  1707     rightView := diffTextView rightTextView.
  1708     singleView := self componentAt:#singleTextView.
  1708     singleView := self componentAt:#singleTextView.
  1709 
  1709 
  1710     (Array
  1710     (Array
  1711 	with:leftView
  1711         with:leftView
  1712 	with:rightView
  1712         with:rightView
  1713 	with:singleView)
  1713         with:singleView)
  1714     do:[:v |
  1714     do:[:v |
  1715 	|mGen|
  1715         |mGen|
  1716 
  1716 
  1717 	mGen := [
  1717         mGen := [
  1718 	    |m|
  1718             |m|
  1719 
  1719 
  1720 	    m := v editMenu.
  1720             m := v editMenu.
  1721 
  1721 
  1722 	    (m selectorAt:#accept) isNil ifTrue:[
  1722             (m selectorAt:#accept) isNil ifTrue:[
  1723 		m addLabels:(resources array:#('-' 'Accept'))
  1723                 m addLabels:(resources array:#('-' 'Accept'))
  1724 		  selectors:(Array with:nil with:#accept)
  1724                   selectors:#(nil #accept)
  1725 		  after:#copySelection.
  1725                   after:#copySelection.
  1726 	    ].
  1726             ].
  1727 	    m
  1727             m
  1728 		actionAt:#accept
  1728                 actionAt:#accept
  1729 		put:[
  1729                 put:[
  1730 		    v == singleView ifTrue:[
  1730                     v == singleView ifTrue:[
  1731 			self acceptInSingleView
  1731                         self acceptInSingleView
  1732 		    ] ifFalse:[
  1732                     ] ifFalse:[
  1733 			v == leftView ifTrue:[
  1733                         v == leftView ifTrue:[
  1734 			   self acceptInLeftView
  1734                            self acceptInLeftView
  1735 			] ifFalse:[
  1735                         ] ifFalse:[
  1736 			   self acceptInRightView
  1736                            self acceptInRightView
  1737 			].
  1737                         ].
  1738 		    ].
  1738                     ].
  1739 		].
  1739                 ].
  1740 	    m selectorAt:#accept put:nil.
  1740             m selectorAt:#accept put:nil.
  1741 	    m enable:#copySelection.
  1741             m enable:#copySelection.
  1742 	    m setEnable:#accept to:[self canAcceptInCodeView].
  1742             m setEnable:#accept to:[self canAcceptInCodeView].
  1743 	    m
  1743             m
  1744 	].
  1744         ].
  1745 	v menuHolder:mGen.
  1745         v menuHolder:mGen.
  1746 	v menuMessage:#value.
  1746         v menuMessage:#value.
  1747     ]
  1747     ]
  1748 !
  1748 !
  1749 
  1749 
  1750 applyChange:change
  1750 applyChange:change
  1751     change notNil ifTrue:[
  1751     change notNil ifTrue:[
  2479 ! !
  2479 ! !
  2480 
  2480 
  2481 !VersionDiffBrowser class methodsFor:'documentation'!
  2481 !VersionDiffBrowser class methodsFor:'documentation'!
  2482 
  2482 
  2483 version
  2483 version
  2484     ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.116 2013-08-07 09:57:46 stefan Exp $'
  2484     ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.117 2013-09-12 08:29:48 cg Exp $'
  2485 !
  2485 !
  2486 
  2486 
  2487 version_CVS
  2487 version_CVS
  2488     ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.116 2013-08-07 09:57:46 stefan Exp $'
  2488     ^ '$Header: /cvs/stx/stx/libtool/VersionDiffBrowser.st,v 1.117 2013-09-12 08:29:48 cg Exp $'
  2489 !
  2489 !
  2490 
  2490 
  2491 version_HG
  2491 version_HG
  2492 
  2492 
  2493     ^ '$Changeset: <not expanded> $'
  2493     ^ '$Changeset: <not expanded> $'