diff -r 25575d9c0fc5 -r 26ebad245428 DataSetBuilder.st --- a/DataSetBuilder.st Sat Feb 20 02:26:52 1999 +0100 +++ b/DataSetBuilder.st Mon Feb 22 20:40:18 1999 +0100 @@ -321,11 +321,12 @@ #window: #(#WindowSpec #name: 'DataSet Basic' - #layout: #(#LayoutFrame 85 0 154 0 407 0 480 0) + #layout: #(#LayoutFrame 216 0 173 0 538 0 499 0) + #level: 0 #label: 'DataSet Basic' #min: #(#Point 10 10) #max: #(#Point 1280 1024) - #bounds: #(#Rectangle 85 154 408 481) + #bounds: #(#Rectangle 216 173 539 500) #usePreferredExtent: false ) #component: @@ -352,15 +353,16 @@ #tabable: true #model: #label #type: #smalltalkObject - #immediateAccept: false + #immediateAccept: true #acceptOnLeave: true + #acceptOnLostFocus: true ) #(#LabelSpec #name: 'LabelFont' #layout: #(#AlignmentOrigin 94 0 68 0 1 0.5) #label: 'Font:' + #resizeForLabel: true #adjust: #left - #resizeForLabel: true ) #(#FontMenuSpec #name: 'fontMenu' @@ -384,8 +386,8 @@ #name: 'JustificationLabel' #layout: #(#AlignmentOrigin 140 0 96 0 1 0.5) #label: 'Justification:' + #resizeForLabel: true #adjust: #left - #resizeForLabel: true ) #(#CheckBoxSpec #name: 'labelIsImage' @@ -463,8 +465,8 @@ #name: 'JustificationC' #layout: #(#AlignmentOrigin 140 0 69 0 1 0.5) #label: 'Justification:' + #resizeForLabel: true #adjust: #left - #resizeForLabel: true ) #(#PopUpListSpec #name: 'AlignmentC' @@ -831,11 +833,12 @@ #window: #(#WindowSpec #name: 'DataSet Dimension' - #layout: #(#LayoutFrame 44 0 255 0 368 0 602 0) + #layout: #(#LayoutFrame 216 0 173 0 540 0 520 0) + #level: 0 #label: 'DataSet Dimension' #min: #(#Point 10 10) #max: #(#Point 1280 1024) - #bounds: #(#Rectangle 44 255 369 603) + #bounds: #(#Rectangle 216 173 541 521) #usePreferredExtent: false ) #component: @@ -851,7 +854,7 @@ #( #(#CheckBoxSpec #name: 'showRowSeparator' - #layout: #(#LayoutFrame 5 0 15 0 181 0 38 0) + #layout: #(#LayoutFrame 5 0 15 0 293 0 38 0) #activeHelpKey: #frameShowRowSeparator #tabable: true #model: #showRowSeparator @@ -867,7 +870,7 @@ ) #(#CheckBoxSpec #name: 'showColSeparator' - #layout: #(#LayoutFrame 5 0 70 0 181 0 93 0) + #layout: #(#LayoutFrame 5 0 70 0 294 0 93 0) #activeHelpKey: #frameShowColumnSeparator #tabable: true #model: #showColSeparator @@ -889,8 +892,8 @@ #name: 'widthLabel' #layout: #(#AlignmentOrigin 140 0.0 23 0 1 0.5) #label: 'Column Width:' + #resizeForLabel: true #adjust: #right - #resizeForLabel: true ) #(#InputFieldSpec #name: 'widthField' @@ -904,8 +907,8 @@ #name: 'minWidthLabel' #layout: #(#AlignmentOrigin 140 0.0 51 0 1 0.5) #label: 'Min Width:' + #resizeForLabel: true #adjust: #right - #resizeForLabel: true ) #(#InputFieldSpec #name: 'minWidthField' @@ -919,8 +922,8 @@ #name: 'heightLabel' #layout: #(#AlignmentOrigin 140 0.0 79 0 1 0.5) #label: 'Row Height:' + #resizeForLabel: true #adjust: #right - #resizeForLabel: true ) #(#InputFieldSpec #name: 'heightField' @@ -2449,7 +2452,9 @@ (column := self selectedColumn) isNil ifTrue:[ self tabModel value:0. ] ifFalse:[ - aspects keysAndValuesDo:[:aKey :aModel|aModel value:(column perform:aKey) withoutNotifying: self]. + aspects keysAndValuesDo:[:aKey :aModel | + aModel value:(column perform:aKey) withoutNotifying: self + ]. tabSelection == 0 ifTrue:[self tabModel value:1] ] ! ! @@ -2560,7 +2565,9 @@ (aspects at:aKey) value:nil ] ]. - aspects keysAndValuesDo:[:aKey :aModel| column perform:(aKey , ':') asSymbol with: aModel value]. + aspects keysAndValuesDo:[:aKey :aModel| + column perform:(aKey , ':') asSymbol with: aModel value + ]. self seqList at:selectedColumnIndex put:(self labelFromColumn:column). self updateColumnView. self cancel. @@ -2578,6 +2585,27 @@ "Modified: / 27.10.1998 / 14:41:41 / cg" ! +cutOrDelete:isCut + "remove selected column and optionally put it to the clipboard" + + |idx| + + ((idx := selectedColumnIndex) ~~ 0 and: [self askForItemModification]) + ifTrue: + [ + self selectedColumnModel value:0. + isCut ifTrue:[self clipboard: (columns at: idx)]. + columns removeIndex:idx. + self seqList removeIndex:idx. + columns size > 0 ifTrue: [self selectedColumnModel value: ((idx - 1) max: 1)]. + self updateColumnView. + self updateInputFields. + columns isEmpty ifTrue: [self isColumnSelected value: false]. + self cancel. + modified := true. + ] +! + doBrowseRowClass "browse class of columns spec" @@ -2611,7 +2639,9 @@ label := 'Column ', (list size + 1) printString. columns add:(DataSetColumnSpec label:label selector:nil) afterIndex:selectedColumnIndex. self seqList add:label afterIndex:selectedColumnIndex. - self valueOfEnablingCommitButtons value ifFalse:[self selectedColumnModel value:selectedColumnIndex + 1]. + self valueOfEnablingCommitButtons value ifFalse:[ + self selectedColumnModel value:selectedColumnIndex + 1 + ]. self cancel. self updateColumnView. modified := true. @@ -2621,22 +2651,7 @@ doCut "remove selected column and put it to the clipboard" - |idx| - - ((idx := selectedColumnIndex) ~~ 0 and: [self askForItemModification]) - ifTrue: - [ - self selectedColumnModel value:0. - self clipboard: (columns at: idx). - columns removeIndex:idx. - self seqList removeIndex:idx. - columns size > 0 ifTrue: [self selectedColumnModel value: ((idx - 1) max: 1)]. - self updateColumnView. - self updateInputFields. - columns isEmpty ifTrue: [self isColumnSelected value: false]. - self cancel. - modified := true. - ] + self cutOrDelete:true ! doDefineRowClass @@ -2720,21 +2735,8 @@ doDelete "remove selected column and put it to the clipboard" - |idx| - - ((idx := selectedColumnIndex) ~~ 0 and: [self askForItemModification]) - ifTrue: - [ - self selectedColumnModel value:0. - columns removeIndex:idx. - self seqList removeIndex:idx. - columns size > 0 ifTrue: [self selectedColumnModel value: ((idx - 1) max: 1)]. - self updateColumnView. - self updateInputFields. - columns isEmpty ifTrue: [self isColumnSelected value: false]. - self cancel. - modified := true. - ] + self cutOrDelete:false + ! doGenerateCode