From 262a74dc6f9f78146b1eb1cde111dc2079e10ded Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 18 Nov 2011 22:57:17 +0000 Subject: [PATCH] Remove old audio display color options which have been replaced by the audio color schemes Originally committed to SVN as r5881. --- aegisub/src/libresrc/default_config.json | 11 +---------- aegisub/src/preferences.cpp | 7 ------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/aegisub/src/libresrc/default_config.json b/aegisub/src/libresrc/default_config.json index 1a1712c9d..e2594e7f4 100644 --- a/aegisub/src/libresrc/default_config.json +++ b/aegisub/src/libresrc/default_config.json @@ -91,11 +91,6 @@ "Colour" : { "Audio Display" : { - "Background" : { - "Background" : "rgb(0,0,0)", - "Selection" : "rgb(64, 64, 64)", - "Selection Modified" : "rgb(92, 0, 0)" - }, "Keyframe" : "rgb(255,0,255)", "Line Boundary Inactive Line" : "rgb(190,190,190)", "Line boundary End" : "rgb(0, 0, 216)", @@ -103,11 +98,7 @@ "Play Cursor" : "rgb(255,255,255)", "Seconds Boundaries" : "rgb(0, 100, 255)", "Syllable Boundaries" : "rgb(255,255,0)", - "Syllable Text" : "rgb(255,0,0)", - "Waveform" : "rgb(0, 200, 0)", - "Waveform Inactive" : "rgb(0, 80, 0)", - "Waveform Modified" : "rgb(255, 230, 230)", - "Waveform Selected" : "rgb(255,255,255)" + "Syllable Text" : "rgb(255,0,0)" }, "Style Editor" : { "Background" : { diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp index 167eb0fe9..f97f5fbf9 100644 --- a/aegisub/src/preferences.cpp +++ b/aegisub/src/preferences.cpp @@ -210,14 +210,7 @@ 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, _("Background"), "Colour/Audio Display/Background/Background"); - OptionAdd(audio, _("Selection background"), "Colour/Audio Display/Background/Selection"); - OptionAdd(audio, _("Selection background modified"), "Colour/Audio Display/Background/Selection Modified"); OptionAdd(audio, _("Seconds boundaries"), "Colour/Audio Display/Seconds Boundaries"); - OptionAdd(audio, _("Waveform"), "Colour/Audio Display/Waveform"); - OptionAdd(audio, _("Waveform selected"), "Colour/Audio Display/Waveform Selected"); - OptionAdd(audio, _("Waveform Modified"), "Colour/Audio Display/Waveform Modified"); - OptionAdd(audio, _("Waveform Inactive"), "Colour/Audio Display/Waveform Inactive"); 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");