diff --git a/platform/platform-impl/src/com/intellij/ide/ui/EditorOptionsTopHitProvider.java b/platform/platform-impl/src/com/intellij/ide/ui/EditorOptionsTopHitProvider.java index e1faa3473cff..6ffe2489fb52 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/EditorOptionsTopHitProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/EditorOptionsTopHitProvider.java @@ -17,6 +17,7 @@ package com.intellij.ide.ui; import com.intellij.ide.ui.search.BooleanOptionDescription; import com.intellij.openapi.editor.ex.EditorSettingsExternalizable; +import com.intellij.openapi.editor.impl.softwrap.SoftWrapAppliancePlaces; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.SystemInfo; import com.intellij.util.containers.ContainerUtil; @@ -38,6 +39,31 @@ public class EditorOptionsTopHitProvider extends OptionsTopHitProvider { ? "checkbox.enable.ctrl.mousewheel.changes.font.size.macos" : "checkbox.enable.ctrl.mousewheel.changes.font.size"), "IS_WHEEL_FONTCHANGE_ENABLED"), editor("Mouse: " + messageApp("checkbox.enable.drag.n.drop.functionality.in.editor"), "IS_DND_ENABLED"), + new EditorOptionDescription(null, messageApp("checkbox.use.soft.wraps.at.editor.action.text"), "preferences.editor") { + @Override + public boolean isOptionEnabled() { + return EditorSettingsExternalizable.getInstance().isUseSoftWraps(SoftWrapAppliancePlaces.MAIN_EDITOR); + } + + @Override + public void setOptionState(boolean enabled) { + EditorSettingsExternalizable.getInstance().setUseSoftWraps(enabled, SoftWrapAppliancePlaces.MAIN_EDITOR); + fireUpdated(); + } + }, + new EditorOptionDescription(null, messageApp("checkbox.use.soft.wraps.at.console.action.text"), "preferences.editor") { + @Override + public boolean isOptionEnabled() { + return EditorSettingsExternalizable.getInstance().isUseSoftWraps(SoftWrapAppliancePlaces.CONSOLE); + } + + @Override + public void setOptionState(boolean enabled) { + EditorSettingsExternalizable.getInstance().setUseSoftWraps(enabled, SoftWrapAppliancePlaces.CONSOLE); + fireUpdated(); + } + }, + editor(messageApp("checkbox.use.custom.soft.wraps.indent.action.text"), "USE_CUSTOM_SOFT_WRAP_INDENT"), new EditorOptionDescription(null, messageApp("checkbox.show.softwraps.only.for.caret.line.action.text"), "preferences.editor") { @Override public boolean isOptionEnabled() { diff --git a/platform/platform-resources-en/src/messages/ApplicationBundle.properties b/platform/platform-resources-en/src/messages/ApplicationBundle.properties index 42de805294e4..5853d7ce92e3 100644 --- a/platform/platform-resources-en/src/messages/ApplicationBundle.properties +++ b/platform/platform-resources-en/src/messages/ApplicationBundle.properties @@ -394,8 +394,11 @@ radio.close.non.modified.files.first=Close non-modified files first label.when.number.of.opened.editors.exceeds.tab.limit=When number of opened editors exceeds tab limit: group.soft.wraps=Soft Wraps checkbox.use.soft.wraps.at.editor=Use soft wraps in editor +checkbox.use.soft.wraps.at.editor.action.text=Soft Wraps: Use in editor checkbox.use.soft.wraps.at.console=Use soft wraps in console +checkbox.use.soft.wraps.at.console.action.text=Soft Wraps: Use in console checkbox.use.custom.soft.wraps.indent=Use original line's indent for wrapped parts. Additional shift: +checkbox.use.custom.soft.wraps.indent.action.text=Soft Wraps: Use original line's indent for wrapped parts checkbox.show.softwraps.only.for.caret.line=Show soft wraps for current line only checkbox.show.softwraps.only.for.caret.line.action.text=Soft Wraps: Show for current line only group.virtual.space=Virtual Space