hg/stx-libtool2: comparison DataSetBuilder.st

equal deleted inserted replaced

-:2dda94c7ff25
+:286a039ea7d1
 height
 menu
 foregroundSelector
 backgroundSelector
 doubleClickedSelector
+rowSeparatorSelector
 selectSelector
 printSelector
 readSelector
 writeSelector
 rendererType
 showColSeparator
+showSelectionHighLighted
 showRowSeparator
 backgroundColor
 foregroundColor
 labelForegroundColor
 labelBackgroundColor
 UIHelpTool openOnClass:DataSetBuilder
 "
 <resource: #help>
-^super helpSpec addPairsFrom:#(
+^ super helpSpec addPairsFrom:#(
 #addColumn
 'Adds a new column.'
 #basicsEditor
 'Turns on/off displaying column separators.'
 #frameShowRowSeparator
 'Turns on/off displaying row separators.'
+#frameShowRowSeparatorSelector
+'An optional selector, which is used to test whether the row separator at the bottom is shown.'
 #generate
 'Code generation.'
 #generateCode
 'Generate code and install in the selected class/selector.'
 #selectionLabelClickSelector
 'A selector called if label cell was clicked.'
 #selectionLabelSelectorArgument
 'An argument passed to label selection selector.'
+#showSelectionHighLighted
+'Show selected cell highligthened (change fg/bg color).'
 #valuesChoiceSelector
 'A selector returning a collection of choices for a cell having a ComboBox or a ComboList widget.'
 #valuesMenuSelector
 #(#FullSpec
 #window:
 #(#WindowSpec
 #name: 'DataSet Dimension'
-#layout: #(#LayoutFrame 216 0 173 0 506 0 416 0)
+#layout: #(#LayoutFrame 44 0 255 0 368 0 602 0)
 #label: 'DataSet Dimension'
 #min: #(#Point 10 10)
 #max: #(#Point 1280 1024)
-#bounds: #(#Rectangle 216 173 507 417)
+#bounds: #(#Rectangle 44 255 369 603)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 #(
 #(#FramedBoxSpec
 #name: 'separatorBox'
-#layout: #(#LayoutFrame 0 0.0 3 0 0 1.0 95 0)
+#layout: #(#LayoutFrame 0 0.0 3 0 0 1.0 132 0)
 #component:
 #(#SpecCollection
 #collection:
 #(
 #(#CheckBoxSpec
 #activeHelpKey: #frameShowRowSeparator
 #tabable: true
 #model: #showRowSeparator
 #label: 'Show Row-Separator'
 )
+#(#InputFieldSpec
+#name: 'rowSeparatorSelector'
+#layout: #(#LayoutFrame 29 0 41 0 2 1.0 63 0)
+#activeHelpKey: #frameShowRowSeparatorSelector
+#tabable: true
+#model: #rowSeparatorSelector
+#type: #symbolOrNil
+)
 #(#CheckBoxSpec
 #name: 'showColSeparator'
-#layout: #(#LayoutFrame 5 0 41 0 181 0 64 0)
+#layout: #(#LayoutFrame 5 0 70 0 181 0 93 0)
 #activeHelpKey: #frameShowColumnSeparator
 #tabable: true
 #model: #showColSeparator
 #label: 'Show Column-Separator'
 )
 #label: 'Separators'
 #labelPosition: #topLeft
 )
 #(#FramedBoxSpec
 #name: 'framedBox1'
-#layout: #(#LayoutFrame 0 0.0 108 0 0 1.0 225 0)
+#layout: #(#LayoutFrame 0 0.0 151 0 0 1.0 268 0)
 #component:
 #(#SpecCollection
 #collection:
 #(
 #(#LabelSpec
 #labelPosition: #topLeft
 )
 )
 )
 )
-"Modified: / 13.8.1998 / 19:54:30 / cg"
 !
 selectionEditSpec
 "This resource specification was automatically generated
 by the UIPainter of ST/X."
 #(#FullSpec
 #window:
 #(#WindowSpec
 #name: 'DataSet Basic'
