diff -r 472d1ea1a076 -r dd6828abc760 FileBrowser.st --- a/FileBrowser.st Mon Nov 28 23:05:05 2016 +0100 +++ b/FileBrowser.st Mon Nov 28 23:07:37 2016 +0100 @@ -749,151 +749,132 @@ "Do not manually edit this!! If it is corrupted, the MenuEditor may not be able to read the specification." + " - MenuEditor new openOnClass:FileBrowser andSelector:#menuSpec - (Menu new fromLiteralArrayEncoding:(FileBrowser menuSpec)) startUp + MenuEditor new openOnClass:FileBrowser andSelector:#fileMenuSpec + (Menu new fromLiteralArrayEncoding:(FileBrowser fileMenuSpec)) startUp " ^ #(Menu + ( + (MenuItem + label: 'Spawn' + itemValue: fileSpawn + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasSelection + label: 'Open' + itemValue: menuOpen + isVisible: false + ) + (MenuItem + enabled: hasFilenameSelectionInCodeView + label: 'Open selected Filename' + itemValue: openSelectedFilename + isVisible: hasFilenameSelectionInCodeView + ) + (MenuItem + enabled: hasSelection + label: 'FileIn' + itemValue: fileFileIn + ) + (MenuItem + enabled: hasSelection + label: 'FileInTo NameSpace...' + itemValue: fileFileInToNameSpace + ) + (MenuItem + label: '-' + ) + (MenuItem + label: 'New' + submenu: + (Menu ( (MenuItem - label: 'Spawn' - itemValue: fileSpawn - translateLabel: true - ) - (MenuItem - label: '-' - ) - (MenuItem - enabled: hasSelection - label: 'Open' - itemValue: menuOpen - translateLabel: true - isVisible: false - ) - (MenuItem - enabled: hasFilenameSelectionInCodeView - label: 'Open selected Filename' - itemValue: openSelectedFilename - translateLabel: true - isVisible: hasFilenameSelectionInCodeView - ) - (MenuItem - enabled: hasSelection - label: 'FileIn' - itemValue: fileFileIn - translateLabel: true - ) - (MenuItem - enabled: hasSelection - label: 'FileInTo NameSpace...' - itemValue: fileFileInToNameSpace - translateLabel: true - ) - (MenuItem - label: '-' + label: 'Directory...' + itemValue: newDirectory ) (MenuItem - label: 'New' - translateLabel: true - submenu: - (Menu - ( - (MenuItem - label: 'Directory...' - itemValue: newDirectory - translateLabel: true - ) - (MenuItem - label: 'File...' - itemValue: newFile - translateLabel: true - ) - (MenuItem - label: 'Hard Link...' - itemValue: newHardLink - translateLabel: true - isVisible: systemIsUnix - ) - (MenuItem - label: 'Symbolic Link...' - itemValue: newSoftLink - translateLabel: true - isVisible: systemIsUnix - ) - ) - nil - nil - ) - ) - (MenuItem - enabled: hasSelection - label: 'Remove' - itemValue: fileRemove - translateLabel: true - ) - (MenuItem - enabled: hasSelection - label: 'Rename' - itemValue: fileRename - translateLabel: true + label: 'File...' + itemValue: newFile ) (MenuItem - label: '-' - ) - (MenuItem - enabled: hasSelection - label: 'Properties...' - itemValue: fileGetLongInfo - translateLabel: true - ) - (MenuItem - label: '-' - isVisible: javaSupportLoaded - ) - (MenuItem - enabled: canAddToClassPath - label: 'Add to Java ClassPath' - itemValue: fileAddToJavaClassPath - translateLabel: true - isVisible: javaSupportLoaded + label: 'Hard Link...' + itemValue: newHardLink ) (MenuItem - enabled: canRemoveFromClassPath - label: 'Remove from Java ClassPath' - itemValue: fileRemoveFromJavaClassPath - translateLabel: true - isVisible: javaSupportLoaded - ) - (MenuItem - enabled: canAddToSourcePath - label: 'Add to Java SourcePath' - itemValue: fileAddToJavaSourcePath - translateLabel: true - isVisible: javaSupportLoaded - ) - (MenuItem - enabled: canRemoveFromSourcePath - label: 'Remove from Java SourcePath' - itemValue: fileRemoveFromJavaSourcePath - translateLabel: true - isVisible: javaSupportLoaded - ) - (MenuItem - label: '-' - ) - (MenuItem - label: 'Exit' - itemValue: menuExit - translateLabel: true + label: 'Symbolic Link...' + itemValue: newSoftLink ) ) nil nil ) + ) + (MenuItem + enabled: hasSelection + label: 'Remove' + itemValue: fileRemove + ) + (MenuItem + enabled: hasSelection + label: 'Rename' + itemValue: fileRename + ) + (MenuItem + label: '-' + ) + (MenuItem + enabled: hasSelection + label: 'Properties...' + itemValue: fileGetLongInfo + ) + (MenuItem + label: '-' + isVisible: javaSupportLoaded + ) + (MenuItem + enabled: canAddToClassPath + label: 'Add to Java ClassPath' + itemValue: fileAddToJavaClassPath + isVisible: javaSupportLoaded + ) + (MenuItem + enabled: canRemoveFromClassPath + label: 'Remove from Java ClassPath' + itemValue: fileRemoveFromJavaClassPath + isVisible: javaSupportLoaded + ) + (MenuItem + enabled: canAddToSourcePath + label: 'Add to Java SourcePath' + itemValue: fileAddToJavaSourcePath + isVisible: javaSupportLoaded + ) + (MenuItem + enabled: canRemoveFromSourcePath + label: 'Remove from Java SourcePath' + itemValue: fileRemoveFromJavaSourcePath + isVisible: javaSupportLoaded + ) + (MenuItem + label: '-' + ) + (MenuItem + label: 'Exit' + itemValue: menuExit + ) + ) + nil + nil + ) ! helpMenuSpec @@ -977,6 +958,7 @@ "Do not manually edit this!! If it is corrupted, the MenuEditor may not be able to read the specification." + " MenuEditor new openOnClass:FileBrowser andSelector:#menuPopUp (Menu new fromLiteralArrayEncoding:(FileBrowser menuPopUp)) startUp @@ -990,7 +972,6 @@ (MenuItem label: 'Spawn' itemValue: fileSpawn - translateLabel: true ) (MenuItem label: '-' @@ -999,19 +980,16 @@ enabled: hasSelection label: 'Edit File' itemValue: fileGet - translateLabel: true ) (MenuItem enabled: hasSelection label: 'Insert File' itemValue: fileInsert - translateLabel: true ) (MenuItem enabled: hasSelection label: 'FileIn' itemValue: fileFileIn - translateLabel: true shortcutKey: Accept ) (MenuItem @@ -1019,31 +997,24 @@ ) (MenuItem label: 'New' - translateLabel: true submenu: (Menu ( (MenuItem label: 'Directory...' itemValue: newDirectory - translateLabel: true ) (MenuItem label: 'File...' itemValue: newFile - translateLabel: true ) (MenuItem label: 'Hard Link...' itemValue: newHardLink - translateLabel: true - isVisible: systemIsUnix ) (MenuItem label: 'Symbolic Link...' itemValue: newSoftLink - translateLabel: true - isVisible: systemIsUnix ) ) nil @@ -1054,14 +1025,12 @@ enabled: hasSelection label: 'Remove...' itemValue: fileRemove - translateLabel: true shortcutKey: Cut ) (MenuItem enabled: hasSelection label: 'Rename...' itemValue: fileRename - translateLabel: true shortcutKey: Rename ) (MenuItem @@ -1071,14 +1040,12 @@ enabled: hasSelection label: 'Properties...' itemValue: fileGetLongInfo - translateLabel: true ) (MenuItem label: '-' ) (MenuItem label: 'Tools' - translateLabel: true submenuChannel: toolsMenuSpec shortcutKey: Ctrl keepLinkedMenu: true @@ -1089,7 +1056,6 @@ (MenuItem label: 'Update' itemValue: updateCurrentDirectory - translateLabel: true ) ) nil @@ -3456,13 +3422,11 @@ Error handle:[:ex | err := ex description ] do:[ - hardOrSoftSymbol == #soft - ifTrue:[ - OperatingSystem createSymbolicLinkFrom:name1 to:name2 - ] - ifFalse:[ - OperatingSystem createHardLinkFrom:name1 to:name2 - ] + hardOrSoftSymbol == #soft ifTrue:[ + f2 createAsSymbolicLinkTo:f1. + ] ifFalse:[ + f2 createAsHardLinkTo:f1. + ] ] ] ] @@ -4711,10 +4675,10 @@ |f| f := currentDirectory construct:fileName. - OperatingSystem accessDeniedErrorSignal handle:[:ex| + OsError handle:[:ex| "was not able to remove it" msg := (resources string:'cannot remove ''%1'' !!' with:fileName). - self showAlert:msg with:(OperatingSystem lastErrorString) + self showAlert:msg with:(ex description) ] do:[ |answer contents| @@ -6588,10 +6552,10 @@ |f| f := currentDirectory construct:fileName. - OperatingSystem accessDeniedErrorSignal handle:[:ex| + OsError handle:[:ex| "was not able to remove it" msg := (resources string:'Cannot remove ''%1'' !!' with:fileName). - self showAlert:msg with:(OperatingSystem lastErrorString) + self showAlert:msg with:(ex description) ] do:[ |answer i|