iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed multiple splashes and replaced them with a new one 

Originally committed to SVN as r353.
This commit is contained in:
Rodrigo Braz Monteiro 2006-04-27 18:12:48 +00:00
parent b755b54899
commit 44f1f7a985
12 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/about.cpp
View File

@ -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);

2
core/about.h
View File

@ -47,6 +47,6 @@
// Splash screen class
class AboutScreen: public wxDialog {
public:
AboutScreen(wxWindow *parent,bool easter=false);
AboutScreen(wxWindow *parent);
~AboutScreen();
};

BIN
core/bitmaps/splash.bmp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 95 KiB

BIN
core/bitmaps/splash_01.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 95 KiB

BIN
core/bitmaps/splash_02.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 95 KiB

BIN
core/bitmaps/splash_03.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 95 KiB

BIN
core/bitmaps/splash_04.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 95 KiB

BIN
core/bitmaps/splash_05.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 95 KiB

6
core/frame_main_events.cpp
View File

@ -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();
}

1
core/options.cpp
View File

@ -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);

6
core/res.rc
View File

@ -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"

8
core/splash.cpp
View File

@ -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();