diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml index 941d02504c8..bb3ee7b5797 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml +++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml @@ -424,22 +424,22 @@ diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml index b9aee2cc2ae..8e673b2ab33 100644 --- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml +++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml @@ -476,4 +476,25 @@ label="Language Mappings"/> + + + + + + + + + + + + + + + + + diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref-multi-cfg.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-multi-cfg.png new file mode 100644 index 00000000000..bc593fe53a6 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-multi-cfg.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref-prop-pages.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-prop-pages.png new file mode 100644 index 00000000000..167a0ab303b Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-prop-pages.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref-wizard-defaults.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-wizard-defaults.png new file mode 100644 index 00000000000..dfbbd0516e9 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-wizard-defaults.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref-wizard-toolchains.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-wizard-toolchains.png new file mode 100644 index 00000000000..f8d4aa698f5 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref-wizard-toolchains.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm new file mode 100644 index 00000000000..5d401446383 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_multi_cfg.htm @@ -0,0 +1,61 @@ + + + + + + + Multi-Configuration Edit preferences + + + + +

Multi-Configuration Edit preferences

+ +

Since CDT 5.0, user is able to edit properties for +multiple project configurations simultaneously.

+

Either all configuations or some of them can be selected.

+

But, then we deal with string list property values, +it is not obvious how to concatenate them, if they differ.

+ + +

Multi-Configuration Edit preferences tab

+
+
String list Display Mode
+
Specifies how values will be shown.
+ There are 2 options: conjunction or disjunction. +
    +
  • Conjunction shows common elements only, so if 1st configuration has + value <A, B, C> and 2nd configuration has <B, C, D>, <B, C> will be shown. +
  • Disjunction shows all existing elements except doubles, so if 1st configuration has + value <A, B, C> and 2nd configuration has <B, C, D>, <A, B, C, D> will be shown. +
+ Note that Display mode can be changed directly on each tab which deals with string lists. + Result is immediate: data on the tab refereshed according to selected mode.
+
+
String list Write Mode
+
Specifies how values will be saved.
+ There are 2 options: modify or replace. +
    +
  • Modify mode adds, changes or removes elements affected by user's actions. + Elements which were not touched by user are left unchanged.
    + Example: cfg1 has <A, B, C>; cfg2 has <B, C, D>.
    + User removed B and added F.
    + Result: cfg1 has <A, C, F>; cfg2 has <C, D, F>. +
  • Replace mode puts currently visible elements to all configurations. + Old contents will be lost.
    + Example: cfg1 has <A, B, C>; cfg2 has <B, C, D>.
    + Visible list depends of Display mode: <B, C> or <A, B, C, D>.
    + User removed B and added F.
    + Result: both cfgs will contain either <C, F> or <A, C, D, F> depending of Display mode. +
+ Note that Write mode can be changed directly on each tab which deals with string lists.
+
+
Restore Defaults
+
Sets all parameters to default values
+
Apply
+
Saves current settings.
+
+ + + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_prop_pages.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_prop_pages.htm new file mode 100644 index 00000000000..350968b9e15 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_prop_pages.htm @@ -0,0 +1,52 @@ + + + + + + + Property Pages Settings preferences + + + + +

Property Pages Settings preferences

+ +

These settings affect behaviour of CDT property pages.

+

Property Pages Settings preferences tab

+
+
Show 'Manage Configurations...' button
+
Shows or hides corresponding button, normally placed on every property page.
+ If this button is hidden, Manage operation can be accessed from Main Menu or Context Menu.
+
Display 'Data hierarchy' tab
+
Displays auxilliary tab which allows browsing data of project configurations. + This feature is useful for debug purposes mostly, so it's disabled by default.
+
Display 'Tool Chain Editor' tab
+
Shows or hides corresponding tab. Normally, users need not to edit tool chains manually.
+
Save property dialog bounds
+
Defines how property dialog parameters will be preserved: +
    +
  • Save dialog size only (position is set by system). +
  • Save dialog and position (next time, dialog will be shown on the same place with the same size). +
  • Do not save at all (size and position is set by system each time when dialog is shown). +
+
+
Discovery profiles naming rule
+
Discovery profiles have unique IDs, but their names may be duplicate, + expecially if they are contributed by different developers. So there + are 4 way to distinguish them in the list on Discovery tab: +
    +
  • Show names if they are unique. Else show Name + ID. +
  • Show names if they are unique. Else show IDs only. +
  • Always show Name + ID. +
  • Always show IDs only. +
+
+
Restore Defaults
+
Sets all parameters to default values
+
Apply
+
Saves current settings.
+
+ + + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_defaults.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_defaults.htm new file mode 100644 index 00000000000..2908639e3da --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_defaults.htm @@ -0,0 +1,34 @@ + + + + + + + CDT Project Wizard Defaults preferences + + + + +

CDT Project Wizard Defaults preferences

+ +

These settings affect CDT New Project Wizard behaviour.

+

CDT Project Wizard Defaults preferences tab

+
+
Show only supported toolchains, by default
+
Allows to filter out toolchains which are not supported by system.
+ If disabled, all toolchains known to CDT are shown.
+ Note that this mode can be switched directly in Project Wizard dialog. +
+
Group old-style toolchains to <Others> folder
+
Old-style toolchains do not distinguish project types (executable, shared library or static library).
+ So they can be either placed to list's root, or grouped in <Others> folder on the left pane of Wizard. +
+
Restore Defaults
+
Sets all parameters to default values
+
Apply
+
Saves current settings.
+
+ + + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_toolchains.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_toolchains.htm new file mode 100644 index 00000000000..db8130676f6 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_pref_wizard_toolchains.htm @@ -0,0 +1,40 @@ + + + + + + + CDT Project Wizard Toolchains preferences + + + + +

CDT Project Wizard Toolchains preferences

+ +

These settings define which toolchains are selected in CDT New Project Wizard by default.

+

CDT Project Wizard Toolchains preferences tab

+
+
Project types:
+
The same project types list as shown in Project Wizard.
+
Toolchain:
+
The same list of toolchains as shown in Project Wizard.
+
Make toolchain(s) preferred
+
Makes selected toolchain(s) preferred.
+ In this tab, preferred toolchains are marked by arrow icon (">").
+ In Project Wizard dialog, preferred toolchain is selected by default.
+ If there are more than one toolchain preferred, the first of them will be selected.
+ If there are no toolchains preferred, the first in the whole list will be selected. +
+
Make toolchain(s) not preferred
+
Removes preference mark from selected toolchain(s).
+
Show project types and toolchains only if they are supported on the platform
+
The same control as on Project Wizard page. Defines whether unsupported project types and toolchains are hidden or shown.
+
Restore Defaults
+
Sets all parameters to default values
+
Apply
+
Saves current settings.
+
+ + + + diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml index cd70ed7d01e..7bbe1f14f10 100644 --- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml +++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml @@ -86,7 +86,9 @@ - + + + @@ -95,16 +97,99 @@ - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +