814 "Modified: / 01-08-2012 / 18:15:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
814 "Modified: / 01-08-2012 / 18:15:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
815 ! ! |
815 ! ! |
816 |
816 |
817 !ChangeList methodsFor:'event processing'! |
817 !ChangeList methodsFor:'event processing'! |
818 |
818 |
819 buttonPress:button x:x y:y view:aView |
|
820 |
|
821 | itemIndex item | |
|
822 |
|
823 button ~= 1 ifTrue:[^aView buttonPress:button x:x y:y]. |
|
824 |
|
825 itemIndex := aView yVisibleToLineNr:y. |
|
826 itemIndex isNil ifTrue:[^self]. |
|
827 itemIndex == 0 ifTrue:[^self]. |
|
828 itemIndex > aView list size ifTrue:[^self]. |
|
829 item := aView list at: itemIndex. |
|
830 |
|
831 ((aView left + x) between: (item x) and: (item x + 16)) |
|
832 ifFalse:[^aView buttonPress:button x:x y:y]. |
|
833 |
|
834 item removed: item removed not. |
|
835 aView invalidate |
|
836 |
|
837 "Created: / 08-12-2009 / 14:12:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
838 "Modified: / 18-11-2011 / 14:55:41 / cg" |
|
839 ! |
|
840 |
|
841 handlesButtonPress:button inView:aView |
|
842 |
|
843 ^listView scrolledView == aView |
|
844 |
|
845 "Created: / 08-12-2009 / 14:08:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
846 ! |
|
847 |
|
848 handlesKeyPress:key inView:aView |
819 handlesKeyPress:key inView:aView |
849 <resource: #keyboard (#Accept #Ctrls)> |
820 <resource: #keyboard (#Accept #Ctrls)> |
850 |
821 |
851 ^(key == #Accept or:[ key == #Ctrls]) |
822 ^(key == #Accept or:[ key == #Ctrls]) |
852 and:[ listView scrolledView == aView ] |
823 and:[ listView scrolledView == aView ] |
1205 ]. |
1176 ]. |
1206 ]. |
1177 ]. |
1207 oldSel := self selection. |
1178 oldSel := self selection. |
1208 |
1179 |
1209 changeset := inGenerator isNil ifTrue:[ #() ] ifFalse:[ inGenerator ]. |
1180 changeset := inGenerator isNil ifTrue:[ #() ] ifFalse:[ inGenerator ]. |
1210 newList := changeset |
1181 self showConflictsOnlyHolder value ifTrue:[ |
1211 select: |
1182 newList := changeset select: [:chg | chg isConflict ]. |
1212 [:chg | |
1183 ] ifFalse:[ |
1213 (self showRemovedHolder value or:[ chg removed not ]) |
1184 | showRemoved showSame | |
1214 and:[self showSameHolder value or:[chg delta ~~ #=]] |
1185 |
1215 ]. |
1186 showRemoved := self showRemovedHolder value. |
|
1187 showSame := self showSameHolder value. |
|
1188 |
|
1189 newList := changeset select: [:chg | |
|
1190 (showRemoved or:[ chg removed not ]) |
|
1191 and:[showSame or:[chg delta ~~ #=]] |
|
1192 ]. |
|
1193 ]. |
|
1194 "/ OLD CODE |
|
1195 "/ newList := changeset |
|
1196 "/ select: |
|
1197 "/ [:chg | |
|
1198 "/ (self showRemovedHolder value or:[ chg removed not ]) |
|
1199 "/ and:[self showSameHolder value or:[chg delta ~~ #=]] |
|
1200 "/ ]. |
1216 newList := self filterList: newList. |
1201 newList := self filterList: newList. |
1217 newList := newList collect:[:chg | self listEntryFor:chg ]. |
1202 newList := newList collect:[:chg | self listEntryFor:chg ]. |
1218 self listHolder value ~= newList ifTrue:[ |
1203 self listHolder value ~= newList ifTrue:[ |
1219 self listHolder value: newList. |
1204 self listHolder value: newList. |
1220 ((newList size ~~ 0) and:[scrollToBottom]) ifTrue:[ |
1205 ((newList size ~~ 0) and:[scrollToBottom]) ifTrue:[ |
1555 ! ! |
1541 ! ! |
1556 |
1542 |
1557 !ChangeList class methodsFor:'documentation'! |
1543 !ChangeList class methodsFor:'documentation'! |
1558 |
1544 |
1559 version |
1545 version |
1560 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.27 2014-02-05 18:58:09 cg Exp $' |
1546 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.28 2014-02-12 17:26:19 vrany Exp $' |
1561 ! |
1547 ! |
1562 |
1548 |
1563 version_CVS |
1549 version_CVS |
1564 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.27 2014-02-05 18:58:09 cg Exp $' |
1550 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.28 2014-02-12 17:26:19 vrany Exp $' |
1565 ! |
1551 ! |
1566 |
1552 |
1567 version_SVN |
1553 version_SVN |
1568 ^ '$Id: Tools__ChangeList.st,v 1.27 2014-02-05 18:58:09 cg Exp $' |
1554 ^ '$Id: Tools__ChangeList.st,v 1.28 2014-02-12 17:26:19 vrany Exp $' |
1569 ! ! |
1555 ! ! |
1570 |
1556 |