branch | jv |
changeset 12405 | 76f9a872362b |
parent 12292 | ecc23f7c8dde |
parent 12108 | efa871deeab7 |
child 12406 | 1fbd331e4489 |
12388:3efd83b86c07 | 12405:76f9a872362b |
---|---|
70 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
70 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
71 OTHER DEALINGS IN THE SOFTWARE. |
71 OTHER DEALINGS IN THE SOFTWARE. |
72 " |
72 " |
73 ! ! |
73 ! ! |
74 |
74 |
75 |
|
75 !ChangeList class methodsFor:'image specs'! |
76 !ChangeList class methodsFor:'image specs'! |
76 |
77 |
77 iconEqual |
78 iconEqual |
78 ^ ToolbarIconLibrary iconEqual12x12 |
79 ^ ToolbarIconLibrary iconEqual12x12 |
79 |
80 |
107 iconPlusGrayed |
108 iconPlusGrayed |
108 ^ ToolbarIconLibrary iconPlusGray12x12 |
109 ^ ToolbarIconLibrary iconPlusGray12x12 |
109 |
110 |
110 "Modified: / 31-08-2011 / 10:54:46 / cg" |
111 "Modified: / 31-08-2011 / 10:54:46 / cg" |
111 ! ! |
112 ! ! |
113 |
|
112 |
114 |
113 !ChangeList class methodsFor:'interface specs'! |
115 !ChangeList class methodsFor:'interface specs'! |
114 |
116 |
115 windowSpec |
117 windowSpec |
116 "This resource specification was automatically generated |
118 "This resource specification was automatically generated |
178 ) |
180 ) |
179 |
181 |
180 ) |
182 ) |
181 ) |
183 ) |
182 ! ! |
184 ! ! |
185 |
|
183 |
186 |
184 !ChangeList class methodsFor:'list specs'! |
187 !ChangeList class methodsFor:'list specs'! |
185 |
188 |
186 listColumnSpec |
189 listColumnSpec |
187 "This resource specification was automatically generated |
190 "This resource specification was automatically generated |
291 showColSeparator: false |
294 showColSeparator: false |
292 ) |
295 ) |
293 ) |
296 ) |
294 |
297 |
295 ! ! |
298 ! ! |
299 |
|
296 |
300 |
297 !ChangeList class methodsFor:'menu specs'! |
301 !ChangeList class methodsFor:'menu specs'! |
298 |
302 |
299 listMenu |
303 listMenu |
300 "This resource specification was automatically generated |
304 "This resource specification was automatically generated |
414 nil |
418 nil |
415 nil |
419 nil |
416 ) |
420 ) |
417 ! ! |
421 ! ! |
418 |
422 |
423 |
|
419 !ChangeList class methodsFor:'plugIn spec'! |
424 !ChangeList class methodsFor:'plugIn spec'! |
420 |
425 |
421 aspectSelectors |
426 aspectSelectors |
422 "This resource specification was automatically generated |
427 "This resource specification was automatically generated |
423 by the UIPainter of ST/X." |
428 by the UIPainter of ST/X." |
442 #showTimestampHolder |
447 #showTimestampHolder |
443 ). |
448 ). |
444 |
449 |
445 ! ! |
450 ! ! |
446 |
451 |
452 |
|
447 !ChangeList methodsFor:'accessing'! |
453 !ChangeList methodsFor:'accessing'! |
448 |
454 |
449 acceptEnabled |
455 acceptEnabled |
450 ^ self allowAccept |
456 ^ self allowAccept |
451 |
457 |
522 |
528 |
523 ^self showRemovedHolder value ? true |
529 ^self showRemovedHolder value ? true |
524 |
530 |
525 "Created: / 05-12-2009 / 14:28:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
531 "Created: / 05-12-2009 / 14:28:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
526 ! ! |
532 ! ! |
533 |
|
527 |
534 |
528 !ChangeList methodsFor:'actions'! |
535 !ChangeList methodsFor:'actions'! |
529 |
536 |
530 selectionDoubleclicked |
537 selectionDoubleclicked |
531 |
538 |
538 "/ ifTrue:[app redrawChangeListViews]. |
545 "/ ifTrue:[app redrawChangeListViews]. |
539 |
546 |
540 "Modified: / 24-01-2012 / 22:01:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
547 "Modified: / 24-01-2012 / 22:01:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
541 ! ! |
548 ! ! |
542 |
549 |
550 |
|
543 !ChangeList methodsFor:'aspects'! |
551 !ChangeList methodsFor:'aspects'! |
544 |
552 |
545 allowAcceptHolder |
553 allowAcceptHolder |
546 "return/create the valueHolder 'acceptEnabledHolder'" |
554 "return/create the valueHolder 'acceptEnabledHolder'" |
547 |
555 |
700 oldValue ~~ newValue ifTrue:[ |
708 oldValue ~~ newValue ifTrue:[ |
701 self update:#value with:newValue from:showTimestampHolder. |
709 self update:#value with:newValue from:showTimestampHolder. |
702 ]. |
710 ]. |
703 ! ! |
711 ! ! |
704 |
712 |
713 |
|
705 !ChangeList methodsFor:'change & update'! |
714 !ChangeList methodsFor:'change & update'! |
706 |
715 |
707 update: aspect with: param from: sender |
716 update: aspect with: param from: sender |
708 |
717 |
709 sender == allowRemoveHolder ifTrue:[ |
718 sender == allowRemoveHolder ifTrue:[ |
734 |
743 |
735 "Created: / 24-10-2009 / 19:47:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
744 "Created: / 24-10-2009 / 19:47:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
736 "Modified (format): / 27-12-2011 / 14:20:30 / cg" |
745 "Modified (format): / 27-12-2011 / 14:20:30 / cg" |
737 "Modified: / 26-07-2012 / 18:44:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
746 "Modified: / 26-07-2012 / 18:44:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
738 ! ! |
747 ! ! |
748 |
|
739 |
749 |
740 !ChangeList methodsFor:'drag & drop'! |
750 !ChangeList methodsFor:'drag & drop'! |
741 |
751 |
742 canDrop: aDropContext |
752 canDrop: aDropContext |
743 |
753 |
766 self inGeneratorHolder changed: #value |
776 self inGeneratorHolder changed: #value |
767 |
777 |
768 "Modified: / 01-08-2012 / 18:15:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
778 "Modified: / 01-08-2012 / 18:15:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
769 ! ! |
779 ! ! |
770 |
780 |
781 |
|
771 !ChangeList methodsFor:'event processing'! |
782 !ChangeList methodsFor:'event processing'! |
772 |
783 |
773 |
784 |
774 |
785 |
775 |
786 |
776 |
787 |
777 handlesKeyPress:key inView:aView |
788 handlesKeyPress:key inView:aView |
778 ^(key == #Accept or:[ key == #Ctrls]) |
789 <resource: #keyboard (#Accept #Ctrls)> |
779 and:[ listView scrolledView == aView ] |
790 |
791 ^(key == #Accept or:[ key == #Ctrls]) |
|
792 and:[ listView scrolledView == aView ] |
|
780 |
793 |
781 "Created: / 08-02-2012 / 14:43:11 / cg" |
794 "Created: / 08-02-2012 / 14:43:11 / cg" |
782 ! |
795 ! |
783 |
796 |
784 keyPress:key x:x y:y view:aView |
797 keyPress:key x:x y:y view:aView |
798 <resource: #keyboard (#Ctrls #Accept)> |
|
799 |
|
785 (key == #Accept or:[ key == #Ctrls]) ifTrue:[ |
800 (key == #Accept or:[ key == #Ctrls]) ifTrue:[ |
786 self listMenuApply. |
801 self listMenuApply. |
787 ^ self |
802 ^ self |
788 ]. |
803 ]. |
789 |
804 |
790 "Created: / 08-02-2012 / 14:42:18 / cg" |
805 "Created: / 08-02-2012 / 14:42:18 / cg" |
791 ! ! |
806 ! ! |
807 |
|
792 |
808 |
793 !ChangeList methodsFor:'generators'! |
809 !ChangeList methodsFor:'generators'! |
794 |
810 |
795 makeGenerator |
811 makeGenerator |
796 "Superclass Tools::BrowserList says that I am responsible to implement this method" |
812 "Superclass Tools::BrowserList says that I am responsible to implement this method" |
806 |
822 |
807 "Modified: / 24-07-2009 / 23:00:41 / Jan Vrany <vranyj1@fel.cvut.cz>" |
823 "Modified: / 24-07-2009 / 23:00:41 / Jan Vrany <vranyj1@fel.cvut.cz>" |
808 "Modified: / 25-07-2012 / 15:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
824 "Modified: / 25-07-2012 / 15:39:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
809 ! ! |
825 ! ! |
810 |
826 |
827 |
|
811 !ChangeList methodsFor:'hooks'! |
828 !ChangeList methodsFor:'hooks'! |
812 |
829 |
813 postBuildListView: aView |
830 postBuildListView: aView |
814 |
831 |
815 super postBuildListView: aView. |
832 super postBuildListView: aView. |
816 listView scrolledView delegate: self. |
833 listView scrolledView delegate: self. |
817 |
834 |
818 "Created: / 29-11-2011 / 14:56:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
835 "Created: / 29-11-2011 / 14:56:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
819 ! ! |
836 ! ! |
837 |
|
820 |
838 |
821 !ChangeList methodsFor:'initialization'! |
839 !ChangeList methodsFor:'initialization'! |
822 |
840 |
823 initialize |
841 initialize |
824 |
842 |
829 applyAction := [:change | change apply ]. |
847 applyAction := [:change | change apply ]. |
830 ]. |
848 ]. |
831 |
849 |
832 "Created: / 29-10-2010 / 12:50:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
850 "Created: / 29-10-2010 / 12:50:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
833 ! ! |
851 ! ! |
852 |
|
834 |
853 |
835 !ChangeList methodsFor:'menu actions'! |
854 !ChangeList methodsFor:'menu actions'! |
836 |
855 |
837 listMenuApply |
856 listMenuApply |
838 |sel list idx| |
857 |sel list idx| |
1003 |
1022 |
1004 self selectionHolder value do: |
1023 self selectionHolder value do: |
1005 [:each|each removed: false]. |
1024 [:each|each removed: false]. |
1006 self updateList |
1025 self updateList |
1007 ! ! |
1026 ! ! |
1027 |
|
1008 |
1028 |
1009 !ChangeList methodsFor:'private'! |
1029 !ChangeList methodsFor:'private'! |
1010 |
1030 |
1011 application |
1031 application |
1012 |
1032 |
1143 |
1163 |
1144 "Modified: / 28-12-2011 / 15:46:15 / cg" |
1164 "Modified: / 28-12-2011 / 15:46:15 / cg" |
1145 "Modified: / 01-08-2012 / 18:10:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1165 "Modified: / 01-08-2012 / 18:10:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1146 ! ! |
1166 ! ! |
1147 |
1167 |
1168 |
|
1148 !ChangeList methodsFor:'queries'! |
1169 !ChangeList methodsFor:'queries'! |
1149 |
1170 |
1150 hasChangeSelected |
1171 hasChangeSelected |
1151 |
1172 |
1152 ^self selectionHolder value size > 0 |
1173 ^self selectionHolder value size > 0 |
1181 ^self showColumnSpecHolder value includes: columnSymbol. |
1202 ^self showColumnSpecHolder value includes: columnSymbol. |
1182 |
1203 |
1183 "Created: / 03-04-2012 / 11:28:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1204 "Created: / 03-04-2012 / 11:28:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1184 ! ! |
1205 ! ! |
1185 |
1206 |
1207 |
|
1186 !ChangeList::ListEntry class methodsFor:'instance creation'! |
1208 !ChangeList::ListEntry class methodsFor:'instance creation'! |
1187 |
1209 |
1188 change: aChange |
1210 change: aChange |
1189 |
1211 |
1190 ^self new change: aChange |
1212 ^self new change: aChange |
1203 |
1225 |
1204 ^self new change: aChange; parent: aChangeList |
1226 ^self new change: aChange; parent: aChangeList |
1205 |
1227 |
1206 "Created: / 25-07-2009 / 23:33:00 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1228 "Created: / 25-07-2009 / 23:33:00 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1207 ! ! |
1229 ! ! |
1230 |
|
1208 |
1231 |
1209 !ChangeList::ListEntry methodsFor:'accessing'! |
1232 !ChangeList::ListEntry methodsFor:'accessing'! |
1210 |
1233 |
1211 application |
1234 application |
1212 ^ application ifNil:[super application] |
1235 ^ application ifNil:[super application] |
1323 |
1346 |
1324 "Hack: if the printString contains multiple lines, then |
1347 "Hack: if the printString contains multiple lines, then |
1325 if there are just 2 lines, then merge them, otherwise add |
1348 if there are just 2 lines, then merge them, otherwise add |
1326 ... to the first line" |
1349 ... to the first line" |
1327 (label includes: Character cr) ifTrue:[ |
1350 (label includes: Character cr) ifTrue:[ |
1328 | firstCR secondCR | |
1351 | firstCR secondCR | |
1329 firstCR := label indexOf: Character cr. |
1352 firstCR := label indexOf: Character cr. |
1330 firstCR ~~ label size ifTrue:[ |
1353 firstCR ~~ label size ifTrue:[ |
1331 secondCR := label indexOf: Character cr startingAt: firstCR + 1. |
1354 secondCR := label indexOf: Character cr startingAt: firstCR + 1. |
1332 ]. |
1355 ]. |
1333 secondCR isNil ifTrue:[ |
1356 secondCR isNil ifTrue:[ |
1334 "/2 lines only |
1357 "/2 lines only |
1335 label := label copy at: firstCR put: Character space. |
1358 label := label copy at: firstCR put: Character space. |
1336 ] ifFalse:[ |
1359 ] ifFalse:[ |
1337 label := (label copyTo: firstCR - 1) , '...' |
1360 label := (label copyTo: firstCR - 1) , '...' |
1338 ]. |
1361 ]. |
1339 ]. |
1362 ]. |
1340 self removed ifTrue:[label := label asText colorizeAllWith: Color gray]. |
1363 self removed ifTrue:[label := label asText colorizeAllWith: Color gray]. |
1341 ^label |
1364 ^label |
1342 |
1365 |
1343 "Created: / 05-11-2008 / 08:20:02 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1366 "Created: / 05-11-2008 / 08:20:02 / Jan Vrany <vranyj1@fel.cvut.cz>" |
1386 ! |
1409 ! |
1387 |
1410 |
1388 x |
1411 x |
1389 ^ x |
1412 ^ x |
1390 ! ! |
1413 ! ! |
1414 |
|
1391 |
1415 |
1392 !ChangeList::ListEntry methodsFor:'displaying'! |
1416 !ChangeList::ListEntry methodsFor:'displaying'! |
1393 |
1417 |
1394 displayLabel:aLabel h:lH on:aGC x:newX y:y h:h |
1418 displayLabel:aLabel h:lH on:aGC x:newX y:y h:h |
1395 |
1419 |
1423 "/ ]. |
1447 "/ ]. |
1424 |
1448 |
1425 "Modified: / 27-07-2012 / 17:13:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1449 "Modified: / 27-07-2012 / 17:13:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1426 ! ! |
1450 ! ! |
1427 |
1451 |
1452 |
|
1428 !ChangeList::ListEntry methodsFor:'private'! |
1453 !ChangeList::ListEntry methodsFor:'private'! |
1429 |
1454 |
1430 iconSelector |
1455 iconSelector |
1431 | delta | |
1456 | delta | |
1432 |
1457 |
1438 ^ nil. |
1463 ^ nil. |
1439 |
1464 |
1440 "Modified: / 31-08-2011 / 10:39:32 / cg" |
1465 "Modified: / 31-08-2011 / 10:39:32 / cg" |
1441 ! ! |
1466 ! ! |
1442 |
1467 |
1468 |
|
1443 !ChangeList::ListEntry methodsFor:'protocol-queries'! |
1469 !ChangeList::ListEntry methodsFor:'protocol-queries'! |
1444 |
1470 |
1445 hasChildren |
1471 hasChildren |
1446 ^ change isCompositeChange and:[change changes notEmptyOrNil ]. |
1472 ^ change isCompositeChange and:[change changes notEmptyOrNil ]. |
1447 |
1473 |
1448 "Created: / 04-12-2011 / 14:45:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1474 "Created: / 04-12-2011 / 14:45:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1449 "Modified (format): / 27-07-2012 / 21:25:34 / cg" |
1475 "Modified (format): / 27-07-2012 / 21:25:34 / cg" |
1450 ! ! |
1476 ! ! |
1451 |
1477 |
1478 |
|
1452 !ChangeList class methodsFor:'documentation'! |
1479 !ChangeList class methodsFor:'documentation'! |
1453 |
1480 |
1454 version |
1481 version |
1455 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.19 2012/09/10 12:16:47 cg Exp $' |
1482 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.20 2013-01-17 10:40:20 cg Exp $' |
1456 ! |
1483 ! |
1457 |
1484 |
1458 version_CVS |
1485 version_CVS |
1459 ^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.19 2012/09/10 12:16:47 cg Exp §' |
1486 ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeList.st,v 1.20 2013-01-17 10:40:20 cg Exp $' |
1460 ! |
1487 ! |
1461 |
1488 |
1462 version_SVN |
1489 version_SVN |
1463 ^ '$Id: Tools__ChangeList.st 8054 2012-09-13 09:15:20Z vranyj1 $' |
1490 ^ '§Id: Tools__ChangeList.st 7486 2009-10-26 22:06:24Z vranyj1 §' |
1464 ! ! |
1491 ! ! |
1492 |