diff options
| author | Michael Valenta | 2003-03-18 17:15:52 +0000 |
|---|---|---|
| committer | Michael Valenta | 2003-03-18 17:15:52 +0000 |
| commit | 089635621272ae580fe5c738a7a6e2cd1dec905f (patch) | |
| tree | c9670be54f06f02dd61d05bcadee5c72b172fbc5 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse | |
| parent | 69fa2180575b7ac7aca2e4726c79d781c6afee49 (diff) | |
| download | eclipse.platform.team-089635621272ae580fe5c738a7a6e2cd1dec905f.tar.gz eclipse.platform.team-089635621272ae580fe5c738a7a6e2cd1dec905f.tar.xz eclipse.platform.team-089635621272ae580fe5c738a7a6e2cd1dec905f.zip | |
F1 help updates
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse')
2 files changed, 7 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java index ecd5117a0..6173858f9 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java @@ -118,7 +118,10 @@ public interface IHelpContextIds { public static final String DESELECT_WORKING_SET_ACTION = PREFIX + "deselect_working_set_action_context"; //$NON-NLS-1$ public static final String EDIT_WORKING_SET_ACTION = PREFIX + "edit_working_set_action_context"; //$NON-NLS-1$ public static final String REMOVE_REPOSITORY_LOCATION_ACTION = PREFIX + "remove_root_action_context"; //$NON-NLS-1$ - + public static final String SHOW_IN_RESOURCE_HISTORY = PREFIX + "show_in_history_action_context"; //$NON-NLS-1$ + public static final String SELECT_NEW_RESOURCES_ACTION = PREFIX + "select_new_action_context"; //$NON-NLS-1$ + public static final String CONFIRM_MERGE_ACTION = PREFIX + "confirm_merge_action_context"; //$NON-NLS-1$; + // Team menu actions public static final String TEAM_SYNCHRONIZE_ACTION = PREFIX + "team_synchronize_action_context"; //$NON-NLS-1$ public static final String TEAM_SYNCHRONIZE_OUTGOING_ACTION = PREFIX + "team_synchronize_outgoing_action_context"; //$NON-NLS-1$ diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java index 7953d00f0..a36a41aab 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CVSCatchupReleaseViewer.java @@ -393,6 +393,7 @@ public class CVSCatchupReleaseViewer extends CatchupReleaseViewer { // Show in history view showInHistory = new HistoryAction(Policy.bind("CVSCatchupReleaseViewer.showInHistory")); //$NON-NLS-1$ + WorkbenchHelp.setHelp(showInHistory, IHelpContextIds.SHOW_IN_RESOURCE_HISTORY); addSelectionChangedListener(showInHistory); selectAdditions = new Action(Policy.bind("CVSCatchupReleaseViewer.Select_&Outgoing_Additions_1"), null) { //$NON-NLS-1$ @@ -459,6 +460,7 @@ public class CVSCatchupReleaseViewer extends CatchupReleaseViewer { } } }; + WorkbenchHelp.setHelp(selectAdditions, IHelpContextIds.SELECT_NEW_RESOURCES_ACTION); // confirm merge confirmMerge = new Action(Policy.bind("CVSCatchupReleaseViewer.confirmMerge"), null) { //$NON-NLS-1$ @@ -511,6 +513,7 @@ public class CVSCatchupReleaseViewer extends CatchupReleaseViewer { return true; } }; + WorkbenchHelp.setHelp(confirmMerge, IHelpContextIds.CONFIRM_MERGE_ACTION); } protected void mergeRecursive(IDiffElement element, List needsMerge) { |