mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Make the main edit box's background color customizable

Browse source 
Closes #1042.
Closes Aegisub/Aegisub#12.
This commit is contained in:
Thomas Goyne 2014-06-27 11:03:07 -07:00
parent ce629c2393
commit 4accc988b3
5 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libresrc/default_config.json
View file

@ -224,6 +224,7 @@
"Standard" : "rgb(0,0,0)"
},
"Subtitle" : {
"Background" : "rgb(255, 255, 255)",
"Syntax" : {
"Background" : {
"Brackets" : "",

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

@ -224,6 +224,7 @@
"Standard" : "rgb(0,0,0)"
},
"Subtitle" : {
"Background" : "rgb(255, 255, 255)",
"Syntax" : {
"Background" : {
"Brackets" : "",

1
src/preferences.cpp
View file

@ -246,6 +246,7 @@ void Interface_Colours(wxTreebook *book, Preferences *parent) {
p->OptionAdd(audio, _("Seconds boundaries"), "Colour/Audio Display/Seconds Line");
auto syntax = p->PageSizer(_("Syntax Highlighting"));
p->OptionAdd(syntax, _("Background"), "Colour/Subtitle/Background");
p->OptionAdd(syntax, _("Normal"), "Colour/Subtitle/Syntax/Normal");
p->OptionAdd(syntax, _("Brackets"), "Colour/Subtitle/Syntax/Brackets");
p->OptionAdd(syntax, _("Slashes and Parentheses"), "Colour/Subtitle/Syntax/Slashes");

32
src/subs_edit_ctrl.cpp
View file

@ -145,6 +145,7 @@ SubsTextEditCtrl::SubsTextEditCtrl(wxWindow* parent, wxSize wsize, long style, a
Subscribe("Karaoke Template");
Subscribe("Karaoke Variable");
OPT_SUB("Colour/Subtitle/Background", &SubsTextEditCtrl::SetStyles, this);
OPT_SUB("Subtitle/Highlight/Syntax", &SubsTextEditCtrl::UpdateStyle, this);
OPT_SUB("App/Call Tips", &SubsTextEditCtrl::UpdateCallTip, this);
@ -204,13 +205,15 @@ void SubsTextEditCtrl::OnKeyDown(wxKeyEvent &event) {
}
}
void SubsTextEditCtrl::SetSyntaxStyle(int id, wxFont &font, std::string const& name) {
void SubsTextEditCtrl::SetSyntaxStyle(int id, wxFont &font, std::string const& name, wxColor const& default_background) {
StyleSetFont(id, font);
StyleSetBold(id, OPT_GET("Colour/Subtitle/Syntax/Bold/" + name)->GetBool());
StyleSetForeground(id, to_wx(OPT_GET("Colour/Subtitle/Syntax/" + name)->GetColor()));
const agi::OptionValue *background = OPT_GET("Colour/Subtitle/Syntax/Background/" + name);
if (background->GetType() == agi::OptionType::Color)
StyleSetBackground(id, to_wx(background->GetColor()));
else
StyleSetBackground(id, default_background);
}
void SubsTextEditCtrl::SetStyles() {
@ -220,18 +223,23 @@ void SubsTextEditCtrl::SetStyles() {
if (!fontname.empty()) font.SetFaceName(fontname);
font.SetPointSize(OPT_GET("Subtitle/Edit Box/Font Size")->GetInt());
auto default_background = to_wx(OPT_GET("Colour/Subtitle/Background")->GetColor());
namespace ss = agi::ass::SyntaxStyle;
SetSyntaxStyle(ss::NORMAL, font, "Normal");
SetSyntaxStyle(ss::COMMENT, font, "Comment");
SetSyntaxStyle(ss::DRAWING, font, "Drawing");
SetSyntaxStyle(ss::OVERRIDE, font, "Brackets");
SetSyntaxStyle(ss::PUNCTUATION, font, "Slashes");
SetSyntaxStyle(ss::TAG, font, "Tags");
SetSyntaxStyle(ss::ERROR, font, "Error");
SetSyntaxStyle(ss::PARAMETER, font, "Parameters");
SetSyntaxStyle(ss::LINE_BREAK, font, "Line Break");
SetSyntaxStyle(ss::KARAOKE_TEMPLATE, font, "Karaoke Template");
SetSyntaxStyle(ss::KARAOKE_VARIABLE, font, "Karaoke Variable");
SetSyntaxStyle(ss::NORMAL, font, "Normal", default_background);
SetSyntaxStyle(ss::COMMENT, font, "Comment", default_background);
SetSyntaxStyle(ss::DRAWING, font, "Drawing", default_background);
SetSyntaxStyle(ss::OVERRIDE, font, "Brackets", default_background);
SetSyntaxStyle(ss::PUNCTUATION, font, "Slashes", default_background);
SetSyntaxStyle(ss::TAG, font, "Tags", default_background);
SetSyntaxStyle(ss::ERROR, font, "Error", default_background);
SetSyntaxStyle(ss::PARAMETER, font, "Parameters", default_background);
SetSyntaxStyle(ss::LINE_BREAK, font, "Line Break", default_background);
SetSyntaxStyle(ss::KARAOKE_TEMPLATE, font, "Karaoke Template", default_background);
SetSyntaxStyle(ss::KARAOKE_VARIABLE, font, "Karaoke Variable", default_background);
SetCaretForeground(StyleGetForeground(ss::NORMAL));
StyleSetBackground(wxSTC_STYLE_DEFAULT, default_background);
// Misspelling indicator
IndicatorSetStyle(0,wxSTC_INDIC_SQUIGGLE);

2
src/subs_edit_ctrl.h
View file

@ -91,7 +91,7 @@ class SubsTextEditCtrl final : public wxStyledTextCtrl {
void OnLoseFocus(wxFocusEvent &event);
void OnKeyDown(wxKeyEvent &event);
void SetSyntaxStyle(int id, wxFont &font, std::string const& name);
void SetSyntaxStyle(int id, wxFont &font, std::string const& name, wxColor const& default_background);
void Subscribe(std::string const& name);
void StyleSpellCheck();