hg/stx-libtool: comparison AbstractLauncherApplication.st

equal deleted inserted replaced

-:f9f20407fbf9
+:c4cce8b7a95d
 		packageIcon greyPackageIcon folderIcon greyFolderIcon
 		alreadyLoadedString applicationIcon greyApplicationIcon root
 		itemsByPath getItemByPath myHierarchicalItemWithLabelAndIcon
 		filterHolder masterRoot infoTextHolder loadButton
 		loadAndBrowseButton selectedPackageHolder monticelloRoot
-		backgroundPackageFindProcess'
+		backgroundPackageFindProcess itemsMatchingFilter'
 	classVariableNames:'PreviousPackageDialogItems PreviousPackageDialogExtent'
 	poolDictionaries:''
 	privateIn:AbstractLauncherApplication
+!
+HierarchicalItemWithLabelAndIcon subclass:#MyHierarchicalItem
+	instanceVariableNames:'type info'
+	classVariableNames:''
+	poolDictionaries:''
+	privateIn:AbstractLauncherApplication::PackageLoadDialog
 !
 !AbstractLauncherApplication class methodsFor:'documentation'!
 copyright
 ].
 OpenSettingsDialog := nil.
 ].
 settingsApp := SettingsDialog new.
+settingsApp resources:(AbstractLauncherApplication resources).
 settingsApp requestor:requestor.
 settingsApp installSettingsEntries:(self allSettingsList).
 "/ settingsApp requestor:self.
 OpenSettingsDialog := settingsApp.
 settingsApp allButOpen.
 !
 requestForWindowClose
 "close request from windowing system (window close);
 confirm and ask if closing of launcher only or
-a smalltalk-exit is wanted"
+a Smalltalk-exit is wanted"
 |answer|
 answer := Dialog
 confirmWithCancel:(resources string:'Close %1 only or Exit Smalltalk (Close all) ?' with:self class name)
 answer ifFalse:[
 ^ true
 ].
-self exit
+self exit.
+"/ not reached
+^ false
 "Modified: / 20.5.1999 / 17:24:47 / cg"
 !
 saveAndTerminateRequest
 WindowTreeView openOnAll
 !
 viewBrowse
 "let user pick a view and browse its Application class.