-#layout: #(#LayoutFrame 216 0 173 0 504 0 428 0)
+#layout: #(#LayoutFrame 104 0 195 0 434 0 522 0)
 #label: 'DataSet Basic'
 #min: #(#Point 10 10)
 #max: #(#Point 1280 1024)
-#bounds: #(#Rectangle 216 173 505 429)
+#bounds: #(#Rectangle 104 195 435 523)
 #usePreferredExtent: false
 )
 #component:
 #(#SpecCollection
 #collection:
 #label: 'Label Select Action:'
 #labelPosition: #topLeft
 )
 #(#FramedBoxSpec
 #name: 'framedBox2'
-#layout: #(#LayoutFrame 0 0.0 95 0 0 1.0 178 0)
+#layout: #(#LayoutFrame 0 0.0 95 0 0 1.0 205 0)
 #component:
 #(#SpecCollection
 #collection:
 #(
 #(#CheckBoxSpec
 #name: 'canSelect'
-#layout: #(#Point 95 8)
+#layout: #(#Point 95 1)
 #activeHelpKey: #selectionIsSelectable
 #tabable: true
 #model: #canSelect
 #label: 'Is Selectable'
 )
 #(#LabelSpec
 #name: 'selectorLabel'
-#layout: #(#AlignmentOrigin 95 0 44 0 1 0.5)
+#layout: #(#AlignmentOrigin 95 0 37 0 1 0.5)
 #label: 'Selector:'
 #adjust: #right
 #resizeForLabel: true
 )
 #(#InputFieldSpec
 #name: 'selectSelector'
-#layout: #(#LayoutFrame 98 0 33 0 3 1.0 55 0)
+#layout: #(#LayoutFrame 98 0 26 0 3 1.0 48 0)
 #activeHelpKey: #selectionCellClickSelector
 #tabable: true
 #model: #selectSelector
 #type: #symbolOrNil
+)
+#(#CheckBoxSpec
+#name: 'showSelectionHighLightened'
+#layout: #(#LayoutFrame 95 0 53 0 3 1.0 77 0)
+#activeHelpKey: #showSelectionHighLighted
+#tabable: true
+#model: #showSelectionHighLighted
+#label: 'Show Selection HighLightened'
 )
 )
 )
 #label: 'Cell Selection:'
 #labelPosition: #topLeft
 )
 #(#FramedBoxSpec
 #name: 'framedBox3'
-#layout: #(#LayoutFrame 0 0.0 186 0 0 1.0 243 0)
+#layout: #(#LayoutFrame 0 0.0 217 0 0 1.0 274 0)
 #component:
 #(#SpecCollection
 #collection:
 #(
 #(#LabelSpec
 #labelPosition: #topLeft
 )
 )
 )
 )
-"Modified: / 13.8.1998 / 19:54:49 / cg"
 !
 slices
 ^#(
 (Basics         basicsEditSpec)
 ].
 self updateColumnView.
 !
+resolveRowClass
+"returns the resolved row class
+"
+^ Smalltalk resolveName:rowClass inClass:self class
+!
 rowClassName
-^(Smalltalk resolveName:rowClass inClass:self class) notNil ifTrue:[rowClass] ifFalse:[nil]
+^ self resolveRowClass notNil ifTrue:[rowClass] ifFalse:[nil]
 !
 rowClassName:aClassName
 |cls|
 rowSuperClass := nil.
 (rowClass := aClassName) notNil ifTrue:[
-(cls := self resolveClassNamed) notNil
+(cls := self resolveRowClass) notNil
 ifTrue: [rowSuperClass := cls superclass name asString]
 ifFalse:[rowSuperClass := 'Object']
 ]
 ! !
 catg := 'accessing menu' asSymbol.
 code :=   '\'
 , '    "automatically generated by DataSetBuilder ..."\'
 , '\'
