hg/stx-libtool: comparison SettingsDialog.st

equal deleted inserted replaced

-:e4480574be19
+:6abedc9963c0
-"{ Encoding: utf8 }"
 "
 COPYRIGHT (c) 2002 by eXept Software AG
 All Rights Reserved
 This software is furnished under a license and may be used
 "{ NameSpace: Smalltalk }"
 ApplicationModel subclass:#SettingsDialog
 	instanceVariableNames:'requestor subCanvasApplicationHolder help doReload doSave
 		enableReload enableHelp enableOK selectedItem applicationList
-		categoryIcons lastSelection whyDisabledInfoHolder'
+		categoryIcons lastSelection whyDisabledInfoHolder
+		quickSearchStringHolder quickSearchFieldShownHolder
+		highlightedWidgetsOriginalAttributes'
 	classVariableNames:'ApplicationList IconList'
 	poolDictionaries:''
 	category:'Interface-Smalltalk'
 !
 (ViewSpec
 name: 'Box1'
 component:
 (SpecCollection
 collection: (
-(HierarchicalListViewSpec
+(VerticalPanelViewSpec
-name: 'HierarchicalListView1'
+name: 'VerticalPanel1'
-layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 -34 1)
+layout: (LayoutFrame 0 0 0 0 0 1 -34 1)
-model: selectedItem
+horizontalLayout: fit
-hasHorizontalScrollBar: true
+verticalLayout: topFit
-hasVerticalScrollBar: true
+horizontalSpace: 3
-listModel: applicationList
+verticalSpace: 3
-useIndex: false
+component:
-highlightMode: label
+(SpecCollection
-showLeftIndicators: false
+collection: (
-indicatorSelector: doIndicatorClick:
+(ViewSpec
+name: 'QuickSearchBox'
+visibilityChannel: quickSearchFieldShownHolder
+component:
+(SpecCollection
+collection: (
+(LabelSpec
+label: 'Quick Search:'
+name: 'Label1'
+layout: (LayoutFrame 0 0 0 0 150 0 0 1)
+translateLabel: true
+adjust: left
+)
+(InputFieldSpec
+name: 'QuickSeachEntryField'
+layout: (LayoutFrame 150 0 0 0 0 1 0 1)
+model: quickSearchStringHolder
+immediateAccept: true
+acceptOnReturn: true
+acceptOnTab: true
+acceptOnPointerLeave: true
+)
+)
+)
+extent: (Point 260 30)
+)
+(HierarchicalListViewSpec
+name: 'HierarchicalListView1'
+model: selectedItem
+hasHorizontalScrollBar: true
+hasVerticalScrollBar: true
+listModel: applicationList
+useIndex: false
+highlightMode: label
+showLeftIndicators: false
+indicatorSelector: doIndicatorClick:
+extent: (Point 260 575)
+)
+)
+)
 )
 (HorizontalPanelViewSpec
 name: 'HorizontalPanel2'
 layout: (LayoutFrame 0 0.0 -34 1 0 1.0 0 1)
 visibilityChannel: loadAndSaveSettingsItemVisible
 name: 'Button3'
 activeHelpKey: saveSettingsToFile
 translateLabel: true
 tabable: true
 model: saveSettingsWithoutAskingForFile
-extent: (Point 126 22)
+extent: (Point 124 22)
 )
 (ActionButtonSpec
 label: 'Load From...'
 name: 'Button2'
 activeHelpKey: loadSettingsFromFile
 translateLabel: true
 tabable: true
 model: loadSettingsFromFile
-extent: (Point 126 22)
+extent: (Point 124 22)
 )
 )
 )
 )
 activeHelpKey: helpOnSettings
 translateLabel: true
 tabable: true
 model: help
 enableChannel: enableHelp
-extent: (Point 163 22)
+extent: (Point 161 22)
 )
 (ActionButtonSpec
 label: 'Discard'
 name: 'Reload'
 activeHelpKey: discardChangedSettings
 translateLabel: true
 tabable: true
 model: doReload
 enableChannel: enableReload
-extent: (Point 163 22)
+extent: (Point 162 22)
 )
 (ActionButtonSpec
 label: 'Apply'
 name: 'Apply'
 activeHelpKey: acceptChangedSettings
 translateLabel: true
 tabable: true
 model: doSave
 enableChannel: enableOK
-extent: (Point 164 22)
+extent: (Point 162 22)
 )
 )
 )
 keepSpaceForOSXResizeHandleH: true
 )
 )
 )
 )
-handles: (Any 0.33750000000000002 1.0)
+handles: (Any 0.33750000000000036 1.0)
 )
 )
 )
 )
 )
 (MenuItem
 label: 'Collapse All'
 itemValue: menuCollapseAll
 )
+(MenuItem
+label: '-'
+)
+(MenuItem
+label: 'Show Search Field'
+indication: quickSearchFieldShownHolder
+)
 )
 nil
 nil
 )
 )
 settingsDialog. I think this has to be reworked..."
 ^ requestor notNil "/ loadAndSaveSettingsItemVisible
 !
+quickSearchFieldShownHolder
+quickSearchFieldShownHolder isNil ifTrue:[
+quickSearchFieldShownHolder := false asValue
+].
+^ quickSearchFieldShownHolder.
+!
+quickSearchStringHolder
+<resource: #uiAspect>
+quickSearchStringHolder isNil ifTrue:[
+quickSearchStringHolder := ValueHolder new.
+quickSearchStringHolder onChangeSend:#quickSearchStringHolderChanged to:self.
+].
+^ quickSearchStringHolder.
+!
 selectedItem
 selectedItem isNil ifTrue:[
 selectedItem := ValueHolder new.
 selectedItem addDependent:self.
 ].
 arguments:#().
 ].
 ^ self
 ].
 oldAppl modifiedChannel removeDependent:self.
