--- a/AbstractLauncherApplication.st Fri Nov 08 18:07:39 2002 +0100
+++ b/AbstractLauncherApplication.st Fri Nov 08 18:51:34 2002 +0100
@@ -31,7 +31,8 @@
AbstractSettingsApplication subclass:#LanguageSettingsAppl
instanceVariableNames:'modifiedChannel languageHolder languageList listOfLanguages
- translatedLanguages noticeLabelHolder currentLanguageChannel'
+ translatedLanguages noticeLabelHolder currentLanguageChannel
+ currentLanguageLabel'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractLauncherApplication
@@ -2108,14 +2109,14 @@
#name: 'Language Settings'
#min: #(#Point 10 10)
#max: #(#Point 1024 768)
- #bounds: #(#Rectangle 16 42 491 393)
+ #bounds: #(#Rectangle 16 42 491 713)
)
#component:
#(#SpecCollection
#collection: #(
#(#InputFieldSpec
#name: 'EntryField1'
- #layout: #(#LayoutFrame 0 0.0 60 0 0 1.0 82 0)
+ #layout: #(#LayoutFrame 0 0.0 105 0 0 1.0 125 0)
#model: #languageHolder
#acceptOnReturn: true
#acceptOnTab: true
@@ -2124,7 +2125,7 @@
)
#(#SequenceViewSpec
#name: 'List1'
- #layout: #(#LayoutFrame 0 0.0 82 0 0 1.0 -34 1)
+ #layout: #(#LayoutFrame 0 0.0 125 0 0 1.0 -34 1)
#model: #languageHolder
#hasHorizontalScrollBar: true
#hasVerticalScrollBar: true
@@ -2170,7 +2171,7 @@
#(#LabelSpec
#label: 'Notice:'
#name: 'Notice'
- #layout: #(#LayoutFrame 0 0 0 0 475 0 60 0)
+ #layout: #(#LayoutFrame 0 0 0 0 0 1.0 105 0)
#translateLabel: true
#labelChannel: #noticeLabelHolder
#adjust: #left
@@ -2189,6 +2190,7 @@
#name: 'Label1'
#layout: #(#LayoutFrame 190 0 0 0 -150 1 20 0)
#translateLabel: true
+ #labelChannel: #currentLanguageLabel
#adjust: #right
)
)
@@ -2359,6 +2361,14 @@
^ currentLanguageChannel.
!
+currentLanguageLabel
+
+ currentLanguageLabel isNil ifTrue:[
+ currentLanguageLabel := (resources string:'Current Language:') asValue.
+ ].
+ ^ currentLanguageLabel.
+!
+
languageHolder
languageHolder isNil ifTrue:[
@@ -7262,7 +7272,7 @@
^ #(
#('Tools' #'AbstractLauncherApplication::ToolsSettingsAppl')
- #('Language' #'AbstractLauncherApplication::LanguageSettingsAppl')
+ #('Language' #'AbstractLauncherApplication::LanguageSettingsAppl')
).
!
@@ -7928,7 +7938,7 @@
!AbstractLauncherApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.223 2002-11-08 16:02:37 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.224 2002-11-08 17:50:58 penk Exp $'
! !
AbstractLauncherApplication::SettingsDialog initialize!
--- a/AbstractSettingsApplication.st Fri Nov 08 18:07:39 2002 +0100
+++ b/AbstractSettingsApplication.st Fri Nov 08 18:51:34 2002 +0100
@@ -21,11 +21,11 @@
| masterApplication |
masterApplication := self masterApplication.
- ^ masterApplication notNil and:[ masterApplication class == SettingsDialog].
+ ^ masterApplication notNil and:[ masterApplication class == AbstractLauncherApplication::SettingsDialog].
! !
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.1 2002-11-08 16:07:24 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.2 2002-11-08 17:51:34 penk Exp $'
! !