iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Eliminate a bunch of entirely pointless OptionPage subclasses

This commit is contained in:
Thomas Goyne 2014-05-30 20:32:07 -07:00
parent 76f0afecaf
commit 193b30af86
4 changed files with 369 additions and 388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

683
src/preferences.cpp
View File

@ -56,62 +56,38 @@
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/treebook.h> #include <wx/treebook.h>
#define CLASS_PAGE(name) \
struct name : OptionPage { \
name(wxTreebook *book, Preferences *parent); \
};
CLASS_PAGE(General)
CLASS_PAGE(General_DefaultStyles)
CLASS_PAGE(Audio)
CLASS_PAGE(Video)
CLASS_PAGE(Interface)
CLASS_PAGE(Interface_Colours)
CLASS_PAGE(Backup)
CLASS_PAGE(Automation)
CLASS_PAGE(Advanced)
CLASS_PAGE(Advanced_Audio)
CLASS_PAGE(Advanced_Video)
class Interface_Hotkeys final : public OptionPage {
wxDataViewCtrl *dvc;
wxObjectDataPtr<HotkeyDataViewModel> model;
wxSearchCtrl *quick_search;
void OnNewButton(wxCommandEvent&);
void OnUpdateFilter(wxCommandEvent&);
public:
Interface_Hotkeys(wxTreebook *book, Preferences *parent);
};
/// General preferences page /// General preferences page
General::General(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("General")) { void General(wxTreebook *book, Preferences *parent) {
wxFlexGridSizer *general = PageSizer(_("General")); auto p = new OptionPage(book, parent, _("General"));
OptionAdd(general, _("Check for updates on startup"), "App/Auto/Check For Updates");
OptionAdd(general, _("Show main toolbar"), "App/Show Toolbar");
OptionAdd(general, _("Save UI state in subtitles files"), "App/Save UI State");
CellSkip(general);
OptionAdd(general, _("Toolbar Icon Size"), "App/Toolbar Icon Size"); auto general = p->PageSizer(_("General"));
p->OptionAdd(general, _("Check for updates on startup"), "App/Auto/Check For Updates");
p->OptionAdd(general, _("Show main toolbar"), "App/Show Toolbar");
p->OptionAdd(general, _("Save UI state in subtitles files"), "App/Save UI State");
p->CellSkip(general);
p->OptionAdd(general, _("Toolbar Icon Size"), "App/Toolbar Icon Size");
wxString autoload_modes[] = { _("Never"), _("Always"), _("Ask") }; wxString autoload_modes[] = { _("Never"), _("Always"), _("Ask") };
wxArrayString autoload_modes_arr(3, autoload_modes); wxArrayString autoload_modes_arr(3, autoload_modes);
OptionChoice(general, _("Automatically load linked files"), autoload_modes_arr, "App/Auto/Load Linked Files"); p->OptionChoice(general, _("Automatically load linked files"), autoload_modes_arr, "App/Auto/Load Linked Files");
OptionAdd(general, _("Undo Levels"), "Limits/Undo Levels", 2, 10000); p->OptionAdd(general, _("Undo Levels"), "Limits/Undo Levels", 2, 10000);
wxFlexGridSizer *recent = PageSizer(_("Recently Used Lists")); auto recent = p->PageSizer(_("Recently Used Lists"));
OptionAdd(recent, _("Files"), "Limits/MRU", 0, 16); p->OptionAdd(recent, _("Files"), "Limits/MRU", 0, 16);
OptionAdd(recent, _("Find/Replace"), "Limits/Find Replace"); p->OptionAdd(recent, _("Find/Replace"), "Limits/Find Replace");
SetSizerAndFit(sizer); p->SetSizerAndFit(p->sizer);
} }
General_DefaultStyles::General_DefaultStyles(wxTreebook *book, Preferences *parent) : OptionPage(book, parent, _("Default styles"), PAGE_SUB) { void General_DefaultStyles(wxTreebook *book, Preferences *parent) {
auto staticbox = new wxStaticBoxSizer(wxVERTICAL, this, _("Default style catalogs")); auto p = new OptionPage(book, parent, _("Default styles"), OptionPage::PAGE_SUB);
sizer->Add(staticbox, 0, wxEXPAND, 5);
sizer->AddSpacer(8);
wxStaticText *instructions = new wxStaticText(this, wxID_ANY, _("The chosen style catalogs will be loaded when you start a new file or import files in the various formats.\n\nYou can set up style catalogs in the Style Manager.")); auto staticbox = new wxStaticBoxSizer(wxVERTICAL, p, _("Default style catalogs"));
sizer->Fit(this); p->sizer->Add(staticbox, 0, wxEXPAND, 5);
p->sizer->AddSpacer(8);
auto instructions = new wxStaticText(p, wxID_ANY, _("The chosen style catalogs will be loaded when you start a new file or import files in the various formats.\n\nYou can set up style catalogs in the Style Manager."));
p->sizer->Fit(p);
instructions->Wrap(400); instructions->Wrap(400);
staticbox->Add(instructions, 0, wxALL, 5); staticbox->Add(instructions, 0, wxALL, 5);
staticbox->AddSpacer(16); staticbox->AddSpacer(16);
@ -121,11 +97,10 @@ General_DefaultStyles::General_DefaultStyles(wxTreebook *book, Preferences *pare
staticbox->Add(general, 1, wxEXPAND, 5); staticbox->Add(general, 1, wxEXPAND, 5);
// Build a list of available style catalogs, and wished-available ones // Build a list of available style catalogs, and wished-available ones
std::unordered_set<std::string> catalogs_set; auto const& avail_catalogs = AssStyleStorage::GetCatalogs();
std::unordered_set<std::string> catalogs_set(begin(avail_catalogs), end(avail_catalogs));
// Always include one named "Default" even if it doesn't exist (ensure there is at least one on the list) // Always include one named "Default" even if it doesn't exist (ensure there is at least one on the list)
catalogs_set.insert("Default"); catalogs_set.insert("Default");
// Include all catalog files that exist
[&](std::vector<std::string> const& l){ catalogs_set.insert(l.begin(), l.end()); } (AssStyleStorage::GetCatalogs());
// Include all catalogs named in the existing configuration // Include all catalogs named in the existing configuration
static const char *formats[] = { "ASS", "MicroDVD", "SRT", "TTXT", "TXT" }; static const char *formats[] = { "ASS", "MicroDVD", "SRT", "TTXT", "TXT" };
for (auto formatname : formats) for (auto formatname : formats)
@ -136,170 +111,337 @@ General_DefaultStyles::General_DefaultStyles(wxTreebook *book, Preferences *pare
catalogs.Add(to_wx(cn)); catalogs.Add(to_wx(cn));
catalogs.Sort(); catalogs.Sort();
OptionChoice(general, _("New files"), catalogs, "Subtitle Format/ASS/Default Style Catalog"); p->OptionChoice(general, _("New files"), catalogs, "Subtitle Format/ASS/Default Style Catalog");
OptionChoice(general, _("MicroDVD import"), catalogs, "Subtitle Format/MicroDVD/Default Style Catalog"); p->OptionChoice(general, _("MicroDVD import"), catalogs, "Subtitle Format/MicroDVD/Default Style Catalog");
OptionChoice(general, _("SRT import"), catalogs, "Subtitle Format/SRT/Default Style Catalog"); p->OptionChoice(general, _("SRT import"), catalogs, "Subtitle Format/SRT/Default Style Catalog");
OptionChoice(general, _("TTXT import"), catalogs, "Subtitle Format/TTXT/Default Style Catalog"); p->OptionChoice(general, _("TTXT import"), catalogs, "Subtitle Format/TTXT/Default Style Catalog");
OptionChoice(general, _("Plain text import"), catalogs, "Subtitle Format/TXT/Default Style Catalog"); p->OptionChoice(general, _("Plain text import"), catalogs, "Subtitle Format/TXT/Default Style Catalog");
SetSizerAndFit(sizer); p->SetSizerAndFit(p->sizer);
} }
/// Audio preferences page /// Audio preferences page
Audio::Audio(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Audio")) { void Audio(wxTreebook *book, Preferences *parent) {
wxFlexGridSizer *general = PageSizer(_("Options")); auto p = new OptionPage(book, parent, _("Audio"));
OptionAdd(general, _("Default mouse wheel to zoom"), "Audio/Wheel Default to Zoom");
OptionAdd(general, _("Lock scroll on cursor"), "Audio/Lock Scroll on Cursor");
OptionAdd(general, _("Snap markers by default"), "Audio/Snap/Enable");
OptionAdd(general, _("Auto-focus on mouse over"), "Audio/Auto/Focus");
OptionAdd(general, _("Play audio when stepping in video"), "Audio/Plays When Stepping Video");
OptionAdd(general, _("Left-click-drag moves end marker"), "Audio/Drag Timing");
OptionAdd(general, _("Default timing length (ms)"), "Timing/Default Duration", 0, 36000);
OptionAdd(general, _("Default lead-in length (ms)"), "Audio/Lead/IN", 0, 36000);
OptionAdd(general, _("Default lead-out length (ms)"), "Audio/Lead/OUT", 0, 36000);
OptionAdd(general, _("Marker drag-start sensitivity (px)"), "Audio/Start Drag Sensitivity", 1, 15); auto general = p->PageSizer(_("Options"));
OptionAdd(general, _("Line boundary thickness (px)"), "Audio/Line Boundaries Thickness", 1, 5); p->OptionAdd(general, _("Default mouse wheel to zoom"), "Audio/Wheel Default to Zoom");
OptionAdd(general, _("Maximum snap distance (px)"), "Audio/Snap/Distance", 0, 25); p->OptionAdd(general, _("Lock scroll on cursor"), "Audio/Lock Scroll on Cursor");
p->OptionAdd(general, _("Snap markers by default"), "Audio/Snap/Enable");
p->OptionAdd(general, _("Auto-focus on mouse over"), "Audio/Auto/Focus");
p->OptionAdd(general, _("Play audio when stepping in video"), "Audio/Plays When Stepping Video");
p->OptionAdd(general, _("Left-click-drag moves end marker"), "Audio/Drag Timing");
p->OptionAdd(general, _("Default timing length (ms)"), "Timing/Default Duration", 0, 36000);
p->OptionAdd(general, _("Default lead-in length (ms)"), "Audio/Lead/IN", 0, 36000);
p->OptionAdd(general, _("Default lead-out length (ms)"), "Audio/Lead/OUT", 0, 36000);
p->OptionAdd(general, _("Marker drag-start sensitivity (px)"), "Audio/Start Drag Sensitivity", 1, 15);
p->OptionAdd(general, _("Line boundary thickness (px)"), "Audio/Line Boundaries Thickness", 1, 5);
p->OptionAdd(general, _("Maximum snap distance (px)"), "Audio/Snap/Distance", 0, 25);
const wxString dtl_arr[] = { _("Don't show"), _("Show previous"), _("Show previous and next"), _("Show all") }; const wxString dtl_arr[] = { _("Don't show"), _("Show previous"), _("Show previous and next"), _("Show all") };
wxArrayString choice_dtl(4, dtl_arr); wxArrayString choice_dtl(4, dtl_arr);
OptionChoice(general, _("Show inactive lines"), choice_dtl, "Audio/Inactive Lines Display Mode"); p->OptionChoice(general, _("Show inactive lines"), choice_dtl, "Audio/Inactive Lines Display Mode");
CellSkip(general); p->CellSkip(general);
OptionAdd(general, _("Include commented inactive lines"), "Audio/Display/Draw/Inactive Comments"); p->OptionAdd(general, _("Include commented inactive lines"), "Audio/Display/Draw/Inactive Comments");
wxFlexGridSizer *display = PageSizer(_("Display Visual Options")); auto display = p->PageSizer(_("Display Visual Options"));
OptionAdd(display, _("Keyframes in dialogue mode"), "Audio/Display/Draw/Keyframes in Dialogue Mode"); p->OptionAdd(display, _("Keyframes in dialogue mode"), "Audio/Display/Draw/Keyframes in Dialogue Mode");
OptionAdd(display, _("Keyframes in karaoke mode"), "Audio/Display/Draw/Keyframes in Karaoke Mode"); p->OptionAdd(display, _("Keyframes in karaoke mode"), "Audio/Display/Draw/Keyframes in Karaoke Mode");
OptionAdd(display, _("Cursor time"), "Audio/Display/Draw/Cursor Time"); p->OptionAdd(display, _("Cursor time"), "Audio/Display/Draw/Cursor Time");
OptionAdd(display, _("Video position"), "Audio/Display/Draw/Video Position"); p->OptionAdd(display, _("Video position"), "Audio/Display/Draw/Video Position");
OptionAdd(display, _("Seconds boundaries"), "Audio/Display/Draw/Seconds"); p->OptionAdd(display, _("Seconds boundaries"), "Audio/Display/Draw/Seconds");
CellSkip(display); p->CellSkip(display);
OptionChoice(display, _("Waveform Style"), AudioWaveformRenderer::GetWaveformStyles(), "Audio/Display/Waveform Style"); p->OptionChoice(display, _("Waveform Style"), AudioWaveformRenderer::GetWaveformStyles(), "Audio/Display/Waveform Style");
wxFlexGridSizer *label = PageSizer(_("Audio labels")); auto label = p->PageSizer(_("Audio labels"));
OptionFont(label, "Audio/Karaoke/"); p->OptionFont(label, "Audio/Karaoke/");
SetSizerAndFit(sizer); p->SetSizerAndFit(p->sizer);
} }
/// Video preferences page /// Video preferences page
Video::Video(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Video")) { void Video(wxTreebook *book, Preferences *parent) {
wxFlexGridSizer *general = PageSizer(_("Options")); auto p = new OptionPage(book, parent, _("Video"));
OptionAdd(general, _("Show keyframes in slider"), "Video/Slider/Show Keyframes");
CellSkip(general); auto general = p->PageSizer(_("Options"));
OptionAdd(general, _("Only show visual tools when mouse is over video"), "Tool/Visual/Autohide"); p->OptionAdd(general, _("Show keyframes in slider"), "Video/Slider/Show Keyframes");
CellSkip(general); p->CellSkip(general);
OptionAdd(general, _("Seek video to line start on selection change"), "Video/Subtitle Sync"); p->OptionAdd(general, _("Only show visual tools when mouse is over video"), "Tool/Visual/Autohide");
CellSkip(general); p->CellSkip(general);
OptionAdd(general, _("Automatically open audio when opening video"), "Video/Open Audio"); p->OptionAdd(general, _("Seek video to line start on selection change"), "Video/Subtitle Sync");
CellSkip(general); p->CellSkip(general);
p->OptionAdd(general, _("Automatically open audio when opening video"), "Video/Open Audio");
p->CellSkip(general);
const wxString czoom_arr[24] = { "12.5%", "25%", "37.5%", "50%", "62.5%", "75%", "87.5%", "100%", "112.5%", "125%", "137.5%", "150%", "162.5%", "175%", "187.5%", "200%", "212.5%", "225%", "237.5%", "250%", "262.5%", "275%", "287.5%", "300%" }; const wxString czoom_arr[24] = { "12.5%", "25%", "37.5%", "50%", "62.5%", "75%", "87.5%", "100%", "112.5%", "125%", "137.5%", "150%", "162.5%", "175%", "187.5%", "200%", "212.5%", "225%", "237.5%", "250%", "262.5%", "275%", "287.5%", "300%" };
wxArrayString choice_zoom(24, czoom_arr); wxArrayString choice_zoom(24, czoom_arr);
OptionChoice(general, _("Default Zoom"), choice_zoom, "Video/Default Zoom"); p->OptionChoice(general, _("Default Zoom"), choice_zoom, "Video/Default Zoom");
OptionAdd(general, _("Fast jump step in frames"), "Video/Slider/Fast Jump Step"); p->OptionAdd(general, _("Fast jump step in frames"), "Video/Slider/Fast Jump Step");
const wxString cscr_arr[3] = { "?video", "?script", "." }; const wxString cscr_arr[3] = { "?video", "?script", "." };
wxArrayString scr_res(3, cscr_arr); wxArrayString scr_res(3, cscr_arr);
OptionChoice(general, _("Screenshot save path"), scr_res, "Path/Screenshot"); p->OptionChoice(general, _("Screenshot save path"), scr_res, "Path/Screenshot");
wxFlexGridSizer *resolution = PageSizer(_("Script Resolution")); auto resolution = p->PageSizer(_("Script Resolution"));
wxControl *autocb = OptionAdd(resolution, _("Use resolution of first video opened"), "Subtitle/Default Resolution/Auto"); wxControl *autocb = p->OptionAdd(resolution, _("Use resolution of first video opened"), "Subtitle/Default Resolution/Auto");
CellSkip(resolution); p->CellSkip(resolution);
DisableIfChecked(autocb, p->DisableIfChecked(autocb,
OptionAdd(resolution, _("Default width"), "Subtitle/Default Resolution/Width")); p->OptionAdd(resolution, _("Default width"), "Subtitle/Default Resolution/Width"));
DisableIfChecked(autocb, p->DisableIfChecked(autocb,
OptionAdd(resolution, _("Default height"), "Subtitle/Default Resolution/Height")); p->OptionAdd(resolution, _("Default height"), "Subtitle/Default Resolution/Height"));
const wxString cres_arr[] = {_("Never"), _("Ask"), _("Always set"), _("Always resample")}; const wxString cres_arr[] = {_("Never"), _("Ask"), _("Always set"), _("Always resample")};
wxArrayString choice_res(4, cres_arr); wxArrayString choice_res(4, cres_arr);
OptionChoice(resolution, _("Match video resolution on open"), choice_res, "Video/Script Resolution Mismatch"); p->OptionChoice(resolution, _("Match video resolution on open"), choice_res, "Video/Script Resolution Mismatch");
SetSizerAndFit(sizer); p->SetSizerAndFit(p->sizer);
} }
/// Interface preferences page /// Interface preferences page
Interface::Interface(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Interface")) { void Interface(wxTreebook *book, Preferences *parent) {
wxFlexGridSizer *edit_box = PageSizer(_("Edit Box")); auto p = new OptionPage(book, parent, _("Interface"));
OptionAdd(edit_box, _("Enable call tips"), "App/Call Tips");
OptionAdd(edit_box, _("Overwrite in time boxes"), "Subtitle/Time Edit/Insert Mode");
CellSkip(edit_box);
OptionAdd(edit_box, _("Enable syntax highlighting"), "Subtitle/Highlight/Syntax");
OptionBrowse(edit_box, _("Dictionaries path"), "Path/Dictionary");
OptionFont(edit_box, "Subtitle/Edit Box/");
wxFlexGridSizer *character_count = PageSizer(_("Character Counter")); auto edit_box = p->PageSizer(_("Edit Box"));
OptionAdd(character_count, _("Maximum characters per line"), "Subtitle/Character Limit", 0, 1000); p->OptionAdd(edit_box, _("Enable call tips"), "App/Call Tips");
OptionAdd(character_count, _("Characters Per Second Warning Threshold"), "Subtitle/Character Counter/CPS Warning Threshold", 0, 1000); p->OptionAdd(edit_box, _("Overwrite in time boxes"), "Subtitle/Time Edit/Insert Mode");
OptionAdd(character_count, _("Characters Per Second Error Threshold"), "Subtitle/Character Counter/CPS Error Threshold", 0, 1000); p->CellSkip(edit_box);
OptionAdd(character_count, _("Ignore whitespace"), "Subtitle/Character Counter/Ignore Whitespace"); p->OptionAdd(edit_box, _("Enable syntax highlighting"), "Subtitle/Highlight/Syntax");
OptionAdd(character_count, _("Ignore punctuation"), "Subtitle/Character Counter/Ignore Punctuation"); p->OptionBrowse(edit_box, _("Dictionaries path"), "Path/Dictionary");
p->OptionFont(edit_box, "Subtitle/Edit Box/");
wxFlexGridSizer *grid = PageSizer(_("Grid")); auto character_count = p->PageSizer(_("Character Counter"));
OptionAdd(grid, _("Focus grid on click"), "Subtitle/Grid/Focus Allow"); p->OptionAdd(character_count, _("Maximum characters per line"), "Subtitle/Character Limit", 0, 1000);
OptionAdd(grid, _("Highlight visible subtitles"), "Subtitle/Grid/Highlight Subtitles in Frame"); p->OptionAdd(character_count, _("Characters Per Second Warning Threshold"), "Subtitle/Character Counter/CPS Warning Threshold", 0, 1000);
OptionAdd(grid, _("Hide overrides symbol"), "Subtitle/Grid/Hide Overrides Char"); p->OptionAdd(character_count, _("Characters Per Second Error Threshold"), "Subtitle/Character Counter/CPS Error Threshold", 0, 1000);
OptionFont(grid, "Subtitle/Grid/"); p->OptionAdd(character_count, _("Ignore whitespace"), "Subtitle/Character Counter/Ignore Whitespace");
p->OptionAdd(character_count, _("Ignore punctuation"), "Subtitle/Character Counter/Ignore Punctuation");
SetSizerAndFit(sizer); auto grid = p->PageSizer(_("Grid"));
p->OptionAdd(grid, _("Focus grid on click"), "Subtitle/Grid/Focus Allow");
p->OptionAdd(grid, _("Highlight visible subtitles"), "Subtitle/Grid/Highlight Subtitles in Frame");
p->OptionAdd(grid, _("Hide overrides symbol"), "Subtitle/Grid/Hide Overrides Char");
p->OptionFont(grid, "Subtitle/Grid/");
p->SetSizerAndFit(p->sizer);
} }
/// Interface Colours preferences subpage /// Interface Colours preferences subpage
Interface_Colours::Interface_Colours(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Colors"), PAGE_SCROLL|PAGE_SUB) { void Interface_Colours(wxTreebook *book, Preferences *parent) {
delete sizer; auto p = new OptionPage(book, parent, _("Colors"), OptionPage::PAGE_SCROLL|OptionPage::PAGE_SUB);
delete p->sizer;
wxSizer *main_sizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *main_sizer = new wxBoxSizer(wxHORIZONTAL);
sizer = new wxBoxSizer(wxVERTICAL); p->sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->Add(sizer, wxEXPAND); main_sizer->Add(p->sizer, wxEXPAND);
wxFlexGridSizer *audio = PageSizer(_("Audio Display")); auto audio = p->PageSizer(_("Audio Display"));
OptionAdd(audio, _("Play cursor"), "Colour/Audio Display/Play Cursor"); p->OptionAdd(audio, _("Play cursor"), "Colour/Audio Display/Play Cursor");
OptionAdd(audio, _("Line boundary start"), "Colour/Audio Display/Line boundary Start"); p->OptionAdd(audio, _("Line boundary start"), "Colour/Audio Display/Line boundary Start");
OptionAdd(audio, _("Line boundary end"), "Colour/Audio Display/Line boundary End"); p->OptionAdd(audio, _("Line boundary end"), "Colour/Audio Display/Line boundary End");
OptionAdd(audio, _("Line boundary inactive line"), "Colour/Audio Display/Line Boundary Inactive Line"); p->OptionAdd(audio, _("Line boundary inactive line"), "Colour/Audio Display/Line Boundary Inactive Line");
OptionAdd(audio, _("Syllable boundaries"), "Colour/Audio Display/Syllable Boundaries"); p->OptionAdd(audio, _("Syllable boundaries"), "Colour/Audio Display/Syllable Boundaries");
OptionAdd(audio, _("Seconds boundaries"), "Colour/Audio Display/Seconds Line"); p->OptionAdd(audio, _("Seconds boundaries"), "Colour/Audio Display/Seconds Line");
wxFlexGridSizer *syntax = PageSizer(_("Syntax Highlighting")); auto syntax = p->PageSizer(_("Syntax Highlighting"));
OptionAdd(syntax, _("Normal"), "Colour/Subtitle/Syntax/Normal"); p->OptionAdd(syntax, _("Normal"), "Colour/Subtitle/Syntax/Normal");
OptionAdd(syntax, _("Brackets"), "Colour/Subtitle/Syntax/Brackets"); p->OptionAdd(syntax, _("Brackets"), "Colour/Subtitle/Syntax/Brackets");
OptionAdd(syntax, _("Slashes and Parentheses"), "Colour/Subtitle/Syntax/Slashes"); p->OptionAdd(syntax, _("Slashes and Parentheses"), "Colour/Subtitle/Syntax/Slashes");
OptionAdd(syntax, _("Tags"), "Colour/Subtitle/Syntax/Tags"); p->OptionAdd(syntax, _("Tags"), "Colour/Subtitle/Syntax/Tags");
OptionAdd(syntax, _("Parameters"), "Colour/Subtitle/Syntax/Parameters"); p->OptionAdd(syntax, _("Parameters"), "Colour/Subtitle/Syntax/Parameters");
OptionAdd(syntax, _("Error"), "Colour/Subtitle/Syntax/Error"); p->OptionAdd(syntax, _("Error"), "Colour/Subtitle/Syntax/Error");
OptionAdd(syntax, _("Error Background"), "Colour/Subtitle/Syntax/Background/Error"); p->OptionAdd(syntax, _("Error Background"), "Colour/Subtitle/Syntax/Background/Error");
OptionAdd(syntax, _("Line Break"), "Colour/Subtitle/Syntax/Line Break"); p->OptionAdd(syntax, _("Line Break"), "Colour/Subtitle/Syntax/Line Break");
OptionAdd(syntax, _("Karaoke templates"), "Colour/Subtitle/Syntax/Karaoke Template"); p->OptionAdd(syntax, _("Karaoke templates"), "Colour/Subtitle/Syntax/Karaoke Template");
sizer = new wxBoxSizer(wxVERTICAL); p->sizer = new wxBoxSizer(wxVERTICAL);
main_sizer->AddSpacer(5); main_sizer->AddSpacer(5);
main_sizer->Add(sizer, wxEXPAND); main_sizer->Add(p->sizer, wxEXPAND);
wxFlexGridSizer *color_schemes = PageSizer(_("Audio Color Schemes")); auto color_schemes = p->PageSizer(_("Audio Color Schemes"));
wxArrayString schemes = to_wx(OPT_GET("Audio/Colour Schemes")->GetListString()); wxArrayString schemes = to_wx(OPT_GET("Audio/Colour Schemes")->GetListString());
OptionChoice(color_schemes, _("Spectrum"), schemes, "Colour/Audio Display/Spectrum"); p->OptionChoice(color_schemes, _("Spectrum"), schemes, "Colour/Audio Display/Spectrum");
OptionChoice(color_schemes, _("Waveform"), schemes, "Colour/Audio Display/Waveform"); p->OptionChoice(color_schemes, _("Waveform"), schemes, "Colour/Audio Display/Waveform");
wxFlexGridSizer *grid = PageSizer(_("Subtitle Grid")); auto grid = p->PageSizer(_("Subtitle Grid"));
OptionAdd(grid, _("Standard foreground"), "Colour/Subtitle Grid/Standard"); p->OptionAdd(grid, _("Standard foreground"), "Colour/Subtitle Grid/Standard");
OptionAdd(grid, _("Standard background"), "Colour/Subtitle Grid/Background/Background"); p->OptionAdd(grid, _("Standard background"), "Colour/Subtitle Grid/Background/Background");
OptionAdd(grid, _("Selection foreground"), "Colour/Subtitle Grid/Selection"); p->OptionAdd(grid, _("Selection foreground"), "Colour/Subtitle Grid/Selection");
OptionAdd(grid, _("Selection background"), "Colour/Subtitle Grid/Background/Selection"); p->OptionAdd(grid, _("Selection background"), "Colour/Subtitle Grid/Background/Selection");
OptionAdd(grid, _("Collision foreground"), "Colour/Subtitle Grid/Collision"); p->OptionAdd(grid, _("Collision foreground"), "Colour/Subtitle Grid/Collision");
OptionAdd(grid, _("In frame background"), "Colour/Subtitle Grid/Background/Inframe"); p->OptionAdd(grid, _("In frame background"), "Colour/Subtitle Grid/Background/Inframe");
OptionAdd(grid, _("Comment background"), "Colour/Subtitle Grid/Background/Comment"); p->OptionAdd(grid, _("Comment background"), "Colour/Subtitle Grid/Background/Comment");
OptionAdd(grid, _("Selected comment background"), "Colour/Subtitle Grid/Background/Selected Comment"); p->OptionAdd(grid, _("Selected comment background"), "Colour/Subtitle Grid/Background/Selected Comment");
OptionAdd(grid, _("Header background"), "Colour/Subtitle Grid/Header"); p->OptionAdd(grid, _("Header background"), "Colour/Subtitle Grid/Header");
OptionAdd(grid, _("Left Column"), "Colour/Subtitle Grid/Left Column"); p->OptionAdd(grid, _("Left Column"), "Colour/Subtitle Grid/Left Column");
OptionAdd(grid, _("Active Line Border"), "Colour/Subtitle Grid/Active Border"); p->OptionAdd(grid, _("Active Line Border"), "Colour/Subtitle Grid/Active Border");
OptionAdd(grid, _("Lines"), "Colour/Subtitle Grid/Lines"); p->OptionAdd(grid, _("Lines"), "Colour/Subtitle Grid/Lines");
OptionAdd(grid, _("CPS Error"), "Colour/Subtitle Grid/CPS Error"); p->OptionAdd(grid, _("CPS Error"), "Colour/Subtitle Grid/CPS Error");
sizer = main_sizer; p->sizer = main_sizer;
SetSizerAndFit(sizer); p->SetSizerAndFit(p->sizer);
}
/// Backup preferences page
void Backup(wxTreebook *book, Preferences *parent) {
auto p = new OptionPage(book, parent, _("Backup"));
auto save = p->PageSizer(_("Automatic Save"));
wxControl *cb = p->OptionAdd(save, _("Enable"), "App/Auto/Save");
p->CellSkip(save);
p->EnableIfChecked(cb,
p->OptionAdd(save, _("Interval in seconds"), "App/Auto/Save Every Seconds", 1));
p->OptionBrowse(save, _("Path"), "Path/Auto/Save", cb, true);
p->OptionAdd(save, _("Autosave after every change"), "App/Auto/Save on Every Change");
auto backup = p->PageSizer(_("Automatic Backup"));
cb = p->OptionAdd(backup, _("Enable"), "App/Auto/Backup");
p->CellSkip(backup);
p->OptionBrowse(backup, _("Path"), "Path/Auto/Backup", cb, true);
p->SetSizerAndFit(p->sizer);
}
/// Automation preferences page
void Automation(wxTreebook *book, Preferences *parent) {
auto p = new OptionPage(book, parent, _("Automation"));
auto general = p->PageSizer(_("General"));
p->OptionAdd(general, _("Base path"), "Path/Automation/Base");
p->OptionAdd(general, _("Include path"), "Path/Automation/Include");
p->OptionAdd(general, _("Auto-load path"), "Path/Automation/Autoload");
const wxString tl_arr[6] = { _("0: Fatal"), _("1: Error"), _("2: Warning"), _("3: Hint"), _("4: Debug"), _("5: Trace") };
wxArrayString tl_choice(6, tl_arr);
p->OptionChoice(general, _("Trace level"), tl_choice, "Automation/Trace Level");
const wxString tp_arr[3] = { _("Normal"), _("Below Normal (recommended)"), _("Lowest") };
wxArrayString tp_choice(3, tp_arr);
p->OptionChoice(general, _("Thread priority"), tp_choice, "Automation/Thread Priority");
const wxString ar_arr[4] = { _("No scripts"), _("Subtitle-local scripts"), _("Global autoload scripts"), _("All scripts") };
wxArrayString ar_choice(4, ar_arr);
p->OptionChoice(general, _("Autoreload on Export"), ar_choice, "Automation/Autoreload Mode");
p->SetSizerAndFit(p->sizer);
}
/// Advanced preferences page
void Advanced(wxTreebook *book, Preferences *parent) {
auto p = new OptionPage(book, parent, _("Advanced"));
auto general = p->PageSizer(_("General"));
auto warning = new wxStaticText(p, wxID_ANY ,_("Changing these settings might result in bugs and/or crashes. Do not touch these unless you know what you're doing."));
warning->SetFont(wxFont(12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
p->sizer->Fit(p);
warning->Wrap(400);
general->Add(warning, 0, wxALL, 5);
p->SetSizerAndFit(p->sizer);
}
/// Advanced Audio preferences subpage
void Advanced_Audio(wxTreebook *book, Preferences *parent) {
auto p = new OptionPage(book, parent, _("Audio"), OptionPage::PAGE_SUB);
auto expert = p->PageSizer(_("Expert"));
wxArrayString ap_choice = to_wx(AudioProviderFactory::GetClasses());
p->OptionChoice(expert, _("Audio provider"), ap_choice, "Audio/Provider");
wxArrayString apl_choice = to_wx(AudioPlayerFactory::GetClasses());
p->OptionChoice(expert, _("Audio player"), apl_choice, "Audio/Player");
auto cache = p->PageSizer(_("Cache"));
const wxString ct_arr[3] = { _("None (NOT RECOMMENDED)"), _("RAM"), _("Hard Disk") };
wxArrayString ct_choice(3, ct_arr);
p->OptionChoice(cache, _("Cache type"), ct_choice, "Audio/Cache/Type");
p->OptionBrowse(cache, _("Path"), "Audio/Cache/HD/Location");
auto spectrum = p->PageSizer(_("Spectrum"));
const wxString sq_arr[4] = { _("Regular quality"), _("Better quality"), _("High quality"), _("Insane quality") };
wxArrayString sq_choice(4, sq_arr);
p->OptionChoice(spectrum, _("Quality"), sq_choice, "Audio/Renderer/Spectrum/Quality");
p->OptionAdd(spectrum, _("Cache memory max (MB)"), "Audio/Renderer/Spectrum/Memory Max", 2, 1024);
#ifdef WITH_AVISYNTH
auto avisynth = p->PageSizer("Avisynth");
const wxString adm_arr[3] = { "ConvertToMono", "GetLeftChannel", "GetRightChannel" };
wxArrayString adm_choice(3, adm_arr);
p->OptionChoice(avisynth, _("Avisynth down-mixer"), adm_choice, "Audio/Downmixer");
p->OptionAdd(avisynth, _("Force sample rate"), "Provider/Audio/AVS/Sample Rate");
#endif
#ifdef WITH_FFMS2
auto ffms = p->PageSizer("FFmpegSource");
const wxString error_modes[] = { _("Ignore"), _("Clear"), _("Stop"), _("Abort") };
wxArrayString error_modes_choice(4, error_modes);
p->OptionChoice(ffms, _("Audio indexing error handling mode"), error_modes_choice, "Provider/Audio/FFmpegSource/Decode Error Handling");
p->OptionAdd(ffms, _("Always index all audio tracks"), "Provider/FFmpegSource/Index All Tracks");
#endif
#ifdef WITH_PORTAUDIO
auto portaudio = p->PageSizer("Portaudio");
p->OptionChoice(portaudio, _("Portaudio device"), PortAudioPlayer::GetOutputDevices(), "Player/Audio/PortAudio/Device Name");
#endif
#ifdef WITH_OSS
auto oss = p->PageSizer("OSS");
p->OptionBrowse(oss, _("OSS Device"), "Player/Audio/OSS/Device");
#endif
#ifdef WITH_DIRECTSOUND
auto dsound = p->PageSizer("DirectSound");
p->OptionAdd(dsound, _("Buffer latency"), "Player/Audio/DirectSound/Buffer Latency", 1, 1000);
p->OptionAdd(dsound, _("Buffer length"), "Player/Audio/DirectSound/Buffer Length", 1, 100);
#endif
p->SetSizerAndFit(p->sizer);
}
/// Advanced Video preferences subpage
void Advanced_Video(wxTreebook *book, Preferences *parent) {
auto p = new OptionPage(book, parent, _("Video"), OptionPage::PAGE_SUB);
auto expert = p->PageSizer(_("Expert"));
wxArrayString vp_choice = to_wx(VideoProviderFactory::GetClasses());
p->OptionChoice(expert, _("Video provider"), vp_choice, "Video/Provider");
wxArrayString sp_choice = to_wx(SubtitlesProviderFactory::GetClasses());
p->OptionChoice(expert, _("Subtitles provider"), sp_choice, "Subtitle/Provider");
p->CellSkip(expert);
p->OptionAdd(expert, _("Force BT.601"), "Video/Force BT.601");
#ifdef WITH_AVISYNTH
auto avisynth = p->PageSizer("Avisynth");
p->OptionAdd(avisynth, _("Allow pre-2.56a Avisynth"), "Provider/Avisynth/Allow Ancient");
p->CellSkip(avisynth);
p->OptionAdd(avisynth, _("Avisynth memory limit"), "Provider/Avisynth/Memory Max");
#endif
#ifdef WITH_FFMS2
auto ffms = p->PageSizer("FFmpegSource");
const wxString log_levels[] = { "Quiet", "Panic", "Fatal", "Error", "Warning", "Info", "Verbose", "Debug" };
wxArrayString log_levels_choice(8, log_levels);
p->OptionChoice(ffms, _("Debug log verbosity"), log_levels_choice, "Provider/FFmpegSource/Log Level");
p->OptionAdd(ffms, _("Decoding threads"), "Provider/Video/FFmpegSource/Decoding Threads", -1);
p->OptionAdd(ffms, _("Enable unsafe seeking"), "Provider/Video/FFmpegSource/Unsafe Seeking");
#endif
p->SetSizerAndFit(p->sizer);
} }
/// wxDataViewIconTextRenderer with command name autocompletion /// wxDataViewIconTextRenderer with command name autocompletion
@ -412,15 +554,26 @@ static void edit_item(wxDataViewCtrl *dvc, wxDataViewItem item) {
dvc->EditItem(item, dvc->GetColumn(0)); dvc->EditItem(item, dvc->GetColumn(0));
} }
class Interface_Hotkeys final : public OptionPage {
wxDataViewCtrl *dvc;
wxObjectDataPtr<HotkeyDataViewModel> model;
wxSearchCtrl *quick_search;
void OnNewButton(wxCommandEvent&);
void OnUpdateFilter(wxCommandEvent&);
public:
Interface_Hotkeys(wxTreebook *book, Preferences *parent);
};
/// Interface Hotkeys preferences subpage /// Interface Hotkeys preferences subpage
Interface_Hotkeys::Interface_Hotkeys(wxTreebook *book, Preferences *parent) Interface_Hotkeys::Interface_Hotkeys(wxTreebook *book, Preferences *parent)
: OptionPage(book, parent, _("Hotkeys"), PAGE_SUB) : OptionPage(book, parent, _("Hotkeys"), OptionPage::PAGE_SUB)
, model(new HotkeyDataViewModel(parent)) , model(new HotkeyDataViewModel(parent))
{ {
quick_search = new wxSearchCtrl(this, -1); quick_search = new wxSearchCtrl(this, -1);
wxButton *new_button = new wxButton(this, -1, _("&New")); auto new_button = new wxButton(this, -1, _("&New"));
wxButton *edit_button = new wxButton(this, -1, _("&Edit")); auto edit_button = new wxButton(this, -1, _("&Edit"));
wxButton *delete_button = new wxButton(this, -1, _("&Delete")); auto delete_button = new wxButton(this, -1, _("&Delete"));
new_button->Bind(wxEVT_BUTTON, &Interface_Hotkeys::OnNewButton, this); new_button->Bind(wxEVT_BUTTON, &Interface_Hotkeys::OnNewButton, this);
edit_button->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { edit_item(dvc, dvc->GetSelection()); }); edit_button->Bind(wxEVT_BUTTON, [=](wxCommandEvent&) { edit_item(dvc, dvc->GetSelection()); });
@ -477,155 +630,6 @@ void Interface_Hotkeys::OnUpdateFilter(wxCommandEvent&) {
} }
} }
/// Backup preferences page
Backup::Backup(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Backup")) {
wxFlexGridSizer *save = PageSizer(_("Automatic Save"));
wxControl *cb = OptionAdd(save, _("Enable"), "App/Auto/Save");
CellSkip(save);
EnableIfChecked(cb,
OptionAdd(save, _("Interval in seconds"), "App/Auto/Save Every Seconds", 1));
OptionBrowse(save, _("Path"), "Path/Auto/Save", cb, true);
OptionAdd(save, _("Autosave after every change"), "App/Auto/Save on Every Change");
wxFlexGridSizer *backup = PageSizer(_("Automatic Backup"));
cb = OptionAdd(backup, _("Enable"), "App/Auto/Backup");
CellSkip(backup);
OptionBrowse(backup, _("Path"), "Path/Auto/Backup", cb, true);
SetSizerAndFit(sizer);
}
/// Automation preferences page
Automation::Automation(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Automation")) {
wxFlexGridSizer *general = PageSizer(_("General"));
OptionAdd(general, _("Base path"), "Path/Automation/Base");
OptionAdd(general, _("Include path"), "Path/Automation/Include");
OptionAdd(general, _("Auto-load path"), "Path/Automation/Autoload");
const wxString tl_arr[6] = { _("0: Fatal"), _("1: Error"), _("2: Warning"), _("3: Hint"), _("4: Debug"), _("5: Trace") };
wxArrayString tl_choice(6, tl_arr);
OptionChoice(general, _("Trace level"), tl_choice, "Automation/Trace Level");
const wxString tp_arr[3] = { _("Normal"), _("Below Normal (recommended)"), _("Lowest") };
wxArrayString tp_choice(3, tp_arr);
OptionChoice(general, _("Thread priority"), tp_choice, "Automation/Thread Priority");
const wxString ar_arr[4] = { _("No scripts"), _("Subtitle-local scripts"), _("Global autoload scripts"), _("All scripts") };
wxArrayString ar_choice(4, ar_arr);
OptionChoice(general, _("Autoreload on Export"), ar_choice, "Automation/Autoreload Mode");
SetSizerAndFit(sizer);
}
/// Advanced preferences page
Advanced::Advanced(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Advanced")) {
wxFlexGridSizer *general = PageSizer(_("General"));
wxStaticText *warning = new wxStaticText(this, wxID_ANY ,_("Changing these settings might result in bugs and/or crashes. Do not touch these unless you know what you're doing."));
warning->SetFont(wxFont(12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD));
sizer->Fit(this);
warning->Wrap(400);
general->Add(warning, 0, wxALL, 5);
SetSizerAndFit(sizer);
}
/// Advanced Audio preferences subpage
Advanced_Audio::Advanced_Audio(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Audio"), PAGE_SUB) {
wxFlexGridSizer *expert = PageSizer(_("Expert"));
wxArrayString ap_choice = to_wx(AudioProviderFactory::GetClasses());
OptionChoice(expert, _("Audio provider"), ap_choice, "Audio/Provider");
wxArrayString apl_choice = to_wx(AudioPlayerFactory::GetClasses());
OptionChoice(expert, _("Audio player"), apl_choice, "Audio/Player");
wxFlexGridSizer *cache = PageSizer(_("Cache"));
const wxString ct_arr[3] = { _("None (NOT RECOMMENDED)"), _("RAM"), _("Hard Disk") };
wxArrayString ct_choice(3, ct_arr);
OptionChoice(cache, _("Cache type"), ct_choice, "Audio/Cache/Type");
OptionBrowse(cache, _("Path"), "Audio/Cache/HD/Location");
wxFlexGridSizer *spectrum = PageSizer(_("Spectrum"));
const wxString sq_arr[4] = { _("Regular quality"), _("Better quality"), _("High quality"), _("Insane quality") };
wxArrayString sq_choice(4, sq_arr);
OptionChoice(spectrum, _("Quality"), sq_choice, "Audio/Renderer/Spectrum/Quality");
OptionAdd(spectrum, _("Cache memory max (MB)"), "Audio/Renderer/Spectrum/Memory Max", 2, 1024);
#ifdef WITH_AVISYNTH
wxFlexGridSizer *avisynth = PageSizer("Avisynth");
const wxString adm_arr[3] = { "ConvertToMono", "GetLeftChannel", "GetRightChannel" };
wxArrayString adm_choice(3, adm_arr);
OptionChoice(avisynth, _("Avisynth down-mixer"), adm_choice, "Audio/Downmixer");
OptionAdd(avisynth, _("Force sample rate"), "Provider/Audio/AVS/Sample Rate");
#endif
#ifdef WITH_FFMS2
wxFlexGridSizer *ffms = PageSizer("FFmpegSource");
const wxString error_modes[] = { _("Ignore"), _("Clear"), _("Stop"), _("Abort") };
wxArrayString error_modes_choice(4, error_modes);
OptionChoice(ffms, _("Audio indexing error handling mode"), error_modes_choice, "Provider/Audio/FFmpegSource/Decode Error Handling");
OptionAdd(ffms, _("Always index all audio tracks"), "Provider/FFmpegSource/Index All Tracks");
#endif
#ifdef WITH_PORTAUDIO
wxFlexGridSizer *portaudio = PageSizer("Portaudio");
OptionChoice(portaudio, _("Portaudio device"), PortAudioPlayer::GetOutputDevices(), "Player/Audio/PortAudio/Device Name");
#endif
#ifdef WITH_OSS
wxFlexGridSizer *oss = PageSizer("OSS");
OptionBrowse(oss, _("OSS Device"), "Player/Audio/OSS/Device");
#endif
#ifdef WITH_DIRECTSOUND
wxFlexGridSizer *dsound = PageSizer("DirectSound");
OptionAdd(dsound, _("Buffer latency"), "Player/Audio/DirectSound/Buffer Latency", 1, 1000);
OptionAdd(dsound, _("Buffer length"), "Player/Audio/DirectSound/Buffer Length", 1, 100);
#endif
SetSizerAndFit(sizer);
}
/// Advanced Video preferences subpage
Advanced_Video::Advanced_Video(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Video"), PAGE_SUB) {
wxFlexGridSizer *expert = PageSizer(_("Expert"));
wxArrayString vp_choice = to_wx(VideoProviderFactory::GetClasses());
OptionChoice(expert, _("Video provider"), vp_choice, "Video/Provider");
wxArrayString sp_choice = to_wx(SubtitlesProviderFactory::GetClasses());
OptionChoice(expert, _("Subtitles provider"), sp_choice, "Subtitle/Provider");
CellSkip(expert);
OptionAdd(expert, _("Force BT.601"), "Video/Force BT.601");
#ifdef WITH_AVISYNTH
wxFlexGridSizer *avisynth = PageSizer("Avisynth");
OptionAdd(avisynth, _("Allow pre-2.56a Avisynth"), "Provider/Avisynth/Allow Ancient");
CellSkip(avisynth);
OptionAdd(avisynth, _("Avisynth memory limit"), "Provider/Avisynth/Memory Max");
#endif
#ifdef WITH_FFMS2
wxFlexGridSizer *ffms = PageSizer("FFmpegSource");
const wxString log_levels[] = { "Quiet", "Panic", "Fatal", "Error", "Warning", "Info", "Verbose", "Debug" };
wxArrayString log_levels_choice(8, log_levels);
OptionChoice(ffms, _("Debug log verbosity"), log_levels_choice, "Provider/FFmpegSource/Log Level");
OptionAdd(ffms, _("Decoding threads"), "Provider/Video/FFmpegSource/Decoding Threads", -1);
OptionAdd(ffms, _("Enable unsafe seeking"), "Provider/Video/FFmpegSource/Unsafe Seeking");
#endif
SetSizerAndFit(sizer);
}
void Preferences::SetOption(std::unique_ptr<agi::OptionValue> new_value) { void Preferences::SetOption(std::unique_ptr<agi::OptionValue> new_value) {
pending_changes[new_value->GetName()] = std::move(new_value); pending_changes[new_value->GetName()] = std::move(new_value);
if (IsEnabled()) if (IsEnabled())
@ -679,37 +683,35 @@ void Preferences::OnResetDefault(wxCommandEvent&) {
EndModal(-1); EndModal(-1);
} }
static void PageChanged(wxBookCtrlEvent& evt) {
OPT_SET("Tool/Preferences/Page")->SetInt(evt.GetSelection());
}
Preferences::Preferences(wxWindow *parent): wxDialog(parent, -1, _("Preferences"), wxDefaultPosition, wxSize(-1, -1), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) { Preferences::Preferences(wxWindow *parent): wxDialog(parent, -1, _("Preferences"), wxDefaultPosition, wxSize(-1, -1), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER) {
SetIcon(GETICON(options_button_16)); SetIcon(GETICON(options_button_16));
book = new wxTreebook(this, -1, wxDefaultPosition, wxDefaultSize); book = new wxTreebook(this, -1, wxDefaultPosition, wxDefaultSize);
new General(book, this); General(book, this);
new General_DefaultStyles(book, this); General_DefaultStyles(book, this);
new Audio(book, this); Audio(book, this);
new Video(book, this); Video(book, this);
new Interface(book, this); Interface(book, this);
new Interface_Colours(book, this); Interface_Colours(book, this);
new Interface_Hotkeys(book, this); new Interface_Hotkeys(book, this);
new Backup(book, this); Backup(book, this);
new Automation(book, this); Automation(book, this);
new Advanced(book, this); Advanced(book, this);
new Advanced_Audio(book, this); Advanced_Audio(book, this);
new Advanced_Video(book, this); Advanced_Video(book, this);
book->Fit(); book->Fit();
book->ChangeSelection(OPT_GET("Tool/Preferences/Page")->GetInt()); book->ChangeSelection(OPT_GET("Tool/Preferences/Page")->GetInt());
book->Bind(wxEVT_TREEBOOK_PAGE_CHANGED, &PageChanged); book->Bind(wxEVT_TREEBOOK_PAGE_CHANGED, [](wxBookCtrlEvent &evt) {
OPT_SET("Tool/Preferences/Page")->SetInt(evt.GetSelection());
});
// Bottom Buttons // Bottom Buttons
wxStdDialogButtonSizer *stdButtonSizer = CreateStdDialogButtonSizer(wxOK | wxCANCEL | wxAPPLY | wxHELP); auto stdButtonSizer = CreateStdDialogButtonSizer(wxOK | wxCANCEL | wxAPPLY | wxHELP);
applyButton = stdButtonSizer->GetApplyButton(); applyButton = stdButtonSizer->GetApplyButton();
wxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer *buttonSizer = new wxBoxSizer(wxHORIZONTAL);
wxButton *defaultButton = new wxButton(this, -1, _("&Restore Defaults")); auto defaultButton = new wxButton(this, -1, _("&Restore Defaults"));
buttonSizer->Add(defaultButton, wxSizerFlags(0).Expand()); buttonSizer->Add(defaultButton, wxSizerFlags(0).Expand());
buttonSizer->AddStretchSpacer(1); buttonSizer->AddStretchSpacer(1);
buttonSizer->Add(stdButtonSizer, wxSizerFlags(0).Expand()); buttonSizer->Add(stdButtonSizer, wxSizerFlags(0).Expand());
@ -729,6 +731,3 @@ Preferences::Preferences(wxWindow *parent): wxDialog(parent, -1, _("Preferences"
Bind(wxEVT_BUTTON, std::bind(&HelpButton::OpenPage, "Options"), wxID_HELP); Bind(wxEVT_BUTTON, std::bind(&HelpButton::OpenPage, "Options"), wxID_HELP);
defaultButton->Bind(wxEVT_BUTTON, &Preferences::OnResetDefault, this); defaultButton->Bind(wxEVT_BUTTON, &Preferences::OnResetDefault, this);
} }
Preferences::~Preferences() {
}

7
src/preferences.h
View File

@ -17,8 +17,6 @@
/// @see preferences.cpp /// @see preferences.cpp
/// @ingroup configuration_ui /// @ingroup configuration_ui
#include <libaegisub/exception.h>
#include <functional> #include <functional>
#include <map> #include <map>
#include <memory> #include <memory>
@ -30,10 +28,6 @@ class wxButton;
class wxTreebook; class wxTreebook;
namespace agi { class OptionValue; } namespace agi { class OptionValue; }
DEFINE_EXCEPTION(PreferencesError, agi::Exception);
DEFINE_EXCEPTION(PreferenceIncorrectType, PreferencesError);
DEFINE_EXCEPTION(PreferenceNotSupported, PreferencesError);
class Preferences final : public wxDialog { class Preferences final : public wxDialog {
public: public:
typedef std::function<void ()> Thunk; typedef std::function<void ()> Thunk;
@ -52,7 +46,6 @@ private:
public: public:
Preferences(wxWindow *parent); Preferences(wxWindow *parent);
~Preferences();
/// Add an option to be set when the OK or Apply button is clicked /// Add an option to be set when the OK or Apply button is clicked
/// @param new_value Clone of the option with the new value to copy over /// @param new_value Clone of the option with the new value to copy over

61
src/preferences_base.cpp
View File

@ -23,6 +23,7 @@
#include "options.h" #include "options.h"
#include "preferences.h" #include "preferences.h"
#include <libaegisub/exception.h>
#include <libaegisub/path.h> #include <libaegisub/path.h>
#include <libaegisub/make_unique.h> #include <libaegisub/make_unique.h>
@ -111,11 +112,11 @@ void OptionPage::CellSkip(wxFlexGridSizer *flex) {
wxControl *OptionPage::OptionAdd(wxFlexGridSizer *flex, const wxString &name, const char *opt_name, double min, double max, double inc) { wxControl *OptionPage::OptionAdd(wxFlexGridSizer *flex, const wxString &name, const char *opt_name, double min, double max, double inc) {
parent->AddChangeableOption(opt_name); parent->AddChangeableOption(opt_name);
const agi::OptionValue *opt = OPT_GET(opt_name); const auto opt = OPT_GET(opt_name);
switch (opt->GetType()) { switch (opt->GetType()) {
case agi::OptionType::Bool: { case agi::OptionType::Bool: {
wxCheckBox *cb = new wxCheckBox(this, -1, name); auto cb = new wxCheckBox(this, -1, name);
flex->Add(cb, 1, wxEXPAND, 0); flex->Add(cb, 1, wxEXPAND, 0);
cb->SetValue(opt->GetBool()); cb->SetValue(opt->GetBool());
cb->Bind(wxEVT_CHECKBOX, BoolUpdater(opt_name, parent)); cb->Bind(wxEVT_CHECKBOX, BoolUpdater(opt_name, parent));
@ -123,21 +124,21 @@ wxControl *OptionPage::OptionAdd(wxFlexGridSizer *flex, const wxString &name, co
} }
case agi::OptionType::Int: { case agi::OptionType::Int: {
wxSpinCtrl *sc = new wxSpinCtrl(this, -1, std::to_wstring((int)opt->GetInt()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, min, max, opt->GetInt()); auto sc = new wxSpinCtrl(this, -1, std::to_wstring((int)opt->GetInt()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, min, max, opt->GetInt());
sc->Bind(wxEVT_SPINCTRL, IntUpdater(opt_name, parent)); sc->Bind(wxEVT_SPINCTRL, IntUpdater(opt_name, parent));
Add(flex, name, sc); Add(flex, name, sc);
return sc; return sc;
} }
case agi::OptionType::Double: { case agi::OptionType::Double: {
wxSpinCtrlDouble *scd = new wxSpinCtrlDouble(this, -1, std::to_wstring(opt->GetDouble()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, min, max, opt->GetDouble(), inc); auto scd = new wxSpinCtrlDouble(this, -1, std::to_wstring(opt->GetDouble()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, min, max, opt->GetDouble(), inc);
scd->Bind(wxEVT_SPINCTRL, DoubleUpdater(opt_name, parent)); scd->Bind(wxEVT_SPINCTRL, DoubleUpdater(opt_name, parent));
Add(flex, name, scd); Add(flex, name, scd);
return scd; return scd;
} }
case agi::OptionType::String: { case agi::OptionType::String: {
wxTextCtrl *text = new wxTextCtrl(this, -1 , to_wx(opt->GetString())); auto text = new wxTextCtrl(this, -1 , to_wx(opt->GetString()));
text->Bind(wxEVT_TEXT, StringUpdater(opt_name, parent)); text->Bind(wxEVT_TEXT, StringUpdater(opt_name, parent));
Add(flex, name, text); Add(flex, name, text);
return text; return text;
@ -151,15 +152,15 @@ wxControl *OptionPage::OptionAdd(wxFlexGridSizer *flex, const wxString &name, co
} }
default: default:
throw PreferenceNotSupported("Unsupported type"); throw agi::InternalError("Unsupported type");
} }
} }
void OptionPage::OptionChoice(wxFlexGridSizer *flex, const wxString &name, const wxArrayString &choices, const char *opt_name) { void OptionPage::OptionChoice(wxFlexGridSizer *flex, const wxString &name, const wxArrayString &choices, const char *opt_name) {
parent->AddChangeableOption(opt_name); parent->AddChangeableOption(opt_name);
const agi::OptionValue *opt = OPT_GET(opt_name); const auto opt = OPT_GET(opt_name);
wxComboBox *cb = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, choices, wxCB_READONLY | wxCB_DROPDOWN); auto cb = new wxComboBox(this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, choices, wxCB_READONLY | wxCB_DROPDOWN);
Add(flex, name, cb); Add(flex, name, cb);
switch (opt->GetType()) { switch (opt->GetType()) {
@ -180,12 +181,12 @@ void OptionPage::OptionChoice(wxFlexGridSizer *flex, const wxString &name, const
} }
default: default:
throw PreferenceNotSupported("Unsupported type"); throw agi::InternalError("Unsupported type");
} }
} }
wxFlexGridSizer* OptionPage::PageSizer(wxString name) { wxFlexGridSizer* OptionPage::PageSizer(wxString name) {
wxSizer *tmp_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, name); auto tmp_sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, name);
sizer->Add(tmp_sizer, 0,wxEXPAND, 5); sizer->Add(tmp_sizer, 0,wxEXPAND, 5);
auto flex = new wxFlexGridSizer(2,5,5); auto flex = new wxFlexGridSizer(2,5,5);
flex->AddGrowableCol(0,1); flex->AddGrowableCol(0,1);
@ -196,19 +197,19 @@ wxFlexGridSizer* OptionPage::PageSizer(wxString name) {
void OptionPage::OptionBrowse(wxFlexGridSizer *flex, const wxString &name, const char *opt_name, wxControl *enabler, bool do_enable) { void OptionPage::OptionBrowse(wxFlexGridSizer *flex, const wxString &name, const char *opt_name, wxControl *enabler, bool do_enable) {
parent->AddChangeableOption(opt_name); parent->AddChangeableOption(opt_name);
const agi::OptionValue *opt = OPT_GET(opt_name); const auto opt = OPT_GET(opt_name);
if (opt->GetType() != agi::OptionType::String) if (opt->GetType() != agi::OptionType::String)
throw PreferenceIncorrectType("Option must be agi::OptionType::String for BrowseButton."); throw agi::InternalError("Option must be agi::OptionType::String for BrowseButton.");
wxTextCtrl *text = new wxTextCtrl(this, -1 , to_wx(opt->GetString())); auto text = new wxTextCtrl(this, -1 , to_wx(opt->GetString()));
text->SetMinSize(wxSize(160, -1)); text->SetMinSize(wxSize(160, -1));
text->Bind(wxEVT_TEXT, StringUpdater(opt_name, parent)); text->Bind(wxEVT_TEXT, StringUpdater(opt_name, parent));
wxButton *browse = new wxButton(this, -1, _("Browse...")); auto browse = new wxButton(this, -1, _("Browse..."));
browse->Bind(wxEVT_BUTTON, std::bind(browse_button, text)); browse->Bind(wxEVT_BUTTON, std::bind(browse_button, text));
wxSizer *button_sizer = new wxBoxSizer(wxHORIZONTAL); auto button_sizer = new wxBoxSizer(wxHORIZONTAL);
button_sizer->Add(text, wxSizerFlags(1).Expand()); button_sizer->Add(text, wxSizerFlags(1).Expand());
button_sizer->Add(browse, wxSizerFlags().Expand()); button_sizer->Add(browse, wxSizerFlags().Expand());
@ -227,23 +228,23 @@ void OptionPage::OptionBrowse(wxFlexGridSizer *flex, const wxString &name, const
} }
void OptionPage::OptionFont(wxSizer *sizer, std::string opt_prefix) { void OptionPage::OptionFont(wxSizer *sizer, std::string opt_prefix) {
const agi::OptionValue *face_opt = OPT_GET(opt_prefix + "Font Face"); const auto face_opt = OPT_GET(opt_prefix + "Font Face");
const agi::OptionValue *size_opt = OPT_GET(opt_prefix + "Font Size"); const auto size_opt = OPT_GET(opt_prefix + "Font Size");
parent->AddChangeableOption(face_opt->GetName()); parent->AddChangeableOption(face_opt->GetName());
parent->AddChangeableOption(size_opt->GetName()); parent->AddChangeableOption(size_opt->GetName());
wxTextCtrl *font_name = new wxTextCtrl(this, -1, to_wx(face_opt->GetString())); auto font_name = new wxTextCtrl(this, -1, to_wx(face_opt->GetString()));
font_name->SetMinSize(wxSize(160, -1)); font_name->SetMinSize(wxSize(160, -1));
font_name->Bind(wxEVT_TEXT, StringUpdater(face_opt->GetName().c_str(), parent)); font_name->Bind(wxEVT_TEXT, StringUpdater(face_opt->GetName().c_str(), parent));
wxSpinCtrl *font_size = new wxSpinCtrl(this, -1, std::to_wstring((int)size_opt->GetInt()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 3, 42, size_opt->GetInt()); auto font_size = new wxSpinCtrl(this, -1, std::to_wstring((int)size_opt->GetInt()), wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 3, 42, size_opt->GetInt());
font_size->Bind(wxEVT_SPINCTRL, IntUpdater(size_opt->GetName().c_str(), parent)); font_size->Bind(wxEVT_SPINCTRL, IntUpdater(size_opt->GetName().c_str(), parent));
wxButton *pick_btn = new wxButton(this, -1, _("Choose...")); auto pick_btn = new wxButton(this, -1, _("Choose..."));
pick_btn->Bind(wxEVT_BUTTON, std::bind(font_button, parent, font_name, font_size)); pick_btn->Bind(wxEVT_BUTTON, std::bind(font_button, parent, font_name, font_size));
wxSizer *button_sizer = new wxBoxSizer(wxHORIZONTAL); auto button_sizer = new wxBoxSizer(wxHORIZONTAL);
button_sizer->Add(font_name, wxSizerFlags(1).Expand()); button_sizer->Add(font_name, wxSizerFlags(1).Expand());
button_sizer->Add(pick_btn, wxSizerFlags().Expand()); button_sizer->Add(pick_btn, wxSizerFlags().Expand());
@ -251,28 +252,18 @@ void OptionPage::OptionFont(wxSizer *sizer, std::string opt_prefix) {
Add(sizer, _("Font Size"), font_size); Add(sizer, _("Font Size"), font_size);
} }
struct disabler {
wxControl *ctrl;
bool enable;
void operator()(wxCommandEvent &evt) {
ctrl->Enable(!!evt.GetInt() == enable);
evt.Skip();
}
};
void OptionPage::EnableIfChecked(wxControl *cbx, wxControl *ctrl) { void OptionPage::EnableIfChecked(wxControl *cbx, wxControl *ctrl) {
wxCheckBox *cb = dynamic_cast<wxCheckBox*>(cbx); auto cb = dynamic_cast<wxCheckBox*>(cbx);
if (!cb) return; if (!cb) return;
ctrl->Enable(cb->IsChecked()); ctrl->Enable(cb->IsChecked());
cb->Bind(wxEVT_CHECKBOX, disabler{ctrl, true}); cb->Bind(wxEVT_CHECKBOX, [=](wxCommandEvent& evt) { ctrl->Enable(!!evt.GetInt()); });
} }
void OptionPage::DisableIfChecked(wxControl *cbx, wxControl *ctrl) { void OptionPage::DisableIfChecked(wxControl *cbx, wxControl *ctrl) {
wxCheckBox *cb = dynamic_cast<wxCheckBox*>(cbx); auto cb = dynamic_cast<wxCheckBox*>(cbx);
if (!cb) return; if (!cb) return;
ctrl->Enable(!cb->IsChecked()); ctrl->Enable(!cb->IsChecked());
cb->Bind(wxEVT_CHECKBOX, disabler{ctrl, false}); cb->Bind(wxEVT_CHECKBOX, [=](wxCommandEvent& evt) { ctrl->Enable(!evt.GetInt()); });
} }

6
src/preferences_base.h
View File

@ -30,7 +30,7 @@ class wxTreebook;
class OptionPage : public wxScrolled<wxPanel> { class OptionPage : public wxScrolled<wxPanel> {
template<class T> template<class T>
void Add(wxSizer *sizer, wxString const& label, T *control); void Add(wxSizer *sizer, wxString const& label, T *control);
protected: public:
enum Style { enum Style {
PAGE_DEFAULT = 0x00000000, PAGE_DEFAULT = 0x00000000,
PAGE_SCROLL = 0x00000001, PAGE_SCROLL = 0x00000001,
@ -39,15 +39,13 @@ protected:
wxSizer *sizer; wxSizer *sizer;
Preferences *parent; Preferences *parent;
wxFlexGridSizer *PageSizer(wxString name);
wxFlexGridSizer* PageSizer(wxString name);
void CellSkip(wxFlexGridSizer *flex); void CellSkip(wxFlexGridSizer *flex);
wxControl *OptionAdd(wxFlexGridSizer *flex, const wxString &name, const char *opt_name, double min=0, double max=INT_MAX, double inc=1); wxControl *OptionAdd(wxFlexGridSizer *flex, const wxString &name, const char *opt_name, double min=0, double max=INT_MAX, double inc=1);
void OptionChoice(wxFlexGridSizer *flex, const wxString &name, const wxArrayString &choices, const char *opt_name); void OptionChoice(wxFlexGridSizer *flex, const wxString &name, const wxArrayString &choices, const char *opt_name);
void OptionBrowse(wxFlexGridSizer *flex, const wxString &name, const char *opt_name, wxControl *enabler = nullptr, bool do_enable = false); void OptionBrowse(wxFlexGridSizer *flex, const wxString &name, const char *opt_name, wxControl *enabler = nullptr, bool do_enable = false);
void OptionFont(wxSizer *sizer, std::string opt_prefix); void OptionFont(wxSizer *sizer, std::string opt_prefix);
public:
/// Enable ctrl only when cbx is checked /// Enable ctrl only when cbx is checked
void EnableIfChecked(wxControl *cbx, wxControl *ctrl); void EnableIfChecked(wxControl *cbx, wxControl *ctrl);