hg/stx-libtool2: comparison ImageEditor.st

equal deleted inserted replaced

-:116cf2acebe3
+:f792d83774b3
 openModalOnClass: aClass andSelector: aSelector
 "self openModalOnClass: self andSelector: #newImageIcon"
 |imageEditor className resourceClassName resourceSelector|
 imageEditor := self new.
 aClass isClass ifTrue: [className := aClass name].
 aClass isString ifTrue: [className := aClass].
-imageEditor postOpenAction: [imageEditor loadFromMessage: className printString, ' ', aSelector].
+imageEditor postOpenAction: [imageEditor loadFromOrPrepareForMessage: className, ' ', aSelector].
 imageEditor openModal.
 resourceClassName := imageEditor valueOfResourceClass value.
 resourceSelector := imageEditor valueOfResourceSelector value.
-^resourceClassName, ' ', resourceSelector
+(className asString ~= resourceClassName) | (aSelector asString ~= resourceSelector)
+ifTrue: [^resourceClassName, ' ', resourceSelector]
+ifFalse:[^nil]
 !
 openOnClass: aClass andSelector: aSelector
 "self openOnClass: self andSelector: #newImageIcon"
 #(#FullSpec
 #'window:'
 #(#WindowSpec
 #'name:' 'Image Editor'
-#'layout:' #(#LayoutFrame 368 0 254 0 867 0 599 0)
+#'layout:' #(#LayoutFrame 109 0 301 0 608 0 646 0)
 #'label:' 'Image Editor'
 #'min:' #(#Point 400 320)
 #'max:' #(#Point 1152 900)
-#'bounds:' #(#Rectangle 368 254 868 600)
+#'bounds:' #(#Rectangle 109 301 609 647)
 #'menu:' #menu
 #'usePreferredExtent:' false
 )
 #'component:'
 #(#SpecCollection
 #'collection:'
 #(
 #(#MenuPanelSpec
 #'name:' 'menuToolbarView'
-#'layout:' #(#LayoutFrame 0 0.0 0 0 0 1.0 34 0)
+#'layout:' #(#LayoutFrame 0 0.0 0 0 0 1.0 32 0)
 #'menu:' #menuToolbar
 #'style:' #(#FontDescription #helvetica #medium #roman 10)
 #'showSeparatingLines:' true
 )
 #(#VariableHorizontalPanelSpec
 #'name:' 'variableHorizontalPanel1'
-#'layout:' #(#LayoutFrame 0 0.0 36 0.0 0 1.0 -22 1.0)
+#'layout:' #(#LayoutFrame 0 0.0 34 0.0 0 1.0 -22 1.0)
 #'component:'
 #(#SpecCollection
 #'collection:'
 #(
 #(#ViewSpec
 #(#DataSetColumnSpec
 #'rendererType:' #rowSelector
 #'backgroundSelector:' #yourself
 )
 #(#DataSetColumnSpec
-#'label:' ' Red'
+#'label:' 'Red'
 #'model:' #rowRedByte
 #'canSelect:' false
 )
 #(#DataSetColumnSpec
-#'label:' ' Green'
+#'label:' 'Green'
 #'model:' #rowGreenByte
 #'canSelect:' false
 )
 #(#DataSetColumnSpec
-#'label:' ' Blue'
+#'label:' 'Blue'
 #'model:' #rowBlueByte
 #'canSelect:' false
 )
 )
 )
 #'collection:'
 #(
 #(#InputFieldSpec
 #'name:' 'resourceClassInputField'
 #'activeHelpKey:' #classNameInputField
+#'enableChannel:' #valueOfOpenedStandAlone
 #'model:' #valueOfResourceClass
 #'immediateAccept:' false
 #'extent:' #(#Point 129 21)
 )
 #(#InputFieldSpec
 ' used colors)'
 !
-updateInputFieldsAndLabelsAndHistory
+updateInputFields
-self imageIsLoaded value: self image notNil.
-self image isNil ifTrue: [^nil].
-self updateInfoLabel.
-self imageEditView coordInfoBlock: [:value| self valueOfCoordLabel value: value].
-self valueOfFileName removeDependent: self.
-self valueOfFileName value: self image fileName.
-self valueOfFileName addDependent: self.
 self valueOfResourceSelector removeDependent: self.
 self valueOfResourceSelector value: self imageEditView resourceSelector.
 self valueOfResourceSelector addDependent: self.
 self imageEditView resourceClass notNil
 ifTrue: [self valueOfResourceClass value: self imageEditView resourceClass]
 ifFalse: [self valueOfResourceClass value: ''].
 self valueOfResourceClass addDependent: self.
+!
+updateInputFieldsAndLabelsAndHistory
+self imageIsLoaded value: self image notNil.
+self image isNil ifTrue: [^nil].
+self updateInfoLabel.
+self imageEditView coordInfoBlock: [:value| self valueOfCoordLabel value: value].
+self valueOfFileName removeDependent: self.
+self valueOfFileName value: self image fileName.
+self valueOfFileName addDependent: self.
+self updateInputFields.
 self imageEditView resourceMessage asCollectionOfWords size = 2
 ifTrue: [self addToHistory: self imageEditView resourceMessage -> #loadFromMessage:].
 self image fileName notNil
 ifTrue: [self addToHistory: self image fileName -> #loadFromFile:].
 !
 open
 super open.
-self imageEditView masterApplication: self.
 self resourceClassInputField entryCompletionBlock:
 [:value|
 |what|
 what := Smalltalk classnameCompletion: value withoutSpaces.
 ].
 !
 postOpenWith:aBuilder
+self imageEditView masterApplication: self.
 postOpenAction notNil ifTrue: [postOpenAction value].
 super postOpenWith:aBuilder.
 !
 reOpen
 self findColorMapMode.
 self updateInputFieldsAndLabelsAndHistory.
 ]
 !
+loadFromOrPrepareForMessage: aMessage
+(self imageEditView loadFromMessage: aMessage) notNil
+ifTrue:
+[
+self listOfColors contents: self image usedColors asSet asOrderedCollection.
+self findColorMapMode.
+self updateInputFieldsAndLabelsAndHistory.
+]
+ifFalse:
+[
+self imageEditView resourceMessage: aMessage.
+self updateInputFields.
+]
+!
 newImage
 |aspects|
 aspects  := IdentityDictionary new
 at:#listOfSizes put: self class listOfDefaultSizes asValue;

changeset 415	f792d83774b3
parent 405	8546da96ab11
child 420	7fd01e47c912