mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-21 21:52:10 +02:00
Code Issues Wiki Activity

Cleanup Core Build Preference pages.

Browse source 
Move Toolchains directly under C/C++ and rename to Core
Build Toolchains. Add a label describing what the toolchains
are for in hope of avoiding confusion with managed build.
Also move Qt into C/C++.

Change-Id: Ia1d76087c65b26562d1001243ea355c7ac32365e
This commit is contained in:
Doug Schaefer 2017-12-01 14:02:47 -05:00
parent 4eb76a4ede
commit d6a1c13e5c
8 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/org.eclipse.cdt.cmake.ui/plugin.properties
View file

@ -7,4 +7,3 @@
###############################################################################
cmake.preferences.name = CMake
toolchains.preferences.name = Toolchains

6
build/org.eclipse.cdt.cmake.ui/plugin.xml
View file

@ -28,12 +28,6 @@
id="org.eclipse.cdt.cmake.ui.page1"
name="%cmake.preferences.name">
</page>
<page
category="org.eclipse.cdt.cmake.ui.page1"
class="org.eclipse.cdt.ui.build.ToolChainPreferencePage"
id="org.eclipse.cdt.cmake.ui.page.toolchains"
name="%toolchains.preferences.name">
</page>
</extension>
<extension
point="org.eclipse.tools.templates.ui.templates">

2
core/org.eclipse.cdt.ui/plugin.properties
View file

@ -674,3 +674,5 @@ RefreshExclusionContributorExtensionPoint = Refresh Exclusion Contributor
semanticHighlightingExtensionPoint = Semantic Highlighting Extension Point
UserSettingEntries.name = CDT User Setting Entries
toolchains.preferences.name = Core Build Toolchains

9
core/org.eclipse.cdt.ui/plugin.xml
View file

@ -5030,5 +5030,14 @@
</adapter>
</factory>
</extension>
<extension
point="org.eclipse.ui.preferencePages">
<page
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.ui.build.ToolChainPreferencePage"
id="org.eclipse.cdt.cmake.ui.page.toolchains"
name="%toolchains.preferences.name">
</page>
</extension>
</plugin>

1
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.java
View file

@ -69,6 +69,7 @@ public final class CUIMessages extends NLS {
public static String ToolChainPreferencePage_Arch;
public static String ToolChainPreferencePage_AreYouSure;
public static String ToolChainPreferencePage_AvailableToolchains;
public static String ToolChainPreferencePage_Desc;
public static String ToolChainPreferencePage_Down;
public static String ToolChainPreferencePage_Edit;
public static String ToolChainPreferencePage_EditDot;

3
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CUIMessages.properties
View file

@ -69,6 +69,7 @@ ToolChainPreferencePage_Add=Add...
ToolChainPreferencePage_Arch=Arch
ToolChainPreferencePage_AreYouSure=Are you sure you'd like to remove the selected toolchain?
ToolChainPreferencePage_AvailableToolchains=Available Toolchains
ToolChainPreferencePage_Desc=Toolchains for use with CMake, Qt, and Core Build Makefile projects.
ToolChainPreferencePage_Down=Down
ToolChainPreferencePage_Edit=Edit
ToolChainPreferencePage_EditDot=Edit...
@ -78,7 +79,7 @@ ToolChainPreferencePage_OS=OS
ToolChainPreferencePage_Remove=Remove
ToolChainPreferencePage_Remove1=Remove
ToolChainPreferencePage_RemoveToolchain=Remove Toolchain
ToolChainPreferencePage_Toolchains=Toolchains
ToolChainPreferencePage_Toolchains=Core Build Toolchains
ToolChainPreferencePage_Type=Type
ToolChainPreferencePage_Up=Up
ToolChainPreferencePage_UserDefinedToolchains=User Defined Toolchains

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/build/ToolChainPreferencePage.java
View file

@ -41,6 +41,7 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.ui.IWorkbench;
@ -116,6 +117,9 @@ public class ToolChainPreferencePage extends PreferencePage implements IWorkbenc
Composite control = new Composite(parent, SWT.NONE);
control.setLayout(new GridLayout());
Label label = new Label(control, SWT.NONE);
label.setText(CUIMessages.ToolChainPreferencePage_Desc);
Group availGroup = new Group(control, SWT.NONE);
availGroup.setText(CUIMessages.ToolChainPreferencePage_AvailableToolchains);
availGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));

1
qt/org.eclipse.cdt.qt.ui/plugin.xml
View file

@ -63,6 +63,7 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
class="org.eclipse.cdt.internal.qt.ui.preferences.QtPreferencePage"
id="org.eclipse.cdt.qt.ui.preferencePage.qt"
name="%preferences.qt.name">