# HG changeset patch # User tz # Date 885057227 -3600 # Node ID b8094b7c7fe7a938e74c0e590c73cff236d68ad2 # Parent 7fd01e47c9122e59f479d758cdd5700526071c87 commit buttons moved as subSpec to ToolApplicationModel diff -r 7fd01e47c912 -r b8094b7c7fe7 DataSetBuilder.st --- a/DataSetBuilder.st Sat Jan 17 16:23:27 1998 +0100 +++ b/DataSetBuilder.st Sat Jan 17 18:13:47 1998 +0100 @@ -1019,11 +1019,11 @@ #'window:' #(#WindowSpec #'name:' 'Data Set Builder' - #'layout:' #(#LayoutFrame 246 0 169 0 732 0 528 0) + #'layout:' #(#LayoutFrame 109 0 262 0 595 0 621 0) #'label:' 'Data Set Builder' #'min:' #(#Point 10 10) #'max:' #(#Point 1152 900) - #'bounds:' #(#Rectangle 246 169 733 529) + #'bounds:' #(#Rectangle 109 262 596 622) #'menu:' #menu #'usePreferredExtent:' false ) @@ -1081,33 +1081,11 @@ #'layout:' #(#LayoutFrame 0 0.0 35 0.0 0 1.0 -30 1.0) #'specHolder:' #specChannel ) - #(#HorizontalPanelViewSpec - #'name:' 'modifyPanel' - #'layout:' #(#LayoutFrame 0 0.0 -30 1.0 0 1.0 0 1.0) - #'component:' - #(#SpecCollection - #'collection:' - #( - #(#ActionButtonSpec - #'name:' 'cancelButton' - #'label:' 'Cancel' - #'model:' #cancel - #'enableChannel:' #modifiedChannel - #'extent:' #(#Point 173 24) - ) - #(#ActionButtonSpec - #'name:' 'acceptButton' - #'label:' 'OK' - #'model:' #accept - #'enableChannel:' #modifiedChannel - #'extent:' #(#Point 174 24) - ) - ) - ) - #'horizontalLayout:' #fitSpace - #'verticalLayout:' #fitSpace - #'horizontalSpace:' 3 - #'verticalSpace:' 3 + #(#UISubSpecification + #'name:' 'SubSpecification' + #'layout:' #(#LayoutFrame 2 0.0 -26 1 -2 1.0 -2 1.0) + #'majorKey:' #ToolApplicationModel + #'minorKey:' #windowSpecForCommit ) ) ) @@ -1427,16 +1405,6 @@ ! -modifiedChannel - "returns a boolean value holder which is set to true if something is modified - and not accepted" - - ^builder booleanValueAspectFor:#modifiedChannel - - - -! - rendererTypeList "generate list of supported renderer types" @@ -1520,7 +1488,7 @@ ifFalse: [ isModified := hasChanged := true. - self modifiedChannel value: true. + self valueOfEnablingCommitButtons value: true. self columnIsNotEditing value: false ] ! ! @@ -1850,14 +1818,14 @@ checkMenuItemModified "check column modification" - self modifiedChannel value + self valueOfEnablingCommitButtons value ifTrue: [ ((YesNoBox title:'Column was modified!!\Save it?\' withCRs) noText:'No'; yesText:'Yes'; showAtPointer; - accepted) ifFalse: [self modifiedChannel value: false. ^true]. + accepted) ifFalse: [self valueOfEnablingCommitButtons value: false. ^true]. self accept ]. ^true @@ -1986,7 +1954,7 @@ |column type| - self modifiedChannel value == false ifTrue: [^self]. + self valueOfEnablingCommitButtons value == false ifTrue: [^self]. isModified := true. (column := self selectedColumn) isNil ifTrue: [^self cancel]. @@ -2012,7 +1980,7 @@ |column| self updateInputFields. - self modifiedChannel value:false. + self valueOfEnablingCommitButtons value:false. self columnIsNotEditing value: true. isModified := false ! @@ -2052,7 +2020,7 @@ columns add:(DataSetColumnSpec label:label selector:nil) afterIndex:selectedColumnIndex. self seqList add:label afterIndex:selectedColumnIndex. hasChanged := true. - self modifiedChannel value ifFalse:[self selectedColumnModel value:selectedColumnIndex + 1]. + self valueOfEnablingCommitButtons value ifFalse:[self selectedColumnModel value:selectedColumnIndex + 1]. self cancel ! @@ -2229,7 +2197,7 @@ self seqList add: label afterIndex:selectedColumnIndex. hasChanged := true. - self modifiedChannel value ifFalse:[self selectedColumnModel value:selectedColumnIndex + 1]. + self valueOfEnablingCommitButtons value ifFalse:[self selectedColumnModel value:selectedColumnIndex + 1]. self updateColumnView. ! !