Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-06-11 14:46:28 -0400
committerMichael Valenta2002-06-11 14:46:28 -0400
commit1ac7bea2a869da8c0e8e8283e2b3685aa1fc3db4 (patch)
tree310cd05d0c01ea990e97b0c357c15640a8b82663
parente61b7db1dfea33c771d7fb5e997caadc3cc99463 (diff)
downloadeclipse.platform.team-1ac7bea2a869da8c0e8e8283e2b3685aa1fc3db4.tar.gz
eclipse.platform.team-1ac7bea2a869da8c0e8e8283e2b3685aa1fc3db4.tar.xz
eclipse.platform.team-1ac7bea2a869da8c0e8e8283e2b3685aa1fc3db4.zip
19193: Context-sensitive help missing for various Team components
-rw-r--r--bundles/org.eclipse.team.ui/help_contexts.xml67
-rw-r--r--bundles/org.eclipse.team.ui/plugin.xml6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/IHelpContextIds.java10
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetSyncAction.java10
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutSyncAction.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/SiteExplorerView.java19
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/TargetCatchupReleaseViewer.java5
7 files changed, 101 insertions, 22 deletions
diff --git a/bundles/org.eclipse.team.ui/help_contexts.xml b/bundles/org.eclipse.team.ui/help_contexts.xml
index 2b810476b..8c8caf7d1 100644
--- a/bundles/org.eclipse.team.ui/help_contexts.xml
+++ b/bundles/org.eclipse.team.ui/help_contexts.xml
@@ -11,4 +11,71 @@
<!-- Old reference fom 1.0 -->
<topic label="More info" href="reference/ref20.html"/>
</context>
+
+ <!-- ********************************** -->
+ <!-- TargetMenuActions -->
+ <!-- ********************************** -->
+
+ <context id="target_get_action_context">
+ <description>Downloads the file(s) from the remote server
+ </description>
+ </context>
+
+ <context id="target_put_action_context">
+ <description>Uploads the file(s) to the remote server
+ </description>
+ </context>
+
+ <context id="target_synchronize_action_context">
+ <description>Gets the remote &amp; local projects in sync with each other
+ </description>
+ </context>
+
+ <context id="target_getas_action_context">
+ <description>Save the file with a different name
+ </description>
+ </context>
+
+ <context id="target_getasproject_action_context">
+ <description>Save the project under a different name
+ </description>
+ </context>
+
+ <context id="target_disconnect_action_context">
+ <description>Remove the Target provider
+ </description>
+ </context>
+
+ <!-- ********************************** -->
+ <!-- TargetCatchupReleaseViewer -->
+ <!-- ********************************** -->
+
+ <context id="catchup_release_viewer_context">
+ <description>Bring the local project up-to-date with the remote one
+ </description>
+ </context>
+
+ <!-- ********************************** -->
+ <!-- TargetActions -->
+ <!-- ********************************** -->
+
+ <context id="sync_get_action">
+ <description>Sync the local project to the remote one
+ </description>
+ </context>
+
+ <context id="sync_put_action">
+ <description>Sync the remote project to the local one
+ </description>
+ </context>
+
+ <!-- ********************************** -->
+ <!-- Views -->
+ <!-- ********************************** -->
+
+ <context id="site_explorer_view">
+ <description>This view allows you to manipulate the files on the remote server.
+ </description>
+ </context>
+
</contexts> \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/plugin.xml b/bundles/org.eclipse.team.ui/plugin.xml
index fa0fe7648..2fba0801d 100644
--- a/bundles/org.eclipse.team.ui/plugin.xml
+++ b/bundles/org.eclipse.team.ui/plugin.xml
@@ -98,6 +98,7 @@
<action
menubarPath="replaceWithMenu/replaceWithGroup"
class="org.eclipse.team.internal.ui.target.GetAction"
+ helpContextId="org.eclipse.team.ui.target_get_action_context"
id="org.eclipse.team.target.getAction"
label="%Deployment.getAction">
</action>
@@ -105,11 +106,13 @@
menubarPath="team.main/targetGroup"
class="org.eclipse.team.internal.ui.target.UploadAction"
id="org.eclipse.team.target.uploadAction"
+ helpContextId="org.eclipse.team.ui.target_put_action_context"
label="%Deployment.uploadAction">
</action>
<action
menubarPath="team.main/targetGroup"
class="org.eclipse.team.internal.ui.target.SyncAction"
+ helpContextId="org.eclipse.team.ui.target_synchronize_action_context"
id="org.eclipse.team.target.SyncAction"
label="%Deployment.synchronize">
</action>
@@ -135,12 +138,14 @@
label="%SiteExplorerGetAs.label"
tooltip="%SiteExplorerGetAs.tooltip"
class="org.eclipse.team.internal.ui.target.GetAsAction"
+ helpContextId="org.eclipse.team.ui.target_getas_action_context"
id="org.eclipse.team.internal.ui.target.GetAsAction">
</action>
<action
label="%SiteExplorerGetAsProject.label"
tooltip="%SiteExplorerGetAsProject.tooltip"
class="org.eclipse.team.internal.ui.target.GetAsProjectAction"
+ helpContextId="org.eclipse.team.ui.target_getasproject_action_context"
id="org.eclipse.team.internal.ui.target.GetAsProjectAction">
</action>
</objectContribution>
@@ -152,6 +157,7 @@
label="%SiteExplorerDiscardSite.label"
tooltip="%SiteExplorerDiscardSite.tooltip"
class="org.eclipse.team.internal.ui.target.DiscardSiteAction"
+ helpContextId="org.eclipse.team.ui.target_disconnect_action_context"
id="org.eclipse.team.internal.ui.target.DiscardSiteAction">
</action>
</objectContribution>
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 56baf0fbb..1432d17b0 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
@@ -23,4 +23,14 @@ public interface IHelpContextIds {
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$
+
+ // 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$
+
+ // Views
+ public static final String SITE_EXPLORER_VIEW = PREFIX + "site_explorer_view"; //$NON-NLS-1$
+
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetSyncAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetSyncAction.java
index 620ea3022..5b0bbf4ca 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetSyncAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/GetSyncAction.java
@@ -17,27 +17,25 @@ import java.util.List;
import java.util.Set;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.core.TeamException;
-import org.eclipse.team.core.target.TargetManager;
import org.eclipse.team.core.target.TargetProvider;
-import org.eclipse.team.internal.core.*;
+import org.eclipse.team.internal.core.InfiniteSubProgressMonitor;
+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.sync.ITeamNode;
import org.eclipse.team.internal.ui.sync.SyncSet;
-import org.eclipse.team.internal.ui.sync.SyncView;
+import org.eclipse.ui.help.WorkbenchHelp;
public class GetSyncAction extends TargetSyncAction {
public GetSyncAction(TargetSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) {
super(model, sp, label, shell);
+ WorkbenchHelp.setHelp(this, IHelpContextIds.SYNC_GET_ACTION);
}
/**
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutSyncAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutSyncAction.java
index a9c418e5f..96d35d235 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutSyncAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/target/PutSyncAction.java
@@ -18,23 +18,25 @@ import java.util.Set;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.target.TargetProvider;
-import org.eclipse.team.internal.core.*;
+import org.eclipse.team.internal.core.InfiniteSubProgressMonitor;
+import org.eclipse.team.internal.ui.IHelpContextIds;
import org.eclipse.team.internal.ui.Policy;
import org.eclipse.team.internal.ui.sync.ITeamNode;
import org.eclipse.team.internal.ui.sync.SyncSet;
import org.eclipse.team.internal.ui.sync.SyncView;
+import org.eclipse.ui.help.WorkbenchHelp;
public class PutSyncAction extends TargetSyncAction {
public PutSyncAction(TargetSyncCompareInput model, ISelectionProvider sp, String label, Shell shell) {
super(model, sp, label, shell);
+ WorkbenchHelp.setHelp(this, IHelpContextIds.SYNC_PUT_ACTION);
}
/**
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 4f12420d3..01b6b1dbf 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
@@ -21,19 +21,7 @@ import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.jface.viewers.*;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
@@ -55,12 +43,14 @@ import org.eclipse.team.core.target.IRemoteTargetResource;
import org.eclipse.team.core.target.ISiteListener;
import org.eclipse.team.core.target.Site;
import org.eclipse.team.core.target.TargetManager;
+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.ui.ISharedImages;
import org.eclipse.team.ui.TeamImages;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.help.WorkbenchHelp;
import org.eclipse.ui.internal.WorkbenchImages;
import org.eclipse.ui.model.WorkbenchLabelProvider;
import org.eclipse.ui.part.ViewPart;
@@ -333,6 +323,9 @@ public class SiteExplorerView extends ViewPart implements ISiteListener {
root = new SiteRootsElement(getViewSite().getWorkbenchWindow());
initalizeActions();
folderTree.setInput(root);
+
+ // F1 Help
+ WorkbenchHelp.setHelp(folderTree.getControl(), IHelpContextIds.SITE_EXPLORER_VIEW);
}
private Shell getShell() {
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 cf0731df9..c7937729b 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
@@ -14,10 +14,11 @@ import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.team.internal.ui.IHelpContextIds;
import org.eclipse.team.internal.ui.Policy;
import org.eclipse.team.internal.ui.sync.CatchupReleaseViewer;
import org.eclipse.team.internal.ui.sync.SyncView;
-
+import org.eclipse.ui.help.WorkbenchHelp;
public class TargetCatchupReleaseViewer extends CatchupReleaseViewer {
private GetSyncAction getAction;
private PutSyncAction putAction;
@@ -25,6 +26,8 @@ public class TargetCatchupReleaseViewer extends CatchupReleaseViewer {
public TargetCatchupReleaseViewer(Composite parent, TargetSyncCompareInput input) {
super(parent, input);
initializeActions(input);
+ // set F1 help
+ WorkbenchHelp.setHelp(this.getControl(), IHelpContextIds.CATCHUP_RELEASE_VIEWER);
}
/**

Back to the top