diff --git a/src/libresrc/default_config.json b/src/libresrc/default_config.json index 75b8f33b8..72158d3c9 100644 --- a/src/libresrc/default_config.json +++ b/src/libresrc/default_config.json @@ -414,6 +414,7 @@ "Width" : 1280 }, "Edit Box" : { + "Soft Line Break": false, "Font Face" : "", "Font Size" : 10 }, diff --git a/src/libresrc/osx/default_config.json b/src/libresrc/osx/default_config.json index 3b90825f8..439038eeb 100644 --- a/src/libresrc/osx/default_config.json +++ b/src/libresrc/osx/default_config.json @@ -414,6 +414,7 @@ "Width" : 1280 }, "Edit Box" : { + "Soft Line Break": false, "Font Face" : "", "Font Size" : 13 }, diff --git a/src/preferences.cpp b/src/preferences.cpp index 8657b3ffe..bfce6a5ee 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -211,7 +211,7 @@ void Interface(wxTreebook *book, Preferences *parent) { auto edit_box = p->PageSizer(_("Edit Box")); p->OptionAdd(edit_box, _("Enable call tips"), "App/Call Tips"); p->OptionAdd(edit_box, _("Overwrite in time boxes"), "Subtitle/Time Edit/Insert Mode"); - p->CellSkip(edit_box); + p->OptionAdd(edit_box, _("Shift+Enter adds \\n"), "Subtitle/Edit Box/Soft Line Break"); p->OptionAdd(edit_box, _("Enable syntax highlighting"), "Subtitle/Highlight/Syntax"); p->OptionBrowse(edit_box, _("Dictionaries path"), "Path/Dictionary"); p->OptionFont(edit_box, "Subtitle/Edit Box/"); diff --git a/src/subs_edit_ctrl.cpp b/src/subs_edit_ctrl.cpp index 0a22c382d..5ebf7b2a4 100644 --- a/src/subs_edit_ctrl.cpp +++ b/src/subs_edit_ctrl.cpp @@ -216,7 +216,7 @@ void SubsTextEditCtrl::OnKeyDown(wxKeyEvent &event) { auto sel_start = GetSelectionStart(), sel_end = GetSelectionEnd(); wxCharBuffer old = GetTextRaw(); std::string data(old.data(), sel_start); - data.append("\\N"); + data.append(OPT_GET("Subtitle/Edit Box/Soft Line Break")->GetBool() ? "\\n" : "\\N"); data.append(old.data() + sel_end, old.length() - sel_end); SetTextRaw(data.c_str());