Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Leherbauer2007-06-21 13:25:02 +0000
committerAnton Leherbauer2007-06-21 13:25:02 +0000
commit39ef61836d8b3c4e1f598d4ebc762dabea0990c2 (patch)
treed3e9920084ec73f84f3964a145cd77f856777419
parentbc30ad342a9896ce3bf5469622e620ad25dd8542 (diff)
downloadorg.eclipse.cdt-39ef61836d8b3c4e1f598d4ebc762dabea0990c2.tar.gz
org.eclipse.cdt-39ef61836d8b3c4e1f598d4ebc762dabea0990c2.tar.xz
org.eclipse.cdt-39ef61836d8b3c4e1f598d4ebc762dabea0990c2.zip
Add editor features to New & Noteworthy, Code Style preferences
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/ICHelpContextIds.java1
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java10
-rw-r--r--doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm51
-rw-r--r--doc/org.eclipse.cdt.doc.user/contexts_CDT.xml28
-rw-r--r--doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml4
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/code_style_preferences.pngbin0 -> 27331 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/editor_annotations_preferences.pngbin22241 -> 0 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/editor_navigation_preferences.pngbin11598 -> 0 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/nn_codeColoring.pngbin0 -> 4235 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/nn_codeFolding.pngbin0 -> 6785 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/nn_codeFolding1.gifbin12389 -> 0 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/nn_codeFolding2.gifbin7185 -> 0 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/nn_codeFoldingPrefs.gifbin13353 -> 0 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/nn_codeFormatterPrefs.pngbin0 -> 23914 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/nn_inactiveCode.pngbin0 -> 6251 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/images/nn_smartTypingPrefs.pngbin0 -> 22419 bytes
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm4
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm11
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm75
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_navigation.htm33
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_typing.htm5
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm2
-rw-r--r--doc/org.eclipse.cdt.doc.user/topics_Reference.xml5
23 files changed, 160 insertions, 69 deletions
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 dc41bc1b59..35d08dddad 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 cf3fda0d72..9af008daf9 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 3fe0a5da10..f4959892d7 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
@@ -54,15 +54,52 @@ tr {vertical-align: top;}
</tr>
<tr>
+<tr>
+<tr>
+ <td>
+ <p align="right"><b>Semantic Highlighting</b></p>
+ </td>
<td>
- <p align="right"><b>Code Folding</b></p> </td>
- <td><p>Now you can collapse and expand blocks of comments and code in C and C++ files. </p>
- <p><img src="../images/nn_codeFolding1.gif"> </p>
- The same code folded up:
- <p><img src="../images/nn_codeFolding2.gif"> </p>
- <p>Code Folding Options: </p>
- <p><img src="../images/nn_codeFoldingPrefs.gif"> </td>
+ <p>Identifiers in the source code can now be colored according to their role, e.g. typedefs, functions, variables, fields, etc.</p>
+ <p><img src="../images/nn_codeColoring.png"> </p>
+ </td>
</tr>
+
+ <td>
+ <p align="right"><b>Inactive Code Highlighting</b></p>
+ </td>
+ <td>
+ <p>Code being excluded by conditional compilation is marked with grey background.</p>
+ <p><img src="../images/nn_inactiveCode.png"> </p>
+ </td>
+ </tr>
+
+ <td>
+ <p align="right"><b>Code Folding Improvements</b></p> </td>
+ <td><p>Now you can collapse and expand blocks of comments and preprocessor branches in C and C++ files in addition to functions, structures, etc. </p>
+ <p><img src="../images/nn_codeFolding.png"> </p>
+ </tr>
+
+<tr>
+ <td>
+ <p align="right"><b>Code Formatter</b></p>
+ </td>
+ <td>
+ <p>A configurable code formatter with 4 predefined styles has been added:</p>
+ <p><img src="../images/nn_codeFormatterPrefs.png"> </p>
+ </td>
+ </tr>
+
+<tr>
+ <td>
+ <p align="right"><b>Smart Typing</b></p>
+ </td>
+ <td>
+ <p>Typing assistance has been greatly improved. Options include automatic closing of brackets, smart paste and more:</p>
+ <p><img src="../images/nn_smartTypingPrefs.png"> </p>
+ </td>
+ </tr>
+
<!-- ******************** Views ********************** -->
<tr>
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 806e59a54b..89f93f5105 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 @@
<context id ="code_temp">
<description>Click below to see help.</description>
<topic href="reference/cdt_u_code_temp.htm"
- label="Code Templates"/>
+ label="C/C++ Editor Templates Preferences"/>
+</context>
+<context id ="codeformatter_preference_page_context">
+ <description>Click below to see help.</description>
+ <topic href="reference/cdt_u_c_code_style_pref.htm"
+ label="C/C++ Code Style Preferences"/>
</context>
<context id ="c_editor_gen">
<description>Click below to see help.</description>
<topic href="reference/cdt_u_c_editor_gen.htm"
- label="Editor General Preferences"/>
+ label="C/C++ Editor Preferences"/>
</context>
<context id ="c_editor_color">
<description>Click below to see help.</description>
<topic href="reference/cdt_u_c_editor_color.htm"
- label="Editor Colors Preferences"/>
+ label="C/C++ Editor Syntax Coloring Preferences"/>
</context>
<context id ="c_editor_con_assist">
<description>Click below to see help.</description>
<topic href="reference/cdt_u_c_editor_con_assist.htm"
- label="Editor Content Assist Preferences"/>
+ label="C/C++ Editor Content Assist Preferences"/>
</context>
<context id ="c_editor_hov">
<description>Click below to see help.</description>
<topic href="reference/cdt_u_c_editor_hov.htm"
- label="Editor Hovers Preferences"/>
+ label="C/C++ Editor Hovers Preferences"/>
</context>
<context id ="c_editor_typing">
<description>Click below to see help.</description>
- <topic href="reference/cdt_u_c_pref.htm"
- label="C/C++ Preferences"/>
+ <topic href="reference/cdt_u_c_editor_typing.htm"
+ label="C/C++ Editor Typing Preferences"/>
</context>
<context id ="c_editor_folding">
<description>Click below to see help.</description>
- <topic href="reference/cdt_u_c_pref.htm"
- label="C/C++ Preferences"/>
-</context>
-<context id ="c_editor_navigation">
- <description>Click below to see help.</description>
- <topic href="reference/cdt_u_c_editor_navigation.htm"
- label="Editor Navigation Preferences"/>
+ <topic href="reference/cdt_u_c_editor_folding.htm"
+ label="C/C++ Editor Folding Preferences"/>
</context>
<context id ="c_file_types">
<description>Click below to see help.</description>
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 1ce6633ba7..9e15c5e6e3 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 @@
<?NLS TYPE="org.eclipse.help.contexts"?>
<!--
******************************************************************
-** (C) COPYRIGHT International Business Machines Corp. 2001,2003
+** (C) COPYRIGHT International Business Machines Corp. 2001,2007
** All Rights Reserved * Licensed Materials - Property of IBM
******************************************************************
-->
@@ -12,7 +12,7 @@
<!ENTITY registersViewPrefs "Registers view preferences">
<!ENTITY memoryView "Memory view">
<!ENTITY memoryViewPrefs "Memory view preferences">
- <!ENTITY ModulesView "Modules view">
+ <!ENTITY modulesView "Modules view">
<!ENTITY sharedLibsViewPrefs "Shared Libraries view preferences">
<!ENTITY signalsView "Signals view">
<!ENTITY debugPrefs "Debug preferences">
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 0000000000..fe780ff6de
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/code_style_preferences.png
Binary files 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 7e9542a368..0000000000
--- a/doc/org.eclipse.cdt.doc.user/images/editor_annotations_preferences.png
+++ /dev/null
Binary files 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 6d39a4a687..0000000000
--- a/doc/org.eclipse.cdt.doc.user/images/editor_navigation_preferences.png
+++ /dev/null
Binary files 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 0000000000..6098c2dfeb
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/nn_codeColoring.png
Binary files 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 0000000000..a145e980e9
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding.png
Binary files 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 83d31bc1cc..0000000000
--- a/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding1.gif
+++ /dev/null
Binary files 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 f27b26646f..0000000000
--- a/doc/org.eclipse.cdt.doc.user/images/nn_codeFolding2.gif
+++ /dev/null
Binary files 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 d235fe9de6..0000000000
--- a/doc/org.eclipse.cdt.doc.user/images/nn_codeFoldingPrefs.gif
+++ /dev/null
Binary files 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 0000000000..082455dfbf
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/nn_codeFormatterPrefs.png
Binary files 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 0000000000..a98c054cb0
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/nn_inactiveCode.png
Binary files 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 0000000000..08f80e2dfe
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/images/nn_smartTypingPrefs.png
Binary files 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 c7f1938622..fb58755265 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 @@
<p>This section describes how to set preferences for the C/C++ editor.</p>
- <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">Editor preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">General preferences</a><br>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist.htm">Content Assist preferences</a><br>
&nbsp;&nbsp;&nbsp;&nbsp;<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist_adv.htm">Advanced preferences</a><br>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_folding.htm">Folding preferences</a><br>
@@ -23,7 +23,7 @@
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_code_temp.htm">Templates preferences</a><br>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_typing.htm">Typing preferences</a>
-<p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
+<p><img src="../images/ng00_07.gif" ALT="IBM Copyright Statement" ></p>
</body>
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 48d58c878c..b960c01801 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 @@
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_find_replace.htm">Find/Replace</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_pref.htm">C/C++ Preferences</a><br>
<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_build_pref.htm">Build Console preferences</a><br>
- <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_code_temp.htm">Code Templates preferences</a><br>
<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_debug.htm">Debug preferences</a><br>
<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_gdb_mi.htm">GDB MI preferences</a><br>
<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_src.htm">Source Code Locations preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_style_pref.htm">Code Style preferences</a><br>
<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_ceditor_pref.htm">C/C++ Editor preferences</a><br>
<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">General preferences</a><br>
- <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_color.htm">Color preferences</a><br>
<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist.htm">Content Assist preferences</a><br>
- <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_hov.htm">Hover preferences</a><br>
- <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_navigation.htm">Navigation preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist_adv.htm">Advanced preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_folding.htm">Folding preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_hov.htm">Hovers preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_color.htm">Syntax Coloring preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_code_temp.htm">Templates preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_typing.htm">Typing preferences</a><br>
<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_file_types.htm">File Types preferences</a><br>
<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_targets_pref.htm">Make Targets preferences</a><br>
<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_proj_prop_pages.htm">New Make Projects properties preferences</a><br>
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 0000000000..2ecb15b824
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_code_style_pref.htm
@@ -0,0 +1,75 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html lang="en">
+
+<head>
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Code Style preferences</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h1>Code Style preferences</h1>
+
+<p>Use the <b>Code Style</b> preference panel to configure you code style profiles for smart typing features, like auto-indentation and formatting. Click <b>Window &gt; Preferences &gt; C/C++ &gt; Code Style</b> to make changes.</p>
+<p><img src="../images/code_style_preferences.png" alt="Code Style Preferences"></p>
+<table border="1" cellspacing="0" cellpadding="5" width="600" summary="All options">
+ <thead>
+ <tr>
+ <th>
+ <p>Action</p>
+ </th>
+ <th>
+ <p>Description</p>
+ </th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td valign="top" width="25%">
+ <p>New...</p>
+ </td>
+ <td valign="top">
+ <p>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.</p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" width="25%">
+ <p>Edit...</p>
+ </td>
+ <td valign="top">
+ <p>Shows a dialog which displays the settings stored in the active profile. Only user-defined profiles can be modified.</p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" width="25%">
+ <p>Remove</p>
+ </td>
+ <td valign="top">
+ <p>Removes the selected profile. This action is only available on user-defined profiles.</p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" width="25%">
+ <p>Import...</p>
+ </td>
+ <td valign="top">
+ <p>Imports profiles from the file system.</p>
+ </td>
+ </tr>
+ </tbody>
+</table>
+
+<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"> <br>
+<a href="../concepts/cdt_o_code_entry.htm">Coding aids</a></p>
+<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
+<br>
+<a href="../tasks/cdt_t_cust_cpp_editor.htm">Customizing the C/C++ editor</a><br>
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
+<br>
+<a href="cdt_o_ceditor_pref.htm">C/C++ editor preferences</a></p>
+<img src="../images/ng00_07.gif" ALT="IBM Copyright Statement" >
+
+</body>
+
+</html>
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 25a4787793..0000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_navigation.htm
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-
-<head>
- <meta http-equiv="Content-Language" content="en-us">
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Navigation preferences</title>
- <link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-<body>
-
-<h1>Navigation preferences</h1>
-
-<p>Enable the editor hyperlink navigation and then you can use <b>Ctrl+click</b> to jump to the declaration of an item on the C/C++ editor</p>
-<p><img src="../images/editor_navigation_preferences.png" alt="Editor Navigation Preferences Dialog Box"></p>
-<dl>
- <dt>Enable Hyperlink Navigation</dt>
- <dd>Select this checkbox to support hyperlink style navigation for Open Declaration.</dd>
-</dl>
-
-<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"> <br>
-<a href="../concepts/cdt_o_code_entry.htm">Coding aids</a></p>
-<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
-<br>
-<a href="../tasks/cdt_t_cust_cpp_editor.htm">Customizing the C/C++ editor</a></p>
-<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
-<br>
-<a href="cdt_o_ceditor_pref.htm">C/C++ editor preferences</a></p>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
-
-</body>
-
-</html> \ 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 b4c98f7c65..f9ffbdcc5c 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 @@
<h1>Typing preferences</h1>
-<p>Use the <b>Typing</b> preference panel to assist in formatting input as you type. Click <b>Window &gt; Preferences &gt; C/C++ &gt; Typing</b> to make changes.</p>
+<p>Use the <b>Typing</b> preference panel to assist in formatting input as you type. Click <b>Window &gt; Preferences &gt; C/C++ &gt; Editor &gt; Typing</b> to make changes.</p>
<img src="../images/editor_typing_preferences.png" alt="Typing Preferences">
<table width="600px" cellpadding="5" cellspacing="0" border="1" >
<caption><b>Typing Preference Options</b></caption>
@@ -64,7 +64,8 @@
<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
<br>
<a href="cdt_o_ceditor_pref.htm">C/C++ editor preferences</a></p>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
+<a href="cdt_u_c_code_style_pref.htm">Code Style preferences</a></p>
+<img src="../images/ng00_07.gif" ALT="IBM Copyright Statement" >
</body>
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 65fa70d6ae..8b49a346c7 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 @@
<dd>Preferences for customize the appearance of the Build Console view.</dd>
<dt>CDT build variables</dt>
<dd>Displays a list of build variables (ex-build macros) available in CDT.</dd>
- <dt>Code style</dt>
+ <dt>Code Style</dt>
<dd>Defines default code style. You can select one of existing profiles or set your own style.</dd>
<dt>Debug</dt>
<dd>Preferences for customizing the C/C++ debugger.</dd>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index c265661c2d..c16e3e62a5 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 @@
<topic label="Source Code Locations preferences" href="reference/cdt_u_dbg_src.htm"/>
</topic>
+ <topic label="Code Style preferences" href="reference/cdt_u_c_code_style_pref.htm">
+ </topic>
+
<topic label="C/C++ Editor preferences" href="reference/cdt_o_ceditor_pref.htm">
- <topic label="Editor preferences" href="reference/cdt_u_c_editor_gen.htm"/>
+ <topic label="General preferences" href="reference/cdt_u_c_editor_gen.htm"/>
<topic label="Content Assist preferences" href="reference/cdt_u_c_editor_con_assist.htm" >
<topic label="Advanced preferences" href="reference/cdt_u_c_editor_con_assist_adv.htm"/>
</topic>

Back to the top