hg/stx-libtool: comparison FileApplicationNoteBook.st

equal deleted inserted replaced

-:a20ddffb0618
+:1a5d0cc081b7
 AbstractFileApplicationNoteBookComponent subclass:#ArchiveViewApplication
 	instanceVariableNames:'archiveFileList enableStopButton fileTable currentSortOrder
 		selectionHolder tableColumns commandProcess errorListHolder
 		viewErrorList temporaryDirectory enableRemoveErrorOutput
 		errorListVisibilityHolder hasListEntriesHolder archiver process
-		terminateByMe columnDescriptors inDropMode'
+		terminateByMe columnDescriptors inDropMode selectionIndexHolder'
-	classVariableNames:''
+	classVariableNames:'LastSearchedInName'
 	poolDictionaries:''
 	privateIn:FileApplicationNoteBook
 !
 Object subclass:#ArchivItem
 "
 <resource: #canvas>
 ^
-#(#FullSpec
+#(FullSpec
-#name: #windowSpec
+name: windowSpec
-#window:
+uuid: '7d0661ea-7553-11e8-9d37-b8f6b1108e05'
-#(#WindowSpec
+window:
-#label: 'Archive Application'
+(WindowSpec
-#name: 'Archive Application'
+label: 'Archive Application'
-#min: #(#Point 10 10)
+name: 'Archive Application'
-#bounds: #(#Rectangle 16 46 692 538)
+uuid: '7d066460-7553-11e8-9d37-b8f6b1108e05'
-#menu: #mainMenu
+min: (Point 10 10)
-)
+bounds: (Rectangle 0 0 676 492)
-#component:
+menu: mainMenu
-#(#SpecCollection
+)
-#collection: #(
+component:
-#(#MenuPanelSpec
+(SpecCollection
-#name: 'MenuArchive'
+collection: (
-#layout: #(#LayoutFrame 0 0.0 0 0 0 1.0 32 0)
+(MenuPanelSpec
-#level: 0
+name: 'MenuArchive'
-#menu: #menu
+layout: (LayoutFrame 0 0.0 0 0 0 1.0 32 0)
-#textDefault: true
+uuid: '7d066668-7553-11e8-9d37-b8f6b1108e05'
-)
+level: 0
-#(#'FileBrowserV2UISpecifications::PanelSpec'
+menu: menu
-#name: 'VerticalPanel'
+textDefault: true
-#layout: #(#LayoutFrame 0 0.0 32 0.0 0 1.0 0 1.0)
+)
-#level: 0
+(#'FileBrowserV2UISpecifications::PanelSpec'
-#whichView: #last
+name: 'VerticalPanel'
-#orientation: #vertical
+layout: (LayoutFrame 0 0.0 32 0.0 0 1.0 0 1.0)
-#visibility: #errorListVisibilityHolder
+uuid: '7d06688e-7553-11e8-9d37-b8f6b1108e05'
-#component:
+level: 0
-#(#SpecCollection
+whichView: last
-#collection: #(
+orientation: vertical
-#(#DataSetSpec
+visibility: errorListVisibilityHolder
-#name: 'Table1'
+component:
-#model: #selectionHolder
+(SpecCollection
-#menu: #fileListMenu
+collection: (
-#hasHorizontalScrollBar: true
+(DataSetSpec
-#hasVerticalScrollBar: true
+name: 'Table1'
-#dataList: #archiveFileList
+uuid: '7d066a8c-7553-11e8-9d37-b8f6b1108e05'
-#useIndex: false
+model: selectionIndexHolder
-#has3Dsepartors: false
+menu: fileListMenu
-#doubleClickSelector: #dblClick
+hasHorizontalScrollBar: true
-#columnHolder: #tableColumns
+hasVerticalScrollBar: true
-#multipleSelectOk: true
+dataList: archiveFileList
-#verticalSpacing: 0
+doubleClickSelector: dblClick
-#postBuildCallback: #postBuildFileTable:
+columnHolder: tableColumns
-#properties:
+multipleSelectOk: true
-#(#PropertyListDictionary
+verticalSpacing: 0
-#enterSelector: #dropEnter:
+postBuildCallback: postBuildFileTable:
-#dragArgument: #archivApplication
+properties:
-#startDragSelector: #doStartDrag:in:
+(PropertyListDictionary
-#displayObjectSelector: #getDisplayObjects:
+leaveSelector: dropLeave:
-#dropObjectSelector: #getDropObjects:
+startDragSelector: doStartDrag:in:
-#overSelector: nil
+overSelector: nil
-#dropArgument: #archivApplication
+dragArgument: archivApplication
-#canDropSelector: #canDrop:
+dropSelector: doDrop:
-#leaveSelector: #dropLeave:
+canDropSelector: canDrop:
-#dropSelector: #doDrop:
+dropObjectSelector: getDropObjects:
-)
+enterSelector: dropEnter:
-)
+dropArgument: archivApplication
-#(#SequenceViewSpec
+displayObjectSelector: getDisplayObjects:
-#name: 'ErrorList'
+)
-#initiallyDisabled: true
-#hasHorizontalScrollBar: true
-#hasVerticalScrollBar: true
-#backgroundColor: #(#Color 100.0 100.0 100.0)
-#isMultiSelect: true
-#useIndex: false
-#sequenceList: #errorListHolder
-)
 )
+(SequenceViewSpec
-)
+name: 'ErrorList'
-#handles: #(#Any 0.5 1.0)
+uuid: '7d066e1a-7553-11e8-9d37-b8f6b1108e05'
-)
+initiallyDisabled: true
+hasHorizontalScrollBar: true
+hasVerticalScrollBar: true
+backgroundColor: (Color 100.0 100.0 100.0)
+isMultiSelect: true
+useIndex: false
+sequenceList: errorListHolder
+)
+)
+)
+handles: (Any 0.5 1.0)
 )
