hg/stx-libtool: comparison SettingsDialog.st

equal deleted inserted replaced

-:fbe0461cda6b
+:ffab88b8b1e5
 ^ requestor
 !
 requestor:something
-"set the value of the instance variable 'requestor' (automatically generated)"
 requestor := something.
 !
 rootItemLabel
 ^ self applicationList root label.
 ! !
 !SettingsDialog methodsFor:'actions'!
 changeLabelTo:aLabel application:aApplication
 | item |
 item := self getItemByApplication:aApplication.
 item notNil ifTrue:[
 item label:aLabel.
 item changed.
 ].
 !
 destroyAll
+self applicationList do:[ :applItem |
-self applicationList do:[ : applItem |
 (applItem isCategory not and:[applItem application notNil]) ifTrue:[
 applItem application close.
 ].
 ].
 ^ true
 !
 doIndicatorClick:index
-"handle a click on the indicator
+"handle a click on the indicator"
-"
 (self applicationList at:index) toggleExpand
 !
 doReload
 item application saveSettingsIfUnsavedChangesArePresent.
 ].
 !
 expandItemForApplication:aApplication
 | item |
 item := self applicationList detect:[:item | item application = aApplication] ifNone:[nil].
 item notNil ifTrue:[
 item expand
 ].
 !
 help
 | item |
 item := self selectedItem value.
 (item isNil or:[item isCategory or:[item application isNil]]) ifTrue:[ ^ self].
 item application help.
 ].
 ^ true
 !
 sendSaveRequestToAll
 self applicationList do:[ : applItem |
 (applItem isCategory not and:[applItem application notNil]) ifTrue:[
 applItem application saveRequest ifFalse:[
 ^ false
 ].
 ].
 ^ true
 !
 sendSaveRequestToCurrent
 | item |
 item := self selectedItem value.
 (item isNil or:[item isCategory or:[item application isNil]]) ifTrue:[ ^ true].
 self withWaitCursorDo:[
 ! !
 !SettingsDialog methodsFor:'application list access'!
 addApplClass:aClass forApplication:anApplication label:aLabel expand:aBoolean
-" add a application in the to the settingsTree, take the icon from the application class defaultIcon method"
+"add an application to the settingsTree, take the icon from the application classes defaultIcon method"
 | class |
 class := Smalltalk classNamed:aClass.
 class isNil ifTrue:[
 ('SettingsDialog [warning]:cant find ', aClass asString, ' for register') infoPrintCR.
 class autoload.
 ^ self createItemForApplication:anApplication class:aClass label:aLabel icon:class defaultIcon expandParent:aBoolean replaceExisting:false
 !
 addApplClass:aClass withName:aName
-" add a application in the to the settingsTree, take the icon from the application class defaultIcon method"
+"add an application to the settingsTree, take the icon from the application classes defaultIcon method"
 ^ self addApplClass:aClass withName:aName icon:nil.
 !
 addApplClass:aClass withName:aName expand:aBoolean
-" add a application in the to the settingsTree, take the icon from the application class defaultIcon method"
+"add an application to the settingsTree, take the icon from the application classes defaultIcon method"
 ^ self addApplClass:aClass withName:aName icon:nil expand:aBoolean.
 !
 addApplClass:aClass withName:aName icon:icon
 ^ self addApplClass:aClass withName:aName icon:icon expand:false
 !
 addApplClass:aClass withName:aName icon:icon expand:doExpand
 |applicationLabel locIcon locClass|
 "/    (self applicationNames includes:aName) ifTrue:[
 "/        ^ self getItemForName:aName.
 "/    ].
 ^ self createItemName:aName label:(resources string:applicationLabel) class:locClass icon:locIcon expandParent:doExpand replaceExisting:false
 !
 addIcon:aIcon forCategory:aCategoryName
+"add a new category Icon for a category"
-" add a new category Icon for a categorie "
 |existingItem|
 self categoryIcons at:aCategoryName put:aIcon.
 existingItem := self getItemForName:aCategoryName.
 existingItem icon:aIcon
 ].
 !
 applicationNames
 ^ self applicationList collect:[:item | item nameString].
 !
 categoryIcons
 categoryIcons isNil ifTrue:[
 categoryIcons := Dictionary new.
 ].
 ^ categoryIcons
 !
 childrenApplicationItemFor:aApplication fromItem:anItem
 anItem application = aApplication ifTrue:[
 ^ anItem
 ].
 anItem hasChildren ifTrue:[
 anItem children do:[:aChildItem |
 ].
 ^ nil
 !
 getAllChildrenAppsForApplication:aApplication
 ^ self getAllChildrenAppsForApplication:aApplication matchBlock:nil
 !
 getAllChildrenAppsForApplication:aApplication childrenClass:aClass
+|matchBlock|
-| matchBlock |
-matchBlock := [:aSubApplication| aSubApplication class == aClass].
+matchBlock := [:aSubApplication | aSubApplication class == aClass ].
 ^ self getAllChildrenAppsForApplication:aApplication matchBlock:matchBlock
 !
 getAllChildrenAppsForApplication:aApplication matchBlock:aMatchBlock
 | children |
 children := self getAllChildrenByApplication:aApplication.
 aMatchBlock notNil ifTrue:[
 children := children select:[:aChild | aMatchBlock value:(aChild application)]
 ].
 ^ children collect:[:item | item application].
 !
 getAllChildrenByApplication:aApplication
 | item |
 item := self getItemByApplication:aApplication.
 item isNil ifTrue:[ ^ #()].
 ^ item children.
 !
 getApplicationsByClass:aClass
 | classEntries|
 self applicationList isNil ifTrue:[
 self initialize.
 ].
 classEntries := self applicationList select:[:aEntry | aEntry application class == aClass].
 ^ classEntries collect:[:aItem | aItem application].
 !
 getItemByApplication:anApplication
 |item|
 self applicationList do:[:anItem |
 item := self childrenApplicationItemFor:anApplication fromItem:anItem.
 item notNil ifTrue:[ ^ item ].
 ].
 ^ nil
 !
 getNameOfApplication:aApplication
 |item|
 self applicationList do:[:anItem |
 item := self childrenApplicationItemFor:aApplication fromItem:anItem.
 item notNil ifTrue:[ ^ item nameString].
 iconHolderOrNil := entry at:3 ifAbsent:nil.
 self addApplClass:applClassOrNil withName:applName icon:iconHolderOrNil value
 !
 parentApplicationFor:aApplication
 |item parent|
 item := (self getItemByApplication:aApplication).
 parent := item parent.
 parent notNil ifTrue:[
 ].
 ^ nil
 !
 remApplClassByName:aName
-" remove a application from the settingsTree"
+"remove an application from the settingsTree"
 |item|
 item := self getItemForName:aName.
 self removeItem:item
 !
 removeAllApplicationsByClass:aClass
 |apps|
 apps := self getApplicationsByClass:aClass.
 apps do:[:aApp |
 self removeByApplication:aApp.
 ].
 !
 removeAllSubApplicationsFor:aApp
 |apps|
 apps := self getAllChildrenAppsForApplication:aApp.
 apps do:[:aApp |
 self removeByApplication:aApp.
 ].
 !
 removeApplicationByClass:aClass
 | classEntries|
 self applicationList isNil ifTrue:[
 self initialize.
 ].
 self removeItem:aItem.
 ].
 !
 removeApplicationFromTree:aApplication
 | classEntries|
 self applicationList isNil ifTrue:[
 self initialize.
 ].
 ].
 self applicationList removeAllFoundIn:classEntries.
 !
 removeByApplication:aApplication
 | item |
 item := self getItemByApplication:aApplication.
 item notNil ifTrue:[
 self removeItem:item.
 ]
 !
 sortSubApplicationsFor:anApplication
 |item|
 item := self getItemByApplication:anApplication.
 item sort:[:a :b|
 a label < b label
 ! !
 !SettingsDialog methodsFor:'application list access -private'!
 addCategoriesFor:aName
+"create all the categories"
-" create all the categories before application itself
-"
 (aName includes:$/) ifFalse:[ ^ self].
 self treeName:aName butLast:1 do:[:currentLabel :currentName| | length icon|
 currentLabel notEmpty ifTrue:[
 icon := self categoryIcons at:currentName ifAbsent:[nil].
 ]
 ].
 !
 createItemForApplication:anApplication class:aClass label:aLabel icon:aIcon expandParent:expandParent replaceExisting:doReplaceExisting
+"create an application item in my application list"
-" create an application item in my application list
-"
 | newItem parent locIcon item|
 parent := self getItemByApplication:anApplication.
 parent isNil ifTrue:[
 ^ nil
 ].
 ^ newItem
 !
 createItemName:aNameString label:aLabel class:aClass icon:aIcon
 ^ self createItemName:aNameString label:aLabel class:aClass icon:aIcon expandParent:false
 !
 createItemName:aNameString label:aLabel class:aClass icon:aIcon expandParent:expandParent
 ^ self
 expandParent:expandParent
 replaceExisting:true
 !
 createItemName:aNameString label:aLabel class:aClass icon:aIcon expandParent:expandParent replaceExisting:doReplaceExisting
+"create an application item in my application list"
-" create an application item in my application list
-"
 | newItem parentsName parent locIcon item|
 (aNameString includes:$/) ifTrue:[
 parentsName := aNameString copyTo:(aNameString lastIndexOf:$/)-1.
 parent := self getItemForName:parentsName.
 ].
 ^ newItem
 !
 createItemName:aNameString label:aLabel icon:aIcon
+"create an application item in my application list"
-" create an application item in my application list
-"
 self createItemName:aNameString label:aLabel class:nil icon:aIcon expandParent:false
 !
 createItemName:aNameString label:aLabel icon:aIcon replaceExisting:doReplaceExisting
+"create an application item in my application list"
-" create an application item in my application list
-"
 self createItemName:aNameString label:aLabel class:nil icon:aIcon expandParent:false replaceExisting:doReplaceExisting
 !
 getItemForName:aName
 | searchItem|
 searchItem := self applicationList root.
 self treeName:aName do:[:currentLabel :currentName|
 searchItem children isNil ifTrue:[ ^ nil].
 ].
 ^ searchItem
 !
 removeItem:aItem
-" remove a application from the settingsTree"
+"remove a application from the settingsTree"
 |parent remParent|
 aItem application release.
 self applicationList remove:aItem ifAbsent:[nil].
 self selectedItem value:parent.
 !
 treeName:aName butLast:last do:aBlock
 | tree  length|
 tree := aName asCollectionOfSubstringsSeparatedBy:$/.
 tree from:1 to:(tree size - last) keysAndValuesDo:[:idx :aCategory| | itemName |
 length := 0.
 aBlock value:aCategory value:itemName.
 ].
 !
 treeName:aName do:aBlock
 self treeName:aName butLast:0 do:aBlock
 ! !
 !SettingsDialog methodsFor:'aspects'!
 applicationList
 applicationList isNil ifTrue:[
 applicationList := SettingsDialog::HierarchicalApplicationList new.
 ].
 ^ applicationList.
 !
 enableHelp
 enableHelp isNil ifTrue:[
 enableHelp := true asValue.
 ].
 ^ enableHelp.
 !
 enableOK
 enableOK isNil ifTrue:[
 enableOK := true asValue.
 ].
 ^ enableOK.
 !
 enableReload
 enableReload isNil ifTrue:[
 enableReload := true asValue.
 ].
 ^ enableReload.
 !
 selectedItem
 selectedItem isNil ifTrue:[
 selectedItem := ValueHolder new.
 selectedItem addDependent:self.
 ].
 ^ selectedItem.
 !
 subCanvasApplicationHolder
 subCanvasApplicationHolder isNil ifTrue:[
 subCanvasApplicationHolder := ValueHolder new.
 ].
 ^ subCanvasApplicationHolder.
 ! !
 !SettingsDialog methodsFor:'change & update'!
 modifiedChanged
 |changedObject|
 changedObject := self subCanvasApplicationHolder value modifiedChannel.
 self enableOK value:(changedObject value).
 self enableReload value:(changedObject value).
 !
 selectionChanged
 | item oldAppl noApp lbl window app itemLabel|
 self selectedItem value == lastSelection  ifTrue:[ ^ self].
 oldAppl := self subCanvasApplicationHolder value.
 oldAppl notNil ifTrue:[
 |rootItem|
 resources := AbstractLauncherApplication resources.
 rootItem := self class itemClass new.
 rootItem label:(resources string:'Settings') "allBold".
-rootItem nameString:'Settings'.
+rootItem nameString:(resources string:'Settings').
 rootItem icon:self class settingsIcon.
 self applicationList root:rootItem; showRoot:true "false".
 self selectedItem value:rootItem.
 super initialize.
 !
 askForFileAndSaveSettings
 self class askForFileAndSaveSettings.
 !
 loadSettingsFromFile
 "restore settings from a settings-file."
 "a temporary kludge - we need a central systemSettings object for this,
 which can be saved/restored with a single store/read."
 ! !
 !SettingsDialog class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.59 2004-11-11 08:31:05 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/SettingsDialog.st,v 1.60 2004-11-11 09:06:09 cg Exp $'
 ! !
 SettingsDialog initialize!

changeset 6127	ffab88b8b1e5
parent 6126	fbe0461cda6b
child 6293	1c16cd8fdb79