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 dc41bc1b597..35d08dddad4 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 @@ -51,7 +51,6 @@ public interface ICHelpContextIds { public static final String C_EDITOR_PREF_PAGE = PREFIX + "c_editor_gen"; //$NON-NLS-1$ public static final String C_EDITOR_COLORS_PREF_PAGE = PREFIX + "c_editor_color"; //$NON-NLS-1$ public static final String C_EDITOR_CONTENT_ASSIST_PREF_PAGE = PREFIX + "c_editor_con_assist"; //$NON-NLS-1$ - public static final String C_EDITOR_NAVIGATION_PAGE = PREFIX + "c_editor_navigation"; //$NON-NLS-1$ public static final String C_EDITOR_HOVERS_PAGE = PREFIX + "c_editor_hov"; //$NON-NLS-1$ public static final String C_EDITOR_TYPING_PAGE = PREFIX + "c_editor_typing"; //$NON-NLS-1$; public static final String C_EDITOR_FOLDING_PAGE = PREFIX + "c_editor_folding"; //$NON-NLS-1$; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java index cf3fda0d728..9af008daf90 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java @@ -63,6 +63,14 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage { } + /* + * @see PreferencePage#createControl(Composite) + */ + public void createControl(Composite parent) { + super.createControl(parent); + PlatformUI.getWorkbench().getHelpSystem().setHelp(getControl(), ICHelpContextIds.C_EDITOR_CONTENT_ASSIST_PREF_PAGE); + } + /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) */ @@ -132,8 +140,6 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage { initializeFields(); - PlatformUI.getWorkbench().getHelpSystem().setHelp(contentAssistComposite, ICHelpContextIds.C_EDITOR_CONTENT_ASSIST_PREF_PAGE); - return contentAssistComposite; } diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm index 3fe0a5da10e..f4959892d7f 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm @@ -53,16 +53,53 @@ tr {vertical-align: top;}
Editor
+ + -

Code Folding

-

Now you can collapse and expand blocks of comments and code in C and C++ files.

-

- The same code folded up: -

-

Code Folding Options:

-

+

Semantic Highlighting

+ + +

Identifiers in the source code can now be colored according to their role, e.g. typedefs, functions, variables, fields, etc.

+

+ + + +

Inactive Code Highlighting

+ + +

Code being excluded by conditional compilation is marked with grey background.

+

+ + + + +

Code Folding Improvements

+

Now you can collapse and expand blocks of comments and preprocessor branches in C and C++ files in addition to functions, structures, etc.

+

+ + + + +

Code Formatter

+ + +

A configurable code formatter with 4 predefined styles has been added:

+

+ + + + + +

Smart Typing

+ + +

Typing assistance has been greatly improved. Options include automatic closing of brackets, smart paste and more:

+

+ + + diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml index 806e59a54b9..89f93f51059 100644 --- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml +++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml @@ -106,42 +106,42 @@ Click below to see help. + label="C/C++ Editor Templates Preferences"/> + + + Click below to see help. + Click below to see help. + label="C/C++ Editor Preferences"/> Click below to see help. + label="C/C++ Editor Syntax Coloring Preferences"/> Click below to see help. + label="C/C++ Editor Content Assist Preferences"/> Click below to see help. + label="C/C++ Editor Hovers Preferences"/> Click below to see help. - + Click below to see help. - - - - Click below to see help. - + Click below to see help. diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml index 1ce6633ba7b..9e15c5e6e36 100644 --- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml +++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml @@ -2,7 +2,7 @@ @@ -12,7 +12,7 @@ - + diff --git a/doc/org.eclipse.cdt.doc.user/images/code_style_preferences.png b/doc/org.eclipse.cdt.doc.user/images/code_style_preferences.png new file mode 100644 index 00000000000..fe780ff6def Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/code_style_preferences.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_annotations_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_annotations_preferences.png deleted file mode 100644 index 7e9542a368d..00000000000 Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_annotations_preferences.png and /dev/null differ diff --git a/doc/org.eclipse.cdt.doc.user/images/editor_navigation_preferences.png b/doc/org.eclipse.cdt.doc.user/images/editor_navigation_preferences.png deleted file mode 100644 index 6d39a4a6877..00000000000 Binary files a/doc/org.eclipse.cdt.doc.user/images/editor_navigation_preferences.png and /dev/null differ diff --git a/doc/org.eclipse.cdt.doc.user/images/nn_codeColoring.png b/doc/org.eclipse.cdt.doc.user/images/nn_codeColoring.png new file mode 100644 index 00000000000..6098c2dfeb9 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/nn_codeColoring.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding.png b/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding.png new file mode 100644 index 00000000000..a145e980e94 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding1.gif b/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding1.gif deleted file mode 100644 index 83d31bc1cc6..00000000000 Binary files a/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding1.gif and /dev/null differ diff --git a/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding2.gif b/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding2.gif deleted file mode 100644 index f27b26646f8..00000000000 Binary files a/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding2.gif and /dev/null differ diff --git a/doc/org.eclipse.cdt.doc.user/images/nn_codeFoldingPrefs.gif b/doc/org.eclipse.cdt.doc.user/images/nn_codeFoldingPrefs.gif deleted file mode 100644 index d235fe9de6a..00000000000 Binary files a/doc/org.eclipse.cdt.doc.user/images/nn_codeFoldingPrefs.gif and /dev/null differ diff --git a/doc/org.eclipse.cdt.doc.user/images/nn_codeFormatterPrefs.png b/doc/org.eclipse.cdt.doc.user/images/nn_codeFormatterPrefs.png new file mode 100644 index 00000000000..082455dfbff Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/nn_codeFormatterPrefs.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/nn_inactiveCode.png b/doc/org.eclipse.cdt.doc.user/images/nn_inactiveCode.png new file mode 100644 index 00000000000..a98c054cb09 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/nn_inactiveCode.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/nn_smartTypingPrefs.png b/doc/org.eclipse.cdt.doc.user/images/nn_smartTypingPrefs.png new file mode 100644 index 00000000000..08f80e2dfea Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/nn_smartTypingPrefs.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm index c7f19386222..fb587552654 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm @@ -14,7 +14,7 @@

This section describes how to set preferences for the C/C++ editor.

- Editor preferences
+ General preferences
Content Assist preferences
    Advanced preferences
Folding preferences
@@ -23,7 +23,7 @@ Templates preferences
Typing preferences -

IBM Copyright Statement

+

IBM Copyright Statement

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 48d58c878c2..b960c018010 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 @@ -45,16 +45,19 @@ Find/Replace
C/C++ Preferences
Build Console preferences
- Code Templates preferences
Debug preferences
GDB MI preferences
Source Code Locations preferences
+ Code Style preferences
C/C++ Editor preferences
General preferences
- Color preferences
Content Assist preferences
- Hover preferences
- Navigation preferences
+ Advanced preferences
+ Folding preferences
+ Hovers preferences
+ Syntax Coloring preferences
+ Templates preferences
+ Typing preferences
File Types preferences
Make Targets preferences
New Make Projects properties preferences
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm new file mode 100644 index 00000000000..2ecb15b8240 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm @@ -0,0 +1,75 @@ + + + + + + + Code Style preferences + + + + +

Code Style preferences

+ +

Use the Code Style preference panel to configure you code style profiles for smart typing features, like auto-indentation and formatting. Click Window > Preferences > C/C++ > Code Style to make changes.

+

Code Style Preferences

+ + + + + + + + + + + + + + + + + + + + + + + + + +
+

Action

+ 		+

Description

+
+

New...

+ 		+

Shows the dialog to create a new profile. The dialog requires you to enter a name for the new profile. Additionally, you may select a built-in or user-defined existing profile to base your new profile on.

+
+

Edit...

+ 		+

Shows a dialog which displays the settings stored in the active profile. Only user-defined profiles can be modified.

+
+

Remove

+ 		+

Removes the selected profile. This action is only available on user-defined profiles.

+
+

Import...

+ 		+

Imports profiles from the file system.

+
+ +

Related concepts
+Coding aids

+

Related tasks +
+Customizing the C/C++ editor
+

Related reference +
+C/C++ editor preferences

+IBM Copyright Statement + + + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_navigation.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_navigation.htm deleted file mode 100644 index 25a4787793c..00000000000 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_navigation.htm +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - Navigation preferences - - - - -

Navigation preferences

- -

Enable the editor hyperlink navigation and then you can use Ctrl+click to jump to the declaration of an item on the C/C++ editor

-

Editor Navigation Preferences Dialog Box

-
-
Enable Hyperlink Navigation
-
Select this checkbox to support hyperlink style navigation for Open Declaration.
-
- -

Related concepts
-Coding aids

-

Related tasks -
-Customizing the C/C++ editor

-

Related reference -
-C/C++ editor preferences

-IBM Copyright Statement - - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm index b4c98f7c657..f9ffbdcc5cb 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm @@ -11,7 +11,7 @@

Typing preferences

-

Use the Typing preference panel to assist in formatting input as you type. Click Window > Preferences > C/C++ > Typing to make changes.

+

Use the Typing preference panel to assist in formatting input as you type. Click Window > Preferences > C/C++ > Editor > Typing to make changes.

Typing Preferences @@ -64,7 +64,8 @@

Related reference
C/C++ editor preferences

-IBM Copyright Statement +Code Style preferences

+IBM Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm index 65fa70d6ae8..8b49a346c72 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm @@ -37,7 +37,7 @@
Preferences for customize the appearance of the Build Console view.
CDT build variables
Displays a list of build variables (ex-build macros) available in CDT.
-
Code style
+
Code Style
Defines default code style. You can select one of existing profiles or set your own style.
Debug
Preferences for customizing the C/C++ debugger.
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml index c265661c2d6..c16e3e62a54 100644 --- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml +++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml @@ -58,8 +58,11 @@ + + + - +
Typing Preference Options