+)
-)
 )
+)
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication class methodsFor:'menu specs'!
 fileListMenu
 #(
 #(#MenuItem
 #enabled: #hasListEntriesHolder
 #label: 'Select All'
 #itemValue: #selectAll
+#translateLabel: true
+)
+#(#MenuItem
+#enabled: #hasListEntriesHolder
+#label: 'Find in Name...'
+#itemValue: #findInName
 #translateLabel: true
 )
 #(#MenuItem
 #label: '-'
 )
 #translateLabel: true
 #shortcutKey: #Delete
 )
 #(#MenuItem
 #label: '-'
+"/ #isVisible: #closeButtonShown
 )
 #(#MenuItem
 #enabled: #canViewFile
 #label: 'Show Contents'
 #itemValue: #viewFile
 #translateLabel: true
-#isVisible: #closeButtonShown
+"/ #isVisible: #closeButtonShown
 )
 )
 nil
 nil
 )
 "Modified: / 12-01-2012 / 00:34:13 / cg"
+"Modified: / 21-06-2018 / 14:58:39 / Claus Gittinger"
 !
 menu
 "This resource specification was automatically generated
 by the MenuEditor of ST/X."
 ^ true
 ].
 ^ false
 !
+selection
+^ self selectionHolder value.
+"Created: / 21-06-2018 / 15:04:24 / Claus Gittinger"
+!
 temporaryDirectory
 "return the value of the instance variable 'temporaryDirectory' (automatically generated)"
 temporaryDirectory isNil ifTrue:[
 temporaryDirectory := Filename newTemporaryDirectory.
 self archiveFileList value removeAll.
 !
 copyFilesToClipboard
+"copy the names of the selected files to the clipboard"
 |sel list stream|
-sel := self selectionHolder value.
+sel := self selection.
 list := self archiveFileList.
 (sel notEmptyOrNil) ifTrue:[
 stream := CharacterWriteStream new.
 sel do:[: key |
 stream nextPutAll:(key fileName asString).
 ].
 self window setClipboardText:stream contents.
 ].
 "Modified (format): / 29-11-2011 / 18:57:40 / cg"
+"Modified (comment): / 21-06-2018 / 15:05:13 / Claus Gittinger"
 !
 dblClick
 self viewFile.
 self enableStopButton value:false.
 "Modified (format): / 29-11-2011 / 18:57:50 / cg"
 !
+findInName
+|selIndices pattern startIndex listOfFiles|
+pattern := Dialog request:'Find in Name:'
+initialAnswer:LastSearchedInName.
+pattern isEmptyOrNil ifTrue:[
+^ self
+].
+LastSearchedInName := pattern.
+selIndices := self selectionIndexHolder value.
+selIndices isEmpty ifTrue:[ selIndices := #(1) ].
+startIndex := (selIndices min max:1) + 1.
+listOfFiles := self archiveFileList value.
+startIndex to:(listOfFiles size) do:[:idx |
+|item|
+item := listOfFiles at:idx.
+(item fileName includesString:pattern caseSensitive:false) ifTrue:[
+self selectionIndexHolder value:(Array with:idx).
+^ self
+].
+].
+self device beep.
+"Created: / 21-06-2018 / 15:00:31 / Claus Gittinger"
+!
 removeErrorOutput
 self viewErrorList value:false.
 self errorListHolder removeAll.
 !
 temporaryDirectory := nil.
 ].
 !
 selectAll
+|sel listOfFiles|
-| sel listOfFiles|
-sel := OrderedCollection new.
 listOfFiles := self archiveFileList value.
-1 to:(listOfFiles size) do:[ : el |
+"/    sel := OrderedCollection new.
-sel add:el
+"/    1 to:(listOfFiles size) do:[:el |
-].
+"/        sel add:el
-self selectionHolder value:sel.
+"/    ].
+"/    self selectionHolder value:sel.
+self selectionIndexHolder value:(1 to:(listOfFiles size)).
+"Modified: / 21-06-2018 / 15:07:08 / Claus Gittinger"
 !
 updateFileBrowserIfPresentWith:aDirectory
 | master|
 | master item file tempDir|
 self canViewFile ifFalse:[^ self].
 master := self masterApplication.
-self selectionHolder value size = 1 ifFalse:[
+self selection size = 1 ifFalse:[
-Dialog warn:'only one file have to be selected'.
+Dialog warn:'only one file has to be selected'.
 ^ self.
 ].
 tempDir := self temporaryDirectory.
 self extractSelectedFilesTo:tempDir askForExtractOptions:false.
 process notNil ifTrue:[
 item := DirectoryContentsBrowser itemClass fileName:file.
 ].
 master notNil ifTrue:[
 master openApplByFileItem:item.
 ].
+"Modified: / 21-06-2018 / 15:07:23 / Claus Gittinger"
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'aspects'!
 archiveFileList
 !
 hasSelectionInList
 | sel |
-sel := self selectionHolder value.
+sel := self selection.
 ^ sel notEmptyOrNil
+"Modified: / 21-06-2018 / 15:05:54 / Claus Gittinger"
 !
 selectionHolder
 selectionHolder isNil ifTrue:[
 selectionHolder := ValueHolder new.
 selectionHolder addDependent:self.
 ].
 ^ selectionHolder.
 !
+selectionIndexHolder
+selectionIndexHolder isNil ifTrue:[
+selectionIndexHolder := ValueHolder new.
+selectionIndexHolder addDependent:self.
+].
+^ selectionIndexHolder.
+"Created: / 21-06-2018 / 15:03:42 / Claus Gittinger"
+!
 tableColumns
 tableColumns isNil ifTrue:[
 tableColumns := self class tableColumns asValue.
 ].
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'change & update'!
 update:something with:aParameter from:changedObject
+changedObject == selectionIndexHolder ifTrue:[
+self selectionHolder value:(self selectionIndexHolder value
+collect:[:idx | self archiveFileList at:idx ifAbsent:nil]).
+^ self
+].
 changedObject == self archiveFileList ifTrue:[
 self hasListEntriesHolder value:(changedObject notEmpty).
 ^ self
 ].
 super update:something with:aParameter from:changedObject
+"Modified: / 21-06-2018 / 15:15:17 / Claus Gittinger"
 !
 viewErrorListChanged
 | viewListValue|
 extractSelectionTo:aDirectory askForExtractOptions:askForExtractOptionsBoolean
 |  sel index extractWithDirectoryPart extractAllFilesInSelectedDirectories extractFiles|
 extractWithDirectoryPart := true.
 extractAllFilesInSelectedDirectories := false.
-sel := self selectionHolder value.
+sel := self selection.
 (sel isEmptyOrNil) ifTrue:[
 sel := self archiveFileList value.
 ].
 sel := sel do:[:item|
 item fileName: item fileName
 self extractWithOutDirectoryPartTo:aDirectory with:extractFiles.
 ].
 ^ true
 "Modified (format): / 29-11-2011 / 18:57:54 / cg"
+"Modified: / 21-06-2018 / 15:05:20 / Claus Gittinger"
 !
 extractWithDirectoryPartTo:aDirectory with:extractFiles
 self archiver
 outStream:nil
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'commands remove'!
 removeFilesFromArchive
 |sel realSel list firtsPre stringCol stringRealSel|
-sel := self selectionHolder value.
+sel := self selection.
 stringCol := sel collect:[:item | item fileName].
 firtsPre := stringCol at:1.
 stringCol from:2 do:[:el | firtsPre := firtsPre commonPrefixWith:el].
 list := self archiveFileList value.
 "/    realSel := OrderedCollection new.
 synchron:true.
 self
 makeProcessFor:[ self archiver removeFilesFromArchive:stringCol ]
 with:'Remove files'.
 self archiveFileList value removeAllFoundIn:realSel
+"Modified: / 21-06-2018 / 15:05:58 / Claus Gittinger"
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'drag & drop'!
 canDrop:aContext
 getDisplayObjects:anArgument
 "retrieve the objects displayed during a drag"
 | sel string size fnName stream|
-sel := self selectionHolder value.
+sel := self selection.
 size := sel size.
 size == 0  ifTrue:[^ ''].
 stream := CharacterWriteStream new.
 stream nextPutAll:(sel first fileName asFilename baseName asString).
 string := stream contents.
 ^ Array with:(LabelAndIcon icon:(Image fromFile:fnName) string:(string allBold))
 "Modified: / 20-06-2017 / 08:18:07 / cg"
+"Modified: / 21-06-2018 / 15:05:39 / Claus Gittinger"
 !
 getDropObjects:anArgument
 "common code, used in subclasses"
 |sel|
-sel := self selectionHolder value.
+sel := self selection.
 ^ sel collect:[:el| DropObject newFileInArchive:(el fileName asFilename) ].
+"Modified: / 21-06-2018 / 15:05:45 / Claus Gittinger"
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'event handling'!
 processEvent:anEvent
 "filter keyboard events.
 Return true, if I have eaten the event"
-<resource: #keyboard (#Delete )>
+<resource: #keyboard (#Delete #Find)>
 |focusView key rawKey|
 anEvent isKeyPressEvent ifTrue:[
 focusView := anEvent targetView.
 key := anEvent key.
 rawKey := anEvent rawKey.
 (focusView isSameOrComponentOf:self window) ifTrue:[
 (key == #Delete) ifTrue:[
 self removeFilesFromArchive.
 ^ true
+].
+(key == #Find) ifTrue:[
+self findInName.
+^ true
 ]
 ]
 ].
 ^ false
+"Modified: / 21-06-2018 / 15:20:57 / Claus Gittinger"
 ! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'initialization & release'!
 postBuildFileTable:aWidget
 release
 self archiver release.
 super release.
 ! !
+!FileApplicationNoteBook::ArchiveViewApplication methodsFor:'menus'!
+fileListMenu
+^ [ self class fileListMenu ].
+"Created: / 21-06-2018 / 15:01:53 / Claus Gittinger"
+! !
 !FileApplicationNoteBook::ArchiveViewApplication methodsFor:'queries'!
 canDelete
 ^ (self hasOneSelectionInList and:[archiver class canRemoveFiles])
 !
 hasOneSelectionInList
 | sel |
-sel := self selectionHolder value.
+sel := self selection.
 ^ (sel notNil and:[sel notEmpty and:[sel size = 1]])
+"Modified: / 21-06-2018 / 15:05:50 / Claus Gittinger"
 !
 selRemoveFilesForDirs:aSel
 |stringCol newSel string|

changeset 18236	1a5d0cc081b7
parent 17994	5bf3861b0696
child 18266	0e62cddf5604