hg/stx-libtool2: comparison Tools__InternationalLanguageTranslationEditor.st

equal deleted inserted replaced

-:dcec4e818069
+:d10762e5d924
 		languageShownHolders dataSetView lastExtractedClass
 		lastExtractedApplicationClass stopApplicationIconVisibleHolder
 		monitoredApplication originalTextModifiedHolder
 		languageTextModifiedHolder languageTextAcceptHolder
 		inSingleFileMode lastExtractedProject lastLanguage
-		lastSelectedKey'
+		lastSelectedKey autoAccept languageEditor selectedColIndexHolder'
 	classVariableNames:'LastExtractedClass LastExtractedApplicationClass
 		LastExtractedProject'
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 	privateIn:InternationalLanguageTranslationEditor
 !
 Collection subclass:#KeyStringsToLanguageMappings
 	instanceVariableNames:'keys keyInfo perLanguageInfo perLanguageMappings languageMappings
-		languages'
+		languages rowPerKey'
 	classVariableNames:''
 	poolDictionaries:''
 	privateIn:InternationalLanguageTranslationEditor
 !
 (WindowSpec
 label: 'InternationalLanguageTranslationEditor'
 name: 'InternationalLanguageTranslationEditor'
 min: (Point 10 10)
 max: (Point 1024 768)
-bounds: (Rectangle 0 0 640 400)
+bounds: (Rectangle 0 0 636 396)
 menu: mainMenu
 )
 component:
 (SpecCollection
 collection: (
 model: selectedKeyRow
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 dataList: keyStringAndLanguageSelectionTable
 columnHolder: keyStringAndLanguageSelectionTableColumnDescriptionHolder
+beDependentOfRows: true
 columnAdaptor: yourself
 postBuildCallback: postBuildDataSet:
 )
 (ViewSpec
 name: 'Box1'
 model: languageTextHolder
 hasHorizontalScrollBar: true
 hasVerticalScrollBar: true
 acceptChannel: languageTextAcceptHolder
 modifiedChannel: languageTextModifiedHolder
+postBuildCallback: languageEditorBuilt:
 )
 )
 )
 )
 "Do not manually edit this!! If it is corrupted,
 the DataSetBuilder may not be able to read the specification."
 "
-DataSetBuilder new openOnClass:Tools::InternationalLanguageTranslationEditor andSelector:#keyTableColumn
+DataSetBuilder new openOnClass:Tools::InternationalLanguageTranslationEditor andSelector:#languageTableColumn
 "
 <resource: #tableColumns>
 ^#(
-#(DataSetColumnSpec
+(DataSetColumnSpec
-label: #lang
+label: lang
-labelAlignment: center
+labelButtonType: Button
-labelButtonType: Button
+minWidth: 50
-minWidth: 50
+editorType: None
-model: #columnInRow:at:
+model: columnInRow:at:
-canSelect: true
+backgroundSelector: getBackgroundForRow:rowNr:col:
-isResizeable: true
+)
-showRowSeparator: true
-showColSeparator: true
-backgroundSelector: #getBackgroundForRow:rowNr:col:
-)
 )
+! !
+!InternationalLanguageTranslationEditor methodsFor:'accessing'!
+autoAccept
+autoAccept isNil ifTrue:[autoAccept := true].
+^ autoAccept
+!
+autoAccept:something
+autoAccept := something.
+!
+newLanguageText
+"/   languageEditor accept
+^self languageTextHolder value isNil
+ifTrue:['']
+ifFalse:[self languageTextHolder value asCollectionOfLines first.]
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'aspects'!
 keyStringAndLanguageSelectionTable
 !
 languageTextAcceptHolder
 languageTextAcceptHolder isNil ifTrue:[
 languageTextAcceptHolder := false asValue.
+languageTextAcceptHolder onChangeSend:#languageTextAccepted to:self.
 ].
 ^ languageTextAcceptHolder.
