hg/stx-libtool2: comparison Tools__InternationalLanguageTranslationEditor.st

equal deleted inserted replaced

-:d10762e5d924
+:998f72439bfc
 		languageShownHolders dataSetView lastExtractedClass
 		lastExtractedApplicationClass stopApplicationIconVisibleHolder
 		monitoredApplication originalTextModifiedHolder
 		languageTextModifiedHolder languageTextAcceptHolder
 		inSingleFileMode lastExtractedProject lastLanguage
-		lastSelectedKey autoAccept languageEditor selectedColIndexHolder'
+		lastSelectedKey autoAcceptHolder languageEditor
+		selectedColIndexHolder exampleLanguageSelectionHolder
+		exampleLanguageTextHolder'
 	classVariableNames:'LastExtractedClass LastExtractedApplicationClass
 		LastExtractedProject'
 	poolDictionaries:''
 	category:'Interface-UIPainter'
 !
 (WindowSpec
 label: 'InternationalLanguageTranslationEditor'
 name: 'InternationalLanguageTranslationEditor'
 min: (Point 10 10)
 max: (Point 1024 768)
-bounds: (Rectangle 0 0 636 396)
+bounds: (Rectangle 0 0 609 482)
 menu: mainMenu
 )
 component:
 (SpecCollection
 collection: (
 layout: (LayoutFrame 0 0 0 0 0 1 30 0)
 menu: menuToolBar
 textDefault: true
 )
 (VariableVerticalPanelSpec
-name: 'VariableVerticalPanel1'
+name: 'VariableVerticalPanel2'
 layout: (LayoutFrame 0 0 30 0 0 1 0 1)
 component:
 (SpecCollection
 collection: (
 (DataSetSpec
 columnHolder: keyStringAndLanguageSelectionTableColumnDescriptionHolder
 beDependentOfRows: true
 columnAdaptor: yourself
 postBuildCallback: postBuildDataSet:
 )
-(ViewSpec
+(VariableVerticalPanelSpec
-name: 'Box1'
+name: 'VariableVerticalPanel1'
 component:
 (SpecCollection
 collection: (
-(LabelSpec
+(ViewSpec
-label: 'Original String (Key):'
+name: 'Box1'
-name: 'Label2'
+component:
-layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+(SpecCollection
-translateLabel: true
+collection: (
-adjust: left
+(LabelSpec
+label: 'Original String (Key):'
+name: 'Label2'
+layout: (LayoutFrame 0 0 -2 0 0 1 28 0)
+translateLabel: true
+adjust: left
+)
+(TextEditorSpec
+name: 'OriginalText'
+layout: (LayoutFrame 0 0 27 0 0 1 -2 1)
+model: originalTextHolder
+hasHorizontalScrollBar: true
+hasVerticalScrollBar: true
+modifiedChannel: originalTextModifiedHolder
+acceptCallBack: languageTextAccepted
+)
+)
+)
 )
-(TextEditorSpec
+(ViewSpec
-name: 'OriginalText'
+name: 'Box3'
-layout: (LayoutFrame 0 0 30 0 0 1 0 1)
+component:
-model: originalTextHolder
+(SpecCollection
-hasHorizontalScrollBar: true
+collection: (
-hasVerticalScrollBar: true
+(LabelSpec
-modifiedChannel: originalTextModifiedHolder
+label: 'Select Another Traduction as example:'
+name: 'Label3'
+layout: (LayoutFrame 0 0 -6 0 0 1 24 0)
+translateLabel: true
+adjust: left
+)
+(ComboBoxSpec
+name: 'ComboBox1'
+layout: (LayoutFrame 197 0 -2 0 322 0 18 0)
+model: exampleLanguageSelectionHolder
+immediateAccept: false
+acceptOnLeave: true
+acceptOnLostFocus: true
+acceptOnPointerLeave: false
+comboList: shownLanguages
+useIndex: false
+)
+(TextEditorSpec
+name: 'ExampleLanguageText'
+layout: (LayoutFrame 0 0 25 0 611 0 66 0)
+model: exampleLanguageTextHolder
+hasHorizontalScrollBar: true
+hasVerticalScrollBar: true
+isReadOnly: true
+)
+)
+)
+)
+(ViewSpec
+name: 'Box2'
+component:
+(SpecCollection
+collection: (
+(LabelSpec
+label: 'Translated String:'
+name: 'Label1'
+layout: (LayoutFrame 0 0 0 0 0 1 30 0)
+translateLabel: true
+adjust: left
+)
+(TextEditorSpec
+name: 'LanguageText'
+layout: (LayoutFrame 0 0 30 0 0 1 0 1)
+model: languageTextHolder
+hasHorizontalScrollBar: true
+hasVerticalScrollBar: true
+acceptChannel: languageTextAcceptHolder
+modifiedChannel: languageTextModifiedHolder
+acceptCallBack: languageTextAccepted
+postBuildCallback: languageEditorBuilt:
+)
+)
+)
 )
 )
 )
-)
+handles: (Any 0.33333333333333 0.66666666666667 1.0)
-(ViewSpec
-name: 'Box2'
-component:
-(SpecCollection
-collection: (
-(LabelSpec
-label: 'Translated String:'
-name: 'Label1'
-layout: (LayoutFrame 0 0 0 0 0 1 30 0)
-translateLabel: true
-adjust: left
-)
-(TextEditorSpec
-name: 'LanguageText'
-layout: (LayoutFrame 0 0 30 0 0 1 0 1)
-model: languageTextHolder
-hasHorizontalScrollBar: true
-hasVerticalScrollBar: true
-acceptChannel: languageTextAcceptHolder
-modifiedChannel: languageTextModifiedHolder
-postBuildCallback: languageEditorBuilt:
-)
-)
-)
 )
 )
 )
-handles: (Any 0.33333333333333 0.66666666666667 1.0)
+handles: (Any 0.5 1.0)
 )
 )
 )
 )
 "Do not manually edit this!! If it is corrupted,
 the MenuEditor may not be able to read the specification."
 "
-MenuEditor new openOnClass:InternationalLanguageTranslationEditor andSelector:#mainMenu
+MenuEditor new openOnClass:Tools::InternationalLanguageTranslationEditor andSelector:#mainMenu
-(Menu new fromLiteralArrayEncoding:(InternationalLanguageTranslationEditor mainMenu)) startUp
+(Menu new fromLiteralArrayEncoding:(Tools::InternationalLanguageTranslationEditor mainMenu)) startUp
 "
 <resource: #menu>
 ^
 )
 (MenuItem
 label: 'Run Application and Collect Translations...'
 itemValue: runApplicationAndCollectTranslations
 translateLabel: true
+)
+)
+nil
+nil
+)
+)
+(MenuItem
+label: 'Preferences'
+translateLabel: true
+submenu:
+(Menu
+(
+(MenuItem
+label: 'Auto Accept Changes'
+translateLabel: true
+indication: autoAcceptHolder
 )
 )
 nil
 nil
 )
 )
 ! !
 !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.]