-, '    "get choices for visual editor; (a list of labels)\'
+, '    "get choices for visual editor; (a list of labels)..."\'
 , '\'
-, '    ^nil'
+, '    ^ #( foo bar baz )'
 .
 columns do:
 [:aColumn|
 (aColumn canSelect
 ]
 ]
 ]
 !
+generateRowSeparatorSelectorIn:aClass
+"generate code for #rowSeparatorSelector"
+|sel catg code bCode|
+catg := 'accessing look' asSymbol.
+code :=   '\'
+, '    "automatically generated by DataSetBuilder ..."\'
+, '\'
+, '    "specific row separator visibility for a cell"\'
+, '\'
+.
+columns do:
+[:aColumn|
+((sel := aColumn rowSeparatorSelector) notNil and:[(aClass implements:sel) not])
+ifTrue:
+[
+bCode := sel asString, code, '    ^true'.
+self compile:bCode forClass:aClass inCategory:catg
+]
+]
+!
 generateSelectSelectorIn:aClass
 "generate code for #selectSelector
 "
 |sel catg code bCode|
 .
 columns do:
 [:aColumn|
 ((sel := aColumn writeSelector) notNil
+and:[aColumn editorType ~~ #None
 and:[aColumn canSelect
-and:[(aClass implements:sel) not]])
+and:[(aClass implements:sel) not]]])
 ifTrue:
 [
 sel numArgs == 1
 ifTrue:
 [
 [:column|
 column readSelector:  #at:;
 writeSelector: #at:put:;
 backgroundSelector:nil;
 foregroundSelector:nil;
+rowSeparatorSelector:nil;
 selectSelector: nil;
 doubleClickedSelector: nil;
 printSelector: nil;
 menu: nil;
 choices: nil
 doBrowseRowClass
 "browse class of columns spec"
 |cls|
-(cls := self resolveClassNamed) notNil
+(cls := self resolveRowClass) notNil
 ifTrue: [SystemBrowser openInClass:cls]
 ifFalse:[self information:'No class defined !!']
 "Modified: / 20.5.1998 / 03:48:04 / cg"
 !
 whileTrue:
 [
 rowClass notNil
 ifTrue:
 [
-(cls := self resolveClassNamed) notNil
+(cls := self resolveRowClass) notNil
 ifTrue:
 [
 rowSuperClass := cls superclass name asString
 ].
 aspects at:#classNameChannel put:(ValueHolder with:rowClass)
 rowClass := nil.
 self information:'no valid className'
 ]
 ifFalse:
 [
-cls := self resolveClassNamed.
+cls := self resolveRowClass.
 cls notNil ifTrue:[cls := cls superclass name asString].
 rowSuperClass size == 0
 ifTrue:
 "generate code for column values"
 |cls superclass|
 rowClass isNil ifTrue:[^self information:'No class defined!!'].
-cls := self resolveClassNamed.
+cls := self resolveRowClass.
 cls isNil
 ifTrue:
 [
 superclass := Smalltalk resolveName:rowSuperClass inClass:self class.
 self generateBackgroundSelectorIn:cls.
 self generateForegroundSelectorIn:cls.
 self generateSelectSelectorIn:cls.
 self generateWriteSelectorIn:cls.
 self generateDoubleClickSelectorIn:cls.
+self generateRowSeparatorSelectorIn:cls.
 !
 doMoveColumn:upOrDown
 "move selected column up or down"
 |cls dst spc idx category mthd excla code resourceType|
 (columns size ~~ 0 and:[super doSave]) ifFalse:[
 ^ nil
 ].
 cls := self resolveName:specClass.
 dst := columns collect:[:aCol| aCol literalArrayEncoding ].
 spc := WriteStream on:String new.
 UISpecification prettyPrintSpecArray:dst asArray on:spc indent:4.
 spc := spc contents.

changeset 983	286a039ea7d1
parent 949	2e3469100a6a
child 1004	b7bfaa2d6ecd