Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-06-12 01:51:20 +0000
committerMichael Valenta2002-06-12 01:51:20 +0000
commit0b037a81afc97836845bae5319423233746b9283 (patch)
treecf5798c5a32a0e3edc4edc3f98bc189dab1a4763
parent0c5c5cfa67182384ac7c6d6666837312e9aa7ec0 (diff)
downloadeclipse.platform.team-0b037a81afc97836845bae5319423233746b9283.tar.gz
eclipse.platform.team-0b037a81afc97836845bae5319423233746b9283.tar.xz
eclipse.platform.team-0b037a81afc97836845bae5319423233746b9283.zip
19193: Context-sensitive help missing for various Team components
-rw-r--r--bundles/org.eclipse.team.cvs.ui/help_contexts.xml42
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/IHelpContextIds.java24
-rw-r--r--bundles/org.eclipse.team.ui/help_contexts.xml41
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java25
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java5
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java2
7 files changed, 118 insertions, 23 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/help_contexts.xml b/bundles/org.eclipse.team.cvs.ui/help_contexts.xml
index 81f6ff956..34dd98a79 100644
--- a/bundles/org.eclipse.team.cvs.ui/help_contexts.xml
+++ b/bundles/org.eclipse.team.cvs.ui/help_contexts.xml
@@ -415,5 +415,45 @@
<description>Commit outgoing changes to the respository
</description>
</context>
-
+
+ <context id="sync_forced_commit_action_context">
+ <description>Override repository with local file
+ </description>
+ </context>
+
+ <context id="sync_update_action_context">
+ <description>Update local with remote
+ </description>
+ </context>
+
+ <context id="sync_forced_update_action_context">
+ <description>Override local file with remote
+ </description>
+ </context>
+
+ <context id="sync_add_action_context">
+ <description>Add file to repository
+ </description>
+ </context>
+
+ <context id="sync_ignore_action_context">
+ <description>Ignore this file
+ </description>
+ </context>
+
+ <context id="merge_update_action_context">
+ <description>Merge and update
+ </description>
+ </context>
+
+ <context id="merge_forced_update_action_context">
+ <description>Perform a forced merge
+ </description>
+ </context>
+
+ <context id="merge_update_with_joinaction_context">
+ <description>Perform a forced merge performing an auto-merge.
+ </description>
+ </context>
+
</contexts>
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 456655dea..01e13cbd4 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
@@ -12,7 +12,7 @@ package org.eclipse.team.internal.ccvs.ui;
public interface IHelpContextIds {
public static final String PREFIX = CVSUIPlugin.ID + "."; //$NON-NLS-1$
-
+
// Dialogs
public static final String TAG_CONFIGURATION_OVERVIEW = PREFIX + "tag_configuration_overview"; //$NON-NLS-1$
public static final String TAG_CONFIGURATION_REFRESHLIST = PREFIX + "tag_configuration_refreshlist"; //$NON-NLS-1$
@@ -21,19 +21,19 @@ public interface IHelpContextIds {
public static final String RELEASE_COMMENT_DIALOG = PREFIX + "release_comment_dialog_context"; //$NON-NLS-1$
public static final String BRANCH_DIALOG = PREFIX + "branch_dialog_context"; //$NON-NLS-1$
- // Different uses of the TagSelectionDialog (not done in xml)
+ // Different uses of the TagSelectionDialog
public static final String REPLACE_TAG_SELECTION_DIALOG = PREFIX + "replace_tag_selection_dialog_context"; //$NON-NLS-1$
public static final String COMPARE_TAG_SELECTION_DIALOG = PREFIX + "compare_tag_selection_dialog_context"; //$NON-NLS-1$
public static final String TAG_REMOTE_WITH_EXISTING_DIALOG = PREFIX + "tag_remote_with_existing_dialog_context"; //$NON-NLS-1$
public static final String SHARE_WITH_EXISTING_TAG_SELETION_DIALOG = PREFIX + "share_with_existing_tag_selection_dialog_context"; //$NON-NLS-1$
- // Different uses of the TagAsVersionDialog (not done in xml)
+ // Different uses of the TagAsVersionDialog
public static final String TAG_AS_VERSION_DIALOG = PREFIX + "tag_as_version_dialog_context"; //$NON-NLS-1$
-
+
// Different uses of InputDialog from actions (not done)
public static final String DEFINE_BRANCH_DIALOG = PREFIX + "define_branch_dialog_context"; //$NON-NLS-1$
public static final String DEFINE_VERSION_DIALOG = PREFIX + "define_version_dialog_context"; //$NON-NLS-1$
-
+
// Wizards (no one seems to add wizard help, only wizard page help)
// (not done)
public static final String SHARING_WIZARD = PREFIX + "sharing_wizard_context"; //$NON-NLS-1$
@@ -41,7 +41,7 @@ public interface IHelpContextIds {
public static final String NEW_LOCATION_WIZARD = PREFIX + "new_location_wizard_context"; //$NON-NLS-1$
public static final String PATCH_WIZARD = PREFIX + "patch_wizard_context"; //$NON-NLS-1$
- // Wizard Pages (not done in xml)
+ // Wizard Pages
public static final String SHARING_AUTOCONNECT_PAGE = PREFIX + "sharing_autoconnect_page_context"; //$NON-NLS-1$
public static final String SHARING_SELECT_REPOSITORY_PAGE = PREFIX + "sharing_select_repository_page_context"; //$NON-NLS-1$
public static final String SHARING_NEW_REPOSITORY_PAGE = PREFIX + "sharing_new_repository_page_context"; //$NON-NLS-1$
@@ -53,7 +53,7 @@ public interface IHelpContextIds {
public static final String KEYWORD_SUBSTITUTION_SUMMARY_PAGE = PREFIX + "keyword_substituton_summary_page_context"; //$NON-NLS-1$
public static final String KEYWORD_SUBSTITUTION_SHARED_PAGE = PREFIX + "keyword_substituton_shared_page_context"; //$NON-NLS-1$
public static final String KEYWORD_SUBSTITUTION_CHANGED_PAGE = PREFIX + "keyword_substituton_changed_page_context"; //$NON-NLS-1$
-
+
// Preference Pages
public static final String PREF_REPOSITORIES_ARE_BINARY = PREFIX + "repositories_are_binary_pref"; //$NON-NLS-1$
public static final String PREF_PRUNE = PREFIX + "prune_empty_directories_pref"; //$NON-NLS-1$
@@ -64,19 +64,19 @@ public interface IHelpContextIds {
public static final String PREF_CONSIDER_CONTENT = PREFIX + "consider_content_pref"; //$NON-NLS-1$
public static final String PREF_MARKERS_ENABLED = PREFIX + "markers_enabled_pref"; //$NON-NLS-1$
public static final String PREF_REPLACE_DELETE_UNMANAGED = PREFIX + "replace_deletion_of_unmanaged_pref"; //$NON-NLS-1$
-
+
// Views
public static final String CONSOLE_VIEW = PREFIX + "console_view_context"; //$NON-NLS-1$
public static final String REPOSITORIES_VIEW = PREFIX + "repositories_view_context"; //$NON-NLS-1$
public static final String RESOURCE_HISTORY_VIEW = PREFIX + "resource_history_view_context"; //$NON-NLS-1$
public static final String COMPARE_REVISIONS_VIEW = PREFIX + "compare_revision_view_context"; //$NON-NLS-1$
-
+
// Viewers
public static final String CATCHUP_RELEASE_VIEWER = PREFIX + "catchup_release_viewer_context"; //$NON-NLS-1$
-
+
// Add to .cvsignor dialog
public static final String ADD_TO_CVSIGNORE = PREFIX + "add_to_cvsignore_context"; //$NON-NLS-1$
-
+
// Actions
public static final String GET_FILE_REVISION_ACTION = PREFIX + "get_file_revision_action_context"; //$NON-NLS-1$
public static final String GET_FILE_CONTENTS_ACTION = PREFIX + "get_file_contents_action_context"; //$NON-NLS-1$
@@ -103,6 +103,6 @@ public interface IHelpContextIds {
public static final String SYNC_ADD_ACTION = PREFIX + "sync_add_action_context"; //$NON-NLS-1$
public static final String SYNC_IGNORE_ACTION = PREFIX + "sync_ignore_action_context"; //$NON-NLS-1$
public static final String MERGE_UPDATE_ACTION = PREFIX + "merge_update_action_context"; //$NON-NLS-1$
- public static final String MERGE_FORCED_UPDATE_ACTION = PREFIX + "merge_forced update_action_context"; //$NON-NLS-1$
+ public static final String MERGE_FORCED_UPDATE_ACTION = PREFIX + "merge_forced_update_action_context"; //$NON-NLS-1$
public static final String MERGE_UPDATE_WITH_JOIN_ACTION = PREFIX + "merge_update_with_joinaction_context"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.team.ui/help_contexts.xml b/bundles/org.eclipse.team.ui/help_contexts.xml
index 8c8caf7d1..905d2a8c0 100644
--- a/bundles/org.eclipse.team.ui/help_contexts.xml
+++ b/bundles/org.eclipse.team.ui/help_contexts.xml
@@ -50,7 +50,7 @@
<!-- TargetCatchupReleaseViewer -->
<!-- ********************************** -->
- <context id="catchup_release_viewer_context">
+ <context id="target_catchup_release_viewer_context">
<description>Bring the local project up-to-date with the remote one
</description>
</context>
@@ -78,4 +78,43 @@
</description>
</context>
+ <!-- ********************************** -->
+ <!-- SiteExplorerViewActions -->
+ <!-- ********************************** -->
+
+ <context id="add_site_action_context">
+ <description>Configure a new site to use for the Target provider
+ </description>
+ </context>
+
+ <context id="new_folder_action_context">
+ <description>Create a new folder on the remote server
+ </description>
+ </context>
+
+ <!-- ********************************** -->
+ <!-- SyncViewActions -->
+ <!-- ********************************** -->
+
+ <context id="refresh_action_context">
+ <description>Refresh the view
+ </description>
+ </context>
+
+ <context id="expandall_action_context">
+ <description>Expand all branches
+ </description>
+ </context>
+
+ <context id="remove_action_context">
+ <description>Remove this
+ </description>
+ </context>
+
+ <context id="navigator_show_action_context">
+ <description>Remove from the navigator
+ </description>
+ </context>
+
+
</contexts> \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java
index 1432d17b0..488885777 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java
@@ -17,20 +17,29 @@ public interface IHelpContextIds {
public static final String TEAM_PREFERENCE_PAGE = PREFIX + "team_preference_page_context"; //$NON-NLS-1$
public static final String IGNORE_PREFERENCE_PAGE = PREFIX + "ignore_preference_page_context"; //$NON-NLS-1$
public static final String FILE_TYPE_PREFERENCE_PAGE = PREFIX + "file_type_preference_page_context"; //$NON-NLS-1$
-
+
// Wizard Pages
public static final String SHARE_PROJECT_PAGE = PREFIX + "share_project_page_context"; //$NON-NLS-1$
public static final String IMPORT_PROJECT_SET_PAGE = PREFIX + "import_project_set_page_context"; //$NON-NLS-1$
public static final String EXPORT_PROJECT_SET_PAGE = PREFIX + "export_project_set_page_context"; //$NON-NLS-1$
-
+
// Catchup Release Viewers
- public static final String CATCHUP_RELEASE_VIEWER = PREFIX + "catchup_release_viewer_context"; //$NON-NLS-1$
-
+ public static final String TARGET_CATCHUP_RELEASE_VIEWER = PREFIX + "target_catchup_release_viewer_context"; //$NON-NLS-1$
+
// Target Actions
- public static final String SYNC_GET_ACTION = PREFIX + "sync_get_action"; //$NON-NLS-1$
- public static final String SYNC_PUT_ACTION = PREFIX + "sync_put_action"; //$NON-NLS-1$
+ public static final String SYNC_GET_ACTION = PREFIX + "sync_get_action_context"; //$NON-NLS-1$
+ public static final String SYNC_PUT_ACTION = PREFIX + "sync_put_action_context"; //$NON-NLS-1$
// Views
- public static final String SITE_EXPLORER_VIEW = PREFIX + "site_explorer_view"; //$NON-NLS-1$
-
+ public static final String SITE_EXPLORER_VIEW = PREFIX + "site_explorer_view_context"; //$NON-NLS-1$
+ public static final String SYNC_VIEW = PREFIX + "sync_view_context"; //$NON-NLS-1$
+
+ // Site Explorer View Actions
+ public static final String ADD_SITE_ACTION = PREFIX + "add_site_action_context"; //$NON-NLS-1$
+ public static final String NEW_FOLDER_ACTION = PREFIX + "new_folder_action_context"; //$NON-NLS-1$
+
+ // Sync View Actions
+ public static final String EXPANDALL_ACTION = PREFIX + "expandall_action_context"; //$NON-NLS-1$
+ public static final String REMOVE_ACTION = PREFIX + "remove_action_context"; //$NON-NLS-1$
+ public static final String NAVIGATOR_SHOW_ACTION = PREFIX + "navigator_show_action_context"; //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java
index 93bb21abb..a01a7b7d4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/CatchupReleaseViewer.java
@@ -52,6 +52,7 @@ import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.team.core.sync.ILocalSyncElement;
import org.eclipse.team.core.sync.IRemoteSyncElement;
+import org.eclipse.team.internal.ui.IHelpContextIds;
import org.eclipse.team.internal.ui.Policy;
import org.eclipse.team.internal.ui.TeamUIPlugin;
import org.eclipse.team.internal.ui.UIConstants;
@@ -61,6 +62,7 @@ import org.eclipse.ui.IPageLayout;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.IViewSite;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.ui.internal.WorkbenchPlugin;
import org.eclipse.ui.views.navigator.ResourceNavigator;
@@ -335,6 +337,7 @@ public abstract class CatchupReleaseViewer extends DiffTreeViewer implements ISe
// Expand action
expandAll = new ExpandAllAction(Policy.bind("CatchupReleaseViewer.expand"), null); //$NON-NLS-1$
+ WorkbenchHelp.setHelp(expandAll, IHelpContextIds.EXPANDALL_ACTION);
// Toggle granularity
image = TeamImages.getImageDescriptor(UIConstants.IMG_CONTENTS);
@@ -349,6 +352,7 @@ public abstract class CatchupReleaseViewer extends DiffTreeViewer implements ISe
toggleGranularity.setChecked(compareFileContents);
removeFromTree = new RemoveFromTreeAction(Policy.bind("CatchupReleaseViewer.removeFromView"), null); //$NON-NLS-1$
+ WorkbenchHelp.setHelp(removeFromTree, IHelpContextIds.REMOVE_ACTION);
copyAllRightToLeft = new Action(Policy.bind("CatchupReleaseViewer.copyAllRightToLeft"), null) { //$NON-NLS-1$
public void run() {
@@ -399,6 +403,7 @@ public abstract class CatchupReleaseViewer extends DiffTreeViewer implements ISe
// Show in navigator
if (diffModel.getViewSite() != null) {
showInNavigator = new ShowInNavigatorAction(diffModel.getViewSite(), Policy.bind("CatchupReleaseViewer.showInNavigator")); //$NON-NLS-1$
+ WorkbenchHelp.setHelp(showInNavigator, IHelpContextIds.NAVIGATOR_SHOW_ACTION);
addSelectionChangedListener(showInNavigator);
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java
index 8cd2d57fb..bcf63c8f4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java
@@ -384,6 +384,7 @@ public class SiteExplorerView extends ViewPart implements ISiteListener {
}
};
addSiteAction.setToolTipText(Policy.bind("SiteExplorerView.addSiteActionTooltip")); //$NON-NLS-1$
+ WorkbenchHelp.setHelp(addSiteAction, IHelpContextIds.ADD_SITE_ACTION);
newFolderAction = new Action(Policy.bind("SiteExplorerView.newFolderAction"), WorkbenchImages.getImageDescriptor(org.eclipse.ui.ISharedImages.IMG_OBJ_FOLDER)) { //$NON-NLS-1$
public void run() {
@@ -423,6 +424,7 @@ public class SiteExplorerView extends ViewPart implements ISiteListener {
getSelectedRemoteFolder((IStructuredSelection)folderTree.getSelection()).length == 1;
}
};
+ WorkbenchHelp.setHelp(newFolderAction, IHelpContextIds.NEW_FOLDER_ACTION);
IActionBars bars = getViewSite().getActionBars();
IToolBarManager tbm = bars.getToolBarManager();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java
index c7937729b..e6781d58b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java
@@ -27,7 +27,7 @@ public class TargetCatchupReleaseViewer extends CatchupReleaseViewer {
super(parent, input);
initializeActions(input);
// set F1 help
- WorkbenchHelp.setHelp(this.getControl(), IHelpContextIds.CATCHUP_RELEASE_VIEWER);
+ WorkbenchHelp.setHelp(this.getControl(), IHelpContextIds.TARGET_CATCHUP_RELEASE_VIEWER);
}
/**

Back to the top