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

Combine the Subtitles and Interface pages of the preferences dialog as they both have subs edit box and subs grid options

Browse source 
Originally committed to SVN as r6520.
This commit is contained in:
Thomas Goyne 2012-02-28 01:22:49 +00:00
parent 70261b6466
commit 95a1e187a0
1 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
aegisub/src/preferences.cpp
View file

@ -72,7 +72,6 @@ public: \
}; };
CLASS_PAGE(General) CLASS_PAGE(General)
CLASS_PAGE(Subtitles)
CLASS_PAGE(Audio) CLASS_PAGE(Audio)
CLASS_PAGE(Video) CLASS_PAGE(Video)
CLASS_PAGE(Interface) CLASS_PAGE(Interface)
@ -116,24 +115,6 @@ General::General(wxTreebook *book, Preferences *parent): OptionPage(book, parent
SetSizerAndFit(sizer); SetSizerAndFit(sizer);
} }
/// Subtitles preferences page
Subtitles::Subtitles(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Subtitles")) {
wxFlexGridSizer *general = PageSizer(_("Options"));
OptionAdd(general, _("Enable call tips"), "App/Call Tips");
OptionAdd(general, _("Enable syntax highlighting"), "Subtitle/Highlight/Syntax");
OptionAdd(general, _("Overwrite-Insertion in time boxes"), "Subtitle/Time Edit/Insert Mode");
CellSkip(general);
OptionBrowse(general, _("Dictionaries path"), "Path/Dictionary");
wxFlexGridSizer *grid = PageSizer(_("Grid"));
OptionAdd(grid, _("Allow grid to take focus"), "Subtitle/Grid/Focus Allow");
OptionAdd(grid, _("Highlight visible subtitles"), "Subtitle/Grid/Highlight Subtitles in Frame");
SetSizerAndFit(sizer);
}
/// Audio preferences page /// Audio preferences page
Audio::Audio(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Audio")) { Audio::Audio(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Audio")) {
wxFlexGridSizer *general = PageSizer(_("Options")); wxFlexGridSizer *general = PageSizer(_("Options"));
@ -212,14 +193,20 @@ Video::Video(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _(
/// Interface preferences page /// Interface preferences page
Interface::Interface(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Interface")) { Interface::Interface(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Interface")) {
wxFlexGridSizer *grid = PageSizer(_("Subtitle Grid"));
OptionFont(grid, "Subtitle/Grid/");
OptionAdd(grid, _("Hide overrides symbol"), "Subtitle/Grid/Hide Overrides Char");
wxFlexGridSizer *edit_box = PageSizer(_("Edit Box")); wxFlexGridSizer *edit_box = PageSizer(_("Edit Box"));
OptionAdd(edit_box, _("Enable call tips"), "App/Call Tips");
OptionAdd(edit_box, _("Overwrite-Insertion 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/"); OptionFont(edit_box, "Subtitle/Edit Box/");
wxFlexGridSizer *grid = PageSizer(_("Grid"));
OptionAdd(grid, _("Allow grid to take focus"), "Subtitle/Grid/Focus Allow");
OptionAdd(grid, _("Highlight visible subtitles"), "Subtitle/Grid/Highlight Subtitles in Frame");
OptionAdd(grid, _("Hide overrides symbol"), "Subtitle/Grid/Hide Overrides Char");
OptionFont(grid, "Subtitle/Grid/");
SetSizerAndFit(sizer); SetSizerAndFit(sizer);
} }
@ -670,7 +657,6 @@ Preferences::Preferences(wxWindow *parent): wxDialog(parent, -1, _("Preferences"
book = new wxTreebook(this, -1, wxDefaultPosition, wxDefaultSize); book = new wxTreebook(this, -1, wxDefaultPosition, wxDefaultSize);
new General(book, this); new General(book, this);
new Subtitles(book, this);
new Audio(book, this); new Audio(book, this);
new Video(book, this); new Video(book, this);
new Interface(book, this); new Interface(book, this);