--- a/FileBrowserV2.st Tue May 06 21:39:35 2014 +0200
+++ b/FileBrowserV2.st Tue May 06 21:40:01 2014 +0200
@@ -1081,7 +1081,7 @@
)
(MenuItem
activeHelpKey: fileDesktop
- enabled: enableHome
+ enabled: enableGotoDesktopDirectory
label: 'Desktop'
itemValue: doGotoDesktopDirectory
isButton: true
@@ -1267,8 +1267,8 @@
"
- MenuEditor new openOnClass:FileBrowserV3 andSelector:#toolBarMainMenu
- (Menu new fromLiteralArrayEncoding:(FileBrowserV3 toolBarMainMenu)) startUp
+ MenuEditor new openOnClass:FileBrowserV2 andSelector:#toolBarMainMenu_new
+ (Menu new fromLiteralArrayEncoding:(FileBrowserV2 toolBarMainMenu_new)) startUp
"
<resource: #menu>
@@ -1281,7 +1281,6 @@
enabled: enableBack
label: 'Back'
itemValue: doBack
- translateLabel: true
isButton: true
submenuChannel: menuDirHistoryBack
labelImage: (ResourceRetriever ToolbarIconLibrary historyBackIcon)
@@ -1294,7 +1293,6 @@
enabled: enableForward
label: 'Forward'
itemValue: doForward
- translateLabel: true
isButton: true
submenuChannel: menuDirHistoryForward
labelImage: (ResourceRetriever ToolbarIconLibrary historyForwardIcon)
@@ -1307,25 +1305,30 @@
enabled: enableDirectoryUp
label: 'DirectoryUp'
itemValue: doGoDirectoryUp
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary directoryUpIcon)
)
(MenuItem
activeHelpKey: fileHome
- enabled: enableHome
+ enabled: enableGotoHomeDirectory
label: 'Home'
itemValue: doGotoHomeDirectory
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary homeIcon)
)
(MenuItem
+ activeHelpKey: gotoDesktop
+ enabled: enableGotoDesktopDirectory
+ label: 'Desktop'
+ itemValue: doGotoDesktopDirectory
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary desktopIcon)
+ )
+ (MenuItem
activeHelpKey: fileGotoDefaultDirectory
enabled: enableGotoDefaultDirectory
label: 'Current'
itemValue: doGotoDefaultDirectory
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary currentDirectoryIcon)
@@ -1335,14 +1338,12 @@
enabled: enableGotoSmalltalkDirectory
label: 'ST/X Default'
itemValue: doGotoSmalltalkDirectory
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary stxHomeIcon)
)
(MenuItem
activeHelpKey: fileGotoBookmark
label: 'Bookmarks'
- translateLabel: true
isButton: true
isVisible: false
submenuChannel: gotoBookmarksMenu
@@ -1352,7 +1353,6 @@
activeHelpKey: fileHistory
enabled: enableFileHistory
label: 'File History'
- translateLabel: true
isButton: true
isVisible: false
submenuChannel: menuFileHistory
@@ -1365,7 +1365,6 @@
activeHelpKey: searchFile
label: 'Search File'
itemValue: doOpenSearchFile
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary searchFileIcon)
)
@@ -1377,7 +1376,6 @@
enabled: hasSelection
label: 'Cut'
itemValue: cutFiles
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary cutFileIcon)
@@ -1387,7 +1385,6 @@
enabled: hasSelection
label: 'Copy'
itemValue: copyFiles
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary copyFileIcon)
@@ -1397,7 +1394,6 @@
enabled: canPaste
label: 'Paste'
itemValue: pasteFiles
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary pasteFileIcon)
@@ -1407,7 +1403,6 @@
enabled: hasSelection
label: 'Delete'
itemValue: deleteFiles
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary deleteFileIcon)
@@ -1420,7 +1415,6 @@
activeHelpKey: editFile
label: 'Edit File'
itemValue: doShowFileContents
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary editFileIcon)
@@ -1429,7 +1423,6 @@
activeHelpKey: fileIn
label: 'File In'
itemValue: fileFileIn
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary fileInIcon)
@@ -1439,7 +1432,6 @@
enabled: hasFileSelection
label: 'Changes Browser'
itemValue: openChangesBrowser
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary startChangesBrowserIcon)
)
@@ -1451,7 +1443,6 @@
activeHelpKey: addTerminal
label: 'VT100'
itemValue: doAddTerminal
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary shellTerminalIcon)
)
@@ -1460,14 +1451,12 @@
enabled: canMake
label: 'Make'
itemValue: doMake
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary make24x24Icon3)
)
(MenuItem
activeHelpKey: viewDetails
label: 'viewDetails'
- translateLabel: true
isButton: true
startGroup: right
hideMenuOnActivated: false
@@ -1477,7 +1466,6 @@
(MenuItem
activeHelpKey: viewDetails
label: 'viewDetails'
- translateLabel: true
isButton: true
startGroup: right
isVisible: false
@@ -1497,8 +1485,6 @@
nil
nil
)
-
- "Created: / 05-02-2014 / 11:42:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
toolBarMainMenu_old
@@ -1510,13 +1496,13 @@
"
- MenuEditor new openOnClass:FileBrowserV2 andSelector:#toolBarMainMenu
- (Menu new fromLiteralArrayEncoding:(FileBrowserV2 toolBarMainMenu)) startUp
+ MenuEditor new openOnClass:FileBrowserV2 andSelector:#toolBarMainMenu_old
+ (Menu new fromLiteralArrayEncoding:(FileBrowserV2 toolBarMainMenu_old)) startUp
"
<resource: #menu>
- ^
+ ^
#(Menu
(
(MenuItem
@@ -1524,7 +1510,6 @@
enabled: enableBack
label: 'Back'
itemValue: doBack
- translateLabel: true
isButton: true
submenuChannel: menuDirHistoryBack
labelImage: (ResourceRetriever ToolbarIconLibrary historyBackIcon)
@@ -1537,7 +1522,6 @@
enabled: enableForward
label: 'Forward'
itemValue: doForward
- translateLabel: true
isButton: true
submenuChannel: menuDirHistoryForward
labelImage: (ResourceRetriever ToolbarIconLibrary historyForwardIcon)
@@ -1550,7 +1534,6 @@
enabled: enableDirectoryUp
label: 'DirectoryUp'
itemValue: doGoDirectoryUp
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary directoryUpIcon)
)
@@ -1559,16 +1542,22 @@
enabled: enableHome
label: 'Home'
itemValue: doGotoHomeDirectory
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary homeIcon)
)
(MenuItem
+ activeHelpKey: gotoDesktop
+ enabled: enableGotoDesktopDirectory
+ label: 'Desktop'
+ itemValue: doGotoDesktopDirectory
+ isButton: true
+ labelImage: (ResourceRetriever ToolbarIconLibrary desktopIcon)
+ )
+ (MenuItem
activeHelpKey: fileGotoDefaultDirectory
enabled: enableGotoDefaultDirectory
label: 'Current'
itemValue: doGotoDefaultDirectory
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary currentDirectoryIcon)
@@ -1578,14 +1567,12 @@
enabled: enableGotoSmalltalkDirectory
label: 'ST/X Default'
itemValue: doGotoSmalltalkDirectory
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary stxHomeIcon)
)
(MenuItem
activeHelpKey: fileGotoBookmark
label: 'Bookmarks'
- translateLabel: true
isButton: true
submenuChannel: gotoBookmarksMenu
labelImage: (ResourceRetriever ToolbarIconLibrary directoryBookmarksIcon)
@@ -1594,7 +1581,6 @@
activeHelpKey: fileHistory
enabled: enableFileHistory
label: 'File History'
- translateLabel: true
isButton: true
submenuChannel: menuFileHistory
labelImage: (ResourceRetriever ToolbarIconLibrary historyIcon)
@@ -1606,7 +1592,6 @@
activeHelpKey: searchFile
label: 'Search File'
itemValue: doOpenSearchFile
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary searchFileIcon)
)
@@ -1618,7 +1603,6 @@
enabled: hasSelection
label: 'Cut'
itemValue: cutFiles
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary cutFileIcon)
)
@@ -1627,7 +1611,6 @@
enabled: hasSelection
label: 'Copy'
itemValue: copyFiles
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary copyFileIcon)
)
@@ -1636,7 +1619,6 @@
enabled: canPaste
label: 'Paste'
itemValue: pasteFiles
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary pasteFileIcon)
)
@@ -1645,7 +1627,6 @@
enabled: hasSelection
label: 'Delete'
itemValue: deleteFiles
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary deleteFileIcon)
)
@@ -1656,7 +1637,6 @@
activeHelpKey: editFile
label: 'Edit File'
itemValue: doShowFileContents
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary editFileIcon)
)
@@ -1664,7 +1644,6 @@
activeHelpKey: fileIn
label: 'File In'
itemValue: fileFileIn
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary fileInIcon)
)
@@ -1673,7 +1652,6 @@
enabled: hasFileSelection
label: 'Changes Browser'
itemValue: openChangesBrowser
- translateLabel: true
isButton: true
labelImage: (ResourceRetriever ToolbarIconLibrary startChangesBrowserIcon)
)
@@ -1685,7 +1663,6 @@
activeHelpKey: addTerminal
label: 'VT100'
itemValue: doAddTerminal
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary shellTerminalIcon)
@@ -1695,7 +1672,6 @@
enabled: canMake
label: 'Make'
itemValue: doMake
- translateLabel: true
isButton: true
isVisible: false
labelImage: (ResourceRetriever ToolbarIconLibrary makeIcon)
@@ -1703,7 +1679,6 @@
(MenuItem
activeHelpKey: viewDetails
label: 'viewDetails'
- translateLabel: true
isButton: true
startGroup: right
hideMenuOnActivated: false
@@ -1713,7 +1688,6 @@
(MenuItem
activeHelpKey: viewDetails
label: 'viewDetails'
- translateLabel: true
isButton: true
startGroup: right
isVisible: false
@@ -1733,8 +1707,6 @@
nil
nil
)
-
- "Created: / 05-02-2014 / 11:42:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!FileBrowserV2 methodsFor:'actions'!
@@ -2622,11 +2594,11 @@
!FileBrowserV2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.221 2014-05-06 14:42:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.222 2014-05-06 19:40:01 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.221 2014-05-06 14:42:46 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.222 2014-05-06 19:40:01 cg Exp $'
! !