--- a/AbstractSettingsApplication.st Mon Dec 18 21:55:32 2017 +0000
+++ b/AbstractSettingsApplication.st Sun Nov 19 11:36:08 2017 -0300
@@ -161,7 +161,8 @@
instanceVariableNames:'languageHolder languageIndexHolder languageList
languageListHolder listOfLanguages translatedLanguages
noticeLabelHolder currentFlagAndLanguageChannel
- currentLanguageLabel perLanguageResources useSystemLanguageHolder'
+ currentLanguageLabel perLanguageResources useSystemLanguageHolder
+ languageListEnabledHolder'
classVariableNames:''
poolDictionaries:''
privateIn:AbstractSettingsApplication
@@ -515,10 +516,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpecForDialog
- window:
+ window:
(WindowSpec
label: 'NewApplication'
name: 'NewApplication'
@@ -526,7 +527,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 531 488)
)
- component:
+ component:
(SpecCollection
collection: (
(SubCanvasSpec
@@ -546,7 +547,7 @@
horizontalSpace: 3
verticalSpace: 3
reverseOrderIfOKAtLeft: true
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -567,12 +568,12 @@
extent: (Point 159 25)
)
)
-
+
)
keepSpaceForOSXResizeHandleH: true
)
)
-
+
)
)
! !
@@ -587,30 +588,30 @@
"returns a set of words to match in the quickSearch.
Here, as a fallback, the keys from the help spec,
the widget names and label aspects are returned
- Notice that both all words and its current language translation are included
+ Notice that both all words and its current language translation are included
in the set and will be matched against the word in the quick search field"
-
- |words helpKeys resources
+
+ |words helpKeys resources
addSingleWord addEachWord addEachWordXLated|
"/ translate
resources := self classResources.
- addSingleWord :=
+ addSingleWord :=
[:word :origin|
- true "(w first isLetter)" ifTrue:[
+ true "(w first isLetter)" ifTrue:[
words add:word asLowercase.
- ].
- ].
-
- addEachWord :=
+ ].
+ ].
+
+ addEachWord :=
[:aString :origin|
aString asCollectionOfWordsDo:[:w |
addSingleWord value:w value:origin
- ].
- ].
-
- addEachWordXLated :=
+ ].
+ ].
+
+ addEachWordXLated :=
[:aString :origin |
|xlation|
@@ -619,10 +620,10 @@
(xlation := resources string:aString) notNil ifTrue:[
xlation ~= aString ifTrue:[
addEachWord value:xlation value:origin.
- ].
- ].
- ].
- ].
+ ].
+ ].
+ ].
+ ].
words := Set new.
helpKeys := Set new.
@@ -634,7 +635,7 @@
label notNil ifTrue:[
addEachWordXLated value:label value:(#label->eachSpec).
].
-
+
(helpKey := eachSpec activeHelpKey) notNil ifTrue:[
helpKeys add:helpKey.
"/ words add:helpKey string asLowercase.
@@ -645,15 +646,15 @@
helpKeys add:k.
addSingleWord value:k value:#helpKeyTop
].
-
+
helpKeys do:[:eachKey |
|helpText|
-
+
helpText := self flyByHelpSpec at:eachKey ifAbsent:nil.
addEachWordXLated value:helpText value:(#helpText->eachKey).
- ].
- ^ words
-
+ ].
+ ^ words
+
"
AbstractSettingsApplication::BuildSettingsAppl quickSearchStrings
"
@@ -729,13 +730,13 @@
|app transcript|
DebugView newDebugger.
-
+
transcript := Transcript current.
(transcript notNil and:[transcript isExternalStream not]) ifTrue:[
app := transcript topView application.
app perform:#reopenLauncher ifNotUnderstood:[].
].
-
+
self window topView raise.
!
@@ -790,12 +791,12 @@
!AbstractSettingsApplication methodsFor:'aspects'!
aspects
- "if redefined to return a non-nil list of preference-key aspects,
+ "if redefined to return a non-nil list of preference-key aspects,
you can then use the basicSaveSettings/basicReadSettings/hasUnsavedChanges
as inherited from here.
Otherwise, if you do not want the aspect-list-keys to be read/saved in the settings,
you MUST redefine all of the 3 above mentioned methods."
-
+
^ nil
!
@@ -960,7 +961,7 @@
self
readAspects: aspects
from:currentUserPrefs.
- ^ self
+ ^ self
].
^ self subclassResponsibility:'either basicReadSettings or aspects must be redefined'
!
@@ -969,14 +970,14 @@
"utility to save aspects as listed in the aspects method.
If that has not been redefined, an error will be reported,
as you should then redefine this method in a subclass"
-
+
|aspects|
(aspects := self aspects) notNil ifTrue:[
self
writeAspects:(self aspects)
to:currentUserPrefs.
- ^ self
+ ^ self
].
^ self subclassResponsibility
!
@@ -987,7 +988,7 @@
as you should then redefine this method in a subclass"
|aspects|
-
+
(aspects := self aspects) notNil ifTrue:[
^ (self
hasChangedAspectIn:(self aspects)
@@ -1027,20 +1028,20 @@
"/ to be redefined in subclasses...
|mySpec|
-
+
self hasValuesDifferentFromDefault ifTrue:[
mySpec := self class windowSpec decodeAsLiteralArray.
(self aspects ? #()) do:[:aspect |
|subSpec widget|
-
+
(UserPreferences default perform:aspect) ~= (currentUserPrefs perform:aspect) ifTrue:[
subSpec := mySpec findSpecForWhich:[:spec | spec model = aspect].
- widget := self window
- allSubViewsDetect:[:w | w name = subSpec name]
+ widget := self window
+ allSubViewsDetect:[:w | w name = subSpec name]
ifNone:nil.
- aBlock value:widget.
- ].
- ].
+ aBlock value:widget.
+ ].
+ ].
].
! !
@@ -1050,14 +1051,14 @@
|savedCurrent answer|
self hasUnsavedChanges ifTrue:[^ true].
-
+
savedCurrent := currentUserPrefs.
[
- currentUserPrefs := UserPreferences default.
+ currentUserPrefs := UserPreferences default.
answer := self hasUnsavedChanges
] ensure:[
currentUserPrefs := savedCurrent
- ].
+ ].
^ answer
!
@@ -1153,17 +1154,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'All Settings'
name: 'All Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 659 242)
)
- component:
+ component:
(SpecCollection
collection: (
(DataSetSpec
@@ -1173,16 +1174,16 @@
hasHorizontalScrollBar: true
hasVerticalScrollBar: true
dataList: settingsList
- columns:
+ columns:
(OrderedCollection
-
+
(DataSetColumnSpec
label: 'Name'
labelButtonType: Button
height: heightOfFirstRow
model: key
menuFromApplication: false
- )
+ )
(DataSetColumnSpec
label: 'Value'
labelButtonType: Button
@@ -1193,7 +1194,7 @@
)
)
)
-
+
)
)
! !
@@ -1270,7 +1271,7 @@
list := List new.
UserPreferences selectorsAndMethodsDo:[:sel :mthd|
|setter getter getterMethod|
-
+
sel numArgs == 1 ifTrue:[
(sel endsWith:$:) ifTrue:[
setter := sel.
@@ -1280,9 +1281,9 @@
getterMethod := UserPreferences compiledMethodAt:getter.
getterMethod isObsolete ifFalse:[
list add:(sel -> (UserPreferences current perform:getter)).
- ].
- ].
- ].
+ ].
+ ].
+ ].
].
].
].
@@ -1322,7 +1323,7 @@
settingsList isNil ifTrue:[
settingsList := self fetchSettingsList.
-
+
].
^ settingsList.
!
@@ -1379,7 +1380,7 @@
the UIHelpTool may not be able to read the specification."
"
- UIHelpTool openOnClass:AbstractSettingsApplication::MemorySettingsAppl
+ UIHelpTool openOnClass:AbstractSettingsApplication::MemorySettingsAppl
"
<resource: #help>
@@ -1396,7 +1397,7 @@
defaultIcon
<resource: #programImage>
- ^ ToolbarIconLibrary packageOpen24x24Icon
+ ^ ToolbarIconLibrary packageOpen24x24Icon
! !
!AbstractSettingsApplication::AutoloadedPackagesSettingsAppl class methodsFor:'interface specs'!
@@ -1416,17 +1417,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Autoloaded Packages Settings'
name: 'Autoloaded Packages Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 705 722)
)
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -1436,7 +1437,7 @@
labelPosition: topLeft
translateLabel: true
activeHelpKey: autoloadedPackages
- component:
+ component:
(SpecCollection
collection: (
(SubCanvasSpec
@@ -1450,11 +1451,11 @@
postBuildCallback: postCreatePackageChooserWidget:
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -1499,14 +1500,14 @@
setOfAlreadySelectedPckages := UserPreferences current autoloadedPackages asSet.
packageDirPath asFilename directoryContentsAsFilenames sort do:[:fn |
- |item base nm path parentPath parent isLibrary isApplication isAlreadyLoaded
+ |item base nm path parentPath parent isLibrary isApplication isAlreadyLoaded
defClass target packageID|
- ((fn suffix = 'mcz')
- or:[ fn isDirectory
- or:[ (fn baseName startsWith:'.')
+ ((fn suffix = 'mcz')
+ or:[ fn isDirectory
+ or:[ (fn baseName startsWith:'.')
or:[ (fn baseName = 'README') ]]
- ]) ifFalse:[
+ ]) ifFalse:[
base := fn withoutSuffix baseName.
(base startsWith:'lib') ifTrue:[
nm := (base copyFrom:4).
@@ -1524,14 +1525,14 @@
].
path := nm asCollectionOfSubstringsSeparatedBy:$_.
- packageID := (path size > 1)
+ packageID := (path size > 1)
ifTrue:[ path first , ':' , ((path copyFrom:2) asStringWith:$/) ]
ifFalse:[ path first ].
(setOfPackages includes:packageID) ifFalse:[
(setOfAlreadySelectedPckages includes:packageID) ifFalse:[
setOfPackages add:packageID.
- isAlreadyLoaded :=
+ isAlreadyLoaded :=
(defClass := ProjectDefinition definitionClassForPackage:packageID) notNil
and:[ defClass isLoaded
and:[ defClass isFullyLoaded ]].
@@ -1573,10 +1574,10 @@
packageChooser := aPackageChooser application.
packageChooser addAllButtonVisibleHolder value:false.
packageChooser removeAllButtonVisibleHolder value:false.
- packageChooser listOfPossibleItems value:availPackages asOrderedCollection.
- packageChooser listOfSelectedItems value:selectedPackages asOrderedCollection.
- packageChooser possibleItemsLabelHolder value:(resources string:self possibleItemsLabel).
- packageChooser selectedItemsLabelHolder value:(resources string:self selectedItemsLabel).
+ packageChooser listOfPossibleItems value:availPackages asOrderedCollection.
+ packageChooser listOfSelectedItems value:selectedPackages asOrderedCollection.
+ packageChooser possibleItemsLabelHolder value:(resources string:self possibleItemsLabel).
+ packageChooser selectedItemsLabelHolder value:(resources string:self selectedItemsLabel).
packageChooser listOfSelectedItems onChangeSend:#updateModifiedChannel to:self.
! !
@@ -1668,17 +1669,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Build Settings'
name: 'Build Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 659 242)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -1688,7 +1689,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 4
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -1696,14 +1697,14 @@
name: 'FramedBox1'
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'LocalBuild'
layout: (LayoutFrame 0 0.0 0 0 0 1.0 25 0)
activeHelpKey: localBuild
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -1716,13 +1717,13 @@
translateLabel: true
)
)
-
+
)
)
(ViewSpec
name: 'Build Directory'
layout: (LayoutFrame 0 0 40 0 0 1 70 0)
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -1747,7 +1748,7 @@
viewClassName: FilenameWidgetWithHistory
)
)
-
+
)
)
(HorizontalPanelViewSpec
@@ -1757,7 +1758,7 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -1769,17 +1770,17 @@
extent: (Point 390 26)
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 659 136)
)
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -1797,16 +1798,16 @@
useIndex: false
)
)
-
+
)
extent: (Point 659 25)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -2195,10 +2196,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Byte Code Compiler Settings'
name: 'Byte Code Compiler Settings'
@@ -2206,7 +2207,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 665 706)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -2216,7 +2217,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -2232,7 +2233,7 @@
)
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -2242,7 +2243,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 0
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -2302,7 +2303,7 @@
extent: (Point 313 22)
)
)
-
+
)
)
(VerticalPanelViewSpec
@@ -2312,7 +2313,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 0
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -2372,11 +2373,11 @@
extent: (Point 665 22)
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 665 157)
)
@@ -2394,7 +2395,7 @@
)
(ViewSpec
name: 'Box2'
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -2404,7 +2405,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 0
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -2489,7 +2490,7 @@
extent: (Point 313 22)
)
)
-
+
)
)
(VerticalPanelViewSpec
@@ -2499,7 +2500,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 0
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -2584,17 +2585,17 @@
extent: (Point 600 22)
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 665 206)
)
(ViewSpec
name: 'Box4'
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -2605,7 +2606,7 @@
model: reenableSuppressedWarnings
)
)
-
+
)
extent: (Point 665 32)
)
@@ -2643,7 +2644,7 @@
)
(ViewSpec
name: 'Box3'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -2664,16 +2665,16 @@
useIndex: true
)
)
-
+
)
extent: (Point 665 22)
)
)
-
+
)
)
)
-
+
)
)
@@ -3212,7 +3213,7 @@
].
^ self
].
- (changedObject == self allowDollarInIdentifier
+ (changedObject == self allowDollarInIdentifier
or:[changedObject == self allowParagraphInIdentifier
or:[changedObject == self allowUnderscoreInIdentifier]]) ifTrue:[
self warnings changed.
@@ -3332,17 +3333,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Changes Settings'
name: 'Changes Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 561 478)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -3352,7 +3353,7 @@
verticalLayout: topSpace
horizontalSpace: 5
verticalSpace: 5
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -3360,7 +3361,7 @@
name: 'FramedBox2'
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -3382,7 +3383,7 @@
(ViewSpec
name: 'Box1'
layout: (LayoutFrame 5 0 73 0 -5 1 105 0)
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -3405,20 +3406,20 @@
acceptOnPointerLeave: true
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 551 147)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -3867,17 +3868,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Debugger Settings'
name: 'Debugger Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 600 320)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -3887,13 +3888,13 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 0
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'ShowErrorNotifierBox'
activeHelpKey: showErrorNotifier
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -3905,14 +3906,14 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 34)
)
(ViewSpec
name: 'UseNewLayoutInDebuggerBox'
activeHelpKey: useNewLayout
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -3924,14 +3925,14 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 34)
)
(ViewSpec
name: 'ShowVerboseStackBox'
activeHelpKey: showVerboseStack
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -3943,14 +3944,14 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 34)
)
(ViewSpec
name: 'HideEnumerationCodeBox'
activeHelpKey: hideSupportCode
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -3962,14 +3963,14 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 34)
)
(ViewSpec
name: 'AllowSendingMailFromDebuggerBox'
activeHelpKey: allowSendingMail
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -3981,16 +3982,16 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 34)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -4169,10 +4170,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Display Screen Settings'
name: 'Display Screen Settings'
@@ -4180,7 +4181,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 604 500)
)
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -4415,7 +4416,7 @@
translateLabel: true
)
)
-
+
)
)
! !
@@ -4931,10 +4932,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Editor Settings'
name: 'Editor Settings'
@@ -4942,7 +4943,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 658 543)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -4952,7 +4953,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -4994,7 +4995,7 @@
(ViewSpec
name: 'Box1'
activeHelpKey: codeCompletionOnControlKey
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -5014,7 +5015,7 @@
translateLabel: true
)
)
-
+
)
extent: (Point 658 30)
)
@@ -5141,11 +5142,11 @@
extent: (Point 658 30)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -5164,8 +5165,8 @@
super basicSaveSettings.
currentUserPrefs enforcedDropModeForFiles:
- ( self enforceContentsDropForFiles value
- ifTrue:[ #text ]
+ ( self enforceContentsDropForFiles value
+ ifTrue:[ #text ]
ifFalse:[ nil ] ).
TextView st80SelectMode:(self st80DoubleClickSelectMode value).
@@ -5523,17 +5524,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'General Compiler Settings'
name: 'General Compiler Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 600 320)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -5543,7 +5544,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -5585,7 +5586,7 @@
)
(ViewSpec
name: 'Box2'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -5616,7 +5617,7 @@
adjust: left
)
)
-
+
)
extent: (Point 600 30)
)
@@ -5626,7 +5627,7 @@
)
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -5649,7 +5650,7 @@
useIndex: true
)
)
-
+
)
extent: (Point 600 32)
)
@@ -5667,11 +5668,11 @@
extent: (Point 600 30)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -5679,7 +5680,7 @@
!AbstractSettingsApplication::GeneralCompilerSettingsAppl methodsFor:'actions'!
basicReadSettings
- self keepSourceSelection
+ self keepSourceSelection
value:(self class keepSourceOptions
indexOf:ClassCategoryReader sourceMode
ifAbsent:1).
@@ -5932,17 +5933,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'HTTP Server Settings'
name: 'HTTP Server Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 539 630)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -5952,7 +5953,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -5961,12 +5962,12 @@
verticalLayout: topSpace
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'InfoMessageBox'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -5989,7 +5990,7 @@
model: loadWebServerPackages
)
)
-
+
)
extent: (Point 539 200)
)
@@ -5999,7 +6000,7 @@
)
(ViewSpec
name: 'ActionButtonBox'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -6030,7 +6031,7 @@
verticalLayout: topSpace
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -6074,25 +6075,25 @@
useDefaultExtent: true
)
)
-
+
)
)
)
-
+
)
extent: (Point 539 160)
)
)
-
+
)
extent: (Point 539 620)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -6169,7 +6170,7 @@
|settingsApp itemPathName newItem openApps|
"/ settingsDialog isNil ifTrue:[^ self].
-
+
openApps := settingsDialog getAllChildrenAppsForApplication:self childrenClass:HTTPServerSettingsAppl.
(openApps contains:[:app | app httpServerInstance == aServerInstance]) ifTrue:[
" already have an Item for this application "
@@ -6217,7 +6218,7 @@
Dialog warn:'There is already a server for port ', port asString.
^ self
]
- ].
+ ].
runningServers addDependent:self.
(port = serverClass defaultPort) ifTrue:[
@@ -6309,7 +6310,7 @@
removeAllServerSubApplications
"/ settingsDialog isNil ifTrue:[^ self].
-
+
settingsDialog removeAllSubApplicationsFor:self
!
@@ -6560,17 +6561,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Keyboard Mapping Settings'
name: 'Keyboard Mapping Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 482 654)
)
- component:
+ component:
(SpecCollection
collection: (
(TextEditorSpec
@@ -6590,17 +6591,17 @@
(VariableVerticalPanelSpec
name: 'VariableVerticalPanel1'
layout: (LayoutFrame 0 0.0 100 0 0 1.0 0 1.0)
- component:
+ component:
(SpecCollection
collection: (
(VariableHorizontalPanelSpec
name: 'VariableHorizontalPanel1'
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box2'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -6622,7 +6623,7 @@
(ViewSpec
name: 'Box4'
layout: (LayoutFrame 0 0 -30 1 0 1 0 1)
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -6643,16 +6644,16 @@
acceptOnPointerLeave: true
)
)
-
+
)
)
)
-
+
)
)
(ViewSpec
name: 'Box3'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -6676,7 +6677,7 @@
layout: (LayoutFrame 0 0 -30 1 0 1 0 1)
horizontalLayout: fitSpace
verticalLayout: center
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -6698,21 +6699,21 @@
extent: (Point 125 22)
)
)
-
+
)
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
handles: (Any 0.5 1.0)
)
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -6733,16 +6734,16 @@
hasKeyboardFocusInitially: false
)
)
-
+
)
)
)
-
+
)
handles: (Any 0.5 1.0)
)
)
-
+
)
)
! !
@@ -6774,7 +6775,7 @@
logicalKeys addFirst:(resources string:'* unassigned *').
- self rawKeyList contents: rawKeys.
+ self rawKeyList contents: rawKeys.
self functionKeyList contents: logicalKeys.
self changeMapHolder value:false.
@@ -6791,7 +6792,7 @@
|fn|
- fn := Dialog
+ fn := Dialog
requestFileName:'Save private keyboard settings in:'
default:'private_keyboard.rc'
fromDirectory:(Filename applicationDataDirectory).
@@ -6805,7 +6806,7 @@
s nextPutLine:'map := Screen current keyboardMap.'.
mappings keysAndValuesDo:[:eachKey :eachFunction |
s nextPutLine:('map at:%1 put:%2.' bindWith:eachKey storeString with:eachFunction storeString).
- ].
+ ].
].
! !
@@ -6929,7 +6930,7 @@
| aliases |
aliases := mappings aliasesForLogical:logicalKey.
- aliases notEmptyOrNil ifTrue:[
+ aliases notEmptyOrNil ifTrue:[
rawKey := aliases first.
].
].
@@ -7002,15 +7003,18 @@
the UIHelpTool may not be able to read the specification."
"
- UIHelpTool openOnClass:HTTPServerSettingsAppl
+ UIHelpTool openOnClass:AbstractSettingsApplication::LanguageSettingsAppl
"
<resource: #help>
^ super flyByHelpSpec addPairsFrom:#(
+#currentFlagAndLanguage
+'Currently used language'
+
#useSystemLanguage
-'If set, the operating system language (LANG variable) is used in the next session\(and the setting here only affects the current session).\If clear, the language setting is also used in the next session.'
+'If checked, the operating system locale is used and settings. If unchecked, the language set below us used (defaulting to system locale)'
)
! !
@@ -7040,100 +7044,131 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ uuid: '5d0ce99a-d630-4c46-88a5-7eaf9ed43a1b'
+ window:
(WindowSpec
label: 'Language Settings'
name: 'Language Settings'
+ uuid: '14a0f0d8-7cac-48e9-91f7-3622e4fa7eff'
min: (Point 10 10)
- bounds: (Rectangle 0 0 571 878)
- )
- component:
+ bounds: (Rectangle 0 0 571 734)
+ )
+ component:
(SpecCollection
collection: (
(LabelSpec
- label: 'Current Language:'
- name: 'Label1'
- layout: (LayoutFrame 0 0 0 0 -233 1 30 0)
+ label: ' Language'
+ name: 'LanguageLabel'
+ layout: (LayoutFrame 0 0 0 0 0 1 66 0)
+ style: (FontDescription helvetica medium roman 18 #'iso10646-1' nil nil)
+ uuid: 'cfdca792-c3f4-40f9-9457-ecd53e0b6b35'
+ backgroundColor: (Color 100.0 100.0 100.0)
translateLabel: true
- labelChannel: currentLanguageLabel
- adjust: right
+ adjust: left
)
(LabelSpec
label: 'Label'
name: 'CurrentLang'
- layout: (LayoutFrame -233 1 0 0 0 1 30 0)
+ layout: (LayoutFrame -233 1 0 0 0 1 66 0)
+ activeHelpKey: currentFlagAndLanguage
style: bigLabelFont
+ uuid: '8fdf278f-2c62-4850-92b8-064fb124fca6'
+ backgroundColor: (Color 100.0 100.0 100.0)
translateLabel: true
labelChannel: currentFlagAndLanguageChannel
- adjust: left
- )
- (TextEditorSpec
- name: 'TextEditor1'
- layout: (LayoutFrame 0 0 32 0 0 1.0 240 0)
- model: noticeLabelHolder
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- miniScrollerHorizontal: true
- autoHideScrollBars: true
- isReadOnly: true
- hasKeyboardFocusInitially: false
- postBuildCallback: postBuildHelpLabel:
- viewClassName: 'TextView'
- )
- (InputFieldSpec
- name: 'EntryField1'
- layout: (LayoutFrame 2 0.0 240 0 -2 1.0 270 0)
- model: languageHolder
- acceptOnReturn: true
- acceptOnTab: true
- acceptOnLostFocus: true
- acceptOnPointerLeave: true
- )
- (CheckBoxSpec
- label: 'Use OS Language on Startup'
- name: 'CheckBox1'
- layout: (LayoutFrame 0 0.0 275 0 0 1.0 305 0)
- activeHelpKey: useSystemLanguage
- model: useSystemLanguageHolder
- translateLabel: true
- )
- (SequenceViewSpec
- name: 'List1'
- layout: (LayoutFrame 2 0.0 315 0 -2 1.0 -36 1.0)
- model: languageIndexHolder
- hasHorizontalScrollBar: true
- hasVerticalScrollBar: true
- doubleClickSelector: doubleClick:
- useIndex: true
- sequenceList: languageListHolder
+ adjust: right
+ )
+ (VerticalPanelViewSpec
+ name: 'VerticalPanel1'
+ layout: (LayoutFrame 0 0 66 0 0 1 -37 1)
+ uuid: '062e716f-660f-4d4a-8e1e-24695fe5af06'
+ horizontalLayout: fit
+ verticalLayout: topFit
+ horizontalSpace: 3
+ verticalSpace: 3
+ component:
+ (SpecCollection
+ collection: (
+ (CheckBoxSpec
+ label: 'Use OS Language on Startup'
+ name: 'CheckBox1'
+ activeHelpKey: useSystemLanguage
+ uuid: '20460ac0-eee7-4865-bfac-fc0c75b172dd'
+ model: useSystemLanguageHolder
+ translateLabel: true
+ extent: (Point 571 30)
+ )
+ (SequenceViewSpec
+ name: 'List1'
+ uuid: '41d303b2-4b79-43c1-9244-dacaa7b3d354'
+ enableChannel: languageListEnabledHolder
+ model: languageIndexHolder
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ doubleClickSelector: doubleClick:
+ useIndex: true
+ sequenceList: languageListHolder
+ extent: (Point 571 598)
+ )
+ (InputFieldSpec
+ name: 'EntryField1'
+ uuid: '0a4aecde-d99d-4ddf-aac7-e9e4f479874b'
+ initiallyInvisible: true
+ model: languageHolder
+ acceptOnReturn: true
+ acceptOnTab: true
+ acceptOnLostFocus: true
+ acceptOnPointerLeave: true
+ extent: (Point 567 30)
+ )
+ (TextEditorSpec
+ name: 'TextEditor1'
+ uuid: '4d4d5451-7ea9-4b49-a483-ef897eb6b377'
+ initiallyInvisible: true
+ model: noticeLabelHolder
+ hasHorizontalScrollBar: true
+ hasVerticalScrollBar: true
+ miniScrollerHorizontal: true
+ autoHideScrollBars: true
+ isReadOnly: true
+ hasKeyboardFocusInitially: false
+ extent: (Point 571 208)
+ postBuildCallback: postBuildHelpLabel:
+ viewClassName: 'TextView'
+ )
+ )
+
+ )
)
(HorizontalPanelViewSpec
name: 'HorizontalPanel1'
layout: (LayoutFrame 0 0 -37 1 0 1 0 1)
- horizontalLayout: center
+ uuid: '51ac05d7-6c95-4d50-931e-216d2cd0fea9'
+ horizontalLayout: rightSpace
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
label: 'Reread Language Resources'
name: 'RereadResourcesButton'
+ uuid: '7b6c3b3e-f21f-4775-984b-8c96059f0870'
translateLabel: true
resizeForLabel: true
model: rereadResourceFiles
useDefaultExtent: true
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -7162,9 +7197,9 @@
answer matchingFonts l screen switch dialog anyWrong|
currentUserPrefs useSystemLanguage:(self useSystemLanguageHolder value).
-
+
self withWaitCursorDo:[
- languageString := translatedLanguages at:(self languageIndexHolder value).
+ languageString := translatedLanguages at:(self languageIndexHolder value ? self currentLanguageIndex).
language := self languageHolder value asString string.
(language includes:$-) ifTrue:[
l := language asCollectionOfSubstringsSeparatedBy:$-.
@@ -7179,8 +7214,8 @@
"/ ask user to switch font and allow cancellation.
"/ Otherwise, you are left with unreadable menu & button items ...
- oldLanguage := UserPreferences current language.
- Smalltalk language:language asSymbol.
+ oldLanguage := currentUserPrefs language.
+ currentUserPrefs language:language asSymbol.
ResourcePack flushCachedResourcePacks.
"/ refetch resources ...
@@ -7203,7 +7238,6 @@
].
fontPref := fontPrefs first.
- Smalltalk setLanguage:#en.
ResourcePack flushCachedResourcePacks.
resources := AbstractLauncherApplication classResources.
@@ -7266,10 +7300,8 @@
].
switch ifTrue:[
- Transcript showCR:'Changing language setting to ' , languageString string , ' (' , language , ')...'.
- Smalltalk language:language asSymbol territory:(territory ? language) asSymbol.
+ currentUserPrefs language:language asSymbol; languageTerritory:(territory ? language) asSymbol.
ResourcePack flushCachedResourcePacks.
- "/ ResourcePack flushCachedResourcePacks - already done by language-change
].
].
switch ifTrue:[
@@ -7283,6 +7315,7 @@
self updateForChangedLanguage.
"Modified: / 19-10-2006 / 22:17:44 / cg"
+ "Modified: / 28-11-2017 / 11:29:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
doubleClick:aEntry
@@ -7310,6 +7343,21 @@
self currentFlagAndLanguageChannel value:self currentLanguage.
self setCurrentLanguageLabel.
self setNoticeLabel.
+!
+
+updateModifiedChannel
+ super updateModifiedChannel.
+ self useSystemLanguageHolder value ifTrue:[
+ self languageListEnabledHolder value: false.
+ self languageIndexHolder value: nil
+ ] ifFalse:[
+ self languageListEnabledHolder value: true.
+ self languageIndexHolder value isNil ifTrue:[
+ self languageIndexHolder value: self currentLanguageIndex.
+ ].
+ ].
+
+ "Created: / 19-11-2017 / 10:44:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!AbstractSettingsApplication::LanguageSettingsAppl methodsFor:'aspects'!
@@ -7347,10 +7395,26 @@
languageIndexHolder
languageIndexHolder isNil ifTrue:[
- languageIndexHolder := (self currentLanguageIndex) asValue.
+ languageIndexHolder := nil asValue.
+ self useSystemLanguageHolder value ifFalse:[
+ languageIndexHolder := (self currentLanguageIndex) asValue.
+ ].
languageIndexHolder onChangeSend:#languageIndexChanged to:self.
].
^ languageIndexHolder.
+
+ "Modified: / 19-11-2017 / 10:58:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+languageListEnabledHolder
+ <resource: #uiAspect>
+
+ languageListEnabledHolder isNil ifTrue:[
+ languageListEnabledHolder := ValueHolder with: self useSystemLanguageHolder value not.
+ ].
+ ^ languageListEnabledHolder.
+
+ "Modified: / 19-11-2017 / 10:46:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
languageListHolder
@@ -7369,7 +7433,11 @@
!
setCurrentLanguageLabel
- currentLanguageLabel value: (resources string:'Current Language:')
+ currentLanguageLabel notNil ifTrue:[
+ currentLanguageLabel value: (resources string:'Current Language:')
+ ]
+
+ "Modified: / 19-11-2017 / 11:31:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
setNoticeLabel
@@ -7399,7 +7467,7 @@
!
initializeLanguages
- |flags enResources savedLanguage savedLanguageTerritory enLanguages nativeLanguages
+ |flags enResources enLanguages nativeLanguages
languages listOfLanguageKeys readLanguagesFile rsc|
resources := self class classResources.
@@ -7422,21 +7490,22 @@
readLanguagesFile := rsc notNil and:[(rsc at:#languageFileExists ifAbsent:false) == true].
listOfLanguageKeys do:[:eachLang |
- savedLanguage := Smalltalk language.
- savedLanguageTerritory := Smalltalk languageTerritory.
+ | myProcess oldPrefs newPrefs lang terr |
+
readLanguagesFile ifFalse:[
ResourcePack flushCachedResourcePacks.
].
-
+ lang := terr := eachLang.
+ (lang includes:$_) ifTrue:[
+ terr := lang copyFrom:4.
+ lang := lang copyTo:2.
+ ].
+ oldPrefs := UserPreferences current.
+ newPrefs := UserPreferences new.
+ myProcess := Processor activeProcess.
+ newPrefs language: lang; languageTerritory: terr.
[
- |rsc lang terr|
-
- lang := terr := eachLang.
- (lang includes:$_) ifTrue:[
- terr := lang copyFrom:4.
- lang := lang copyTo:2.
- ].
- Smalltalk setLanguage:lang asSymbol territory:terr asSymbol.
+ UserPreferences setCurrent:[ Processor activeProcess == myProcess ifTrue:[ newPrefs ] ifFalse:[ oldPrefs value ] ].
readLanguagesFile ifTrue:[
rsc := ResourcePack forPackage:'stx:libtool' resourceFileName:'languages.rs' cached:false.
] ifFalse:[
@@ -7444,7 +7513,7 @@
].
perLanguageResources at:eachLang asSymbol put:rsc.
] ensure:[
- Smalltalk setLanguage:savedLanguage territory:savedLanguageTerritory.
+ UserPreferences setCurrent: oldPrefs.
].
].
readLanguagesFile ifFalse:[
@@ -7567,6 +7636,7 @@
collect:[:lang :flag | LabelAndIcon icon:flag string:lang.].
"Modified: / 18-09-2006 / 19:23:39 / cg"
+ "Modified: / 28-11-2017 / 11:28:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
postBuildHelpLabel:aWidget
@@ -7590,7 +7660,7 @@
lang := Smalltalk language.
terr := Smalltalk languageTerritory.
-
+
(lang ~= terr) ifTrue:[
langIdx := listOfLanguages indexOf:(lang , '-' , terr) ifAbsent:nil.
].
@@ -7623,7 +7693,7 @@
Notice that both the word and its current language translation is matched against
the text in the quick search field"
- ^ super quickSearchStrings
+ ^ super quickSearchStrings
addAll:#('language' 'english');
yourself
! !
@@ -7638,7 +7708,7 @@
the UIHelpTool may not be able to read the specification."
"
- UIHelpTool openOnClass:AbstractSettingsApplication::MemorySettingsAppl
+ UIHelpTool openOnClass:AbstractSettingsApplication::MemorySettingsAppl
"
<resource: #help>
@@ -7709,10 +7779,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Memory Manager Settings'
name: 'Memory Manager Settings'
@@ -7720,7 +7790,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 705 722)
)
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -7739,7 +7809,7 @@
horizontalSpace: 0
verticalSpace: 3
ignoreInvisibleComponents: true
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -7752,7 +7822,7 @@
(ViewSpec
name: 'StackLimitBox'
activeHelpKey: stackLimit
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -7784,14 +7854,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'NewSpaceSizeBox'
activeHelpKey: newSpaceSize
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -7822,14 +7892,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'MaximumMemoryLimitBox'
activeHelpKey: maxOldSpace
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -7860,14 +7930,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'QuickAllocationLimitBox'
activeHelpKey: fastMoreLimit
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -7898,14 +7968,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'OldspaceIncrementBox'
activeHelpKey: oldIncr
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -7936,14 +8006,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'OldSpaceCompressLimitBox'
activeHelpKey: compressLimit
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -7974,14 +8044,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'CodeLimitBox'
activeHelpKey: codeLimit
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -8013,14 +8083,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'MethodSizeLimitBox'
activeHelpKey: methodCodeSizeLimit
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -8052,7 +8122,7 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
@@ -8066,7 +8136,7 @@
(ViewSpec
name: 'IncrementalGCAllocationTriggerBox'
activeHelpKey: igcLimit
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -8097,14 +8167,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'IncrementalGCFreespaceTriggerBox'
activeHelpKey: igcFreeLimit
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -8135,14 +8205,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'CodeTriggerBox'
activeHelpKey: codeTrigger
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -8173,14 +8243,14 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
(ViewSpec
name: 'GCAmountBox'
activeHelpKey: igcFreeAmount
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -8211,16 +8281,16 @@
adjust: left
)
)
-
+
)
extent: (Point 705 34)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -8506,10 +8576,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Communication Settings'
name: 'Communication Settings'
@@ -8517,7 +8587,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 738 671)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -8527,7 +8597,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -8536,7 +8606,7 @@
activeHelpKey: dotNetBridge
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -8546,12 +8616,12 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box6'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -8563,13 +8633,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 696 25)
)
(ViewSpec
name: 'Box7'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -8581,12 +8651,12 @@
translateLabel: true
)
)
-
+
)
extent: (Point 696 25)
)
)
-
+
)
)
(ActionButtonSpec
@@ -8599,7 +8669,7 @@
enableChannel: hasDotNetBridge
)
)
-
+
)
extent: (Point 738 92)
)
@@ -8609,7 +8679,7 @@
activeHelpKey: smalltalkBridgeServer
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -8619,12 +8689,12 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box8'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -8636,13 +8706,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 696 25)
)
(ViewSpec
name: 'Box9'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -8654,12 +8724,12 @@
translateLabel: true
)
)
-
+
)
extent: (Point 696 25)
)
)
-
+
)
)
(ActionButtonSpec
@@ -8672,16 +8742,16 @@
enableChannel: hasSmalltalkBridge
)
)
-
+
)
extent: (Point 738 101)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -8885,10 +8955,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Communication Settings'
name: 'Communication Settings'
@@ -8896,7 +8966,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 738 671)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -8906,7 +8976,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -8915,13 +8985,13 @@
activeHelpKey: smtpServer
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box5'
layout: (LayoutFrame 0 0 10 0 0 1 35 0)
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -8941,20 +9011,20 @@
acceptOnPointerLeave: false
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 738 81)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -9562,10 +9632,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Display settings'
name: 'Display settings'
@@ -9573,7 +9643,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 540 662)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -9583,7 +9653,7 @@
verticalLayout: topSpace
horizontalSpace: 5
verticalSpace: 1
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -9757,7 +9827,7 @@
)
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -9789,13 +9859,13 @@
adjust: left
)
)
-
+
)
extent: (Point 530 92)
)
(ViewSpec
name: 'WindowLabelBox'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -9819,16 +9889,16 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 530 30)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -10149,7 +10219,7 @@
^ super flyByHelpSpec addPairsFrom:#(
#windowMigration
-'The window migration service is available for X-display systems only.\It allows a window to be fetched from your screen and moved to another X-display'
+'The window migration service is available for X-display systems only.\It allows a window to be fetched from your screen and moved to another X-display'
#remoteBrowsing
'The remote browsing service allows for another ST/X system''s browser to request a classes source from your running system'
@@ -10240,10 +10310,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Smalltalk Communication Settings'
name: 'Smalltalk Communication Settings'
@@ -10251,7 +10321,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 751 766)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -10261,7 +10331,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -10270,7 +10340,7 @@
activeHelpKey: windowMigration
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -10280,12 +10350,12 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box2'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -10297,13 +10367,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 696 25)
)
(ViewSpec
name: 'Box3'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -10315,13 +10385,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 696 25)
)
(ViewSpec
name: 'Box4'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -10344,16 +10414,16 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 696 25)
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 751 120)
)
@@ -10363,13 +10433,13 @@
activeHelpKey: remoteBrowsing
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box1'
layout: (LayoutFrame 0 0 5 0 0 1 30 0)
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -10381,11 +10451,11 @@
translateLabel: true
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 751 70)
)
@@ -10395,13 +10465,13 @@
activeHelpKey: smallTeamCommon
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'enableBox'
layout: (LayoutFrame 0 0 8 0 0 1 33 0)
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -10414,7 +10484,7 @@
activeHelpKey: smallTeam
)
)
-
+
)
)
(LabelSpec
@@ -10465,7 +10535,7 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -10489,7 +10559,7 @@
activeHelpKey: removeSmallTeamHost
)
)
-
+
)
)
(CheckBoxSpec
@@ -10549,7 +10619,7 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -10573,7 +10643,7 @@
activeHelpKey: removeSmallTeamXMPPUser
)
)
-
+
)
)
(LabelSpec
@@ -10635,16 +10705,16 @@
activeHelpKey: xmppLoginPassword
)
)
-
+
)
extent: (Point 751 521)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -10696,12 +10766,12 @@
basicSaveSettings
super basicSaveSettings.
self smallTeamServerAvailable ifTrue:[
- SmallTeam connectedHosts copy do:[:host |
+ SmallTeam connectedHosts copy do:[:host |
(self listOfSmallTeamHosts includes:host) ifFalse:[
SmallTeam removeHost:host.
].
].
- self listOfSmallTeamHosts do:[:eachHost |
+ self listOfSmallTeamHosts do:[:eachHost |
SmallTeam addHost:eachHost.
].
self smallTeamServerEnabled value ifTrue:[
@@ -10711,12 +10781,12 @@
].
].
self smallTeamViaXMPPAvailable ifTrue:[
- SmallTeamXMPPRoboter listOfXMPPUsers copy do:[:user |
+ SmallTeamXMPPRoboter listOfXMPPUsers copy do:[:user |
(self listOfXMPPSmallTeamUsers includes:user) ifFalse:[
SmallTeamXMPPRoboter removeUser:user.
].
].
- self listOfXMPPSmallTeamUsers do:[:eachUser |
+ self listOfXMPPSmallTeamUsers do:[:eachUser |
SmallTeamXMPPRoboter addUser:eachUser.
].
currentUserPrefs smallteamXMPPServer:(self smallteamXMPPServer value).
@@ -10736,10 +10806,10 @@
] ifTrue:[
SmalltalkShareServer serverRunning ifFalse:[
SmalltalkShareServer start.
-
+
"/ must wait a bit; give it a chance to
"/ really start (before checking)
-
+
Delay waitForSeconds:0.5.
SmalltalkShareServer serverRunning ifFalse:[
self warn:'SmalltalkShareServer startup failed (see stderr).'
@@ -10760,10 +10830,10 @@
] ifTrue:[
WindowMigrationServer serverRunning ifFalse:[
WindowMigrationServer start.
-
+
"/ must wait a bit; give it a chance to
"/ really start (before checking)
-
+
Delay waitForSeconds:0.5.
WindowMigrationServer serverRunning ifFalse:[
self warn:'WindowMigrationServer startup failed (see stderr).'
@@ -10904,7 +10974,7 @@
!
smallTeamViaXMPPAvailable
- ^ SmallTeam notNil
+ ^ SmallTeam notNil
and:[ JBCClient notNil and:[ SmallTeamXMPPRoboter notNil ] ].
!
@@ -11034,8 +11104,8 @@
^ normalText , (resources stringWithCRs:'\\Disabled because the remoteBrowsing package is not loaded')
]
].
- (#(smallTeamCommon
- smallTeam smallTeamHosts
+ (#(smallTeamCommon
+ smallTeam smallTeamHosts
addSmallTeamHost removeSmallTeamHost
smallTeamViaXMPP
xmppServer xmppLoginUser xmppLoginPassword
@@ -11068,18 +11138,18 @@
^ true
].
(self smallTeamServerAvailable) ifTrue:[
- self smallTeamServerEnabled value
+ self smallTeamServerEnabled value
~= (SmallTeam isLoaded and:[ SmallTeam serverRunning ]) ifTrue:[ ^ true ].
self listOfSmallTeamHosts asSet ~= (SmallTeam connectedHosts asSet) ifTrue:[
^ true
].
].
(self smallTeamViaXMPPAvailable) ifTrue:[
- self smallTeamViaXMPPEnabled value ~= (SmallTeamXMPPRoboter isLoaded
+ self smallTeamViaXMPPEnabled value ~= (SmallTeamXMPPRoboter isLoaded
and:[ SmallTeamXMPPRoboter serverRunning ]) ifTrue:[
^ true
].
- self listOfXMPPSmallTeamUsers asSet
+ self listOfXMPPSmallTeamUsers asSet
~= ((SmallTeamXMPPRoboter listOfXMPPUsers ? #()) asSet) ifTrue:[ ^ true ].
self smallteamXMPPServer value ~= (currentUserPrefs smallteamXMPPServer) ifTrue:[
^ true
@@ -11087,7 +11157,7 @@
self smallteamXMPPUser value ~= (currentUserPrefs smallteamXMPPUser) ifTrue:[
^ true
].
- self smallteamXMPPPassword value
+ self smallteamXMPPPassword value
~= (currentUserPrefs smallteamXMPPPassword) ifTrue:[ ^ true ].
].
(self hasRemoteBrowsingSupport and:[ SmalltalkShareServer isLoaded ]) ifTrue:[
@@ -11107,7 +11177,7 @@
(self windowMigrationPassword value ~= WindowMigrationServer password) ifTrue:[
^ true
].
- (self windowMigrationAuthenticate value
+ (self windowMigrationAuthenticate value
~= self windowMigrationPassword value notNil) ifTrue:[ ^ true ].
].
^ false
@@ -11517,21 +11587,21 @@
hasUnsavedChanges
self updateOSIPackagePresentHolders.
- (self osiACSEPresent value
+ (self osiACSEPresent value
and:[
- self osiACSEErrorLogging value ~= OSI::ACSE errorLogging
- or:[ self osiACSEConnectionLogging value ~= OSI::ACSE connectionLogging
+ self osiACSEErrorLogging value ~= OSI::ACSE errorLogging
+ or:[ self osiACSEConnectionLogging value ~= OSI::ACSE connectionLogging
or:[ self osiACSEDataLogging value ~= OSI::ACSE dataLogging]]]) ifTrue:[^ true].
- (self osiROSEPresent value
+ (self osiROSEPresent value
and:[
- self osiROSEErrorLogging value ~= OSI::ROSE errorLogging
- or:[ self osiROSEInvokationLogging value ~= OSI::ROSE invocationLogging
+ self osiROSEErrorLogging value ~= OSI::ROSE errorLogging
+ or:[ self osiROSEInvokationLogging value ~= OSI::ROSE invocationLogging
or:[ self osiROSEResponseLogging value ~= OSI::ROSE responseLogging]]]) ifTrue:[^ true].
-
- (self osiCMISEPresent value
- and:[
- self osiCMISEErrorLogging value ~= OSI::CMISE errorLogging
+
+ (self osiCMISEPresent value
+ and:[
+ self osiCMISEErrorLogging value ~= OSI::CMISE errorLogging
or:[ self osiCMISEMessageLogging value ~= OSI::CMISE messageLogging]])ifTrue:[^ true].
^ false.
@@ -11547,7 +11617,7 @@
the UIHelpTool may not be able to read the specification."
"
- UIHelpTool openOnClass:AbstractSettingsApplication::MemorySettingsAppl
+ UIHelpTool openOnClass:AbstractSettingsApplication::MemorySettingsAppl
"
<resource: #help>
@@ -11563,7 +11633,7 @@
defaultIcon
<resource: #programImage>
- ^ ToolbarIconLibrary packageOpen24x24Icon
+ ^ ToolbarIconLibrary packageOpen24x24Icon
! !
!AbstractSettingsApplication::PackagePathSettingsAppl class methodsFor:'interface specs'!
@@ -11583,17 +11653,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Package Path Settings'
name: 'Package Path Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 659 287)
)
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -11602,7 +11672,7 @@
layout: (LayoutFrame 0 0 0 0 0 1 0 1)
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -11627,7 +11697,7 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -11649,15 +11719,15 @@
usePreferredHeight: true
)
)
-
+
)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -11695,18 +11765,18 @@
)
!
-listOfFoldersInPath
+listOfFoldersInPath
listOfFoldersInPath isNil ifTrue:[
listOfFoldersInPath := List new.
listOfFoldersInPath addAll:Smalltalk packagePath
- ].
+ ].
^ listOfFoldersInPath
!
-selectedFolder
+selectedFolder
selectedFolder isNil ifTrue:[
selectedFolder := nil asValue.
- ].
+ ].
^ selectedFolder
! !
@@ -11748,10 +11818,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Printer Settings'
name: 'Printer Settings'
@@ -11759,7 +11829,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 601 474)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -11769,12 +11839,12 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'PrinterSelectBox'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -11829,14 +11899,14 @@
acceptOnPointerLeave: false
)
)
-
+
)
extent: (Point 601 108)
)
(ViewSpec
name: 'FormatBox'
visibilityChannel: supportsPageFormatSetting
- component:
+ component:
(SpecCollection
collection: (
(DividerSpec
@@ -11869,14 +11939,14 @@
translateLabel: true
)
)
-
+
)
extent: (Point 601 43)
)
(ViewSpec
name: 'MarginBox'
visibilityChannel: supportsMarginSetting
- component:
+ component:
(SpecCollection
collection: (
(DividerSpec
@@ -11890,12 +11960,12 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -11927,13 +11997,13 @@
useIndex: true
)
)
-
+
)
extent: (Point 601 32)
)
(ViewSpec
name: 'Box2'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -11955,13 +12025,13 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 601 32)
)
(ViewSpec
name: 'Box3'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -11983,13 +12053,13 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 601 32)
)
(ViewSpec
name: 'Box4'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -12011,23 +12081,23 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 601 32)
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 601 164)
)
(ViewSpec
name: 'ColorBox'
visibilityChannel: supportsColorSetting
- component:
+ component:
(SpecCollection
collection: (
(DividerSpec
@@ -12043,16 +12113,16 @@
translateLabel: true
)
)
-
+
)
extent: (Point 601 34)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -12793,10 +12863,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'RDoIt Server Settings'
name: 'RDoIt Server Settings'
@@ -12804,7 +12874,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 601 535)
)
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -12814,7 +12884,7 @@
activeHelpKey: rdoitSettings
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -12824,12 +12894,12 @@
verticalLayout: top
horizontalSpace: 0
verticalSpace: 0
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -12841,13 +12911,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 25)
)
(ViewSpec
name: 'Box2'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -12877,13 +12947,13 @@
enableDisableColorChannel: rDoitsEnabled
)
)
-
+
)
extent: (Point 567 60)
)
(ViewSpec
name: 'Box13'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -12895,13 +12965,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 25)
)
(ViewSpec
name: 'Box3'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -12913,13 +12983,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 25)
)
(ViewSpec
name: 'Box4'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -12931,13 +13001,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 24)
)
(ViewSpec
name: 'Box5'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -12949,16 +13019,16 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 23)
)
)
-
+
)
)
)
-
+
)
)
(FramedBoxSpec
@@ -12968,7 +13038,7 @@
activeHelpKey: scriptingSettings
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -12978,12 +13048,12 @@
verticalLayout: top
horizontalSpace: 0
verticalSpace: 0
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box6'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -12995,13 +13065,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 25)
)
(ViewSpec
name: 'Box12'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -13032,13 +13102,13 @@
adjust: left
)
)
-
+
)
extent: (Point 567 60)
)
(ViewSpec
name: 'Box11'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13050,13 +13120,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 25)
)
(ViewSpec
name: 'Box8'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13068,13 +13138,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 25)
)
(ViewSpec
name: 'Box9'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13086,13 +13156,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 24)
)
(ViewSpec
name: 'Box10'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13104,20 +13174,20 @@
translateLabel: true
)
)
-
+
)
extent: (Point 567 23)
)
)
-
+
)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -13367,17 +13437,17 @@
flyByHelpTextForKey:aKey
|usedKey|
-
+
usedKey := aKey.
usedKey == #rdoitSettings ifTrue:[
self hasRDoitServerClass ifFalse:[
usedKey := #rdoitDisabled
- ].
+ ].
].
usedKey == #scriptingSettings ifTrue:[
self hasScriptingServerClass ifFalse:[
usedKey := #scriptingDisabled
- ].
+ ].
].
^ super flyByHelpTextForKey:usedKey.
!
@@ -13532,17 +13602,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'SQL Server Settings'
name: 'SQL Server Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 600 550)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -13553,12 +13623,12 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'EnableBox'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13570,13 +13640,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 25)
)
(ViewSpec
name: 'PortBox'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -13606,13 +13676,13 @@
enableDisableColorChannel: sqlServerEnabled
)
)
-
+
)
extent: (Point 600 72)
)
(ViewSpec
name: 'LogErrorsBox'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13624,13 +13694,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 25)
)
(ViewSpec
name: 'LogDataBox'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13642,13 +13712,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 23)
)
(ViewSpec
name: 'LogRequestsBox'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13660,13 +13730,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 24)
)
(ViewSpec
name: 'LogSQLBox'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13678,13 +13748,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 24)
)
(ViewSpec
name: 'DebugErrorsBox'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13696,7 +13766,7 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 23)
)
@@ -13706,7 +13776,7 @@
)
(ViewSpec
name: 'EnableSmalltalkBox'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -13718,16 +13788,16 @@
translateLabel: true
)
)
-
+
)
extent: (Point 600 24)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -13949,7 +14019,7 @@
the UIHelpTool may not be able to read the specification."
"
- UIHelpTool openOnClass:AbstractSettingsApplication::STCCompilerSettingsAppl
+ UIHelpTool openOnClass:AbstractSettingsApplication::STCCompilerSettingsAppl
"
<resource: #help>
@@ -14103,10 +14173,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'STC Compiler Settings'
name: 'STC Compiler Settings'
@@ -14114,7 +14184,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 600 602)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -14144,7 +14214,7 @@
adjust: left
)
)
-
+
)
extent: (Point 600 90)
)
@@ -14172,7 +14242,7 @@
useIndex: true
)
)
-
+
)
extent: (Point 600 29)
)
@@ -14200,7 +14270,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14228,7 +14298,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14254,7 +14324,7 @@
lampColor: (Color 100.0 100.0 0.0)
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14282,7 +14352,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14313,13 +14383,13 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 29)
)
(ViewSpec
name: 'CCOptionsBox2'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -14343,13 +14413,13 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
(ViewSpec
name: 'CCIncludeDirectoriesBox2'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -14374,7 +14444,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 29)
)
@@ -14404,7 +14474,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14432,7 +14502,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14460,7 +14530,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14488,7 +14558,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14516,7 +14586,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14544,7 +14614,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14572,7 +14642,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14599,7 +14669,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 600 30)
)
@@ -14630,7 +14700,7 @@
stateChangeCallBackSelector: supportedCCompilerSelectionChanged
)
)
-
+
)
extent: (Point 600 29)
)
@@ -14656,16 +14726,16 @@
lampColor: (Color 100.0 100.0 0.0)
)
)
-
+
)
extent: (Point 600 30)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -14753,7 +14823,7 @@
setupForCLANG
|ccOptions linkArgs linkSharedArgs|
-
+
self cc value:'clang'.
ExternalAddress pointerSize == 4 ifTrue:[
ccOptions := '-O3 -arch x86'.
@@ -14765,10 +14835,10 @@
linkSharedArgs := '-shared -arch x86_64'.
].
OperatingSystem isOSXlike ifTrue:[
- ccOptions := ccOptions , ' -mmacosx-version-min=10.3'.
- linkSharedArgs := linkSharedArgs , ' -mmacosx-version-min=10.3 librun.so'
- ].
-
+ ccOptions := ccOptions , ' -mmacosx-version-min=10.3'.
+ linkSharedArgs := linkSharedArgs , ' -mmacosx-version-min=10.3 librun.so'
+ ].
+
self ccOptions value:ccOptions.
self linkArgs value:linkArgs.
self linkSharedArgs value:linkSharedArgs.
@@ -14787,14 +14857,14 @@
self linkSharedArgs value:'-shared'.
stcPath := self stc value asFilename.
- (stcPath exists not and:[ stcPath isAbsolute ]) ifTrue:[
+ (stcPath exists not and:[ stcPath isAbsolute ]) ifTrue:[
stcPath := OperatingSystem pathOfCommand:'stc'.
].
(stcPath exists and:[stcPath isExecutable]) ifTrue:[
| stcInclude |
stcInclude := stcPath directory / 'include'.
- stcInclude isDictionary ifTrue:[
+ stcInclude isDictionary ifTrue:[
self stcIncludes value:'-I', stcInclude pathName.
].
].
@@ -15224,17 +15294,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Code Format Settings'
name: 'Code Format Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 613 685)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -15244,7 +15314,7 @@
verticalLayout: topSpaceFit
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -15253,12 +15323,12 @@
verticalLayout: bottom
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -15276,13 +15346,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 613 30)
)
(ViewSpec
name: 'Box11'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -15300,13 +15370,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 613 30)
)
(ViewSpec
name: 'Box15'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -15324,13 +15394,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 613 30)
)
(ViewSpec
name: 'Box12'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -15348,13 +15418,13 @@
translateLabel: true
)
)
-
+
)
extent: (Point 613 30)
)
(ViewSpec
name: 'Box13'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -15375,13 +15445,13 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 613 30)
)
(ViewSpec
name: 'Box16'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -15402,7 +15472,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
extent: (Point 613 30)
)
@@ -15412,7 +15482,7 @@
verticalLayout: bottom
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -15432,12 +15502,12 @@
extent: (Point 301 22)
)
)
-
+
)
extent: (Point 613 30)
)
)
-
+
)
extent: (Point 613 180)
)
@@ -15447,7 +15517,7 @@
)
(ViewSpec
name: 'Box14'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -15468,12 +15538,12 @@
postBuildCallback: postBuildTextEditor:
)
)
-
+
)
extent: (Point 613 453)
)
)
-
+
)
)
(CheckBoxSpec
@@ -15484,7 +15554,7 @@
translateLabel: true
)
)
-
+
)
)
! !
@@ -15949,10 +16019,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Source Code Manager Settings'
name: 'Source Code Manager Settings'
@@ -15960,7 +16030,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 660 639)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -15970,7 +16040,7 @@
verticalLayout: topSpace
horizontalSpace: 3
verticalSpace: 20
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -15979,12 +16049,12 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 4
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box3'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -16015,7 +16085,7 @@
adjust: right
)
)
-
+
)
extent: (Point 660 30)
)
@@ -16025,7 +16095,7 @@
activeHelpKey: perPackageConfiguration
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -16036,13 +16106,13 @@
verticalLayout: bottomFit
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'RepositoryConfigurationListBox'
activeHelpKey: perPackageConfiguration
- component:
+ component:
(SpecCollection
collection: (
(DataSetSpec
@@ -16063,7 +16133,7 @@
verticalLayout: top
horizontalSpace: 5
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -16116,7 +16186,7 @@
extent: (Point 119 30)
)
)
-
+
)
)
(ActionButtonSpec
@@ -16128,16 +16198,16 @@
model: actionTest
)
)
-
+
)
extent: (Point 622 262)
)
)
-
+
)
)
)
-
+
)
extent: (Point 660 300)
)
@@ -16147,13 +16217,13 @@
activeHelpKey: sourceCache
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'SourceCacheDirBox'
layout: (LayoutFrame 0 0 0 0 0 1 30 0)
- component:
+ component:
(SpecCollection
collection: (
(FilenameInputFieldSpec
@@ -16175,7 +16245,7 @@
adjust: right
)
)
-
+
)
)
(HorizontalPanelViewSpec
@@ -16185,7 +16255,7 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -16199,7 +16269,7 @@
extent: (Point 150 30)
)
)
-
+
)
)
(HorizontalPanelViewSpec
@@ -16209,7 +16279,7 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -16247,17 +16317,17 @@
extent: (Point 150 30)
)
)
-
+
)
)
)
-
+
)
extent: (Point 660 136)
)
(ViewSpec
name: 'UseLocalSourceBox'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -16270,14 +16340,14 @@
translateLabel: true
)
)
-
+
)
extent: (Point 660 32)
)
(ViewSpec
name: 'KeepMethodSourceBox'
activeHelpKey: keepMethodSourceInImage
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -16290,14 +16360,14 @@
translateLabel: true
)
)
-
+
)
extent: (Point 660 32)
)
(ViewSpec
name: 'CheckForHaltSendsBox'
activeHelpKey: checkClassesWhenCheckingIn
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -16310,14 +16380,14 @@
translateLabel: true
)
)
-
+
)
extent: (Point 660 32)
)
(ViewSpec
name: 'VerboseBox'
activeHelpKey: verboseSourceCodeAccess
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -16330,21 +16400,21 @@
translateLabel: true
)
)
-
+
)
extent: (Point 660 32)
)
)
-
+
)
extent: (Point 660 768)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -16621,24 +16691,24 @@
|cacheDir|
- cacheDir := self sourceCacheDir value.
+ cacheDir := self sourceCacheDir value.
cacheDir isNil ifTrue:[
AbstractSourceCodeManager cachingSources ifTrue:[
AbstractSourceCodeManager initCacheDirPath.
- cacheDir := self sourceCacheDir value.
+ cacheDir := self sourceCacheDir value.
cacheDir isNil ifTrue:[
Dialog information:'Failed to setup a default cache directory. Please enter manually'.
^ self.
- ].
+ ].
] ifFalse:[
(Dialog confirm:'No cache directory defined. Setup now?') ifTrue:[
AbstractSourceCodeManager cachingSources:true.
self browseSourceCache
- ].
- ].
- ].
+ ].
+ ].
+ ].
UserPreferences fileBrowserClass openOn:cacheDir
-
+
"Modified: / 12-10-2011 / 11:11:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -16992,7 +17062,7 @@
selectedPerModuleRootChanged
|module entry firstEntry
removeEnabled perModuleRootModule perModuleRoot|
-
+
self acceptChannel value:true.
module := self selectedPerModuleRoot value.
module isNil ifTrue:[
@@ -17012,7 +17082,7 @@
perModuleRoot := ''.
].
].
-
+
self removeEnabled value:removeEnabled.
self perModuleRootModule value:perModuleRootModule.
self perModuleRoot value:perModuleRoot.
@@ -17269,23 +17339,23 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Per Module Source Code Manager'
name: 'Per Module Source Code Manager'
min: (Point 10 10)
bounds: (Rectangle 0 0 581 98)
)
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Content'
layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
- component:
+ component:
(SpecCollection
collection: (
(ComboBoxSpec
@@ -17322,7 +17392,7 @@
hidePullDownMenuButton: true
)
)
-
+
)
)
(HorizontalPanelViewSpec
@@ -17333,7 +17403,7 @@
horizontalSpace: 3
verticalSpace: 3
reverseOrderIfOKAtLeft: true
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -17352,12 +17422,12 @@
extent: (Point 289 22)
)
)
-
+
)
keepSpaceForOSXResizeHandleH: true
)
)
-
+
)
)
! !
@@ -17493,7 +17563,7 @@
standardStyles
"only those are presented initially"
-
+
^ #(
'adwaita'
"/ 'decWindows'
@@ -17565,28 +17635,28 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'ViewStyle Selection'
name: 'ViewStyle Selection'
min: (Point 10 10)
bounds: (Rectangle 0 0 562 661)
)
- component:
+ component:
(SpecCollection
collection: (
(VariableVerticalPanelSpec
name: 'VariableVerticalPanel1'
layout: (LayoutFrame 0 0.0 0 0 0 1.0 -65 1)
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(TextEditorSpec
@@ -17602,12 +17672,12 @@
viewClassName: 'TextView'
)
)
-
+
)
)
(ViewSpec
name: 'Box2'
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -17617,12 +17687,12 @@
verticalLayout: topFit
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'Box4'
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -17640,7 +17710,7 @@
translateLabel: true
)
)
-
+
)
extent: (Point 562 35)
)
@@ -17655,22 +17725,22 @@
extent: (Point 562 334)
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
)
)
-
+
)
handles: (Any 0.37 1.0)
)
(ViewSpec
name: 'Box3'
layout: (LayoutFrame 0 0 -65 1 0 1 0 1)
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -17683,7 +17753,7 @@
adjust: left
)
)
-
+
)
)
(LabelSpec
@@ -17714,7 +17784,7 @@
model: closePreview
)
)
-
+
)
)
! !
@@ -17829,7 +17899,7 @@
previewFile notEmptyOrNil ifTrue:[
previewImage := Image fromFile:'../../doc/online/pictures' asFilename / previewFile.
- ].
+ ].
previewImage notNil ifTrue:[
labelView label:'Preview'.
imgView adjust:#fitBig; image:previewImage.
@@ -17951,7 +18021,7 @@
emphasisMappingList
"self emphasisMappingList"
-
+
^ {
#( #'normal' #normal ) .
#( #'underline' #underline) .
@@ -17960,14 +18030,14 @@
{ 'red underwave' . { #underwave . (#underlineColor->Color red) } } .
#( #'bold' #bold ) .
#( 'bold + underline' #(bold underline) ) .
- { 'bold + red underline' . { #bold . #underline . (#underlineColor->Color red) } } .
+ { 'bold + red underline' . { #bold . #underline . (#underlineColor->Color red) } } .
#( 'bold + underwave' #(bold underwave) ) .
{ 'bold + red underwave' . { #bold . #underwave . (#underlineColor->Color red) } } .
#( #'italic' #italic ) .
- #( 'italic + underline' #(italic underline) ) .
- { 'italic + red underline'. { #italic . #underline . (#underlineColor->Color red) } } .
- #( 'italic + underwave' #(italic underwave) ) .
- { 'italic + red underwave'. { #italic . #underwave . (#underlineColor->Color red) } } .
+ #( 'italic + underline' #(italic underline) ) .
+ { 'italic + red underline'. { #italic . #underline . (#underlineColor->Color red) } } .
+ #( 'italic + underwave' #(italic underwave) ) .
+ { 'italic + red underwave'. { #italic . #underwave . (#underlineColor->Color red) } } .
#( #'reverse' #reverse )
}
!
@@ -18106,17 +18176,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Syntax Color Settings'
name: 'Syntax Color Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 695 609)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -18126,7 +18196,7 @@
verticalLayout: topSpaceFit
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -18161,7 +18231,7 @@
(ViewSpec
name: 'ElementSelectionBox'
activeHelpKey: elementSelection
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -18183,14 +18253,14 @@
hidePullDownMenuButton: false
)
)
-
+
)
extent: (Point 695 34)
)
(ViewSpec
name: 'ColorBox'
activeHelpKey: colorSelection
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -18210,14 +18280,14 @@
labelsAreColored: true
)
)
-
+
)
extent: (Point 695 34)
)
(ViewSpec
name: 'EmphasisBox'
activeHelpKey: emphasisSelection
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -18239,14 +18309,14 @@
hidePullDownMenuButton: false
)
)
-
+
)
extent: (Point 695 34)
)
(ViewSpec
name: 'ResetBox'
activeHelpKey: resetToCommonStyle
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -18269,7 +18339,7 @@
hidePullDownMenuButton: false
)
)
-
+
)
extent: (Point 695 40)
)
@@ -18297,11 +18367,11 @@
extent: (Point 695 291)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -18326,12 +18396,12 @@
oldUserPreferences := currentUserPrefs copy.
elementColorList := UserPreferences syntaxColorNames.
- elementList := elementColorList
- collect:[:each |
- (each endsWith:' Color')
+ elementList := elementColorList
+ collect:[:each |
+ (each endsWith:' Color')
ifTrue:[ each copyButLast:' Color' size ]
ifFalse:[each]].
-
+
resetListLoc := currentUserPrefs listOfPredefinedSyntaxColoringSchemes
collect:[:entry | entry second].
self resetList value:resetListLoc.
@@ -18353,8 +18423,8 @@
prefs := currentUserPrefs. "/ UserPreferences current.
changedSettings keysAndValuesDo:[:k :v |
prefs at:k put:v
- ].
- changedSettings := Dictionary new.
+ ].
+ changedSettings := Dictionary new.
"/ self flyByHelpSettingChanged. "/ reinstall
self recolor.
super discardChangesAndReadSettings.
@@ -18500,12 +18570,12 @@
syntaxColorChanged
|prefKey|
-
+
prefKey := self syntaxColorSelector.
(changedSettings includesKey:prefKey) ifFalse:[
"/ remember previous value
changedSettings at:prefKey put:(currentUserPrefs at:prefKey ifAbsent:nil).
- ].
+ ].
currentUserPrefs at:prefKey put:(self syntaxColor value).
self recolor.
self updateModifiedChannel
@@ -18568,13 +18638,13 @@
self initializeEmphasisDictionary.
super initialize.
- self syntaxEmphasisList
- value:(self class emphasisList
+ self syntaxEmphasisList
+ value:(self class emphasisList
collect:[:lbl |
lbl emphasizeAllWith:( self getEmphasis:lbl )
]).
- changedSettings := Dictionary new.
+ changedSettings := Dictionary new.
resetListDictionary := Dictionary new.
currentUserPrefs listOfPredefinedSyntaxColoringSchemes do:[:entry |
resetListDictionary at:(entry at:1) put:(entry at:2)
@@ -18586,7 +18656,7 @@
emphasisDictionary := Dictionary new.
self class emphasisMappingList do:[ :mapping |
|name emphasis|
-
+
name := mapping first.
emphasis := mapping second.
emphasisDictionary at:name put:emphasis.
@@ -18612,7 +18682,7 @@
|colorList colorPerformer emphasisPerformer|
oldUserPreferences isNil ifTrue:[^ false].
-
+
colorList := UserPreferences syntaxColorNames.
colorList do:[:syntaxElement |
colorPerformer := (self syntaxColorSelectorForElement:syntaxElement).
@@ -18633,11 +18703,11 @@
syntaxColorSelector
|elementName key|
-
+
elementName := key := self syntaxElementSelection value.
(elementName endsWith:' Color') ifFalse:[
key := elementName,' Color'.
- ].
+ ].
^ (self syntaxColorSelectorForElement:key)
!
@@ -18747,10 +18817,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'System Browser Settings'
name: 'System Browser Settings'
@@ -18758,7 +18828,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 569 590)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -18768,7 +18838,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -18776,7 +18846,7 @@
name: 'ToolsSettingsPanel'
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -18786,7 +18856,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -18871,11 +18941,11 @@
extent: (Point 533 30)
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 569 333)
)
@@ -18884,7 +18954,7 @@
name: 'MenuLayoutPanel'
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -18894,7 +18964,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(RadioButtonSpec
@@ -18928,11 +18998,11 @@
extent: (Point 533 30)
)
)
-
- )
- )
- )
-
+
+ )
+ )
+ )
+
)
extent: (Point 569 135)
)
@@ -18941,7 +19011,7 @@
name: 'LintPanel'
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -18951,12 +19021,12 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ViewSpec
name: 'DefaultRulesetBox'
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -18985,13 +19055,13 @@
model: doSelectDefaultRuleset
)
)
-
+
)
extent: (Point 533 25)
)
(ViewSpec
name: 'Box1'
- component:
+ component:
(SpecCollection
collection: (
(LinkButtonSpec
@@ -19004,27 +19074,27 @@
model: doConfigureRulesets
)
)
-
+
)
extent: (Point 533 25)
)
)
-
+
)
useDynamicPreferredHeight: true
usePreferredHeight: true
)
)
-
+
)
extent: (Point 569 92)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -19373,10 +19443,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Messages Settings'
name: 'Messages Settings'
@@ -19384,7 +19454,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 574 602)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -19394,7 +19464,7 @@
verticalLayout: topSpace
horizontalSpace: 5
verticalSpace: 5
- component:
+ component:
(SpecCollection
collection: (
(FramedBoxSpec
@@ -19402,7 +19472,7 @@
name: 'FramedBox1'
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -19446,7 +19516,7 @@
translateLabel: true
)
)
-
+
)
extent: (Point 564 213)
)
@@ -19455,7 +19525,7 @@
name: 'FramedBox3'
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -19503,7 +19573,7 @@
translateLabel: true
)
)
-
+
)
extent: (Point 564 178)
)
@@ -19512,7 +19582,7 @@
name: 'FramedBox4'
labelPosition: topLeft
translateLabel: true
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -19560,16 +19630,16 @@
translateLabel: true
)
)
-
+
)
extent: (Point 564 108)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -19807,7 +19877,7 @@
OperatingSystem isUNIXlike ifTrue:[
^ ToolbarIconLibrary unixShellTerminal22x22Icon
- ].
+ ].
^ ToolbarIconLibrary terminal16x16Icon
! !
@@ -19828,10 +19898,10 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Terminalview Settings'
name: 'Terminalview Settings'
@@ -19839,7 +19909,7 @@
min: (Point 10 10)
bounds: (Rectangle 0 0 658 543)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -19849,7 +19919,7 @@
verticalLayout: top
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(CheckBoxSpec
@@ -19869,11 +19939,11 @@
extent: (Point 658 30)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -20223,17 +20293,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'ToolSetting'
name: 'ToolSetting'
min: (Point 10 10)
bounds: (Rectangle 0 0 431 60)
)
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -20266,7 +20336,7 @@
acceptOnPointerLeave: true
)
)
-
+
)
)
! !
@@ -21144,7 +21214,7 @@
^ super flyByHelpSpec addPairsFrom:#(
-#usersModuleName
+#usersModuleName
'The name used as top-level module name (in the package-identifier) of your own classes and methods).\Will also be the top-level directory name inside the source code repository\and inside your workspace.'
#workspaceDirectory
@@ -21202,7 +21272,7 @@
constantNamed:'AbstractSettingsApplication::WorkspaceSettingsAppl defaultIcon2'
ifAbsentPut:[(Depth8Image width:24 height:24) bits:(ByteArray fromPackedString:'
@@]YVU%YA0@@@@@@@@@@@@@@@@@@@@@@@E%]WV!!]VP@@@@@@@@@@@@@@@@@@@@@@Q8X,BP$IU5]MSUUU[6=MH0@@@@@@@@@@\TZ (CT"%2^$!!C\]^JT6X @@
-@@@@@@@@\U(TEB TUJEP&DM''S5!!\#0@@@@@@@@@@JWR@RR<LP1=E$GVYD @@^0@@@@@@@@@@%Q\;I!!=_\1%)F0-?@@DB@@@@@@@@@@@@BH,?X6L[B4,@@C1
+@@@@@@@@\U(TEB TUJEP&DM''S5!!\#0@@@@@@@@@@JWR@RR<LP1=E$GVYD @@^0@@@@@@@@@@%Q\;I!!=_\1%)F0-?@@DB@@@@@@@@@@@@BH,?X6L[B4,@@C1
@@DB@@@@@@@@@@@@IH0UX@9 L0@B@P@@@PTE@P@@@PH@@@@@RG80LE9^ @CAPDAAPTEAPDAAPL@@@@@^*M&&))=GA0@@ TEAPTEAPTE@ @@@@@@''%L-TVU,
DRD@@PTE@ LB@ TE@P@@@@@@HEHVQA!!D@@@AAPTB@0@@@0HEAPD@@@@@LSH=OS4@@PDEAPTC@C4=@@LEAPTA@P@@\IQNPG\@@0LEAPTB@G]7@@HEAPTC@0@@
@@@@@@@@@@@B@ TE@P@@@PTE@ H@@@@@@@@@@@@@@@@@@ TEAPDAAPTE@ @@@@@@@@@@@@@@@@@@@PTEAPTEAPTE@P@@@@@@@@@@@@@@@@@AAPHBAPTEAPHC
@@ -21227,17 +21297,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'Workspace Settings'
name: 'Workspace Settings'
min: (Point 10 10)
bounds: (Rectangle 0 0 600 320)
)
- component:
+ component:
(SpecCollection
collection: (
(VerticalPanelViewSpec
@@ -21247,7 +21317,7 @@
verticalLayout: topSpace
horizontalSpace: 3
verticalSpace: 5
- component:
+ component:
(SpecCollection
collection: (
(HorizontalPanelViewSpec
@@ -21257,7 +21327,7 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -21276,7 +21346,7 @@
useDefaultExtent: true
)
)
-
+
)
extent: (Point 600 35)
)
@@ -21287,7 +21357,7 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(LabelSpec
@@ -21306,7 +21376,7 @@
useDefaultExtent: true
)
)
-
+
)
extent: (Point 600 35)
)
@@ -21317,7 +21387,7 @@
verticalLayout: center
horizontalSpace: 3
verticalSpace: 3
- component:
+ component:
(SpecCollection
collection: (
(ActionButtonSpec
@@ -21335,16 +21405,16 @@
useDefaultExtent: true
)
)
-
+
)
extent: (Point 600 35)
)
)
-
+
)
)
)
-
+
)
)
! !
@@ -21357,7 +21427,7 @@
(fn := workspaceDirectory value) notEmptyOrNil ifTrue:[
(fn := fn asFilename) exists ifFalse:[
Dialog warn:'Directory does not exist'.
- ] ifTrue:[
+ ] ifTrue:[
UserPreferences current fileBrowserClass openOn:fn
]
]