--- a/AbstractFileBrowser.st Mon Jan 09 09:34:51 2006 +0100
+++ b/AbstractFileBrowser.st Mon Jan 09 09:39:30 2006 +0100
@@ -1754,7 +1754,6 @@
label: 'Execute Script...'
itemValue: doExecuteScript
translateLabel: true
- isVisible: true
)
(MenuItem
enabled: canDoTerminal
@@ -1793,18 +1792,6 @@
translateLabel: true
)
(MenuItem
- enabled: hasSnapshotSelection
- label: 'Snapshot Image Browser'
- itemValue: openSnapshotImageBrowser
- translateLabel: true
- )
- (MenuItem
- enabled: canCreateNewProject
- label: 'Create Smalltalk Project'
- itemValue: createProjectAndOpenProjectBrowser
- translateLabel: true
- )
- (MenuItem
label: '-'
)
(MenuItem
@@ -1879,6 +1866,7 @@
label: 'xv (Image Viewer)'
itemValue: openXV
translateLabel: true
+ isVisible: systemIsUnix
)
(MenuItem
enabled: currentFilesAreInSameDirectory
@@ -1892,12 +1880,123 @@
label: 'gv (Postscript Viewer)'
itemValue: openGV
translateLabel: true
+ isVisible: systemIsUnix
+ )
+ (MenuItem
+ enabled: hasMP3PlayerAndSelection
+ label: 'MP3 Player'
+ itemValue: openMP3Player
+ translateLabel: true
+ isVisible: hasMP3Player
)
(MenuItem
enabled: hasFileSelection
label: 'realplay (avi viewer)'
itemValue: openRP
translateLabel: true
+ isVisible: systemIsUnix
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Smalltalk'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ enabled: hasSnapshotSelection
+ label: 'Snapshot Image Browser'
+ itemValue: openSnapshotImageBrowser
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: canCreateNewProject
+ label: 'Create Smalltalk Project'
+ itemValue: createProjectAndOpenProjectBrowser
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ label: 'Show Contents of Resourcefile'
+ itemValue: readAndShowResources
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ label: 'Image'
+ translateLabel: true
+ submenu:
+ (Menu
+ (
+ (MenuItem
+ enabled: hasFileSelection
+ label: 'Image Editor'
+ itemValue: openImageEditor
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasFileSelection
+ label: 'Image Preview'
+ itemValue: openImagePreview
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasFileSelection
+ label: 'Image Inspector'
+ itemValue: openImageInspector
+ translateLabel: true
+ )
+ (MenuItem
+ label: '-'
+ )
+ (MenuItem
+ enabled: hasFileSelection
+ label: 'Convert to GIF'
+ itemValue: convertImageToGIF
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasFileSelection
+ label: 'Convert to PNG'
+ itemValue: convertImageToPNG
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasFileSelection
+ label: 'Convert to XPM'
+ itemValue: convertImageToXPM
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasFileSelection
+ label: 'Convert to JPG'
+ itemValue: convertImageToJPG
+ translateLabel: true
+ )
+ )
+ nil
+ nil
+ )
+ )
+ (MenuItem
+ enabled: hasZipFileSelected
+ label: 'ZipFile Tool'
+ itemValue: openZipTool
+ translateLabel: true
+ )
+ (MenuItem
+ enabled: hasFileSelection
+ label: 'Hex Dump'
+ itemValue: fileHexDump
+ translateLabel: true
)
)
nil
@@ -1905,68 +2004,6 @@
)
)
(MenuItem
- label: 'Image'
- translateLabel: true
- submenu:
- (Menu
- (
- (MenuItem
- enabled: hasFileSelection
- label: 'Image Editor'
- itemValue: openImageEditor
- translateLabel: true
- )
- (MenuItem
- enabled: hasFileSelection
- label: 'Image Preview'
- itemValue: openImagePreview
- translateLabel: true
- )
- (MenuItem
- enabled: hasFileSelection
- label: 'Image Inspector'
- itemValue: openImageInspector
- translateLabel: true
- )
- (MenuItem
- label: '-'
- )
- (MenuItem
- enabled: hasFileSelection
- label: 'Convert to GIF'
- itemValue: convertImageToGIF
- translateLabel: true
- )
- (MenuItem
- enabled: hasFileSelection
- label: 'Convert to PNG'
- itemValue: convertImageToPNG
- translateLabel: true
- )
- (MenuItem
- enabled: hasFileSelection
- label: 'Convert to XPM'
- itemValue: convertImageToXPM
- translateLabel: true
- )
- (MenuItem
- enabled: hasFileSelection
- label: 'Convert to JPG'
- itemValue: convertImageToJPG
- translateLabel: true
- )
- )
- nil
- nil
- )
- )
- (MenuItem
- enabled: hasZipFileSelected
- label: 'ZipFile Tool'
- itemValue: openZipTool
- translateLabel: true
- )
- (MenuItem
label: 'Find'
translateLabel: true
submenu:
@@ -2007,12 +2044,6 @@
translateLabel: true
isVisible: hasNotTwoFilesSelectedHolder
)
- (MenuItem
- enabled: hasFileSelection
- label: 'Hex Dump'
- itemValue: fileHexDump
- translateLabel: true
- )
)
nil
nil
@@ -5267,11 +5298,11 @@
"open a diff-view"
|name1 name2 text1 text2 d err nm l1 files title
- defaultName lastFile sameContents|
-
- files := self currentSelectedFiles.
+ defaultName lastFile sameContents msg|
+
+ files := self currentSelectedObjects.
files isEmpty ifTrue:[
- Dialog warn:'You have to select a file first'.
+ Dialog warn:(resources string:'You have to select a file first').
^ self.
].
(files size == 2) ifTrue:[
@@ -5289,13 +5320,13 @@
]
].
name2 := files first.
- title := 'Show differences between ', name2 baseName, ' and:'.
+ title := resources string:'Show differences between "%1" and:' with:name2 baseName.
defaultName := name1 notNil ifTrue:[name1 baseName] ifFalse:[nil].
name1 := DialogBox
requestFileName:title
default:defaultName
- ok:'OK'
- abort:'Compare against File List'
+ ok:(resources string:'OK')
+ abort:(resources string:'Compare against File List')
pattern:'*'
fromDirectory:(name2 asFilename directory).
].
@@ -5356,16 +5387,29 @@
].
name1 notNil ifTrue:[
- text1 := name1 contents.
+ name1 isDirectory ifTrue:[
+ text1 := name1 directoryContents asString.
+ ] ifFalse:[
+ text1 := name1 contents.
+ ]
].
- text2 := name2 contents.
+ name2 isDirectory ifTrue:[
+ text2 := name2 directoryContents asString.
+ ] ifFalse:[
+ text2 := name2 contents.
+ ].
text1 = text2 ifTrue:[
- self information:'Same contents.'
+ (name1 isDirectory or:[name2 isDirectory]) ifTrue:[
+ msg := 'Same filename lists.'
+ ] ifFalse:[
+ msg := 'Same contents.'
+ ].
+ self information:(resources string:msg)
] ifFalse:[
d := DiffTextView
openOn:text1 label:l1
and:text2 label:name2 pathName.
- d topView label:'File Differences'.
+ d topView label:(resources string:'File Differences').
]
]
!
@@ -5592,6 +5636,18 @@
]
!
+readAndShowResources
+ self withActivityIndicationDo:[
+ | selectedFiles|
+
+ selectedFiles:= self currentSelectedFiles.
+ selectedFiles do:[:fileName |
+ resources := ResourcePack fromFile:fileName.
+ resources inspect.
+ ].
+ ]
+!
+
singleFileFileIn:fileName lazy:lazy
"fileIn the selected file(s)"
@@ -6345,15 +6401,17 @@
!AbstractFileBrowser methodsFor:'selection'!
currentSelectedDirectories
-
^ self currentDirectories value.
!
currentSelectedFiles
-
^ self currentFileNameHolder value select:[:file | file isDirectory not].
!
+currentSelectedObjects
+ ^ self currentFileNameHolder value
+!
+
firstSelectedFile
^ self currentFileNameHolder value
detect:[:file | file asFilename isDirectory not]
@@ -6850,5 +6908,5 @@
!AbstractFileBrowser class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.310 2005-12-27 16:26:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.311 2006-01-09 08:39:19 cg Exp $'
! !
--- a/FileBrowserV2.st Mon Jan 09 09:34:51 2006 +0100
+++ b/FileBrowserV2.st Mon Jan 09 09:39:30 2006 +0100
@@ -968,15 +968,6 @@
#(Menu
(
(MenuItem
- activeHelpKey: directoryUp
- enabled: enableDirectoryUp
- label: 'DirectoryUp'
- itemValue: doGoDirectoryUp
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever ToolbarIconLibrary directoryUpIcon)
- )
- (MenuItem
activeHelpKey: directoryBack
enabled: enableBack
label: 'Back'
@@ -1000,7 +991,16 @@
labelImage: (ResourceRetriever ToolbarIconLibrary historyForwardIcon)
)
(MenuItem
- label: ''
+ label: '-'
+ )
+ (MenuItem
+ activeHelpKey: directoryUp
+ enabled: enableDirectoryUp
+ label: 'DirectoryUp'
+ itemValue: doGoDirectoryUp
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary directoryUpIcon)
)
(MenuItem
activeHelpKey: fileHome
@@ -1039,9 +1039,6 @@
labelImage: (ResourceRetriever ToolbarIconLibrary directoryBookmarksIcon)
)
(MenuItem
- label: ''
- )
- (MenuItem
activeHelpKey: fileHistory
enabled: enableFileHistory
label: 'File History'
@@ -1051,6 +1048,14 @@
labelImage: (ResourceRetriever ToolbarIconLibrary historyIcon)
)
(MenuItem
+ activeHelpKey: searchFile
+ label: 'Search File'
+ itemValue: doOpenSearchFile
+ translateLabel: true
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary searchFileIcon)
+ )
+ (MenuItem
label: '-'
)
(MenuItem
@@ -1101,6 +1106,9 @@
labelImage: (ResourceRetriever ToolbarIconLibrary editFileIcon)
)
(MenuItem
+ label: '-'
+ )
+ (MenuItem
activeHelpKey: fileIn
label: 'File In'
itemValue: fileFileIn
@@ -1121,14 +1129,6 @@
label: '-'
)
(MenuItem
- activeHelpKey: searchFile
- label: 'Search File'
- itemValue: doOpenSearchFile
- translateLabel: true
- isButton: true
- labelImage: (ResourceRetriever ToolbarIconLibrary searchFileIcon)
- )
- (MenuItem
activeHelpKey: addTerminal
label: 'VT100'
itemValue: doAddTerminal
@@ -1633,6 +1633,12 @@
^ menu
! !
+!FileBrowserV2 methodsFor:'queries'!
+
+getAllFilesAsStrings
+ ^ self directoryContentsBrowser getAllFilesAsStrings
+! !
+
!FileBrowserV2 methodsFor:'startup & release'!
closeRequest
@@ -1721,7 +1727,7 @@
!FileBrowserV2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.143 2005-12-27 16:25:50 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.144 2006-01-09 08:39:30 cg Exp $'
! !
FileBrowserV2 initialize!