# HG changeset patch # User tz # Date 885215907 -3600 # Node ID 118bfaf3f76bbd7591d52ec73d8409f5cd115453 # Parent e9c1ae80550fed2f06cfe3e039715f089f71243a font define forgotten + correct hasChanged flag setting diff -r e9c1ae80550f -r 118bfaf3f76b DataSetBuilder.st --- a/DataSetBuilder.st Mon Jan 19 13:32:45 1998 +0100 +++ b/DataSetBuilder.st Mon Jan 19 14:18:27 1998 +0100 @@ -79,11 +79,11 @@ #'window:' #(#WindowSpec #'name:' 'DataSet Basic' - #'layout:' #(#LayoutFrame 203 0 383 0 491 0 638 0) + #'layout:' #(#LayoutFrame 143 0 445 0 431 0 700 0) #'label:' 'DataSet Basic' #'min:' #(#Point 10 10) #'max:' #(#Point 1280 1024) - #'bounds:' #(#Rectangle 203 383 492 639) + #'bounds:' #(#Rectangle 143 445 432 701) #'usePreferredExtent:' false ) #'component:' @@ -92,7 +92,7 @@ #( #(#FramedBoxSpec #'name:' 'framedBox1' - #'layout:' #(#LayoutFrame 0 0.0 3 0 0 1.0 92 0) + #'layout:' #(#LayoutFrame 0 0.0 3 0 0 1.0 118 0) #'component:' #(#SpecCollection #'collection:' @@ -111,11 +111,16 @@ ) #(#CheckBoxSpec #'name:' 'labelIsImage' - #'layout:' #(#LayoutOrigin 107 0 47 0) + #'layout:' #(#LayoutOrigin 107 0 76 0) #'activeHelpKey:' #labelIsImage #'model:' #labelIsImage #'label:' 'Label Is Image' ) + #(#UISubSpecification + #'name:' 'fontSubSpec' + #'layout:' #(#LayoutFrame 60 0.0 47 0 15 1.0 72 0) + #'minorKey:' #fontSpec + ) ) ) #'label:' 'Header:' @@ -123,7 +128,7 @@ ) #(#FramedBoxSpec #'name:' 'typesFrame' - #'layout:' #(#LayoutFrame 0 0.0 92 0 0 1.0 174 0) + #'layout:' #(#LayoutFrame 0 0.0 118 0 0 1.0 200 0) #'component:' #(#SpecCollection #'collection:' @@ -327,11 +332,11 @@ #'window:' #(#WindowSpec #'name:' 'DataSet Details' - #'layout:' #(#LayoutFrame 231 0 359 0 618 0 650 0) + #'layout:' #(#LayoutFrame 121 0 280 0 508 0 571 0) #'label:' 'DataSet Details' #'min:' #(#Point 10 10) #'max:' #(#Point 1280 1024) - #'bounds:' #(#Rectangle 231 359 619 651) + #'bounds:' #(#Rectangle 121 280 509 572) #'usePreferredExtent:' false ) #'component:' @@ -340,7 +345,7 @@ #( #(#FramedBoxSpec #'name:' 'framedBox1' - #'layout:' #(#LayoutFrame 0 0.0 3 0 0 1.0 87 0) + #'layout:' #(#LayoutFrame 0 0.0 3 0 0 1.0 114 0) #'component:' #(#SpecCollection #'collection:' @@ -376,6 +381,18 @@ ) #'useIndex:' false ) + #(#InputFieldSpec + #'name:' 'formatField' + #'layout:' #(#LayoutFrame 110 0 69 0 15 1.0 91 0) + #'activeHelpKey:' #formatString + #'model:' #formatString + ) + #(#LabelSpec + #'name:' 'formatLabel' + #'layout:' #(#AlignmentOrigin 107 0 80 0 1 0.5) + #'label:' 'Text Format:' + #'resizeForLabel:' true + ) ) ) #'label:' 'Input Format' @@ -383,27 +400,21 @@ ) #(#FramedBoxSpec #'name:' 'framedBox2' - #'layout:' #(#LayoutFrame 0 0.0 87 0 0 1.0 175 0) + #'layout:' #(#LayoutFrame 0 0.0 114 0 0 1.0 174 0) #'component:' #(#SpecCollection #'collection:' #( #(#LabelSpec - #'name:' 'formatLabel' - #'layout:' #(#AlignmentOrigin 107 0 56 0 1 0.5) - #'label:' 'Text Format:' - #'resizeForLabel:' true - ) - #(#LabelSpec #'name:' 'JustificationLabel' - #'layout:' #(#AlignmentOrigin 107 0 29 0 1 0.5) + #'layout:' #(#AlignmentOrigin 107 0 30 0 1 0.5) #'label:' 'Justification:' #'adjust:' #left #'resizeForLabel:' true ) #(#PopUpListSpec #'name:' 'Alignment' - #'layout:' #(#LayoutFrame 110 0 18 0 15 1.0 40 0) + #'layout:' #(#LayoutFrame 110 0 19 0 15 1.0 41 0) #'label:' 'Alignment' #'model:' #labelAlignment #'menu:' @@ -412,12 +423,6 @@ ) #'useIndex:' false ) - #(#InputFieldSpec - #'name:' 'formatField' - #'layout:' #(#LayoutFrame 110 0 45 0 15 1.0 67 0) - #'activeHelpKey:' #formatString - #'model:' #formatString - ) ) ) #'label:' 'Output Format' @@ -1474,7 +1479,6 @@ isModified ifFalse: [ - isModified := hasChanged := true. self valueOfEnablingCommitButtons value: true. self columnIsNotEditing value: false ] @@ -1942,7 +1946,7 @@ |column type| self valueOfEnablingCommitButtons value == false ifTrue: [^self]. - isModified := true. + isModified := hasChanged := true. (column := self selectedColumn) isNil ifTrue: [^self cancel].