hg/stx-libtool2: comparison ColorEditDialog.st

equal deleted inserted replaced

-:f6fbbcdd3764
+:0234d226a06a
 "
 "{ Package: 'stx:libtool2' }"
 SimpleDialog subclass:#ColorEditDialog
 	instanceVariableNames:'red green blue hue light saturation colorNameHolder
-		htmlColorNameHolder'
+		htmlColorNameHolder previewBox'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 editor accepted ifTrue:[
 editor color inspect.
 ]
 [exEnd]
 "
+! !
+!ColorEditDialog class methodsFor:'help specs'!
+flyByHelpSpec
+"This resource specification was automatically generated
+by the UIHelpTool of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the UIHelpTool may not be able to read the specification."
+"
+UIHelpTool openOnClass:ColorEditDialog
+"
+<resource: #help>
+^ super flyByHelpSpec addPairsFrom:#(
+#pickColor
+'Pick a Color from the Screen'
+)
+!
+helpSpec
+"This resource specification was automatically generated
+by the UIHelpTool of ST/X."
+"Do not manually edit this!! If it is corrupted,
+the UIHelpTool may not be able to read the specification."
+"
+UIHelpTool openOnClass:ColorEditDialog
+"
+<resource: #help>
+^ super helpSpec addPairsFrom:#(
+#copyToClipboard
+'Copy the color to the clipboard'
+#hlsMixer
+'Mix color from hls (hue-light-saturation) components'
+#pasteFromClipboard
+'Paste color from the Clipboard'
+#rgbMixer
+'Mix color from rgb (red-green-blue) components'
+)
+! !
+!ColorEditDialog class methodsFor:'image specs'!
+pickColorIcon
+^ ToolbarIconLibrary pipette16x16Icon
 ! !
 !ColorEditDialog class methodsFor:'interface specs'!
 windowSpec
 (WindowSpec
 label: 'Define Color'
 name: 'Define Color'
 min: (Point 440 300)
 max: (Point 440 300)
-bounds: (Rectangle 0 0 436 300)
+bounds: (Rectangle 0 0 440 300)
 )
 component:
 (SpecCollection
 collection: (
 (VerticalPanelViewSpec
 name: 'RGBLabelPanel'
-layout: (LayoutFrame 0 0 0 0 58 0 76 0)
+layout: (LayoutFrame 0 0 0 0 70 0 76 0)
 horizontalLayout: fit
 verticalLayout: spreadSpace
 horizontalSpace: 3
 verticalSpace: 3
 component:
 )
 )
 (VerticalPanelViewSpec
 name: 'RGBSliderPanel'
-layout: (LayoutFrame 62 0 0 0 -177 1 76 0)
+layout: (LayoutFrame 70 0 0 0 -177 1 76 0)
 horizontalLayout: fit
 verticalLayout: spreadSpace
 horizontalSpace: 3
 verticalSpace: 3
 component:
 model: red
 orientation: horizontal
 stop: 255
 step: 1
 backgroundColor: (Color 100.0 0.0 0.0)
-extent: (Point 197 16)
+extent: (Point 193 16)
 )
 (SliderSpec
 name: 'GreenSlider'
 tabable: false
 model: green
 orientation: horizontal
 stop: 255
 step: 1
 backgroundColor: (Color 0.0 100.0 0.0)
-extent: (Point 197 16)
+extent: (Point 193 16)
 )
 (SliderSpec
 name: 'BlueSlider'
 tabable: false
 model: blue
 orientation: horizontal
 stop: 255
 step: 1
 backgroundColor: (Color 0.0 0.0 100.0)
-extent: (Point 197 16)
+extent: (Point 193 16)
 )
 )
 )
 )
 )
 )
 (VerticalPanelViewSpec
 name: 'HLSLabelPanel'
-layout: (LayoutFrame 0 0 86 0 58 0 163 0)
+layout: (LayoutFrame 0 0 86 0 70 0 163 0)
 horizontalLayout: fit
 verticalLayout: spreadSpace
 horizontalSpace: 3
 verticalSpace: 3
 component:
 translateLabel: true
 adjust: right
 useDefaultExtent: true
 )
 (LabelSpec
-label: 'Sat:'
+label: 'Saturation:'
 name: 'Label3'
 translateLabel: true
 adjust: right
 useDefaultExtent: true
 )
 )
 )
 (VerticalPanelViewSpec
 name: 'HLSSliderPanel'
-layout: (LayoutFrame 62 0 86 0 -177 1 163 0)
+layout: (LayoutFrame 70 0 86 0 -177 1 163 0)
 horizontalLayout: fit
 verticalLayout: spreadSpace
 horizontalSpace: 3
 verticalSpace: 3
 component:
 model: hue
 orientation: horizontal
 stop: 359
 step: 1
 keyboardStep: 1
-extent: (Point 197 16)
+extent: (Point 193 16)
 )
 (SliderSpec
 name: 'Slider2'
 tabable: false
 model: light
 orientation: horizontal
 step: 1
 backgroundColor: (Color 66.999313344015 66.999313344015 66.999313344015)
 keyboardStep: 1
-extent: (Point 197 16)
+extent: (Point 193 16)
 )
 (SliderSpec
 name: 'Slider3'
 tabable: false
 model: saturation
 orientation: horizontal
 step: 1
 backgroundColor: (Color 66.999313344015 66.999313344015 66.999313344015)
 keyboardStep: 1
-extent: (Point 197 16)
+extent: (Point 193 16)
 )
 )
 )
 )
 )
 )
 )
 (ViewSpec
-name: 'Box1'
+name: 'PreviewBoxFrame'
 layout: (LayoutFrame -117 1 4 0.0 -3 1.0 -39 1.0)
 level: 1
 component:
 (SpecCollection
 collection: (
 label: 'Preview'
 name: 'PreviewBox'
 layout: (LayoutFrame 2 0.0 2 0.0 -2 1.0 -2 1.0)
 level: -1
 translateLabel: true
+postBuildCallback: postBuildPreviewBox:
 )
 )
 )
 )
 )
 (ActionButtonSpec
 label: 'Copy Color'
 name: 'CopyColor'
 layout: (LayoutFrame 12 0 236 0 100 0 258 0)
+activeHelpKey: hlsMixer
 translateLabel: true
 resizeForLabel: true
 tabable: true
 model: copyColor
 )
 translateLabel: true
 resizeForLabel: true
 tabable: true
 model: pasteColor
 )
