--- a/AbstractLauncherApplication.st Tue Mar 02 13:46:17 2004 +0100
+++ b/AbstractLauncherApplication.st Tue Mar 02 13:46:41 2004 +0100
@@ -173,6 +173,12 @@
"
! !
+!AbstractLauncherApplication class methodsFor:'resources'!
+
+resourcePackName
+ ^ 'Launcher'
+! !
+
!AbstractLauncherApplication class methodsFor:'settings application list'!
addSettingsApplicationByClass:aClass withName:aName icon:aIcon
@@ -6422,5 +6428,5 @@
!AbstractLauncherApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.305 2004-02-26 20:15:20 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.306 2004-03-02 12:46:41 cg Exp $'
! !
--- a/AbstractSettingsApplication.st Tue Mar 02 13:46:17 2004 +0100
+++ b/AbstractSettingsApplication.st Tue Mar 02 13:46:41 2004 +0100
@@ -311,7 +311,7 @@
(self hasUnsavedChanges) ifTrue:[
askForChangeOnRelease ifTrue:[
result := self confirmWithCancel:(resources
- string:'Save changed ' , settingsString , ' ?').
+ string:'Save changed ' , settingsString , ' (in ''settings.stx'') ?').
] ifFalse:[
result := true.
].
@@ -4178,7 +4178,7 @@
!
languageIndexChanged
- self languageHolder value:(listOfLanguages at:self languageIndexHolder value).
+ self languageHolder value:(listOfLanguages at:self languageIndexHolder value ? 1).
self updateModifiedChannel.
!
@@ -4224,9 +4224,16 @@
|flags enResources savedLanguage enLanguages nativeLanguages languages|
resources := self class classResources.
- listOfLanguages := resources at:'LIST_OF_OFFERED_LANGUAGES' default:#('default').
+ listOfLanguages := resources at:'LIST_OF_OFFERED_LANGUAGES' default:#('default' 'en' ).
listOfLanguages := listOfLanguages asOrderedCollection.
+ (perLanguageResources notNil
+ and:[ (perLanguageResources includesKey:#en) not
+ and:[ (perLanguageResources includesKey:#en_us) not ]])
+ ifTrue:[
+ perLanguageResources := nil.
+ ].
+
perLanguageResources isNil ifTrue:[
perLanguageResources := Dictionary new.
@@ -6293,7 +6300,7 @@
label: 'Printer Settings'
name: 'Printer Settings'
min: (Point 10 10)
- bounds: (Rectangle 16 52 616 392)
+ bounds: (Rectangle 0 0 616 385)
)
component:
(SpecCollection
@@ -6316,27 +6323,27 @@
(LabelSpec
label: 'Printer Type:'
name: 'PrinterTypeLabel'
- layout: (LayoutFrame 0 0 5 0 150 0 27 0)
+ layout: (LayoutFrame 0 0 5 0 181 0 27 0)
translateLabel: true
adjust: right
)
(ComboListSpec
name: 'PrinterTypeComboList'
- layout: (LayoutFrame 150 0 5 0 -5 1 27 0)
+ layout: (LayoutFrame 183 0 5 0 -5 1 27 0)
model: printerTypeSelection
comboList: printerType
useIndex: true
)
(LabelSpec
- label: 'Printer Command:'
+ label: 'Print Command:'
name: 'PrinterCommandLabel'
- layout: (LayoutFrame 0 0 31 0 150 0 53 0)
+ layout: (LayoutFrame 0 0 31 0 181 0 53 0)
translateLabel: true
adjust: right
)
(ComboBoxSpec
name: 'CommandComboBox'
- layout: (LayoutFrame 150 0 31 0 -5 1 53 0)
+ layout: (LayoutFrame 183 0 31 0 -5 1 53 0)
enableChannel: printCommandEnabled
model: printCommand
acceptOnLostFocus: true
@@ -6347,14 +6354,15 @@
(LabelSpec
label: 'Print to File:'
name: 'PrinterFileLabel'
- layout: (LayoutFrame 0 0 57 0 150 0 79 0)
+ layout: (LayoutFrame 0 0 57 0 181 0 79 0)
translateLabel: true
adjust: right
)
(FilenameInputFieldSpec
name: 'PrinterFileEntryField'
- layout: (LayoutFrame 150 0 57 0 -5 1 79 0)
+ layout: (LayoutFrame 183 0 57 0 -5 1 79 0)
model: printFilename
+ formatString: ''
immediateAccept: true
acceptOnLeave: true
acceptOnLostFocus: true
@@ -6377,14 +6385,14 @@
(LabelSpec
label: 'Page Format:'
name: 'PageFormatLabel'
- layout: (LayoutFrame 0 0 4 0 150 0 26 0)
+ layout: (LayoutFrame 0 0 4 0 181 0 26 0)
translateLabel: true
adjust: right
)
(PopUpListSpec
label: 'PopUp List'
name: 'PageFormatPopUpList'
- layout: (LayoutFrame 150 0 4 0 300 0 26 0)
+ layout: (LayoutFrame 183 0 4 0 333 0 26 0)
tabable: true
model: pageFormat
enableChannel: enableFormat
@@ -6430,13 +6438,13 @@
(LabelSpec
label: 'Top Margin:'
name: 'TopMarginLabel'
- layout: (LayoutFrame 0 0 0 0 150 0 21 0)
+ layout: (LayoutFrame 0 0 0 0 181 0 21 0)
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'TopMarginEntryField'
- layout: (LayoutFrame 150 0 0 0 250 0 21 0)
+ layout: (LayoutFrame 183 0 0 0 283 0 21 0)
enableChannel: enableMargins
model: topMargin
type: numberOrNil
@@ -6467,13 +6475,13 @@
(LabelSpec
label: 'Left Margin:'
name: 'LeftMarginLabel'
- layout: (LayoutFrame 0 0 0 0 150 0 21 0)
+ layout: (LayoutFrame 0 0 0 0 181 0 21 0)
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'LeftMarginEntryField'
- layout: (LayoutFrame 150 0 0 0 250 0 21 0)
+ layout: (LayoutFrame 183 0 0 0 283 0 21 0)
enableChannel: enableMargins
model: leftMargin
type: numberOrNil
@@ -6495,13 +6503,13 @@
(LabelSpec
label: 'Right Margin:'
name: 'RightMarginLabel'
- layout: (LayoutFrame 0 0 0 0 150 0 21 0)
+ layout: (LayoutFrame 0 0 0 0 181 0 21 0)
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'RightMarginEntryField'
- layout: (LayoutFrame 150 0 0 0 250 0 21 0)
+ layout: (LayoutFrame 183 0 0 0 283 0 21 0)
enableChannel: enableMargins
model: rightMargin
type: numberOrNil
@@ -6523,13 +6531,13 @@
(LabelSpec
label: 'Bottom Margin:'
name: 'BottomMarginLabel'
- layout: (LayoutFrame 0 0 0 0 150 0 21 0)
+ layout: (LayoutFrame 0 0 0 0 181 0 21 0)
translateLabel: true
adjust: right
)
(InputFieldSpec
name: 'BottomMarginEntryField'
- layout: (LayoutFrame 150 0 0 0 250 0 21 0)
+ layout: (LayoutFrame 183 0 0 0 283 0 21 0)
enableChannel: enableMargins
model: bottomMargin
type: numberOrNil
@@ -6564,7 +6572,7 @@
(CheckBoxSpec
label: 'Color Printer'
name: 'ColorPrinterCheckBox'
- layout: (LayoutFrame 0 0 0 0 599 0 21 0)
+ layout: (LayoutFrame 183 0 0 0 782 0 21 0)
enableChannel: enableColorBox
model: supportsColor
translateLabel: true
@@ -11258,5 +11266,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.144 2004-02-26 19:05:54 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.145 2004-03-02 12:46:31 cg Exp $'
+! !