summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorelijahe2013-12-19 14:32:28 (EST)
committer Bogdan Gheorghe2013-12-19 16:30:03 (EST)
commitc2c9303504a1660643eda92449a335f99aa6d3e7 (patch)
tree96497e2bfa15152dbae41d3c2feeb71e4e6e5fa2
parentf422fc81e97c1ba44f356467dd751d9e409dc406 (diff)
downloadorg.eclipse.orion.client-c2c9303504a1660643eda92449a335f99aa6d3e7.zip
org.eclipse.orion.client-c2c9303504a1660643eda92449a335f99aa6d3e7.tar.gz
org.eclipse.orion.client-c2c9303504a1660643eda92449a335f99aa6d3e7.tar.bz2
Bug 421482 - UX: No context menu!v20131219-2130
- Replaced "Move to" and "Copy to" commands in Actions gear dropdown menu with "Copy" and "Paste" commands - Updated related instructions in User Guide --Signed-off-by: Elijah El-Haddad <elijahe@ca.ibm.com>
-rw-r--r--bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js25
-rw-r--r--doc/org.eclipse.orion.doc.user/WikiDoc/Orion/Documentation/User_Guide/Tasks/Working_with_folders_and_files/Working-with-folders-and-files.html4
2 files changed, 14 insertions, 15 deletions
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js
index e21e389..54ca06d 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/widgets/nav/common-nav.js
@@ -313,8 +313,8 @@ define([
commandRegistry.registerCommandContribution(selectionActionsScope, "eclipse.downFolder", 1, "orion.commonNavSelectionGroup", false, downFolder); //$NON-NLS-1$ //$NON-NLS-0$
commandRegistry.registerCommandContribution(selectionActionsScope, "eclipse.renameResource", 2, "orion.commonNavSelectionGroup", false, renameBinding); //$NON-NLS-1$ //$NON-NLS-0$
- commandRegistry.registerCommandContribution(selectionActionsScope, "eclipse.copyFile", 3, "orion.commonNavSelectionGroup"); //$NON-NLS-1$ //$NON-NLS-0$
- commandRegistry.registerCommandContribution(selectionActionsScope, "eclipse.moveFile", 4, "orion.commonNavSelectionGroup"); //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.registerCommandContribution(selectionActionsScope, "eclipse.copySelections", 3, "orion.commonNavSelectionGroup", false, copySelections); //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.registerCommandContribution(selectionActionsScope, "eclipse.pasteSelections", 4, "orion.commonNavSelectionGroup", false, pasteSelections); //$NON-NLS-1$ //$NON-NLS-0$
commandRegistry.registerCommandContribution(selectionActionsScope, "eclipse.deleteFile", 5, "orion.commonNavSelectionGroup", false, delBinding); //$NON-NLS-1$ //$NON-NLS-0$
commandRegistry.registerCommandContribution(selectionActionsScope, "eclipse.compareWithEachOther", 6, "orion.commonNavSelectionGroup"); //$NON-NLS-1$ //$NON-NLS-0$
commandRegistry.registerCommandContribution(selectionActionsScope, "eclipse.compareWith", 7, "orion.commonNavSelectionGroup"); //$NON-NLS-1$ //$NON-NLS-0$
@@ -333,23 +333,22 @@ define([
commandRegistry.registerCommandContribution(contextMenuActionsScope, "eclipse.compareWith", 5, "orion.commonNavContextMenuSelectionGroup"); //$NON-NLS-1$ //$NON-NLS-0$
commandRegistry.registerCommandContribution(contextMenuActionsScope, "eclipse.compareWithEachOther", 6, "orion.commonNavContextMenuSelectionGroup"); //$NON-NLS-1$ //$NON-NLS-0$
+ // Context menu ImportExportGroup group
+ commandRegistry.registerCommandContribution(contextMenuActionsScope, "orion.importZipURL", 1, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.registerCommandContribution(contextMenuActionsScope, "orion.import", 2, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.registerCommandContribution(contextMenuActionsScope, "eclipse.downloadFile", 3, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.registerCommandContribution(contextMenuActionsScope, "orion.importSFTP", 4, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
+ commandRegistry.registerCommandContribution(contextMenuActionsScope, "eclipse.exportSFTPCommand", 5, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
+
FileCommands.createFileCommands(serviceRegistry, commandRegistry, this, fileClient);
return ExtensionCommands.createAndPlaceFileCommandsExtension(serviceRegistry, commandRegistry, selectionActionsScope, 0, "orion.commonNavSelectionGroup", true).then(function() { //$NON-NLS-0$
-
- // OpenWith group
+ // Context menu OpenWith group
var openWithCommands = ExtensionCommands.getOpenWithCommands(commandRegistry);
openWithCommands.forEach(function(command){
commandRegistry.registerCommandContribution(contextMenuActionsScope, command.id, 1, "orion.commonNavContextMenuSelectionGroup/orion.OpenWith"); //$NON-NLS-0$
});
-
- // ImportExportGroup group
- commandRegistry.registerCommandContribution(contextMenuActionsScope, "orion.importZipURL", 1, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
- commandRegistry.registerCommandContribution(contextMenuActionsScope, "orion.import", 2, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
- commandRegistry.registerCommandContribution(contextMenuActionsScope, "eclipse.downloadFile", 3, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
- commandRegistry.registerCommandContribution(contextMenuActionsScope, "orion.importSFTP", 4, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
- commandRegistry.registerCommandContribution(contextMenuActionsScope, "eclipse.exportSFTPCommand", 5, "orion.commonNavContextMenuSelectionGroup/orion.ImportExportGroup"); //$NON-NLS-1$ //$NON-NLS-0$
-
- // Extensions group
+
+ // Context menu Extensions group
var fileCommandIds = ExtensionCommands.getFileCommandIds();
fileCommandIds.forEach(function(commandId){
commandRegistry.registerCommandContribution(contextMenuActionsScope, commandId, 1, "orion.commonNavContextMenuSelectionGroup/orion.Extensions"); //$NON-NLS-0$
diff --git a/doc/org.eclipse.orion.doc.user/WikiDoc/Orion/Documentation/User_Guide/Tasks/Working_with_folders_and_files/Working-with-folders-and-files.html b/doc/org.eclipse.orion.doc.user/WikiDoc/Orion/Documentation/User_Guide/Tasks/Working_with_folders_and_files/Working-with-folders-and-files.html
index f5541ce..2e4c333 100644
--- a/doc/org.eclipse.orion.doc.user/WikiDoc/Orion/Documentation/User_Guide/Tasks/Working_with_folders_and_files/Working-with-folders-and-files.html
+++ b/doc/org.eclipse.orion.doc.user/WikiDoc/Orion/Documentation/User_Guide/Tasks/Working_with_folders_and_files/Working-with-folders-and-files.html
@@ -57,8 +57,8 @@
<a href="http://wiki.eclipse.org/Orion/Documentation/User_Guide/Reference/Editing_page" title="Orion/Documentation/User_Guide/Reference/Editing_page" target="orion_external">Editing page</a>
<a href="http://wiki.eclipse.org/Orion/Documentation/User_Guide/Reference/Navigator_page#Selecting_folders_and_files" title="Orion/Documentation/User_Guide/Reference/Navigator_page#Selecting_folders_and_files" target="orion_external">select</a> the folders/files to copy or move.
</li>
- <li>Select <b>Copy to</b> or <b>Move to</b> from the <b>Actions</b> gear drop-down menu.</li>
- <li>Select a destination from the sub-menu or click <b>Choose folder</b> to pick a different destination.</li>
+ <li>Select <b>Copy</b> from the <b>Actions</b> gear drop-down menu.</li>
+ <li>Select the target folder to copy into and and select <b>Paste</b> from the <b>Actions</b> gear drop-down menu to paste the source folders/files into this folder.</li>
</ol>
<h2 id="Updating_this_document">Updating this document</h2>
<p>This document is maintained in a collaborative wiki. If you wish to update or modify this document please visit