+!
+selectedKey
+"Returns the current selected key if there is one row seleted. Otherwise, returns nil"
+|rowSelectionIndex |
+rowSelectionIndex := self selectedKeyRow value.
+rowSelectionIndex == 0 ifTrue:[^nil].
+^ keyStringsToLanguageMappings keyAt:rowSelectionIndex.
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'aspects'!
+autoAcceptHolder
+autoAcceptHolder isNil ifTrue:[autoAcceptHolder := true asValue].
+^ autoAcceptHolder
+!
+exampleLanguageSelectionHolder
+exampleLanguageSelectionHolder isNil ifTrue:[
+exampleLanguageSelectionHolder := self exampleLanguageByDefault asValue.
+exampleLanguageSelectionHolder addDependent:self.
+].
+^ exampleLanguageSelectionHolder
+!
+exampleLanguageTextHolder
+exampleLanguageTextHolder isNil ifTrue:[
+exampleLanguageTextHolder := '' asValue.
+].
+^ exampleLanguageTextHolder.
+!
 keyStringAndLanguageSelectionTable
 keyStringsToLanguageMappings isNil ifTrue:[
 keyStringsToLanguageMappings := KeyStringsToLanguageMappings new.
 ].
 ^ holder.
 !
 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:[
 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 == languageTextAcceptHolder ifTrue:[
 self updateLanguageTextModification.
 ^ self.
 ].
+changedObject == exampleLanguageSelectionHolder ifTrue:[
+self updateExampleLanguageText.
+^ self.
+].
+!
+updateExampleLanguageText
+self selectedKeyRow value isNil ifTrue:[^ self].
+self exampleLanguageTextHolder value:self currentExampleLanguageText
 !
 updateKeyStringsToLanguageMappings
 keyStringsToLanguageMappings
 at:lastSelectedKey
 language:lastLanguage
 put: self newLanguageText.
+!
+updateLanguageAndKeySelection
+|colSelectionIndex language|
+colSelectionIndex := dataSetView selectedColIndex.
+language := colSelectionIndex > 1 ifTrue:[ shownLanguages at:colSelectionIndex-1 ] ifFalse:nil.
+self originalTextHolder value: self selectedKey.
+self languageTextHolder value: (self languageTextFromSelectedKeyFor: language).
+lastLanguage := language.
+lastSelectedKey := self selectedKey.
 !
 updateLanguageTextModification
 self languageTextModifiedHolder value ifTrue:[
 (self autoAccept or:[Dialog confirm:'Accept changed translation ?']) ifTrue:[
 answer == #acceptAsNew ifTrue:[
 self halt.        ].
 ].
 ! !
+!InternationalLanguageTranslationEditor methodsFor:'dialogs'!
+requestEncoderString
+^Dialog request:'Enter the encoder : '.
+!
+requestFilename
+|aFilename|
+aFilename := Dialog
+requestFileName:'Name of resource file:'
+default:nil
+pattern:'*.rs'.
+aFilename isEmptyOrNil ifTrue:[^ nil ].
+^aFilename asFilename
+!
+requestLanguage
+^ Dialog
+choose:'Which language do you want to save?'
+fromList:languagesList
+lines:10
+! !
 !InternationalLanguageTranslationEditor methodsFor:'initialization & release'!
 closeRequest
 "asks for permission before closing"
 self shownLanguages contents:self keyStringAndLanguageSelectionTable languages.
 modified := false.
 !
 menuOpen
-|fn|
+|aFilename|
-fn := Dialog
+aFilename := self requestFilename.
-requestFileName:'Name of resource file:'
+aFilename isNil ifTrue:[^ self ].
-default:nil
+self readResourceFile:aFilename
-pattern:'*.rs'.
-fn isEmptyOrNil ifTrue:[^ self ].
-fn := fn asFilename.
-fn exists ifFalse:[^ self ].
-self readResourceFile:fn
 !
 menuSave
-"This method was generated by the Browser.
+"Saves the language selected in the fileName from where the language resource was obtained."
-It will be invoked when the menu-item 'save' is selected."
+|lang aFilename|
-"/ change below and add any actions as required here ...
+lang := self requestLanguage.
-self warn:'no action for ''save'' available.'.
+lang isNil ifTrue:[^ self].
+aFilename := keyStringsToLanguageMappings filenameAt:lang.
+aFilename isNil ifTrue:[
+aFilename := self requestFilename.
+aFilename isNil ifTrue:[^ self].
+].
+self saveResourceFile:aFilename for:lang asSymbol
 !
 menuSaveAs
-"This method was generated by the Browser.
+"Saves the language selected in the specified fileName."
-It will be invoked when the menu-item 'saveAs' is selected."
+|lang aFilename|
-"/ change below and add any actions as required here ...
+lang := self requestLanguage.
-self warn:'no action for ''saveAs'' available.'.
+lang isNil ifTrue:[^ self].
+aFilename := self requestFilename.
+aFilename isNil ifTrue:[^ self].
+self saveResourceFile:aFilename for:lang asSymbol
 !
 openAboutThisApplication
 "This method was generated by the Browser.
 It will be invoked when the menu-item 'help-about' is selected."
 lang isNil ifTrue:[^ self ].
 self readResourceFile:aFilename asLanguage:lang asSymbol
 !
-readResourceFile:aFilename asLanguage:lang
-|resourcePack inStream lineString encoding decoder sortedKeys remainingKeys|
-aFilename exists ifFalse:[^ self ].
-resourcePack := ResourcePack new.
-inStream := aFilename readStream.
-[inStream atEnd] whileFalse:[
-lineString := inStream nextLine.
-(lineString notEmpty
-and:[ (lineString startsWith:';') not ]) ifTrue:[
-((lineString startsWith:'#') and:[(lineString startsWith:'#(') not]) ifTrue:[
-lineString := (lineString copyFrom:2) withoutSeparators.
-(lineString startsWith:'encoding ') ifTrue:[
-encoding := ResourcePack extractEncodingFromLine:lineString.
-decoder := CharacterEncoder encoderFor:encoding ifAbsent:nil.
-].
-] ifFalse:[
-ResourcePack
-processResourceLine:lineString
-encoding:decoder
-file:aFilename pathName
-printErrorWith:[:msg | Transcript showCR:msg ]
-for:resourcePack
-keepUselessTranslations:true.
-].
-].
-].
-inStream close.
-sortedKeys := (resourcePack keys select:[:k | k isString]) asSortedCollection.
-remainingKeys := resourcePack keys select:[:k | k isString not].
-sortedKeys do:[:k |
-keyStringsToLanguageMappings at:k language:lang put:(resourcePack at:k)
-].
-remainingKeys do:[:k |
-keyStringsToLanguageMappings at:k language:lang put:(resourcePack at:k)
-].
-!
 removeLanguage
-"automatically generated by UIEditor ..."
+|lang|
-"*** the code below performs no action"
+lang := Dialog choose:'Which language do you want to remove?' fromList:languagesList lines:10.
-"*** (except for some feedback on the Transcript)"
+lang isNil ifTrue:[^ self ].
-"*** Please change as required and accept in the browser."
+(Dialog confirm: 'Are you sure to remove the language ', lang ) ifTrue:[
-"*** (and replace this comment by something more useful ;-)"
+self languagesList remove:lang.
+self shownLanguages remove:lang.
-"action to be added ..."
+].
-Transcript showCR:self class name, ': action for #removeLanguage ...'.
 !
 removeTranslation
 |rowSelectionIndex selectedKey|
 ^ visitor translatedLabels
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'queries'!
+autoAccept
+^ self autoAcceptHolder value
+!
+currentExampleLanguageText
+"Returns the language text corresponding for the current selected key and the example language selection"
+^self languageTextFromSelectedKeyFor: self exampleLanguageSelectionHolder value
+!
+exampleLanguageByDefault
+^self shownLanguages isEmpty
+ifTrue:[nil]
+ifFalse:[self shownLanguages first]
+!
 hasUnsavedChanges
 ^ modified
+!
+languageTextFromSelectedKeyFor: language
+"Returns the language text corresponding for the current selected key and the received language"
+language isNil ifTrue:[^''].
+^keyStringsToLanguageMappings at: self selectedKey language:language.
+! !
+!InternationalLanguageTranslationEditor methodsFor:'read/write resourceFile'!
+printEditingWarningOn: aStream
+aStream nextPutAll: ';';
+cr;
+nextPutAll: '; WARNING:';
+cr;
+nextPutAll: '; this file contains national characters';
+cr;
+nextPutAll: '; DONT EDIT this file with an old vi !!';
+cr;
+nextPutAll: ';';
+cr.
+!
+printEncoderFor: lang on: aStream
+|characterEncoder encoderString|
+characterEncoder := keyStringsToLanguageMappings encoderAt: lang.
+encoderString := characterEncoder isNil
+ifTrue:[self requestEncoderString]
+ifFalse:[characterEncoder nameOfEncoding printString].
+aStream nextPutAll: '#encoding';
+space;
+nextPutAll: encoderString;
+cr;
+cr.
+!
+printLanguage: lang on: aStream
+self printEncoderFor: lang on: aStream.
+self printEditingWarningOn: aStream.
+self printLanguageMappingsFor: lang on: aStream.
+!
+printLanguageMappingsFor: lang on: aStream
+|languageMappings maxKeySize|
+languageMappings := keyStringsToLanguageMappings atLanguage: lang.
+maxKeySize := keyStringsToLanguageMappings maxKeySizeForLanguage: lang.
+maxKeySize := maxKeySize + 10.                  "adds the separator between key and value"
+languageMappings keysAndValuesDo:[:key :value |
+aStream nextPutAll: (key storeString paddedTo: maxKeySize) ;
+nextPutAll: value storeString;
+cr.
+].
+!
+readResourceFile:aFilename asLanguage:lang
+|resourcePack inStream lineString encoding decoder sortedKeys remainingKeys|
+aFilename exists ifFalse:[^ self ].
+resourcePack := ResourcePack new.
+inStream := aFilename readStream.
+[inStream atEnd] whileFalse:[
+lineString := inStream nextLine.
+(lineString notEmpty
+and:[ (lineString startsWith:';') not ]) ifTrue:[
+((lineString startsWith:'#') and:[(lineString startsWith:'#(') not]) ifTrue:[
+lineString := (lineString copyFrom:2) withoutSeparators.
+(lineString startsWith:'encoding ') ifTrue:[
+encoding := ResourcePack extractEncodingFromLine:lineString.
+decoder := CharacterEncoder encoderFor:encoding ifAbsent:nil.
+].
+] ifFalse:[
+ResourcePack
+processResourceLine:lineString
+encoding:decoder
+file:aFilename pathName
+printErrorWith:[:msg | Transcript showCR:msg ]
+for:resourcePack
+keepUselessTranslations:true.
+].
+].
+].
+inStream close.
+sortedKeys := (resourcePack keys select:[:k | k isString]) asSortedCollection.
+remainingKeys := resourcePack keys select:[:k | k isString not].
+keyStringsToLanguageMappings atLanguage: lang putFilename: aFilename.
+keyStringsToLanguageMappings  atLanguage: lang putEncoder: decoder.
+sortedKeys do:[:k |
+keyStringsToLanguageMappings at:k language:lang put:(resourcePack at:k)
+].
+remainingKeys do:[:k |
+keyStringsToLanguageMappings at:k language:lang put:(resourcePack at:k)
+].
+!
+saveResourceFile: aFilename for: lang
+|aStream |
+aStream := FileStream fileNamed: aFilename.
+self printLanguage: lang on: aStream.
+aStream flush;
+close.
+DialogBox information: 'The resource file for the language ', lang printString storeString, ' was saved in the file: ', aFilename nameString
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'specs-dynamic'!
 columnInRow:row at:colIndex
 ^ row keyString
 ! !
 !InternationalLanguageTranslationEditor methodsFor:'user actions'!
+exampleLanguageSelectionChanged
+self updateExampleLanguageText.
+!
 selectionChanged
 self updateOriginalTextModification.
 self updateLanguageTextModification.
 self updateLanguageAndKeySelection.
+self updateExampleLanguageText.
 self originalTextModifiedHolder value:false.
 self languageTextModifiedHolder value:false.
 !
 self addKey:aKey.
 (perLanguageMappings at:language) at:aKey put:value.
 (self rowForKey:aKey) changed
 !
+atLanguage: lang putEncoder: aDecoder
+^(self languageInfoAt: lang) at: self encoderKey put: aDecoder
+!
+atLanguage: lang putFilename: aFilename
+^(self languageInfoAt: lang) at: self fileNameKey put: aFilename
+!
+decoderKey
+^#decoder
+!
+encoderAt:lang
+^ (self languageInfoAt:lang) at: self encoderKey ifAbsent:[nil]
+!
+encoderKey
+^#encoder
+!
+fileNameKey
+^ #filename
+!
+filenameAt:lang
+^ (self languageInfoAt:lang) at: self fileNameKey ifAbsent:[nil]
+!
 keyAt:index
 ^ keys at:index.
 !
 keyAt:index ifAbsent:exceptionalValue
 keys
 ^ keys
 !
+languageInfoAt: lang
+^self perLanguageInfo at: lang ifAbsentPut:[Dictionary new]
+!
 languages
 ^ languages
+!
+perLanguageInfo
+^ perLanguageInfo
+!
+perLanguageInfo:something
+perLanguageInfo := something.
 !
 removeKey:aKey
 keys remove:aKey ifAbsent:[].
 perLanguageMappings do:[:eachMapping |
 super initialize.
 keys := OrderedSet new.
 languages := OrderedCollection new.
 perLanguageMappings := Dictionary new.
 perLanguageInfo := Dictionary new.
 rowPerKey := Dictionary new.
 self addLanguage:#'de'.
 self addLanguage:#'fr'.
 self addLanguage:#'es'.
 ^ languages includes:lang
 !
 indexOfKey:aKey
 ^ keys indexOf:aKey
+!
+maxKeySizeForLanguage: lang
+^(self atLanguage: lang) keys inject: 0 into:[:maxSize :each |
+maxSize < each size
+ifTrue:[each size]
+ifFalse:[maxSize].].
 ! !
 !InternationalLanguageTranslationEditor::LanguageMappingRow methodsFor:'accessing'!
 atLanguage:language

changeset 2050	998f72439bfc
parent 2049	d10762e5d924
child 2051	88d16a7d0bd9