Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Tue, 11 May 2004 16:36:12 +0200
changeset 5830 fd5a247d6fb3
parent 5829 7a217cbb0dd4
child 5831 6db521464804
*** empty log message ***
AbstractFileBrowser.st file | annotate | diff | comparison | revisions 
--- a/AbstractFileBrowser.st	Tue May 11 14:53:59 2004 +0200
+++ b/AbstractFileBrowser.st	Tue May 11 16:36:12 2004 +0200
@@ -2082,252 +2082,260 @@
     <resource: #menu>
 
     ^ 
-     #(#Menu
-        #(
-         #(#MenuItem
-            #label: 'Execute Command...'
-            #itemValue: #doExecuteCommand
-            #translateLabel: true
+     #(Menu
+        (
+         (MenuItem
+            label: 'Execute Command...'
+            itemValue: doExecuteCommand
+            translateLabel: true
           )
-         #(#MenuItem
-            #enabled: #canDoTerminal
-            #label: 'Shell Terminal'
-            #itemValue: #openTerminal
-            #translateLabel: true
-            #isVisible: #canDoTerminalAndSystemIsUnix
+         (MenuItem
+            enabled: canDoTerminal
+            label: 'Shell Terminal'
+            itemValue: openTerminal
+            translateLabel: true
+            isVisible: canDoTerminalAndSystemIsUnix
           )
-         #(#MenuItem
-            #enabled: #canDoTerminal
-            #label: 'DOS Terminal'
-            #itemValue: #openTerminal
-            #translateLabel: true
-            #isVisible: #canDoTerminalAndSystemIsDOS
+         (MenuItem
+            enabled: canDoTerminal
+            label: 'DOS Terminal'
+            itemValue: openTerminal
+            translateLabel: true
+            isVisible: canDoTerminalAndSystemIsDOS
           )
-         #(#MenuItem
-            #label: '-'
+         (MenuItem
+            label: '-'
           )
-         #(#MenuItem
-            #enabled: #hasFileSelection
-            #label: 'Changes Browser'
-            #itemValue: #openChangesBrowser
-            #translateLabel: true
+         (MenuItem
+            enabled: hasFileSelection
+            label: 'Changes Browser'
+            itemValue: openChangesBrowser
+            translateLabel: true
           )
-         #(#MenuItem
-            #enabled: #hasFileSelection
-            #label: 'ChangeSet Browser'
-            #itemValue: #openChangeSetBrowser
-            #translateLabel: true
-            #isVisible: false
+         (MenuItem
+            enabled: hasFileSelection
+            label: 'ChangeSet Browser'
+            itemValue: openChangeSetBrowser
+            translateLabel: true
+            isVisible: false
           )
-         #(#MenuItem
-            #enabled: #hasSnapshotSelection
-            #label: 'Snapshot Image Browser'
-            #itemValue: #openSnapshotImageBrowser
-            #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
+            enabled: canCreateNewProject
+            label: 'Create Smalltalk Project'
+            itemValue: createProjectAndOpenProjectBrowser
+            translateLabel: true
           )
-         #(#MenuItem
-            #enabled: #canReadAbbrevFile
-            #label: 'Install Autoloaded'
-            #itemValue: #readAbbrevFile
-            #translateLabel: true
+         (MenuItem
+            enabled: canReadAbbrevFile
+            label: 'Install Autoloaded'
+            itemValue: readAbbrevFile
+            translateLabel: true
           )
-         #(#MenuItem
-            #enabled: #anySTFilesPresent
-            #label: 'Install all as Autoloaded'
-            #itemValue: #installAllAsAutoloaded
-            #translateLabel: true
+         (MenuItem
+            enabled: anySTFilesPresent
+            label: 'Install all as Autoloaded'
+            itemValue: installAllAsAutoloaded
+            translateLabel: true
           )
-         #(#MenuItem
-            #label: '-'
+         (MenuItem
+            label: '-'
           )
