equal
deleted
inserted
replaced
1 "{ Encoding: utf8 }" |
|
2 |
|
3 " |
1 " |
4 COPYRIGHT (c) 1997-1998 by eXept Software AG |
2 COPYRIGHT (c) 1997-1998 by eXept Software AG |
5 All Rights Reserved |
3 All Rights Reserved |
6 |
4 |
7 This software is furnished under a license and may be used |
5 This software is furnished under a license and may be used |
5809 resourceClass notNil ifTrue:[ |
5807 resourceClass notNil ifTrue:[ |
5810 resourceSelector := imageEditView resourceSelector. |
5808 resourceSelector := imageEditView resourceSelector. |
5811 resourceSelector notNil ifTrue:[ |
5809 resourceSelector notNil ifTrue:[ |
5812 ^ resources |
5810 ^ resources |
5813 string:(self modified |
5811 string:(self modified |
5814 ifTrue:['ImageEditor (modified): %1 » %2'] |
5812 ifTrue:['ImageEditor (modified): %1 » %2'] |
5815 ifFalse:['ImageEditor: %1 » %2']) |
5813 ifFalse:['ImageEditor: %1 » %2']) |
5816 with:resourceClass name |
5814 with:resourceClass name |
5817 with:resourceSelector |
5815 with:resourceSelector |
5818 ]. |
5816 ]. |
5819 ]. |
5817 ]. |
5820 |
5818 |
5843 resourceClass notNil ifTrue:[ |
5841 resourceClass notNil ifTrue:[ |
5844 resourceSelector := imageEditView resourceSelector. |
5842 resourceSelector := imageEditView resourceSelector. |
5845 resourceSelector notNil ifTrue:[ |
5843 resourceSelector notNil ifTrue:[ |
5846 ^ resources |
5844 ^ resources |
5847 string:(self modified |
5845 string:(self modified |
5848 ifTrue:['Image (modified) from: %1 » %2'] |
5846 ifTrue:['Image (modified) from: %1 » %2'] |
5849 ifFalse:['Image from: %1 » %2']) |
5847 ifFalse:['Image from: %1 » %2']) |
5850 with:resourceClass name |
5848 with:resourceClass name |
5851 with:resourceSelector |
5849 with:resourceSelector |
5852 ]. |
5850 ]. |
5853 ]. |
5851 ]. |
5854 |
5852 |
6671 |
6669 |
6672 shiftAction := |
6670 shiftAction := |
6673 [ |
6671 [ |
6674 |hShift lFactor sFactor| |
6672 |hShift lFactor sFactor| |
6675 |
6673 |
6676 acceptChannel value:true. |
6674 "/ commented, because this leads to a recursion error |
|
6675 "/ (holders accept - send shiftAction again - ...) |
|
6676 "/ acceptChannel value:true. |
6677 |
6677 |
6678 firstChange ifTrue:[ |
6678 firstChange ifTrue:[ |
6679 imageEditView makeUndo. |
6679 imageEditView makeUndo. |
6680 firstChange := false. |
6680 firstChange := false. |
6681 anyChange := true. |
6681 anyChange := true. |
6730 bindings at:#previewImageHolder put:previewImageHolder. |
6730 bindings at:#previewImageHolder put:previewImageHolder. |
6731 |
6731 |
6732 bindings at:#resetHueShift put:[hueShiftHolder value:0]. |
6732 bindings at:#resetHueShift put:[hueShiftHolder value:0]. |
6733 bindings at:#resetLightFactor put:[lightFactorHolder value:1.0]. |
6733 bindings at:#resetLightFactor put:[lightFactorHolder value:1.0]. |
6734 bindings at:#resetSaturationFactor put:[saturationFactorHolder value:1.0]. |
6734 bindings at:#resetSaturationFactor put:[saturationFactorHolder value:1.0]. |
6735 |
6735 |
|
6736 [ |
6736 (self openDialogInterface:#changeHLSDialogSpec withBindings:bindings) |
6737 (self openDialogInterface:#changeHLSDialogSpec withBindings:bindings) |
6737 ifFalse:[ |
6738 ifFalse:[ |
6738 anyChange ifTrue:[ |
6739 anyChange ifTrue:[ |
6739 imageEditView undo |
6740 imageEditView undo |
6740 ] |
6741 ] |
6741 ]. |
6742 ]. |
|
6743 ] ensure:[self halt]. |
6742 |
6744 |
6743 (p := shiftProcess) notNil ifTrue:[ |
6745 (p := shiftProcess) notNil ifTrue:[ |
6744 p waitUntilTerminated. |
6746 p waitUntilTerminated. |
6745 ]. |
6747 ]. |
6746 |
6748 |