hg/stx-libtool: comparison DirectoryContentsBrowser.st

equal deleted inserted replaced

-:106ce16d1669
+:c662c75b6bf9
 ^ 8
 ! !
 !DirectoryContentsBrowser class methodsFor:'image specs'!
-detailsMenuIcon2
+detailsMenuIconDown
 "This resource specification was automatically generated
 by the ImageEditor of ST/X."
 "Do not manually edit this!! If it is corrupted,
 the ImageEditor may not be able to read the specification."
 "
-self detailsMenuIcon2 inspect
+self detailsMenuIconDown inspect
-ImageEditor openOnClass:self andSelector:#detailsMenuIcon2
+ImageEditor openOnClass:self andSelector:#detailsMenuIconDown
 Icon flushCachedIcons
 "
 <resource: #image>
 ^Icon
-constantNamed:#'DirectoryContentsBrowser class detailsMenuIcon2'
+constantNamed:#'DirectoryContentsBrowser class detailsMenuIconDown'
-ifAbsentPut:[(Depth1Image new) width: 11; height: 5; photometric:(#palette); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@@@@@a') ; colorMapFromArray:#[0 0 0 255 255 255]; mask:((Depth1Image new) width: 11; height: 5; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'* AT@B @D@@@@@@a') ; yourself); yourself]
+ifAbsentPut:[(Depth1Image new) width: 7; height: 5; photometric:(#palette); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255]; mask:((Depth1Image new) width: 7; height: 5; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@A@(UJ(b') ; yourself); yourself]
 !
 detailsMenuIconR
 "This resource specification was automatically generated
 by the ImageEditor of ST/X."
 <resource: #image>
 ^Icon
 constantNamed:#'DirectoryContentsBrowser class detailsMenuIconR'
 ifAbsentPut:[(Depth1Image new) width: 5; height: 7; photometric:(#palette); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@@a') ; colorMapFromArray:#[0 0 0 255 255 255]; mask:((Depth1Image new) width: 5; height: 7; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' DB TJA@ @@a') ; yourself); yourself]
-! !
+!
-!DirectoryContentsBrowser class methodsFor:'interface specs'!
+detailsMenuIconUp
-detailsMenuIcon
 "This resource specification was automatically generated
 by the ImageEditor of ST/X."
 "Do not manually edit this!! If it is corrupted,
 the ImageEditor may not be able to read the specification."
 "
-self detailsMenuIcon inspect
+self detailsMenuIconUp inspect
-ImageEditor openOnClass:self andSelector:#detailsMenuIcon
+ImageEditor openOnClass:self andSelector:#detailsMenuIconUp
 Icon flushCachedIcons
 "
 <resource: #image>
 ^Icon
-constantNamed:#'DirectoryContentsBrowser class detailsMenuIcon'
+constantNamed:#'DirectoryContentsBrowser class detailsMenuIconUp'
-ifAbsentPut:[(Depth1Image new) width: 7; height: 5; photometric:(#palette); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255]; mask:((Depth1Image new) width: 7; height: 5; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@W49DPDb') ; yourself); yourself]
+ifAbsentPut:[(Depth1Image new) width: 7; height: 5; photometric:(#palette); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255]; mask:((Depth1Image new) width: 7; height: 5; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'*%P(D@@b') ; yourself); yourself]
-!
+! !
+!DirectoryContentsBrowser class methodsFor:'interface specs'!
 tableColumns
 "This resource specification was automatically generated
 by the DataSetBuilder of ST/X."
 <resource: #tableColumns>
 ^#(
 #(#DataSetColumnSpec
-#label: #detailsMenuIconR
+#label: ''
-#labelIsImage: true
+#id: #icon
 #labelButtonType: #Group
 #labelActionSelector: #showDetailMenu
 #width: 22
 #minWidth: 22
 #height: 16
 self browserItemList contents:browserList asList.
 self selectCurrentFiles.
 self updateColumnsTaskStart.
 !
+currentSortOrderChanged
+self viewedColumnsChanged.
+!
 doResizeImage
 |column w h|
 previewIndex == 0 ifTrue:[^ self].
 self selectionChanged.
 ]
 ].
 ^ self.
 ].
+aModel == self currentSortOrder ifTrue:[
+self currentSortOrderChanged.
+^ self.
+].
 aModel == self filterBlockHolder ifTrue:[
 self matchBlock:self filterBlockHolder value.
 ^ self.
 ].
 aModel == self sortBlockHolder ifTrue:[
 super update:something with:aParameter from:aModel
 !
 viewedColumnsChanged
-| columns buffer |
+| columns buffer currentSortOrder currentSortOrderColumn currentSortOrderReverse|
 columns := OrderedCollection new.
 self class tableColumns do:[:el|
 columns add:(DataSetColumnSpec new fromLiteralArrayEncoding:el).
 ].
 columns remove:col.
 ]
 ]
 ] ifFalse:[
 contentsBrowser showLabels:true.
+currentSortOrder := self currentSortOrder value.
+currentSortOrderColumn := currentSortOrder at:#column ifAbsent:nil.
+currentSortOrderReverse := currentSortOrder at:#reverse ifAbsent:nil.
 buffer do:[:col |
 | id |
 id := col id.
 id notNil ifTrue:[
+(col labelActionArgument notNil and:[col labelActionArgument asSymbol == currentSortOrderColumn]) ifTrue:[
+| label icon|
+label := col label.
+icon := currentSortOrderReverse ifTrue:[self class detailsMenuIconDown] ifFalse:[self class detailsMenuIconUp].
+col label:(LabelAndIcon label:label icon:icon).
+].
 (id == #filename) ifTrue:[
 self viewType value ifTrue:[
 col readSelector:#baseNameWithOutSuffix
+] ifFalse:[
+col readSelector:#baseName
+].
+] ifFalse:[
+(id == #suffix and:[self viewType value not]) ifTrue:[
+columns remove:col.
+] ifFalse:[
+(id == #group and:[self viewGroup value not]) ifTrue:[
+columns remove:col.
 ] ifFalse:[
-col readSelector:#baseName
+(id == #owner and:[self viewOwner value not]) ifTrue:[
-].
+columns remove:col.
-] ifFalse:[
-(id == #suffix and:[self viewType value not]) ifTrue:[
-columns remove:col.
-] ifFalse:[
-(id == #group and:[self viewGroup value not]) ifTrue:[
-columns remove:col.
 ] ifFalse:[
-(id == #owner and:[self viewOwner value not]) ifTrue:[
+(id == #perm and:[self viewPermissions value not]) ifTrue:[
 columns remove:col.
 ] ifFalse:[
-(id == #perm and:[self viewPermissions value not]) ifTrue:[
+(id == #preview and:[self viewPreview value not]) ifTrue:[
 columns remove:col.
 ] ifFalse:[
-(id == #preview and:[self viewPreview value not]) ifTrue:[
+(id == #size and:[self viewSize value not]) ifTrue:[
 columns remove:col.
 ] ifFalse:[
-(id == #size and:[self viewSize value not]) ifTrue:[
+(id == #time and:[self viewTime value not]) ifTrue:[
 columns remove:col.
 ] ifFalse:[
-(id == #time and:[self viewTime value not]) ifTrue:[
+(id == #fileInfo and:[self viewDescription value not]) ifTrue:[
 columns remove:col.
-] ifFalse:[
+]
-(id == #fileInfo and:[self viewDescription value not]) ifTrue:[
+]
-columns remove:col.
-]
-]
 ]
 ]
 ]
 ]
 ]
 makeDependent
 super makeDependent.
 self currentFileNameHolder addDependent:self.
+self currentSortOrder addDependent:self.
 self viewDirectoriesInDirectoryContentsBrowser addDependent:self.
 self filterBlockHolder addDependent:self.
 self sortBlockHolder addDependent:self.
 self viewDescription onChangeSend:#viewedColumnsChanged to:self.
 self viewDetails onChangeSend:#viewedColumnsChanged to:self.
 ! !
 !DirectoryContentsBrowser class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.33 2002-10-22 14:58:15 penk Exp $'
+^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.34 2002-10-22 16:05:06 penk Exp $'
 ! !

changeset 4027	c662c75b6bf9
parent 4026	106ce16d1669
child 4033	3cc51124deaa