-Of course, only smalltalk views are allowed"
+Of course, only Smalltalk views are allowed"
 |v app appClass browser|
 (v := self pickAView) notNil ifTrue:[
 browser := UserPreferences browserClass.
 "Created: / 30-06-2011 / 22:59:03 / cg"
 !
 viewDestroy
 "let user pick a view and destroy it.
-Even allow destroying non-smalltalk views
+Even allow destroying non-Smalltalk views
 (also for views which I forgot due to some error)"
 |screen v id i c|
 Delay waitForSeconds:1.
 "Modified: / 27-04-2012 / 13:24:23 / cg"
 !
 viewInspect
 "let user pick a view and inspect it.
-Of course, only smalltalk views are allowed"
+Of course, only Smalltalk views are allowed"
 |v|
 (v := self pickAView) notNil ifTrue:[
 v inspect
 ]
 !
 viewMigrate
 "let user pick a view and migrate it to some other display.
-Only smalltalk views are allowed"
+Only Smalltalk views are allowed"
 |v|
 (v := self pickAView) notNil ifTrue:[
 self migrateWindow:v topView
 filterHolder := ValueHolder with:nil.
 itemsByPath := Dictionary new.
 packageIdByItem := IdentityDictionary new.
 pathByItem := IdentityDictionary new.
-Class withoutUpdatingChangesDo:[
-myHierarchicalItemWithLabelAndIcon :=
-HierarchicalItemWithLabelAndIcon
-subclass:#myHierarchicalItemWithLabelAndIcon
-instanceVariableNames:'type info'
-classVariableNames:''
-poolDictionaries:''
-category:nil
-inEnvironment:nil.
-myHierarchicalItemWithLabelAndIcon compile:'type ^ type'.
-myHierarchicalItemWithLabelAndIcon compile:'type:aSymbol type := aSymbol'.
-myHierarchicalItemWithLabelAndIcon compile:'info ^ info'.
-myHierarchicalItemWithLabelAndIcon compile:'info:anObject info := anObject'.
-].
 list := HierarchicalList new.
-masterRoot := myHierarchicalItemWithLabelAndIcon new.
+masterRoot := MyHierarchicalItem new.
 masterRoot icon:(ToolbarIconLibrary stxHomeIcon).
 masterRoot label:(resources string:'local ').
 masterRoot type:#localRoot.
-root := myHierarchicalItemWithLabelAndIcon new.
+root := MyHierarchicalItem new.
 root icon:folderIcon.
 root label:((resources string:'[Compiled Packages]') asText allItalic withColor:Color grey).
 root type:#compiledPackagesRoot.
 masterRoot add:root.
-monticelloRoot := myHierarchicalItemWithLabelAndIcon new.
+monticelloRoot := MyHierarchicalItem new.
 monticelloLabel := ((resources string:'[Monticello Packages]') asText allItalic withColor:Color grey).
 monticelloRoot type:#monticelloRoot.
 (MCRepositoryGroup isNil or:[MCRepositoryGroup isLoaded not]) ifTrue:[
 monticelloRoot icon:greyFolderIcon.
 ]
 ].
 !
 filterChangedAction
-|matchingItems filterPattern isMatch firstMatchingItem|
+|newMatchingItems filterPattern isMatch firstMatchingItem|
 filterPattern := filterHolder value.
 filterPattern isEmptyOrNil ifTrue:[
-"/ nothing
+itemsMatchingFilter notEmptyOrNil ifTrue:[
-root recursiveDo:[:item |
+"/ nothing
-item label:(item label copy asText allNonBold withoutAnyColorEmphasis).
-].
-] ifFalse:[
-filterPattern := filterPattern asLowercase.
-isMatch := filterPattern includesMatchCharacters.
-matchingItems := OrderedCollection new.
-masterRoot recursiveDo:[:item |
-|itemLabel itemPackage|
-itemLabel := item label.
-itemPackage := packageIdByItem at:item ifAbsent:''.
-((isMatch and:[itemLabel matches:filterPattern caseSensitive:false])
-or:[ (isMatch not and:[ itemLabel asLowercase includesString:filterPattern ])
-or:[ (isMatch and:[itemPackage matches:filterPattern caseSensitive:false])
-or:[ isMatch not and:[ itemPackage asLowercase includesString:filterPattern ]]]])
-ifTrue:[
-matchingItems add:item.
-]
-].
-matchingItems isEmpty ifTrue:[
-"/ nothing found
 root recursiveDo:[:item |
 item label:(item label copy asText allNonBold withoutAnyColorEmphasis).
 ].
-Screen current beep.
+].
-] ifFalse:[
+itemsMatchingFilter := #().
-"/ collapse all and fully expand all matching items
+^ self.
-masterRoot recursiveDo:[:item |
+].
-item collapse.
-item label:(item label copy asText allNonBold withColor:Color grey).
+filterPattern := filterPattern asLowercase.
-].
+isMatch := filterPattern includesMatchCharacters.
-firstMatchingItem := nil.
-matchingItems do:[:item |
+newMatchingItems := OrderedCollection new.
-item label:(item label copy asText allBold withoutAnyColorEmphasis).
+masterRoot recursiveDo:[:item |
-item makeVisible.
+|itemLabel itemPackage|
-firstMatchingItem := firstMatchingItem ? item.
-].
+itemLabel := item label.
-hierarchicalListView makeLineVisible:firstMatchingItem listIndex.
+itemPackage := packageIdByItem at:item ifAbsent:''.
-].
-].
+((isMatch and:[itemLabel matches:filterPattern caseSensitive:false])
+or:[ (isMatch not and:[ itemLabel asLowercase includesString:filterPattern ])
+or:[ (isMatch and:[itemPackage matches:filterPattern caseSensitive:false])
+or:[ isMatch not and:[ itemPackage asLowercase includesString:filterPattern ]]]])
+ifTrue:[
+newMatchingItems add:item.
+]
+].
+(newMatchingItems sameContentsAs:itemsMatchingFilter) ifTrue:[
+^ self
+].
+newMatchingItems isEmpty ifTrue:[
+"/ nothing found
+root recursiveDo:[:item |
+item label:(item label copy asText allNonBold withoutAnyColorEmphasis).
+].
+Screen current beep.
+] ifFalse:[
+"/ collapse all and fully expand all matching items
+masterRoot recursiveDo:[:item |
+item collapse.
+item label:(item label copy asText allNonBold withColor:Color grey).
+].
+firstMatchingItem := nil.
+newMatchingItems do:[:item |
+item label:(item label copy asText allBold withoutAnyColorEmphasis).
+item makeVisible.
+firstMatchingItem := firstMatchingItem ? item.
+].
+hierarchicalListView makeLineVisible:firstMatchingItem listIndex.
+].
+itemsMatchingFilter := newMatchingItems.
 !
 getItemByPath:path packageID:packageID under:aRoot
 "/ ensures an item for a path and returns it.
 "/ if not already present, the item is created as a folder
 item := path isEmpty
 ifTrue:[aRoot]
 ifFalse:[ itemsByPath at:( {aRoot label},path) ifAbsent:nil ].
 item isNil ifTrue:[
 parent := self getItemByPath:(path copyButLast) packageID:packageID under:aRoot.
-item := myHierarchicalItemWithLabelAndIcon new
+item := MyHierarchicalItem new
 children:#();
 icon:greyFolderIcon;
 label:path last.
 parent add:item.
 itemsByPath at:( {aRoot label},path) put:item.
 (MCRepositoryGroup default repositories
 asSortedCollection:[:a :b |a displayString < b displayString])
 do:[:each |
 |reposItem|
-reposItem := myHierarchicalItemWithLabelAndIcon new.
+reposItem := MyHierarchicalItem new.
 reposItem icon:folderIcon.
 reposItem label:each displayString , ((resources string:' [MC Repository]') asText allItalic withColor:Color grey).
 reposItem type:#monticelloRepository.
 reposItem info:each.
 monticelloRoot add:reposItem.
 each allPackageNames asSortedCollection do:[:eachPackage |
 |packageItem|
-packageItem := myHierarchicalItemWithLabelAndIcon new.
+packageItem := MyHierarchicalItem new.
 packageItem icon:packageIcon.
 packageItem label:eachPackage.
 packageItem type:#monticelloPackage.
 reposItem add:packageItem.
 ]
 |path|
 path := subDir asFilename components.
 (itemsByPath at:( {root label},path) ifAbsent:nil) isNil ifTrue:[
 folderRoot isNil ifTrue:[
-folderRoot := myHierarchicalItemWithLabelAndIcon new.
+folderRoot := MyHierarchicalItem new.
 folderRoot icon:folderIcon.
 folderRoot label:((resources string:'[%1]' with:eachDirName) asText allItalic withColor:Color grey).
 folderRoot type:#compiledPackagesRoot.
 ].
 self
 ].
 ].
 ].
 ! !
+!AbstractLauncherApplication::PackageLoadDialog::MyHierarchicalItem methodsFor:'accessing'!
+info
+^ info
+!
+info:something
+info := something.
+!
+type
+^ type
+!
+type:something
+type := something.
+! !
 !AbstractLauncherApplication class methodsFor:'documentation'!
 version
 ^ '$Header$'
 !

branch	jv
changeset 17134	c4cce8b7a95d
parent 17133	f9f20407fbf9
parent 16974	0159bd547729
child 17136	cb908d2ba02e