iqbalrifai/Aegisub
1
0
Fork 0
mirror of https://github.com/odrling/Aegisub synced 2025-04-11 22:56:02 +02:00
Code Issues Releases Wiki Activity

Merge branch 'misc' into feature

Browse Source
This commit is contained in:
arch1t3cht 2024-06-20 20:27:58 +02:00
commit cb930ab6b2
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libresrc/default_config.json
View File

@ -414,6 +414,7 @@
"Width" : 1280 "Width" : 1280
}, },
"Edit Box" : { "Edit Box" : {
"Soft Line Break": false,
"Font Face" : "", "Font Face" : "",
"Font Size" : 10 "Font Size" : 10
}, },

1
src/libresrc/osx/default_config.json
View File

@ -414,6 +414,7 @@
"Width" : 1280 "Width" : 1280
}, },
"Edit Box" : { "Edit Box" : {
"Soft Line Break": false,
"Font Face" : "", "Font Face" : "",
"Font Size" : 13 "Font Size" : 13
}, },

2
src/preferences.cpp
View File

@ -211,7 +211,7 @@ void Interface(wxTreebook *book, Preferences *parent) {
auto edit_box = p->PageSizer(_("Edit Box")); auto edit_box = p->PageSizer(_("Edit Box"));
p->OptionAdd(edit_box, _("Enable call tips"), "App/Call Tips"); p->OptionAdd(edit_box, _("Enable call tips"), "App/Call Tips");
p->OptionAdd(edit_box, _("Overwrite in time boxes"), "Subtitle/Time Edit/Insert Mode"); 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->OptionAdd(edit_box, _("Enable syntax highlighting"), "Subtitle/Highlight/Syntax");
p->OptionBrowse(edit_box, _("Dictionaries path"), "Path/Dictionary"); p->OptionBrowse(edit_box, _("Dictionaries path"), "Path/Dictionary");
p->OptionFont(edit_box, "Subtitle/Edit Box/"); p->OptionFont(edit_box, "Subtitle/Edit Box/");

2
src/subs_edit_ctrl.cpp
View File

@ -216,7 +216,7 @@ void SubsTextEditCtrl::OnKeyDown(wxKeyEvent &event) {
auto sel_start = GetSelectionStart(), sel_end = GetSelectionEnd(); auto sel_start = GetSelectionStart(), sel_end = GetSelectionEnd();
wxCharBuffer old = GetTextRaw(); wxCharBuffer old = GetTextRaw();
std::string data(old.data(), sel_start); 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); data.append(old.data() + sel_end, old.length() - sel_end);
SetTextRaw(data.c_str()); SetTextRaw(data.c_str());