diff options
Diffstat (limited to 'org.eclipse.debug.ui/ui/org')
3 files changed, 20 insertions, 2 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java index aec2308b0..9ee4e6119 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/ConsolePreferencePage.java @@ -82,6 +82,8 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements private ConsoleIntegerFieldEditor fTabSizeEditor; private BooleanFieldEditor autoScrollLockEditor; + private BooleanFieldEditor2 fWordWrapEditor; + private BooleanFieldEditor2 fInterpretControlCharactersEditor; private BooleanFieldEditor2 fInterpretCrAsControlCharacterEditor; @@ -149,6 +151,11 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements autoScrollLockEditor = new BooleanFieldEditor(IConsoleConstants.P_CONSOLE_AUTO_SCROLL_LOCK, DebugPreferencesMessages.ConsolePreferencePage_Show__Console_View_enable_auto_scroll_lock, SWT.NONE, getFieldEditorParent()); addField(autoScrollLockEditor); + + fWordWrapEditor = new BooleanFieldEditor2(IConsoleConstants.P_CONSOLE_WORD_WRAP, + DebugPreferencesMessages.ConsolePreferencePage_Enable_Word_Wrap_text, SWT.NONE, getFieldEditorParent()); + addField(fWordWrapEditor); + addField(new BooleanFieldEditor(IDebugPreferenceConstants.CONSOLE_OPEN_ON_OUT, DebugPreferencesMessages.ConsolePreferencePage_Show__Console_View_when_there_is_program_output_3, SWT.NONE, getFieldEditorParent())); addField(new BooleanFieldEditor(IDebugPreferenceConstants.CONSOLE_OPEN_ON_ERR, DebugPreferencesMessages.ConsolePreferencePage_Show__Console_View_when_there_is_program_error_3, SWT.NONE, getFieldEditorParent())); @@ -203,6 +210,7 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements updateAutoScrollLockEditor(); updateBufferSizeEditor(); updateInterpretCrAsControlCharacterEditor(); + updateWordWrapEditorFromConsolePreferences(); } /** @@ -242,6 +250,14 @@ public class ConsolePreferencePage extends FieldEditorPreferencePage implements } /** + * Update enablement of word wrapping from Console plugin preference store. + */ + protected void updateWordWrapEditorFromConsolePreferences() { + fWordWrapEditor.setPreferenceStore(ConsolePlugin.getDefault().getPreferenceStore()); + fWordWrapEditor.load(); + } + + /** * @see org.eclipse.jface.preference.PreferencePage#performDefaults() */ @Override diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java index 14fa191ee..7310f1cb6 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2019 IBM Corporation and others. + * Copyright (c) 2000, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -37,6 +37,7 @@ public class DebugPreferencesMessages extends NLS { public static String ConsolePreferencePage_13; public static String ConsolePreferencePage_Interpret_control_characters; public static String ConsolePreferencePage_Interpret_cr_as_control_character; + public static String ConsolePreferencePage_Enable_Word_Wrap_text; public static String DebugPreferencePage_1; public static String DebugPreferencePage_2; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties index 2a454274d..45717805a 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/preferences/DebugPreferencesMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2019 IBM Corporation and others. +# Copyright (c) 2000, 2020 IBM Corporation and others. # # This program and the accompanying materials # are made available under the terms of the Eclipse Public License 2.0 @@ -30,6 +30,7 @@ ConsolePreferencePage_13=Tab width must be between 1 and 100 inclusive. ConsolePreferencePage_11=Back&ground color: ConsolePreferencePage_Interpret_control_characters=Interpret ASCII &control characters ConsolePreferencePage_Interpret_cr_as_control_character=Interpret Carriage &Return (\\r) as control character +ConsolePreferencePage_Enable_Word_Wrap_text=E&nable word wrap DebugPreferencePage_1=General Settings for Running and Debugging. DebugPreferencePage_2=Re&use editor when displaying source code |