diff options
author | Michael Valenta | 2002-05-17 21:22:31 +0000 |
---|---|---|
committer | Michael Valenta | 2002-05-17 21:22:31 +0000 |
commit | 266599bb2be8c6f86918b46e0ebaf55e55ac7626 (patch) | |
tree | e110400a255c254f24ec5cc56ea881b2a2878946 /bundles/org.eclipse.team.cvs.ui/src | |
parent | d8b03558a1060ae3d1073223ca26643ef77c3342 (diff) | |
download | eclipse.platform.team-266599bb2be8c6f86918b46e0ebaf55e55ac7626.tar.gz eclipse.platform.team-266599bb2be8c6f86918b46e0ebaf55e55ac7626.tar.xz eclipse.platform.team-266599bb2be8c6f86918b46e0ebaf55e55ac7626.zip |
Added more F1 help stuff
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src')
7 files changed, 75 insertions, 22 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java index 8cdf8d211..c62e7b436 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/BranchPromptDialog.java @@ -28,8 +28,9 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Tree; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.ui.merge.ProjectElement; import org.eclipse.team.internal.ccvs.ui.wizards.CVSWizardPage; +import org.eclipse.team.internal.ccvs.ui.merge.ProjectElement; +import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; @@ -124,6 +125,9 @@ public class BranchPromptDialog extends DetailsDialog { versionText.setText(versionName); } + // F1 Help + WorkbenchHelp.setHelp(composite, IHelpContextIds.BRANCH_DIALOG); + branchText.setFocus(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java index 4e5a7bcc8..189f4633f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/Console.java @@ -10,11 +10,11 @@ ******************************************************************************/ package org.eclipse.team.internal.ccvs.ui; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.OperationCanceledException; @@ -35,16 +35,16 @@ import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.LineStyleEvent; -import org.eclipse.swt.custom.LineStyleListener; -import org.eclipse.swt.custom.StyleRange; -import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.RGB; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.custom.LineStyleEvent; +import org.eclipse.swt.custom.LineStyleListener; +import org.eclipse.swt.custom.StyleRange; +import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Menu; @@ -56,6 +56,7 @@ import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; +import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.texteditor.ITextEditorActionConstants; @@ -156,7 +157,10 @@ public class Console extends ViewPart { composite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL)); updatePreferences(null); - + + // F1 Help + WorkbenchHelp.setHelp(composite, IHelpContextIds.CONSOLE_VIEW); + // create the viewer viewer = new TextViewer(composite, SWT.V_SCROLL | SWT.H_SCROLL); GridData data = new GridData(GridData.FILL_BOTH); diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java index 4b56453d8..77a24fb66 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/HistoryView.java @@ -6,9 +6,9 @@ package org.eclipse.team.internal.ccvs.ui; */ import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; import java.text.DateFormat; import java.util.Date; +import java.lang.reflect.InvocationTargetException; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; @@ -71,20 +71,18 @@ import org.eclipse.team.internal.ccvs.core.CVSTeamProvider; import org.eclipse.team.internal.ccvs.core.ICVSFile; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; import org.eclipse.team.internal.ccvs.core.ILogEntry; -import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; -import org.eclipse.team.internal.ccvs.ui.CVSCompareRevisionsInput.HistoryLabelProvider; +import org.eclipse.team.internal.ccvs.core.client.Command; import org.eclipse.team.internal.ccvs.ui.actions.CVSAction; import org.eclipse.team.internal.ccvs.ui.actions.OpenLogEntryAction; import org.eclipse.ui.IActionBars; -import org.eclipse.ui.ISelectionListener; import org.eclipse.ui.IWorkbenchActionConstants; -import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.actions.WorkspaceModifyOperation; import org.eclipse.ui.part.ResourceTransfer; import org.eclipse.ui.part.ViewPart; import org.eclipse.ui.texteditor.ITextEditorActionConstants; +import org.eclipse.ui.help.WorkbenchHelp; /** * The history view allows browsing of an array of resource revisions @@ -371,7 +369,7 @@ public class HistoryView extends ViewPart { contributeActions(); setViewerVisibility(); // set F1 help - //WorkbenchHelp.setHelp(viewer.getControl(), new ViewContextComputer (this, IVCMHelpContextIds.RESOURCE_HISTORY_VIEW)); + WorkbenchHelp.setHelp(tableViewer.getControl(), IHelpContextIds.RESOURCE_HISTORY_VIEW); initDragAndDrop(); } private void initializeImages() { 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 fc71b6923..65822baa7 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 @@ -19,6 +19,40 @@ public interface IHelpContextIds { public static final String TAG_CONFIGURATION_REFRESHACTION = PREFIX + "tag_configuration_refreshaction"; //$NON-NLS-1$ public static final String USER_VALIDATION_DIALOG = PREFIX + "user_validation_dialog_context"; //$NON-NLS-1$ 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"; + + // Different uses of the TagSelectionDialog (not done) + public static final String REPLACE_TAG_SELECTION_DIALOG = PREFIX + "replace_tag_selection_dialog_context"; + public static final String COMPARE_TAG_SELECTION_DIALOG = PREFIX + "compare_tag_selection_dialog_context"; + public static final String TAG_REMOTE_WITH_EXISTING_DIALOG = PREFIX + "tag_remot_with_existing_dialog_context"; + + // Different uses of the TagAsVersionDialog (not done) + public static final String TAG_LOCAL_AS_VERSION_DIALOG = PREFIX + "tag_local_as_version_dialog_context"; + public static final String TAG_REMOTE_AS_VERSION_DIALOG = PREFIX + "tag_remote_as_version_dialog_context"; + + // Different uses of InputDialog from actions (not done) + public static final String DEFINE_BRANCH_DIALOG = PREFIX + "define_branch_dialog_context"; + public static final String DEFINE_VERSION_DIALOG = PREFIX + "define_version_dialog_context"; + + // Wizards + // (not done) + public static final String SHARING_WIZARD = PREFIX + "sharing_wizard_context"; + public static final String KEYWORD_SUBSTITUTION_WIZARD = PREFIX + "keyword_substituton_wizard_context"; + public static final String NEW_LOCATION_WIZARD = PREFIX + "new_location_wizard_context"; + public static final String PATCH_WIZARD = PREFIX + "patch_wizard_context"; + + // Wizard Pages (not done) + public static final String SHARING_AUTOCONNECT_PAGE = PREFIX + "sharing_autoconnect_page_context"; + public static final String SHARING_SELECT_REPOSITORY_PAGE = PREFIX + "sharing_select_repository_page_context"; + public static final String SHARING_NEW_REPOSITORY_PAGE = PREFIX + "sharing_new_repository_page_context"; + public static final String SHARING_MODULE_PAGE = PREFIX + "sharing_module_page_context"; + public static final String SHARING_FINISH_PAGE = PREFIX + "sharing_finish_page_context"; + public static final String PATCH_SELECTION_PAGE = PREFIX + "patch_selection_page_context"; + public static final String PATCH_OPTIONS_PAGE = PREFIX + "patch_options_page_context"; + public static final String KEYWORD_SUBSTITUTION_SELECTION_PAGE = PREFIX + "keyword_substituton_selection_page_context"; + public static final String KEYWORD_SUBSTITUTION_SUMMARY_PAGE = PREFIX + "keyword_substituton_summary_page_context"; + public static final String KEYWORD_SUBSTITUTION_SHARED_PAGE = PREFIX + "keyword_substituton_shared_page_context"; + public static final String KEYWORD_SUBSTITUTION_CHANGED_PAGE = PREFIX + "keyword_substituton_changed_page_context"; // Preference Pages public static final String PREF_PRUNE = PREFIX + "prune_empty_directories_pref"; //$NON-NLS-1$ @@ -29,4 +63,12 @@ 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"; + public static final String REPOSITORIES_VIEW = PREFIX + "repositories_view_context"; + public static final String RESOURCE_HISTORY_VIEW = PREFIX + "resource_history_view_context"; + + // Viewers + public static final String CATCHUP_RELEASE_VIEWER = PREFIX + "catchup_release_viewer_context"; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoriesView.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoriesView.java index ce61d57b0..7e3e136dd 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoriesView.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoriesView.java @@ -35,14 +35,15 @@ import org.eclipse.team.internal.ccvs.core.CVSProvider; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSRemoteFile; import org.eclipse.team.internal.ccvs.core.ICVSRepositoryLocation; +import org.eclipse.team.internal.ccvs.ui.wizards.NewLocationWizard; import org.eclipse.team.internal.ccvs.ui.actions.OpenRemoteFileAction; import org.eclipse.team.internal.ccvs.ui.model.AllRootsElement; import org.eclipse.team.internal.ccvs.ui.model.RemoteContentProvider; -import org.eclipse.team.internal.ccvs.ui.wizards.NewLocationWizard; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IWorkbenchActionConstants; -import org.eclipse.ui.dialogs.PropertyDialogAction; +import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.model.WorkbenchLabelProvider; +import org.eclipse.ui.dialogs.PropertyDialogAction; import org.eclipse.ui.part.DrillDownAdapter; import org.eclipse.ui.part.ViewPart; @@ -262,6 +263,9 @@ public class RepositoriesView extends ViewPart { drillPart = new DrillDownAdapter(viewer); contributeActions(); CVSUIPlugin.getPlugin().getRepositoryManager().addRepositoryListener(listener); + + // F1 Help + WorkbenchHelp.setHelp(viewer.getControl(), IHelpContextIds.REPOSITORIES_VIEW); } /* diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java index 8d370bc19..96b633364 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/TagAsVersionDialog.java @@ -13,8 +13,6 @@ package org.eclipse.team.internal.ccvs.ui; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IDialogConstants; 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; @@ -35,9 +33,9 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; import org.eclipse.team.internal.ccvs.core.CVSTag; import org.eclipse.team.internal.ccvs.core.ICVSFolder; -import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot; import org.eclipse.team.internal.ccvs.ui.merge.TagElement; import org.eclipse.team.internal.ccvs.ui.merge.TagRootElement; +import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; @@ -98,7 +96,6 @@ public class TagAsVersionDialog extends DetailsDialog { table.setLayout(layout); TableColumn col = new TableColumn(table, SWT.NONE); col.setResizable(true); - return new TableViewer(table); } 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 181f8b06f..7377efc21 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 @@ -52,6 +52,7 @@ import org.eclipse.team.internal.ccvs.ui.CVSDecoratorConfiguration; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.ccvs.ui.HistoryView; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; +import org.eclipse.team.internal.ccvs.ui.IHelpContextIds; import org.eclipse.team.internal.ccvs.ui.OverlayIcon; import org.eclipse.team.internal.ccvs.ui.OverlayIconCache; import org.eclipse.team.internal.ccvs.ui.Policy; @@ -65,6 +66,7 @@ import org.eclipse.team.internal.ui.sync.SyncView; import org.eclipse.team.internal.ui.sync.TeamFile; import org.eclipse.team.ui.ISharedImages; import org.eclipse.team.ui.TeamImages; +import org.eclipse.ui.help.WorkbenchHelp; public class CVSCatchupReleaseViewer extends CatchupReleaseViewer { // Actions @@ -163,6 +165,8 @@ public class CVSCatchupReleaseViewer extends CatchupReleaseViewer { super(parent, model); initializeActions(model); initializeLabelProvider(); + // set F1 help + WorkbenchHelp.setHelp(this.getControl(), IHelpContextIds.CATCHUP_RELEASE_VIEWER); } private void initializeLabelProvider() { |