From daa77301ebf67f1e8657b486f684dcb881dfe053 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Thu, 26 Aug 2010 18:38:26 +0000 Subject: [PATCH] Remove "Colour/Background/Modified" option, which was made irrelevant by r4699. Originally committed to SVN as r4762. --- aegisub/src/libresrc/default_config.json | 3 --- aegisub/src/preferences.cpp | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/aegisub/src/libresrc/default_config.json b/aegisub/src/libresrc/default_config.json index aba2952b3..2562f3333 100644 --- a/aegisub/src/libresrc/default_config.json +++ b/aegisub/src/libresrc/default_config.json @@ -105,9 +105,6 @@ "Waveform Modified" : "rgb(255, 230, 230)", "Waveform Selected" : "rgb(255,255,255)" }, - "Background" : { - "Modified" : "rgb(192, 192, 255)" - }, "Style Editor" : { "Background" : { "Preview" : "rgb(125, 153, 176)" diff --git a/aegisub/src/preferences.cpp b/aegisub/src/preferences.cpp index e1eb6f324..7573d2ba3 100644 --- a/aegisub/src/preferences.cpp +++ b/aegisub/src/preferences.cpp @@ -159,12 +159,7 @@ Interface::Interface(wxTreebook *book, Preferences *parent): OptionPage(book, pa /// Interface Colours preferences subpage Interface_Colours::Interface_Colours(wxTreebook *book, Preferences *parent): OptionPage(book, parent, _("Colours"), PAGE_SCROLL|PAGE_SUB) { delete sizer; - wxSizer *main_sizer = new wxBoxSizer(wxHORIZONTAL); - sizer = new wxBoxSizer(wxVERTICAL); - main_sizer->Add(sizer); - - wxFlexGridSizer *general = PageSizer(_("General")); - OptionAdd(general, _("Modified Background"), "Colour/Background/Modified"); + wxSizer *main_sizer = sizer = new wxBoxSizer(wxHORIZONTAL); wxFlexGridSizer *audio = PageSizer(_("Audio Display")); OptionAdd(audio, _("Play cursor"), "Colour/Audio Display/Play Cursor");