--- a/SettingsDialog.st Fri Jan 27 22:18:53 2012 +0100
+++ b/SettingsDialog.st Sun Jan 29 12:53:39 2012 +0000
@@ -190,11 +190,11 @@
#('Processor & Scheduler' #'AbstractSettingsApplication::ProcessorSchedulerSettingsAppl' )
#('Tools' #'AbstractSettingsApplication::ToolsSettingsAppl' )
#('Tools/Editor' #'AbstractSettingsApplication::EditSettingsAppl' )
- #('Tools/Editor/Code Editor 2' #'Tools::CodeView2SettingsAppl' )
- #('Tools/Editor/Syntax Color' #'AbstractSettingsApplication::SyntaxColorSettingsAppl' )
- #('Tools/Editor/Code Format' #'AbstractSettingsApplication::SourceCodeFormatSettingsAppl' )
+ #('Tools/Syntax Color' #'AbstractSettingsApplication::SyntaxColorSettingsAppl' )
+ #('Tools/Code Editor 2' #'Tools::CodeView2SettingsAppl' )
+ #('Tools/Code Format' #'AbstractSettingsApplication::SourceCodeFormatSettingsAppl' )
+ #('Tools/Code Generator' #'AbstractSettingsApplication::CodeGeneratorSettingsAppl' )
#('Tools/System Browser' #'AbstractSettingsApplication::SystemBrowserSettingsAppl' )
- #('Tools/System Browser/Code Generator' #'AbstractSettingsApplication::CodeGeneratorSettingsAppl' )
#('Tools/Changes' #'AbstractSettingsApplication::ChangeFileSettingsAppl' )
#('Tools/Debugger' #'AbstractSettingsApplication::DebuggerSettingsAppl' )
#('Tools/Compiler' #'AbstractSettingsApplication::GeneralCompilerSettingsAppl' )
@@ -225,8 +225,8 @@
) asOrderedCollection
"Modified: / 16-12-2002 / 18:12:28 / penk"
+ "Modified: / 19-04-2011 / 12:55:22 / cg"
"Modified: / 26-07-2011 / 10:42:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
- "Modified: / 25-11-2011 / 15:28:42 / cg"
!
expandParents
@@ -565,13 +565,7 @@
!
showRoot:aBoolean
-
- self applicationList showRoot:aBoolean.
- aBoolean ifFalse:[
- self applicationList root children do:[:e|e expand].
- ]
-
- "Modified: / 15-10-2011 / 12:06:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+ self applicationList showRoot:aBoolean
! !
!SettingsDialog methodsFor:'actions'!
@@ -850,18 +844,6 @@
].
!
-installSettingsEntries: entries expand: expand
-
- "Installs given settings list. If expand is true,
- dynamic settings list is expanded"
-
- entries do:[ :entry|
- self installSettingsEntry:entry expand: expand
- ].
-
- "Created: / 15-10-2011 / 11:45:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
installSettingsEntry:entry
|applName applClassOrNil iconHolderOrNil|
@@ -871,77 +853,6 @@
self addApplClass:applClassOrNil withName:applName icon:iconHolderOrNil value
!
-installSettingsEntry:entry expand: expand
-
- | applName applClassOrNil iconHolderOrNil cookedList className code classList name nameCode nameBlock nameList|
-
- expand ifFalse:[
- applName := entry at:1.
- applClassOrNil := entry at:2.
- iconHolderOrNil := entry at:3 ifAbsent:nil.
- self addApplClass:applClassOrNil withName:applName icon:iconHolderOrNil value.
- ^self
- ].
-
- cookedList := OrderedCollection new.
-
- className := entry at:2 ifAbsent:nil.
- (className notNil and:[className startsWith:'[']) ifTrue:[
- code := className copyFrom:2 to:(className size - 1).
- classList := (Parser evaluate:code) select:[:clsOrNil | clsOrNil notNil].
- name := entry at:1.
- self assert:(name includesString:'[').
-
- nameCode := name copyFrom:(name indexOf:$[)+1 to:(name indexOf:$])-1.
- nameCode := '^ [:each | ' , (nameCode copyReplaceString:'%' withString:'each') ,']'.
- nameBlock := Parser evaluate:nameCode.
-
- nameList := classList collect:nameBlock.
- nameList sortWith:classList.
- nameList with:classList do:[:eachName :eachClass |
- |newEntry|
-
- newEntry := entry copy.
- newEntry at:1 put:(name copyTo:(name indexOf:$[)-1),eachName.
- newEntry at:2 put:eachClass name.
- cookedList add:newEntry.
- ].
- ] ifFalse:[
- (className isNil "a directory entry"
- or:[ (Smalltalk at:className) notNil "a valid entry"]) ifTrue:[
- cookedList add:entry.
- ].
- ].
-
- cookedList do:[:eachEntry |
- |iconCodeOrSelector iconCode iconBlock newEntry|
-
- iconCodeOrSelector := eachEntry at:3 ifAbsent:nil.
- iconCodeOrSelector isNil ifTrue:[
- newEntry := eachEntry
- ] ifFalse:[
- newEntry := eachEntry copy.
- (iconCodeOrSelector startsWith:'[') ifTrue:[
- iconCode := iconCodeOrSelector copyFrom:(iconCodeOrSelector indexOf:$[)+1 to:(iconCodeOrSelector indexOf:$])-1.
- iconCode := '^ [:each | ' , (iconCode copyReplaceString:'%' withString:'each') ,']'.
- iconBlock := Parser evaluate:iconCode.
- newEntry at:3 put:(iconBlock value:(Smalltalk classNamed:(eachEntry at:2))).
- ] ifFalse:[
- newEntry at:3 put:(self perform:iconCodeOrSelector).
- ].
- ].
- self installSettingsEntry:newEntry expand: false.
- ].
-
- "
- self withAllSubclassesDo:[:cls | cls initializeSettingsList ]
- "
-
- "Modified: / 16-12-2002 / 18:12:50 / penk"
- "Modified: / 20-04-2011 / 17:03:33 / cg"
- "Created: / 15-10-2011 / 11:49:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-!
-
parentApplicationFor:aApplication
|item parent|
@@ -1420,12 +1331,8 @@
postOpenWith:aBuilder
self rootItem expand.
super postOpenWith:aBuilder.
- self rootItem children size == 1 ifTrue:[
- self selectedItem value: self rootItem children anyOne.
- ]
"Modified: / 03-11-2007 / 14:23:25 / cg"
- "Modified: / 03-10-2011 / 16:27:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!SettingsDialog methodsFor:'menu actions'!
@@ -1569,15 +1476,15 @@
!SettingsDialog class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.97 2011-11-25 14:44:20 cg Exp $'
+ ^ '$Id: SettingsDialog.st 7810 2011-08-12 14:54:02Z vranyj1 $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.97 2011-11-25 14:44:20 cg Exp $'
+ ^ '§Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.94 2011/07/26 09:50:44 vrany Exp §'
!
version_SVN
- ^ '§Id§'
+ ^ '$Id: SettingsDialog.st 7810 2011-08-12 14:54:02Z vranyj1 $'
! !
-SettingsDialog initialize!
+SettingsDialog initialize!
\ No newline at end of file