Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-09-23 14:33:18 +0000
committerJean Michel-Lemieux2003-09-23 14:33:18 +0000
commitf122f80e04d95e6a71c729b53cc97f3b0c2da011 (patch)
tree472dc019506049075c12802dcc62364d767c2f22
parent655f96f5a52f5ef6b437cdc80449d83dd4ae5b02 (diff)
downloadeclipse.platform.team-f122f80e04d95e6a71c729b53cc97f3b0c2da011.tar.gz
eclipse.platform.team-f122f80e04d95e6a71c729b53cc97f3b0c2da011.tar.xz
eclipse.platform.team-f122f80e04d95e6a71c729b53cc97f3b0c2da011.zip
Bug 42913 [Live Sync View] Review sync view key bindings
-rw-r--r--bundles/org.eclipse.team.ui/plugin.xml36
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/ChooseSubscriberAction.java3
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/NavigateAction.java2
3 files changed, 3 insertions, 38 deletions
diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index 9cc91499e..fd69bae94 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -307,66 +307,30 @@
category="org.eclipse.team.ui.commands.category"
id="org.eclipse.team.ui.syncview.incomingFilter">
</command>
- <keyBinding
- string=""
- scope="org.eclipse.ui.globalScope"
- command="org.eclipse.team.ui.syncview.incomingFilter"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
<command
name="%Command.outgoingFilter.name"
description="%Command.outgoingFilter.description"
category="org.eclipse.team.ui.commands.category"
id="org.eclipse.team.ui.syncview.outgoingFilter">
</command>
- <keyBinding
- string=""
- scope="org.eclipse.ui.globalScope"
- command="org.eclipse.team.ui.syncview.outgoingFilter"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
<command
name="%Command.bothFilter.name"
description="%Command.bothFilter.description"
category="org.eclipse.team.ui.commands.category"
id="org.eclipse.team.ui.syncview.bothFilter">
</command>
- <keyBinding
- string=""
- scope="org.eclipse.ui.globalScope"
- command="org.eclipse.team.ui.syncview.bothFilter"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
<command
name="%Command.conflictsFilter.name"
description="%Command.conflictsFilter.description"
category="org.eclipse.team.ui.commands.category"
id="org.eclipse.team.ui.syncview.conflictsFilter">
</command>
- <keyBinding
- string=""
- scope="org.eclipse.ui.globalScope"
- command="org.eclipse.team.ui.syncview.conflictsFilter"
- configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
- </keyBinding>
<command
name="%Command.syncAll.name"
description="%Command.syncAll.description"
category="org.eclipse.team.ui.commands.category"
id="org.eclipse.team.ui.syncview.syncAll">
</command>
- <command
- name="%Command.selectPreviousChange.name"
- description="%Command.selectPreviousChange.description"
- category="org.eclipse.team.ui.commands.category"
- id="org.eclipse.team.ui.syncview.selectPreviousChange">
- </command>
- <command
- name="%Command.selectNextChange.name"
- description="%Command.selectNextChange.description"
- category="org.eclipse.team.ui.commands.category"
- id="org.eclipse.team.ui.syncview.selectNextChange">
- </command>
</extension>
<!-- ***************** Action sets ********************** -->
<extension
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/ChooseSubscriberAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/ChooseSubscriberAction.java
index a90c54e38..c0d88b58d 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/ChooseSubscriberAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/ChooseSubscriberAction.java
@@ -11,6 +11,7 @@
package org.eclipse.team.internal.ui.sync.actions;
import org.eclipse.team.internal.ui.Utils;
+import org.eclipse.ui.IKeyBindingService;
class ChooseSubscriberAction extends SyncViewerToolbarDropDownAction {
private final SyncViewerActions actions;
@@ -24,5 +25,7 @@ class ChooseSubscriberAction extends SyncViewerToolbarDropDownAction {
super(actionGroup);
this.actions = actions;
Utils.initAction(this, "action.refreshSubscriber."); //$NON-NLS-1$
+ IKeyBindingService kbs = actions.getSyncView().getSite().getKeyBindingService();
+ Utils.registerAction(kbs, this, "org.eclipse.team.ui.syncview.syncAll"); //$NON-NLS-1$
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/NavigateAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/NavigateAction.java
index 0a4509f89..ff6d22750 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/NavigateAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/NavigateAction.java
@@ -46,11 +46,9 @@ class NavigateAction extends Action {
IKeyBindingService kbs = synchronizeView.getSite().getKeyBindingService();
if(direction == INavigableControl.NEXT) {
Utils.initAction(this, "action.navigateNext."); //$NON-NLS-1$
- Utils.registerAction(kbs, this, "org.eclipse.team.ui.syncview.selectNextChange"); //$NON-NLS-1$
synchronizeView.getViewSite().getActionBars().setGlobalActionHandler(IWorkbenchActionConstants.NEXT, this);
} else {
Utils.initAction(this, "action.navigatePrevious."); //$NON-NLS-1$
- Utils.registerAction(kbs, this, "org.eclipse.team.ui.syncview.selectPreviousChange"); //$NON-NLS-1$
synchronizeView.getViewSite().getActionBars().setGlobalActionHandler(IWorkbenchActionConstants.PREVIOUS, this);
}
}

Back to the top