+(ActionButtonSpec
+label: 'pickColorIcon'
+name: 'Button1'
+layout: (LayoutFrame 285 0 236 0 312 0 263 0)
+activeHelpKey: pickColor
+hasCharacterOrientedLabel: false
+translateLabel: true
+resizeForLabel: true
+tabable: true
+model: pickColor
+)
 )
 )
 )
 ! !
 ! !
 !ColorEditDialog methodsFor:'actions'!
 colorChanged
-|box clr|
+|clr|
-box := self componentAt: #PreviewBox.
-box isNil ifTrue:[^ self "called before setup"].
 clr := self color.
-box backgroundColor:clr.
+self setPreview:clr.
-box foregroundColor:(clr brightness < 0.5
-ifTrue:[Color white]
-ifFalse:[Color black]).
 self htmlColorNameHolder value:(clr htmlPrintString).
 !
 colorNameChanged
 "compute rgb and hls (if possible)"
 copyBufferColor isColor ifFalse:[
 self window beep.
 ^ self
 ].
 self color:copyBufferColor
+!
+pickColor
+|color|
+color := Color fromUserWithFeedBack:[:clr | self setPreview:clr].
+color notNil ifTrue:[
+self color:color.
+]
 !
 rgbSliderChanged
 "compute hls"
 self light      value:(l rounded) withoutNotifying:self.
 self saturation value:(s rounded) withoutNotifying:self.
 ].
 self colorNameHolder value:'' withoutNotifying:self.
 self colorChanged
+!
+setPreview:color
+previewBox isNil ifTrue:[^ self "called before setup"].
+previewBox backgroundColor:color.
+previewBox foregroundColor:(color brightness < 0.5
+ifTrue:[Color white]
+ifFalse:[Color black]).
 ! !
 !ColorEditDialog methodsFor:'aspects'!
 blue
 ^ super update:something with:aParameter from:changedObject
 ! !
 !ColorEditDialog methodsFor:'startup & release'!
+postBuildPreviewBox:aView
+previewBox := aView
+!
 postBuildWith:aBuilder
 super postBuildWith:aBuilder.
 self colorChanged.
 "Modified: / 6.9.1998 / 22:55:25 / cg"

changeset 2266	0234d226a06a
parent 2228	6736186fc553
child 2274	e09282d74ec3