diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java index fdc136c9ac6..0f2dbc62618 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/GdbDebugPreferencePage.java @@ -658,6 +658,17 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements // Need to set layout again. group2.setLayout(groupLayout); + boolField= new BooleanFieldEditor( + IGdbDebugPreferenceConstants.PREF_USE_RTTI, + MessagesForPreferences.GdbDebugPreferencePage_use_rtti_label1 + "\n" //$NON-NLS-1$ + + MessagesForPreferences.GdbDebugPreferencePage_use_rtti_label2, + group2); + + boolField.fillIntoGrid(group2, 3); + addField(boolField); + // need to set layout again + group2.setLayout(groupLayout); + Group group = new Group(parent, SWT.NONE); group.setText(MessagesForPreferences.GdbDebugPreferencePage_prettyPrinting_label); groupLayout = new GridLayout(3, false); @@ -702,23 +713,6 @@ public class GdbDebugPreferencePage extends FieldEditorPreferencePage implements } }); - group= new Group(parent, SWT.NONE); - group.setText(MessagesForPreferences.GdbDebugPreferencePage_rtti_label); - groupLayout= new GridLayout(3, false); - group.setLayout(groupLayout); - group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - - boolField= new BooleanFieldEditor( - IGdbDebugPreferenceConstants.PREF_USE_RTTI, - MessagesForPreferences.GdbDebugPreferencePage_use_rtti_label1 + "\n" //$NON-NLS-1$ - + MessagesForPreferences.GdbDebugPreferencePage_use_rtti_label2, - group); - - boolField.fillIntoGrid(group, 3); - addField(boolField); - // need to set layout again - group.setLayout(groupLayout); - // need to set layouts again indentHelper.setLayout(helperLayout); group.setLayout(groupLayout); diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java index 105a25caded..fe43d6cf09c 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.java @@ -56,8 +56,6 @@ class MessagesForPreferences extends NLS { public static String GdbDebugPreferencePage_Non_stop_mode; public static String GdbDebugPreferencePage_Timeout_column_name; public static String GdbDebugPreferencePage_Timeout_value_can_not_be_negative; - /** @since 2.3 */ - public static String GdbDebugPreferencePage_rtti_label; public static String GdbDebugPreferencePage_Stop_on_startup_at; /** @since 2.3 */ public static String GdbDebugPreferencePage_use_rtti_label1; diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties index 9b22d8b9e9c..85c62111b46 100644 --- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties +++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.ui/src/org/eclipse/cdt/dsf/gdb/internal/ui/preferences/MessagesForPreferences.properties @@ -28,12 +28,11 @@ GdbDebugPreferencePage_hideRunningThreads=Show only suspended threads in the Deb GdbDebugPreferencePage_prettyPrinting_label=Pretty Printing GdbDebugPreferencePage_enablePrettyPrinting_label1=Enable pretty printers in variable/expression tree -GdbDebugPreferencePage_enablePrettyPrinting_label2=(requires python-enabled GDB) +GdbDebugPreferencePage_enablePrettyPrinting_label2=(Note: requires python-enabled GDB) GdbDebugPreferencePage_initialChildCountLimitForCollections_label=For collections, initially limit child count to -GdbDebugPreferencePage_rtti_label=Run-time type information GdbDebugPreferencePage_use_rtti_label1=Display run-time type of variables -GdbDebugPreferencePage_use_rtti_label2=(requires GDB 7.5 or higher) +GdbDebugPreferencePage_use_rtti_label2=(Note: requires GDB 7.5 or higher) GdbDebugPreferencePage_defaults_label=Debug Configurations Defaults GdbDebugPreferencePage_Delete_button=Delete