diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java
index 27e3ad57d23..a590352116b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java
@@ -128,14 +128,10 @@ public interface ICHelpContextIds {
// view parts
public static final String TYPE_HIERARCHY_VIEW= PREFIX + "type_hierarchy_view_context"; //$NON-NLS-1$
- public static final String PACKAGES_VIEW= PREFIX + "package_view_context"; //$NON-NLS-1$
- public static final String PROJECTS_VIEW= PREFIX + "projects_view_context"; //$NON-NLS-1$
- public static final String PACKAGES_BROWSING_VIEW= PREFIX + "packages_browsing_view_context"; //$NON-NLS-1$
- public static final String TYPES_VIEW= PREFIX + "types_view_context"; //$NON-NLS-1$
- public static final String MEMBERS_VIEW= PREFIX + "members_view_context"; //$NON-NLS-1$
+ public static final String CALL_HIERARCHY_VIEW= PREFIX + "call_hierarchy_view_context"; //$NON-NLS-1$
+ public static final String INCLUDE_BROWSER_VIEW= PREFIX + "include_browser_view_context"; //$NON-NLS-1$
public static final String OPEN_ACTION = PREFIX + "open_action"; //$NON-NLS-1$
- public static final String OPEN_C_BROWSING_PERSPECTIVE_ACTION = PREFIX + "open_c_browsing_perspective_action"; //$NON-NLS-1$
public static final String OPEN_PROJECT_ACTION = PREFIX + "open_project_action"; //$NON-NLS-1$
public static final String OPEN_TYPE_ACTION = PREFIX + "open_type_action"; //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
index 250607d1710..667c412d049 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/callhierarchy/CHViewPart.java
@@ -51,6 +51,7 @@ import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.contexts.IContextActivation;
import org.eclipse.ui.contexts.IContextService;
@@ -69,6 +70,7 @@ import org.eclipse.cdt.ui.actions.OpenViewActionGroup;
import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup;
import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.IContextMenuConstants;
import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds;
import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup;
@@ -215,7 +217,9 @@ public class CHViewPart extends ViewPart {
if (ctxService != null) {
fContextActivation= ctxService.activateContext(CUIPlugin.CVIEWS_SCOPE);
}
- }
+
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(fPagebook, ICHelpContextIds.CALL_HIERARCHY_VIEW);
+ }
@Override
public void dispose() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
index 194dd9cc14b..a5cd6958fbe 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/includebrowser/IBViewPart.java
@@ -63,6 +63,7 @@ import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.actions.ContributionItemFactory;
import org.eclipse.ui.actions.OpenFileAction;
@@ -90,6 +91,7 @@ import org.eclipse.cdt.core.model.IWorkingCopy;
import org.eclipse.cdt.ui.CUIPlugin;
import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.navigator.OpenCElementAction;
import org.eclipse.cdt.internal.ui.util.Messages;
import org.eclipse.cdt.internal.ui.viewsupport.EditorOpener;
@@ -276,7 +278,9 @@ public class IBViewPart extends ViewPart
if (ctxService != null) {
fContextActivation= ctxService.activateContext(CUIPlugin.CVIEWS_SCOPE);
}
- }
+
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(fPagebook, ICHelpContextIds.INCLUDE_BROWSER_VIEW);
+ }
@Override
public void dispose() {
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
index 0dd66f25d80..5b166eda776 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
@@ -429,12 +429,12 @@ MarkOccurrencesConfigurationBlock_stickyOccurrences= &Keep marks when the select
#Scalability Preferences
ScalabilityPreferencePage_description= Settings for editor scalability
ScalabilityPreferencePage_detection_group_label= Scalability mode detection
-ScalabilityPreferencePage_detection_label= Alert me when scalability mode should be turned on
-ScalabilityPreferencePage_trigger_lines_label= Enable scalability mode options when the number of lines in the file is more than:
+ScalabilityPreferencePage_detection_label= Alert me when scalability mode will be turned on
+ScalabilityPreferencePage_trigger_lines_label= Enable scalability mode when the number of lines in the file is more than:
ScalabilityPreferencePage_error=Value must be an integer between {0} and {1}.
ScalabilityPreferencePage_scalabilityMode_group_label= Scalability mode settings
ScalabilityPreferencePage_scalabilityMode_label= Enable all scalability mode options
-ScalabilityPreferencePage_reconciler_label= Disable editor live parsing (Outline view, semantic highlighting and editor folding will also be disabled)
+ScalabilityPreferencePage_reconciler_label= Disable editor live parsing (Outline view, semantic highlighting and folding will also be disabled)
ScalabilityPreferencePage_syntaxColor_label= Disable syntax coloring in editor
ScalabilityPreferencePage_semanticHighlighting_label= Disable semantic highlighting in editor
ScalabilityPreferencePage_contentAssist_label= Disable parsing-based content assist proposals
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java
index f9e71e53aa8..b7832afe1d3 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/typehierarchy/THViewPart.java
@@ -67,6 +67,7 @@ import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.contexts.IContextActivation;
import org.eclipse.ui.contexts.IContextService;
@@ -89,6 +90,7 @@ import org.eclipse.cdt.ui.actions.OpenViewActionGroup;
import org.eclipse.cdt.ui.refactoring.actions.CRefactoringActionGroup;
import org.eclipse.cdt.internal.ui.CPluginImages;
+import org.eclipse.cdt.internal.ui.ICHelpContextIds;
import org.eclipse.cdt.internal.ui.IContextMenuConstants;
import org.eclipse.cdt.internal.ui.editor.ICEditorActionDefinitionIds;
import org.eclipse.cdt.internal.ui.search.actions.SelectionSearchGroup;
@@ -237,7 +239,9 @@ public class THViewPart extends ViewPart implements ITHModelPresenter {
if (ctxService != null) {
fContextActivation= ctxService.activateContext(CUIPlugin.CVIEWS_SCOPE);
}
- }
+
+ PlatformUI.getWorkbench().getHelpSystem().setHelp(fPagebook, ICHelpContextIds.TYPE_HIERARCHY_VIEW);
+ }
@Override
public void dispose() {
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 8e673b2ab33..929efb696d6 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -87,6 +87,11 @@
Folding preferences
Hovers preferences
Mark Occurrences preferences
+ Scalability preferences
Syntax Coloring preferences
Templates preferences
Typing preferences
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
index 2a34765995d..91f2472f8d1 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
@@ -58,6 +58,7 @@
Folding preferences
Hovers preferences
Mark Occurrences preferences
+ Scalability preferences
Syntax Coloring preferences
Templates preferences
Typing preferences
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm
index 0acb56eeefc..3baeaa1c1ed 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_views.htm
@@ -22,6 +22,7 @@
Editor view
Console view
Call Hierarchy view
+ Type Hierarchy view
Problems view
Properties view
Search view
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
new file mode 100644
index 00000000000..3380e096619
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_scalability.htm
@@ -0,0 +1,75 @@
+
+
+
+
Use the Scalability preference panel to configure options for dealing with large source files. Click Window > Preferences > C/C++ > Editor > Scalability to make changes.
+If enabled, an information dialog pops up when a large file is opened + with the C/C++ Editor which exceeds the specified line limit. | +|
If the number of lines in a file exceeds the specified number the C/C++ Editor will + enable scalability mode and all scalability mode options below will take effect. | +|
If enabled, all options below are enabled, too. | +|
If enabled, parsing while typing will be disabled. + This disables also other features like Outline view, semantic highlighting, folding, etc. | +|
If enabled, C/C++ identifiers will not be colored. | +|
If enabled, no coloring of keywords, comments and literals is done. | +|
If enabled, content assist proposals which require parsing the file will not be available. | +|
If enabled, content assist will not be activated automatically on trigger sequences, like '.', '::' or '->'. | +
+
+Customizing the C/C++ editor
+Working with Content Assist
You can define what the size of the CodeReader Buffer Size is. The CodeReader Buffer is used by the parser to load files from a cache which prevents unnecessary disk and network I/O.
-+ This view shows the include relationships between source and header files. +
++ The Include Browser tree shows files included by the focused file or files including the focused file depending on the selection made in the + toolbar. +
+
+ + Command + + |
+
+ + Description + + |
+
---|---|
+ + Show Next Include + + |
+
+ + This command selects the next include directive of the current file and opens it in the editor. + + |
+
+ + Show Previous Include + + |
+
+ + This command selects the previous include directive of the current file and opens it in the editor. + + |
+
+ + Hide System Includes + + |
+
+ + This command toggles the display of include directives with angle brackets (<>). + + |
+
+ + Hide Includes from Inactive Code + + |
+
+ + This command toggles the display of include directives which are contained in an inactive conditional preprocessor branch. + + |
+
+ + Show Includers + + |
+
+ + Show files including the currently focused file. + + |
+
+ + Show Included Files + + |
+
+ + Show files included by the currently focused file. + + |
+
+ + Show History List + + |
+
+ + This menu displays a history of previously displayed include relationships. + + |
+
+ + Refresh View Content + + |
+
+ + This command updates the view content by running a new query on the index database. + + |
+
+
+ Views
+
+ This view shows the hierarchy of a type. The Type Hierarchy view consists of two panes: +
++ The type hierarchy tree shows supertypes, suptypes or both of a given type depending on the selection made in the + toolbar. +
+
+ + Command + + |
+
+ + Description + + |
+
---|---|
+ + Show the Type Hierarchy + + |
+
+ + This command displays the type in its full context (i.e., superclasses and subclasses) in the Hierarchy view. + + |
+
+ + Show the Supertype Hierarchy + + |
+
+ + This command displays the supertypes in the Hierarchy view. The tree starts at the selected type and + displays the result of traversing up the hierarchy. + + Note: The selected type is always at the top level, in the upper-left corner. + |
+
+ + Show the Subtype Hierarchy + + |
+
+ + This command displays the subtypes of the selected type in the Hierarchy view. The tree starts at the selected type and + displays the result of traversing down the hierarchy + + Note: The selected type is always at the top level, in the upper-left corner. + |
+
+ + Show History List + + |
+
+ + This menu displays a history of previously displayed type hierarchies. + + |
+
+ + Refresh + + |
+
+ + This command updates the view content by running a new query on the index database. + + |
+
+ + Cancel + + |
+
+ + This command cancels a currently running query. + + |
+
+ + Layout > Hierarchy View Only + + |
+
+ + Hides the member list pane. + + |
+
+ The member list pane displays the members of the currently selected type in the type hierarchy tree pane. +
+
+ + Command + + |
+
+ + Description + + |
+
---|---|
+ + Show All Inherited Members + + |
+
+ + Shows or hides all methods and fields inherited by base classes. When this option is set, the name of the type that defines the method is appended to the method + name. + + |
+
+ + Hide Fields + + |
+
+ + Shows or hides the fields. + + |
+
+ + Hide Static Fields and Methods + + |
+
+ + Shows or hides the static fields and methods. + + |
+
+ + Hide Non-Public Members + + |
+
+ + Shows or hides the static fields and methods. + + |
+
+
+ Views
+
Users can choose which indexer they wish to use on a specific
-project by bringing up the project properties and
-selecting an indexer from the available indexer list.
-
-
-C/C++ search
-C/C++ Indexer
-C/C++ Indexer
-Opening or Closing a project
-C/C++ Indexer Progress
-Bar
-Selection Searching for C/C++
-elements
-Enable/Disable the Full C/C++
-Indexer
-Indexing a large project
-Setting Source Folders
-
-
-C/C++ search page, Search
-dialog box
-
-C/C++ Project
-Properties, Managed, Indexer
-
-C/C++ Project
-Properties, Standard, Indexer
-
Users can choose which indexer they wish to use on a specific
-project by bringing up the project properties and
-selecting an indexer from the available indexer list.
-
-
-C/C++ search
-C/C++ Indexer
-C/C++ Indexer
-Opening or Closing a project
-C/C++ Indexer Progress
-Bar
-Selection Searching for C/C++
-elements
-Indexing a large project
-Setting Source Folders
-
-
-C/C++ search page, Search
-dialog box
-
-C/C++ Project Properties, Indexer
-
-
Although any indexer can be used to index an existing project at any
-time, the following steps present a recommended
-approach to importing large projects.
-
Create a new Standard or Managed project.
-
-
-C/C++ search
-C/C++ Indexer
-Full C/C++ Indexer
-CTags Indexer
-C/C++ Indexer Progress
-Bar
-Selection Searching for C/C++
-elements
-Enable/Disable the Full C/C++
-Indexer
-Enable/Disable the CTags
-Indexer
-Setting Source Folders
-
-
-C/C++ search page, Search
-dialog box
-
-C/C++ Project
-Properties, Managed, Indexer
-
-C/C++ Project
-Properties, Standard, Indexer
-