+!
+languageTextAccepted
+"
+self updateLanguageTextModification.    "
+self selectedKeyRow value: self selectedKeyRow value + 1.
 !
 languageTextHolder
 languageTextHolder isNil ifTrue:[
 languageTextHolder := '' asValue.
 shownLanguages
 shownLanguages isNil ifTrue:[
 shownLanguages := List new.
 shownLanguages addAll:(self languagesList).
-"/ shownLanguages addDependent:self.
 shownLanguages onChangeSend:#shownLanguagesChanged to:self.
 ].
 ^ shownLanguages.
 !
 stopApplicationIconVisibleHolder
 stopApplicationIconVisibleHolder isNil ifTrue:[
 stopApplicationIconVisibleHolder := false asValue.
 ].
 ^ stopApplicationIconVisibleHolder.
+!
+updateLanguageAndKeySelection
+|rowSelectionIndex colSelectionIndex language selectedKey originalText languageText|
+colSelectionIndex := dataSetView selectedColIndex.
+language := colSelectionIndex > 1 ifTrue:[ shownLanguages at:colSelectionIndex-1 ] ifFalse:nil.
+rowSelectionIndex := self selectedKeyRow value.
+rowSelectionIndex ~~ 0 ifTrue:[
+selectedKey := keyStringsToLanguageMappings keyAt:rowSelectionIndex.
+originalText := selectedKey storeString.
+language notNil ifTrue:[
+languageText := keyStringsToLanguageMappings at:selectedKey language:language.
+languageText notNil ifTrue:[
+languageText := languageText storeString.
+]
+]
+].
+self originalTextHolder value:originalText.
+self languageTextHolder value:languageText.
+lastLanguage := language.
+lastSelectedKey := selectedKey.
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'change & update'!
 update:something with:aParameter from:changedObject
 changedObject == shownLanguages ifTrue:[
 self shownLanguagesChanged.
 ^ self.
+].
+changedObject == languageTextAcceptHolder ifTrue:[
+self updateLanguageTextModification.
+^ self.
+].
+!
+updateKeyStringsToLanguageMappings
+keyStringsToLanguageMappings
+at:lastSelectedKey
+language:lastLanguage
+put: self newLanguageText.
+!
+updateLanguageTextModification
+self languageTextModifiedHolder value ifTrue:[
+(self autoAccept or:[Dialog confirm:'Accept changed translation ?']) ifTrue:[
+self languageTextModifiedHolder value:false.
+self languageTextHolder value:languageEditor contents.
+lastLanguage notNil ifTrue:[self updateKeyStringsToLanguageMappings.]
+]
+].
+!
+updateOriginalTextModification
+|answer|
+self originalTextModifiedHolder value ifTrue:[
+answer := OptionBox
+request:'Accept changed original text (key) ?'
+label:'Original text (key) changed'
+image:(WarningBox iconBitmap)
+buttonLabels:#('Cancel' 'Accept' 'Accept As New')
+values:#(nil #accept #acceptAsNew)
+default:#acceptAsNew.
+answer isNil ifTrue:[^ self originalTextModifiedHolder value:false. ].
+answer == #accept ifTrue:[
+self halt.        ].
+answer == #acceptAsNew ifTrue:[
+self halt.        ].
 ].
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'initialization & release'!
 modified := false.
 inSingleFileMode := false.
 super initialize
 !
+languageEditorBuilt:aView
+languageEditor := aView.
+!
 postBuildDataSet:aView
-dataSetView := aView
+dataSetView := aView.
+aView selectedColIndexHolder onChangeSend:#selectionChanged to:self.
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'menu actions'!
 addLanguage
 ^ row keyString
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'user actions'!
 selectionChanged
