equal
deleted
inserted
replaced
50 |
50 |
51 SimpleView subclass:#GutterView |
51 SimpleView subclass:#GutterView |
52 instanceVariableNames:'codeView textView textViewScroller widthAcceptCancel |
52 instanceVariableNames:'codeView textView textViewScroller widthAcceptCancel |
53 widthAnnotations widthDiffInfo numberOfLines acceptColor |
53 widthAnnotations widthDiffInfo numberOfLines acceptColor |
54 cancelColor diffColor menuHolder currentBlockNodeHolder |
54 cancelColor diffColor menuHolder currentBlockNodeHolder |
55 showLineNumbers blockWaitingForPossibleDoubleClick' |
55 showLineNumbers blockWaitingForPossibleDoubleClick compareAction' |
56 classVariableNames:'' |
56 classVariableNames:'' |
57 poolDictionaries:'' |
57 poolDictionaries:'' |
58 privateIn:CodeView2 |
58 privateIn:CodeView2 |
59 ! |
59 ! |
60 |
60 |
517 |
517 |
518 "Modified: / 27-07-2012 / 22:32:19 / cg" |
518 "Modified: / 27-07-2012 / 22:32:19 / cg" |
519 "Modified: / 27-09-2013 / 10:01:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
519 "Modified: / 27-09-2013 / 10:01:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
520 ! |
520 ! |
521 |
521 |
|
522 compareAction:aBlock |
|
523 gutterView notNil ifTrue:[ |
|
524 gutterView compareAction:aBlock |
|
525 ]. |
|
526 |
|
527 "Created: / 27-04-2018 / 16:52:47 / stefan" |
|
528 ! |
|
529 |
522 compilerClass |
530 compilerClass |
523 ^textView compilerClass |
531 ^textView compilerClass |
524 |
532 |
525 "Created: / 10-05-2012 / 23:47:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
533 "Created: / 10-05-2012 / 23:47:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
526 ! |
534 ! |
2439 "superclass AbstractBackground says that I am responsible to implement this method" |
2447 "superclass AbstractBackground says that I am responsible to implement this method" |
2440 |
2448 |
2441 ^ self |
2449 ^ self |
2442 ! ! |
2450 ! ! |
2443 |
2451 |
|
2452 !CodeView2::GutterView class methodsFor:'documentation'! |
|
2453 |
|
2454 documentation |
|
2455 " |
|
2456 documentation to be added. |
|
2457 |
|
2458 [author:] |
|
2459 stefan |
|
2460 |
|
2461 [instance variables:] |
|
2462 |
|
2463 [class variables:] |
|
2464 |
|
2465 [see also:] |
|
2466 |
|
2467 " |
|
2468 ! ! |
|
2469 |
2444 !CodeView2::GutterView methodsFor:'accessing'! |
2470 !CodeView2::GutterView methodsFor:'accessing'! |
|
2471 |
|
2472 compareAction |
|
2473 ^ compareAction |
|
2474 ! |
|
2475 |
|
2476 compareAction:something |
|
2477 compareAction := something. |
|
2478 ! |
2445 |
2479 |
2446 menuHolder:aValueThing |
2480 menuHolder:aValueThing |
2447 menuHolder := aValueThing |
2481 menuHolder := aValueThing |
2448 ! |
2482 ! |
2449 |
2483 |
2565 textView cancel |
2599 textView cancel |
2566 |
2600 |
2567 "Created: / 07-10-2011 / 20:23:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2601 "Created: / 07-10-2011 / 20:23:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2568 ! |
2602 ! |
2569 |
2603 |
2570 diff |
2604 compare |
2571 |
2605 "diff agains original version" |
2572 "Created: / 07-10-2011 / 20:23:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2606 |
|
2607 compareAction value. |
|
2608 |
|
2609 "Created: / 27-04-2018 / 16:51:09 / stefan" |
2573 ! |
2610 ! |
2574 |
2611 |
2575 inspectView |
2612 inspectView |
2576 self halt. |
2613 self halt. |
2577 ! |
2614 ! |
2787 ]. |
2824 ]. |
2788 (y < self cancelButtonBottom) ifTrue:[ |
2825 (y < self cancelButtonBottom) ifTrue:[ |
2789 self cancel. |
2826 self cancel. |
2790 ^self. |
2827 ^self. |
2791 ]. |
2828 ]. |
2792 self diff. |
2829 self compare. |
2793 ]. |
2830 ]. |
2794 ^self. |
2831 ^self. |
2795 ]. |
2832 ]. |
2796 |
2833 |
2797 false ifTrue:[ |
2834 false ifTrue:[ |
2808 ]. |
2845 ]. |
2809 ]. |
2846 ]. |
2810 |
2847 |
2811 "Created: / 17-06-2011 / 13:02:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2848 "Created: / 17-06-2011 / 13:02:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
2812 "Modified (comment): / 18-05-2012 / 10:56:54 / cg" |
2849 "Modified (comment): / 18-05-2012 / 10:56:54 / cg" |
|
2850 "Modified: / 27-04-2018 / 17:03:23 / stefan" |
2813 ! |
2851 ! |
2814 |
2852 |
2815 sizeChanged:how |
2853 sizeChanged:how |
2816 super sizeChanged:how. |
2854 super sizeChanged:how. |
2817 "/ self invalidateAcceptCancelBar. |
2855 "/ self invalidateAcceptCancelBar. |