diff --git a/core/about.cpp b/core/about.cpp index 570bd46fd..55733a580 100644 --- a/core/about.cpp +++ b/core/about.cpp @@ -44,18 +44,11 @@ /////////////// // Constructor -AboutScreen::AboutScreen(wxWindow *parent,bool easter) +AboutScreen::AboutScreen(wxWindow *parent) : wxDialog (parent, -1, _("About Aegisub"), wxDefaultPosition, wxSize(300,240), wxSTAY_ON_TOP | wxCAPTION | wxCLOSE_BOX , _("About Aegisub")) { // Get splash - wxBitmap splash; - int splash_n = Options.AsInt(_T("Splash number")); - if (splash_n < 1 || splash_n > 5) splash_n = (rand()%5)+1; - if (splash_n == 1) splash = wxBITMAP(splash_01); - if (splash_n == 2) splash = wxBITMAP(splash_02); - if (splash_n == 3) splash = wxBITMAP(splash_03); - if (splash_n == 4) splash = wxBITMAP(splash_04); - if (splash_n == 5) splash = wxBITMAP(splash_05); + wxBitmap splash = wxBITMAP(splash); // Picture wxSizer *PicSizer = new wxBoxSizer(wxHORIZONTAL); diff --git a/core/about.h b/core/about.h index 9d0749ff1..6d9ed6e2b 100644 --- a/core/about.h +++ b/core/about.h @@ -47,6 +47,6 @@ // Splash screen class class AboutScreen: public wxDialog { public: - AboutScreen(wxWindow *parent,bool easter=false); + AboutScreen(wxWindow *parent); ~AboutScreen(); }; diff --git a/core/bitmaps/splash.bmp b/core/bitmaps/splash.bmp new file mode 100644 index 000000000..bef6212be Binary files /dev/null and b/core/bitmaps/splash.bmp differ diff --git a/core/bitmaps/splash_01.bmp b/core/bitmaps/splash_01.bmp deleted file mode 100644 index ceee0f675..000000000 Binary files a/core/bitmaps/splash_01.bmp and /dev/null differ diff --git a/core/bitmaps/splash_02.bmp b/core/bitmaps/splash_02.bmp deleted file mode 100644 index d2b9e45ba..000000000 Binary files a/core/bitmaps/splash_02.bmp and /dev/null differ diff --git a/core/bitmaps/splash_03.bmp b/core/bitmaps/splash_03.bmp deleted file mode 100644 index f1c985ea7..000000000 Binary files a/core/bitmaps/splash_03.bmp and /dev/null differ diff --git a/core/bitmaps/splash_04.bmp b/core/bitmaps/splash_04.bmp deleted file mode 100644 index df6e188c9..000000000 Binary files a/core/bitmaps/splash_04.bmp and /dev/null differ diff --git a/core/bitmaps/splash_05.bmp b/core/bitmaps/splash_05.bmp deleted file mode 100644 index 11f5f4c3a..000000000 Binary files a/core/bitmaps/splash_05.bmp and /dev/null differ diff --git a/core/frame_main_events.cpp b/core/frame_main_events.cpp index 83665337e..5816b47ad 100644 --- a/core/frame_main_events.cpp +++ b/core/frame_main_events.cpp @@ -381,11 +381,7 @@ void FrameMain::OnExit(wxCommandEvent& WXUNUSED(event)) { ////////////////// // Open about box void FrameMain::OnAbout(wxCommandEvent &event) { - bool easter = false; - if (Options.IsDefined(_T("Alternate splash"))) { - easter = true; - } - AboutScreen About(this,easter); + AboutScreen About(this); About.ShowModal(); } diff --git a/core/options.cpp b/core/options.cpp index b43893d22..82d48d380 100644 --- a/core/options.cpp +++ b/core/options.cpp @@ -102,7 +102,6 @@ void OptionsManager::LoadDefaults() { SetInt(_T("Tips current"),0); SetBool(_T("Show splash"),true); - SetInt(_T("Splash number"),5); SetBool(_T("Show associations"),true); SetBool(_T("Find Match Case"),false); diff --git a/core/res.rc b/core/res.rc index 3c2de35b0..f002c7642 100644 --- a/core/res.rc +++ b/core/res.rc @@ -121,11 +121,7 @@ toggle_audio_spectrum BITMAP "bitmaps/toggle_audio_spectrum.bmp" toggle_audio_link BITMAP "bitmaps/toggle_audio_link.bmp" toggle_video_autoscroll BITMAP "bitmaps/toggle_video_autoscroll.bmp" -splash_01 BITMAP "bitmaps/splash_01.bmp" -splash_02 BITMAP "bitmaps/splash_02.bmp" -splash_03 BITMAP "bitmaps/splash_03.bmp" -splash_04 BITMAP "bitmaps/splash_04.bmp" -splash_05 BITMAP "bitmaps/splash_05.bmp" +splash BITMAP "bitmaps/splash.bmp" wxicon ICON "bitmaps/icon.ico" diff --git a/core/splash.cpp b/core/splash.cpp index 2b2c49f08..e195c62a6 100644 --- a/core/splash.cpp +++ b/core/splash.cpp @@ -50,13 +50,7 @@ SplashScreen::SplashScreen(wxWindow *parent) par = parent; // Get splash - int splash_n = Options.AsInt(_T("Splash number")); - if (splash_n < 1 || splash_n > 5) splash_n = (rand()%5)+1; - if (splash_n == 1) splash = wxBITMAP(splash_01); - if (splash_n == 2) splash = wxBITMAP(splash_02); - if (splash_n == 3) splash = wxBITMAP(splash_03); - if (splash_n == 4) splash = wxBITMAP(splash_04); - if (splash_n == 5) splash = wxBITMAP(splash_05); + splash = wxBITMAP(splash); // Prepare Center();