-         #(#MenuItem
-            #label: 'File Utilities'
-            #translateLabel: true
-            #submenu: 
-           #(#Menu
-              #(
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'Editor'
-                  #itemValue: #openEditor
-                  #translateLabel: true
+         (MenuItem
+            label: 'File Utilities'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  enabled: hasFileSelection
+                  label: 'Editor'
+                  itemValue: openEditor
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'HTML Reader'
-                  #itemValue: #openHTMLReader
-                  #translateLabel: true
+               (MenuItem
+                  enabled: hasFileSelection
+                  label: 'HTML Reader'
+                  itemValue: openHTMLReader
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'Acroread (PDF Viewer)'
-                  #itemValue: #openPDFViewer
-                  #translateLabel: true
+               (MenuItem
+                  enabled: hasFileSelection
+                  label: 'Acroread (PDF Viewer)'
+                  itemValue: openPDFViewer
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #hasASN1AndSelection
-                  #label: 'ASN1 Browser'
-                  #itemValue: #openASN1Browser
-                  #translateLabel: true
-                  #isVisible: #hasASN1
+               (MenuItem
+                  enabled: hasASN1AndSelection
+                  label: 'ASN1 Browser'
+                  itemValue: openASN1Browser
+                  translateLabel: true
+                  isVisible: hasASN1
                 )
-               #(#MenuItem
-                  #enabled: #hasCBrowser
-                  #label: 'C Browser'
-                  #itemValue: #openCBrowser
-                  #translateLabel: true
-                  #isVisible: #hasCBrowser
+               (MenuItem
+                  enabled: hasCBrowser
+                  label: 'C Browser'
+                  itemValue: openCBrowser
+                  translateLabel: true
+                  isVisible: hasCBrowser
                 )
-               #(#MenuItem
-                  #enabled: #hasJavaAndSelection
-                  #label: 'Applet Viewer'
-                  #itemValue: #openAppletViewer
-                  #translateLabel: true
-                  #isVisible: #hasJava
+               (MenuItem
+                  enabled: hasJavaAndSelection
+                  label: 'Applet Viewer'
+                  itemValue: openAppletViewer
+                  translateLabel: true
+                  isVisible: hasJava
                 )
-               #(#MenuItem
-                  #enabled: #hasMP3PlayerAndSelection
-                  #label: 'MP3 Player'
-                  #itemValue: #openMP3Player
-                  #translateLabel: true
-                  #isVisible: #hasMP3Player
+               (MenuItem
+                  enabled: hasMP3PlayerAndSelection
+                  label: 'MP3 Player'
+                  itemValue: openMP3Player
+                  translateLabel: true
+                  isVisible: hasMP3Player
                 )
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'xv (Image Viewer)'
-                  #itemValue: #openXV
-                  #translateLabel: true
+               (MenuItem
+                  enabled: hasFileSelection
+                  label: 'xv (Image Viewer)'
+                  itemValue: openXV
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #currentFilesAreInSameDirectory
-                  #label: 'Slide Show'
-                  #itemValue: #openSlideShow
-                  #translateLabel: true
-                  #isVisible: #hasSlideShow
+               (MenuItem
+                  enabled: currentFilesAreInSameDirectory
+                  label: 'Slide Show'
+                  itemValue: openSlideShow
+                  translateLabel: true
+                  isVisible: hasSlideShow
                 )
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'gv (Postscript Viewer)'
-                  #itemValue: #openGV
-                  #translateLabel: true
+               (MenuItem
+                  enabled: hasFileSelection
+                  label: 'gv (Postscript Viewer)'
+                  itemValue: openGV
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'realplay (avi viewer)'
-                  #itemValue: #openRP
-                  #translateLabel: true
+               (MenuItem
+                  enabled: hasFileSelection
+                  label: 'realplay (avi viewer)'
+                  itemValue: openRP
+                  translateLabel: true
                 )
                )
               nil
               nil
             )
           )
-         #(#MenuItem
-            #label: 'Image'
-            #translateLabel: true
-            #submenu: 
-           #(#Menu
-              #(
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'Image Editor'
-                  #itemValue: #openImageEditor
-                  #translateLabel: true
+         (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 Preview'
+                  itemValue: openImagePreview
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'Image Inspector'
-                  #itemValue: #openImageInspector
-                  #translateLabel: true
+               (MenuItem
+                  enabled: hasFileSelection
+                  label: 'Image Inspector'
+                  itemValue: openImageInspector
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: '-'
+               (MenuItem
+                  label: '-'
                 )
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'Convert to GIF'
-                  #itemValue: #convertImageToGIF
-                  #translateLabel: true
+               (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 PNG'
+                  itemValue: convertImageToPNG
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'Convert to XPM'
-                  #itemValue: #convertImageToXPM
-                  #translateLabel: true
+               (MenuItem
+                  enabled: hasFileSelection
+                  label: 'Convert to XPM'
+                  itemValue: convertImageToXPM
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #hasFileSelection
-                  #label: 'Convert to JPG'
-                  #itemValue: #convertImageToJPG
-                  #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: hasZipFileSelected
+            label: 'ZipFile Tool'
+            itemValue: openZipTool
+            translateLabel: true
           )
-         #(#MenuItem
-            #label: 'Find'
-            #translateLabel: true
-            #submenu: 
-           #(#Menu
-              #(
-               #(#MenuItem
-                  #label: 'File...'
-                  #itemValue: #fileFindFile
-                  #translateLabel: true
+         (MenuItem
+            label: 'Find'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  label: 'File...'
+                  itemValue: fileFindFile
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #label: 'Duplicate Files'
-                  #itemValue: #fileFindDuplicates
-                  #translateLabel: true
+               (MenuItem
+                  label: 'Duplicate Files'
+                  itemValue: fileFindDuplicates
+                  translateLabel: true
                 )
-               #(#MenuItem
-                  #enabled: #hasSelection
-                  #label: 'All Duplicate Files (Recursive)'
-                  #itemValue: #fileFindAllDuplicates
-                  #translateLabel: true
+               (MenuItem
+                  enabled: hasSelection
+                  label: 'All Duplicate Files (Recursive)'
+                  itemValue: fileFindAllDuplicates
+                  translateLabel: true
                 )
                )
               nil
               nil
             )
           )
-         #(#MenuItem
-            #enabled: #hasSelection
-            #label: 'File Differences...'
-            #itemValue: #openDiffView
-            #translateLabel: true
+         (MenuItem
+            enabled: hasSelection
+            label: 'File Differences'
+            itemValue: openDiffView
+            translateLabel: true
+            isVisible: hasTwoFilesSelectedHolder
           )
-         #(#MenuItem
-            #enabled: #hasFileSelection
-            #label: 'Hex Dump'
-            #itemValue: #fileHexDump
-            #translateLabel: true
+         (MenuItem
+            enabled: hasSelection
+            label: 'File Differences...'
+            itemValue: openDiffView
+            translateLabel: true
+            isVisible: hasNotTwoFilesSelectedHolder
+          )
+         (MenuItem
+            enabled: hasFileSelection
+            label: 'Hex Dump'
+            itemValue: fileHexDump
+            translateLabel: true
           )
          )
         nil
@@ -3022,6 +3030,15 @@
     ^ self aspectFor:#hasFileSelection ifAbsent:[ false asValue ].
 !
 
+hasNotTwoFilesSelectedHolder
+    ^ self aspectFor:#hasNotTwoFilesSelectedHolder
+        ifAbsent:[
+            BlockValue 
+                with:[:m | self hasTwoFilesSelected not]
+                argument:self currentFileNameHolder
+        ].
+!
+
 hasSelection
 
     ^ self aspectFor:#hasSelection ifAbsent:[ false asValue ].
@@ -3031,7 +3048,7 @@
     ^ self aspectFor:#hasTwoFilesSelectedHolder
         ifAbsent:[
             BlockValue 
-                with:[self hasTwoFilesSelected]
+                with:[:m | self hasTwoFilesSelected]
                 argument:self currentFileNameHolder
         ].
 !
@@ -5304,7 +5321,7 @@
                     requestFileName:title 
                     default:defaultName 
                     ok:'OK' 
-                    abort:'Use File List' 
+                    abort:'Compare against File List' 
                     pattern:'*' 
                     fromDirectory:(name2 asFilename directory).
     ].
@@ -6724,5 +6741,5 @@
 !AbstractFileBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.228 2004-05-11 10:41:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractFileBrowser.st,v 1.229 2004-05-11 14:36:12 cg Exp $'
 ! !
hg/stx-libtool