mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Move audio color schemes to the Colours page

Browse source 
Originally committed to SVN as r6643.
This commit is contained in:
Thomas Goyne 2012-03-31 17:38:33 +00:00
parent da8ea6d220
commit 8f7d3ba8b8
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
aegisub/src/preferences.cpp
View file

@ -152,11 +152,6 @@ Audio::Audio(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _(
wxFlexGridSizer *label = PageSizer(_("Audio labels")); wxFlexGridSizer *label = PageSizer(_("Audio labels"));
OptionFont(label, "Audio/Karaoke/"); OptionFont(label, "Audio/Karaoke/");
wxFlexGridSizer *color = PageSizer(_("Color Schemes"));
wxArrayString schemes = vec_to_arrstr(OPT_GET("Audio/Colour Schemes")->GetListString());
OptionChoice(color, _("Spectrum"), schemes, "Colour/Audio Display/Spectrum");
OptionChoice(color, _("Waveform"), schemes, "Colour/Audio Display/Waveform");
SetSizerAndFit(sizer); SetSizerAndFit(sizer);
} }
@ -215,7 +210,10 @@ Interface::Interface(wxTreebook *book, Preferences *parent): OptionPage(book, pa
/// Interface Colours preferences subpage /// Interface Colours preferences subpage
Interface_Colours::Interface_Colours(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Colours"), PAGE_SCROLL|PAGE_SUB) { Interface_Colours::Interface_Colours(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Colours"), PAGE_SCROLL|PAGE_SUB) {
delete sizer; delete sizer;
wxSizer *main_sizer = sizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *main_sizer = new wxBoxSizer(wxHORIZONTAL);
sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->Add(sizer);
wxFlexGridSizer *audio = PageSizer(_("Audio Display")); wxFlexGridSizer *audio = PageSizer(_("Audio Display"));
OptionAdd(audio, _("Play cursor"), "Colour/Audio Display/Play Cursor"); OptionAdd(audio, _("Play cursor"), "Colour/Audio Display/Play Cursor");
@ -224,6 +222,11 @@ Interface_Colours::Interface_Colours(wxTreebook *book, Preferences *parent): Opt
OptionAdd(audio, _("Line boundary inactive line"), "Colour/Audio Display/Line Boundary Inactive Line"); OptionAdd(audio, _("Line boundary inactive line"), "Colour/Audio Display/Line Boundary Inactive Line");
OptionAdd(audio, _("Syllable boundaries"), "Colour/Audio Display/Syllable Boundaries"); OptionAdd(audio, _("Syllable boundaries"), "Colour/Audio Display/Syllable Boundaries");
wxFlexGridSizer *color_schemes = PageSizer(_("Audio Color Schemes"));
wxArrayString schemes = vec_to_arrstr(OPT_GET("Audio/Colour Schemes")->GetListString());
OptionChoice(color_schemes, _("Spectrum"), schemes, "Colour/Audio Display/Spectrum");
OptionChoice(color_schemes, _("Waveform"), schemes, "Colour/Audio Display/Waveform");
sizer = new wxBoxSizer(wxVERTICAL); sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->Add(sizer); main_sizer->Add(sizer);