-|rowSelectionIndex colSelectionIndex language selectedKey originalText languageText
-answer newText autoAccept|
+self updateOriginalTextModification.
+self updateLanguageTextModification.
-autoAccept := true.
+self updateLanguageAndKeySelection.
-self originalTextModifiedHolder value ifTrue:[
+self originalTextModifiedHolder value:false.
-answer := OptionBox
+self languageTextModifiedHolder value:false.
-request:'Accept changed original text (key) ?'
-label:'Original text (key) changed'
-image:(WarningBox iconBitmap)
-buttonLabels:#('Cancel' 'Accept' 'Accept As New')
-values:#(nil #accept #acceptAsNew)
-default:#acceptAsNew.
-answer isNil ifTrue:[^ self ].
-answer == #accept ifTrue:[
-self halt.        ].
-answer == #acceptAsNew ifTrue:[
-self halt.        ].
-].
-self languageTextModifiedHolder value ifTrue:[
-(autoAccept or:[Dialog confirm:'Accept changed translation ?']) ifTrue:[
-languageTextAcceptHolder value:true.
-self halt.
-lastLanguage notNil ifTrue:[
-newText := self languageTextHolder value asCollectionOfLines first.
-keyStringsToLanguageMappings at:lastSelectedKey language:lastLanguage put:newText.
-]
-]
-].
-colSelectionIndex := dataSetView selectedColIndex.
-language := colSelectionIndex > 1 ifTrue:[ shownLanguages at:colSelectionIndex-1 ] ifFalse:nil.
-rowSelectionIndex := self selectedKeyRow value.
-rowSelectionIndex ~~ 0 ifTrue:[
-selectedKey := keyStringsToLanguageMappings keyAt:rowSelectionIndex.
-originalText := selectedKey storeString.
-language notNil ifTrue:[
-languageText := keyStringsToLanguageMappings at:selectedKey language:language.
-languageText notNil ifTrue:[
-languageText := languageText storeString.
-]
-]
-].
-self originalTextHolder value:originalText.
-self languageTextHolder value:languageText.
-self originalTextModifiedHolder value:false.
-self languageTextModifiedHolder value:false.
-lastLanguage := language.
-lastSelectedKey := selectedKey.
 !
 shownLanguagesChanged
 self keyStringAndLanguageSelectionTableColumnDescriptionHolder
 value:(self keyStringAndLanguageSelectionTableColumnDescription).
 ^ (perLanguageMappings at:language) at:aKey ifAbsent:nil
 !
 at:aKey language:language put:value
 self addKey:aKey.
-^ (perLanguageMappings at:language) at:aKey put:value
+(perLanguageMappings at:language) at:aKey put:value.
+(self rowForKey:aKey) changed
 !
 keyAt:index
 ^ keys at:index.
 !
 eachMapping removeKey:aKey ifAbsent:[].
 ].
 self changed.
 !
+rowForKey:aKey
+^ rowPerKey
+at:aKey
+ifAbsentPut:[InternationalLanguageTranslationEditor::LanguageMappingRow new
+key:aKey; mappings:self].
+!
 size
 ^ keys size
 ! !
 !InternationalLanguageTranslationEditor::KeyStringsToLanguageMappings methodsFor:'enumerating'!
 do:aBlock
 keys do:[:eachKey |
-aBlock value:(InternationalLanguageTranslationEditor::LanguageMappingRow new
+aBlock value:(self rowForKey:eachKey).
-key:eachKey; mappings:self).
 ].
 ! !
 !InternationalLanguageTranslationEditor::KeyStringsToLanguageMappings methodsFor:'initialization'!
 keys := OrderedSet new.
 languages := OrderedCollection new.
 perLanguageMappings := Dictionary new.
 perLanguageInfo := Dictionary new.
+rowPerKey := Dictionary new.
 self addLanguage:#'de'.
 self addLanguage:#'fr'.
 self addLanguage:#'es'.
 self addLanguage:(Smalltalk language).

changeset 2049	d10762e5d924
parent 2048	dcec4e818069
child 2050	998f72439bfc