From d3eaa5af9cc00a56b1cebca362131cb91fd3fed7 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Tue, 27 Mar 2012 04:23:54 +0000 Subject: [PATCH] Remove some unused options from the config file and preferences dialog Originally committed to SVN as r6619. --- aegisub/src/libresrc/default_config.json | 4 ---- aegisub/src/preferences.cpp | 10 ++-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/aegisub/src/libresrc/default_config.json b/aegisub/src/libresrc/default_config.json index f2d3704de..4c81c2c75 100644 --- a/aegisub/src/libresrc/default_config.json +++ b/aegisub/src/libresrc/default_config.json @@ -42,13 +42,11 @@ "Inactive Comments" : true, "Keyframes in Dialogue Mode" : true, "Keyframes in Karaoke Mode" : true, - "Selection Background" : true, "Video Position" : false }, "Waveform Style" : 1 }, "Downmixer" : "ConvertToMono", - "Grab Times on Select" : true, "Inactive Lines Display Mode" : 1, "Karaoke" : { "Font Face" : "Verdana", @@ -102,10 +100,8 @@ "Line boundary End" : "rgb(0, 0, 216)", "Line boundary Start" : "rgb(216, 0, 0)", "Play Cursor" : "rgb(255,255,255)", - "Seconds Boundaries" : "rgb(0, 100, 255)", "Spectrum" : "Icy Blue", "Syllable Boundaries" : "rgb(255,255,0)", - "Syllable Text" : "rgb(255,0,0)", "Waveform" : "Green" }, "Schemes" : { diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp index 5118614e9..14c3fe8b1 100644 --- a/aegisub/src/preferences.cpp +++ b/aegisub/src/preferences.cpp @@ -122,12 +122,12 @@ General::General(wxTreebook *book, Preferences *parent): OptionPage(book, parent /// Audio preferences page Audio::Audio(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Audio")) { wxFlexGridSizer *general = PageSizer(_("Options")); - OptionAdd(general, _("Grab times from line upon selection"), "Audio/Grab Times on Select"); 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"); + CellSkip(general); OptionAdd(general, _("Default timing length"), "Timing/Default Duration", 0, 36000); OptionAdd(general, _("Default lead-in length"), "Audio/Lead/IN", 0, 36000); OptionAdd(general, _("Default lead-out length"), "Audio/Lead/OUT", 0, 36000); @@ -143,12 +143,10 @@ Audio::Audio(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _( OptionAdd(general, _("Include commented inactive lines"), "Audio/Display/Draw/Inactive Comments"); wxFlexGridSizer *display = PageSizer(_("Display Visual Options")); - OptionAdd(display, _("Selection background"), "Audio/Display/Draw/Selection Background"); - OptionAdd(display, _("Cursor time"), "Audio/Display/Draw/Cursor Time"); OptionAdd(display, _("Keyframes"), "Audio/Display/Draw/Keyframes in Dialogue Mode"); OptionAdd(display, _("Karaoke keyframes"), "Audio/Display/Draw/Keyframes in Karaoke Mode"); + OptionAdd(display, _("Cursor time"), "Audio/Display/Draw/Cursor Time"); OptionAdd(display, _("Video position"), "Audio/Display/Draw/Video Position"); - CellSkip(display); OptionChoice(display, _("Waveform Style"), AudioWaveformRenderer::GetWaveformStyles(), "Audio/Display/Waveform Style"); wxFlexGridSizer *label = PageSizer(_("Audio labels")); @@ -221,11 +219,9 @@ Interface_Colours::Interface_Colours(wxTreebook *book, Preferences *parent): Opt wxFlexGridSizer *audio = PageSizer(_("Audio Display")); OptionAdd(audio, _("Play cursor"), "Colour/Audio Display/Play Cursor"); - OptionAdd(audio, _("Seconds boundaries"), "Colour/Audio Display/Seconds Boundaries"); OptionAdd(audio, _("Line boundary start"), "Colour/Audio Display/Line boundary Start"); OptionAdd(audio, _("Line boundary end"), "Colour/Audio Display/Line boundary End"); OptionAdd(audio, _("Line boundary inactive line"), "Colour/Audio Display/Line Boundary Inactive Line"); - OptionAdd(audio, _("Syllable text"), "Colour/Audio Display/Syllable Text"); OptionAdd(audio, _("Syllable boundaries"), "Colour/Audio Display/Syllable Boundaries"); sizer = new wxBoxSizer(wxVERTICAL); @@ -521,8 +517,6 @@ Advanced_Audio::Advanced_Audio(wxTreebook *book, Preferences *parent): OptionPag wxFlexGridSizer *spectrum = PageSizer(_("Spectrum")); - OptionAdd(spectrum, _("Cutoff"), "Audio/Renderer/Spectrum/Cutoff"); - 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");