+self unhighlightWidgets.
 ].
 item := self selectedItem value.
 item isNil ifTrue:[ item := applicationList root ].
 app readSettings.
 ].
 app modifiedChannel addDependent:self.
 self subCanvasApplicationHolder value:app.
 self modifiedChanged.
+self highlightWidgetsWithMatchingSearchString
 "Modified: / 29-10-2010 / 11:51:13 / cg"
 "Modified: / 17-02-2012 / 10:24:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 saveSettingsWithoutAskingForFile
 self class saveSettingsWithoutAskingForFile.
 self realApplicationsDo:[:app | app clearDidModifySettings].
 ! !
+!SettingsDialog methodsFor:'quick search support'!
+highlightWidgets:aSetOfWidget
+"highlight a matching widget"
+highlightedWidgetsOriginalAttributes := Dictionary new.
+aSetOfWidget do:[:w |
+|perWidget|
+highlightedWidgetsOriginalAttributes at:w put:(perWidget := Dictionary new).
+perWidget at:#borderWidth: put:w borderWidth.
+perWidget at:#borderColor: put:w borderColor.
+w borderWidth:2.
+w borderColor:Color red.
+].
+!
+highlightWidgetsWithMatchingSearchString
+"whenever an app is selected AND a quick search string is present,
+go through the widgets and highlight those which match.
+This is done by looking at the helpkey and model aspects for a match"
+|app searchString pattern words widgetsToHighlight|
+highlightedWidgetsOriginalAttributes notNil ifTrue:[
+self unhighlightWidgets.
+].
+searchString := self quickSearchStringHolder value.
+searchString isEmptyOrNil ifTrue:[^ self].
+pattern := '*',searchString,'*'.
+(app := subCanvasApplicationHolder value) isNil ifTrue:[^ self].
+widgetsToHighlight := Set new.
+words := app quickSearchStrings.
+(words contains:[:word | pattern match:word]) ifTrue:[
+"/ ok - there is a match
+app window withAllSubViewsDo:[:v |
+v helpKey notNil ifTrue:[
+(pattern match:v helpKey caseSensitive:false) ifTrue:[
+|alreadyIn|
+alreadyIn := false.
+v allSuperViewsDo:[:sv | (widgetsToHighlight includes:sv) ifTrue:[ alreadyIn := true]].
+alreadyIn ifFalse:[ widgetsToHighlight add:v ].
+].
+].
+].
+].
+self highlightWidgets:widgetsToHighlight.
+!
+quickSearchStringHolderChanged
+|oldSelection searchString pattern matches|
+oldSelection := self selectedItem value.
+"/ make all labels normal
+applicationList root recursiveDo:[:eachSettingsAppItem |
+eachSettingsAppItem label:(eachSettingsAppItem label string).
+].
+searchString := self quickSearchStringHolder value.
+searchString isEmptyOrNil ifTrue:[^ self].
+pattern := '*',searchString,'*'.
+applicationList root recursiveExpand.
+"/    applicationList root recursiveDo:[:eachSettingsAppItem |
+"/        eachSettingsAppItem expand.
+"/    ].
+matches := OrderedCollection new.
+"/ now search all specs for this word
+applicationList root recursiveDo:[:eachSettingsAppItem |
+|app words|
+eachSettingsAppItem applicationClass notNil ifTrue:[
+(app := eachSettingsAppItem application) isNil ifTrue:[
+eachSettingsAppItem application:(app := eachSettingsAppItem applicationClass new).
+].
+words := app quickSearchStrings.
+(words contains:[:word | pattern match:word caseSensitive:false ]) ifTrue:[
+matches add:eachSettingsAppItem.
+].
+].
+].
+applicationList root children do:[:c | c recursiveCollapse].
+"/ now expand all matches
+matches do:[:eachMatchingItem |
+eachMatchingItem label:(eachMatchingItem label string allBold).
+eachMatchingItem makeVisible
+].
+oldSelection notNil ifTrue:[
+oldSelection makeVisible.
+self selectedItem value:oldSelection.
+].
+!
+unhighlightWidget:aWidget
+"unhighlight a matching widget"
+highlightedWidgetsOriginalAttributes notNil ifTrue:[
+highlightedWidgetsOriginalAttributes keysAndValuesDo:[:widget :oldValues |
+oldValues keysAndValuesDo:[:sel :oldValue |
+widget perform:sel with:oldValue
+].
+].
+highlightedWidgetsOriginalAttributes := nil.
+].
+!
+unhighlightWidgets
+"unhighlight a matching widget"
+highlightedWidgetsOriginalAttributes notNil ifTrue:[
+highlightedWidgetsOriginalAttributes keysAndValuesDo:[:widget :oldValues |
+oldValues keysAndValuesDo:[:sel :oldValue |
+widget perform:sel with:oldValue
+].
+].
+highlightedWidgetsOriginalAttributes := nil.
+].
+! !
 !SettingsDialog methodsFor:'selection'!
 selectItemWithClass:aClass
 "select an item based on the sub-settings application class"
 ! !
 !SettingsDialog::HierarchicalApplicationList::ApplicationItem methodsFor:'queries'!
 canCollapse
-"the rootItem is cannot be collapsed"
+"the rootItem cannot be collapsed"
 "/ first check if we are expanded, if not answer false
 ^ (self isExpanded and:[self isRootItem not])
 !

changeset 16313	6abedc9963c0
parent 16201	639512eafece
child 16315	73c4f82ca456
child 16318	c63c5afa0cc9