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

Merge r4829, r4831 from trunk (Kill the splash screen) 

Originally committed to SVN as r5349.
This commit is contained in:
Thomas Goyne 2011-02-21 21:29:52 +00:00
parent 2d15490233
commit 45a837068e
8 changed files with 1 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
View File

@ -1256,14 +1256,6 @@
RelativePath="..\..\src\dialog_spellchecker.h" RelativePath="..\..\src\dialog_spellchecker.h"
> >
</File> </File>
<File
RelativePath="..\..\src\dialog_splash.cpp"
>
</File>
<File
RelativePath="..\..\src\dialog_splash.h"
>
</File>
<File <File
RelativePath="..\..\src\dialog_style_editor.cpp" RelativePath="..\..\src\dialog_style_editor.cpp"
> >

1
aegisub/src/Makefile.am
View File

@ -287,7 +287,6 @@ aegisub_2_1_SOURCES = \
dialog_selection.cpp \ dialog_selection.cpp \
dialog_shift_times.cpp \ dialog_shift_times.cpp \
dialog_spellchecker.cpp \ dialog_spellchecker.cpp \
dialog_splash.cpp \
dialog_style_editor.cpp \ dialog_style_editor.cpp \
dialog_style_manager.cpp \ dialog_style_manager.cpp \
dialog_styling_assistant.cpp \ dialog_styling_assistant.cpp \

1
aegisub/src/dialog_options.cpp
View File

@ -111,7 +111,6 @@ DialogOptions::DialogOptions(wxWindow *parent)
wxSizer *genSizer1 = new wxStaticBoxSizer(wxHORIZONTAL,generalPage,_("Startup")); wxSizer *genSizer1 = new wxStaticBoxSizer(wxHORIZONTAL,generalPage,_("Startup"));
wxFlexGridSizer *genSizer4 = new wxFlexGridSizer(2,5,5); wxFlexGridSizer *genSizer4 = new wxFlexGridSizer(2,5,5);
AddCheckBox(generalPage,genSizer4,_("Show Splash Screen"),_T("Show splash"));
AddCheckBox(generalPage,genSizer4,_("Auto Check for Updates"),_T("Auto check for updates")); AddCheckBox(generalPage,genSizer4,_("Auto Check for Updates"),_T("Auto check for updates"));
#ifdef __WXMSW__ #ifdef __WXMSW__
AddCheckBox(generalPage,genSizer4,_("Check File Associations on Start"),_T("Show Associations")); AddCheckBox(generalPage,genSizer4,_("Check File Associations on Start"),_T("Show Associations"));

110
aegisub/src/dialog_splash.cpp
View File

@ -1,110 +0,0 @@
// Copyright (c) 2005, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
////////////
// Includes
#include "config.h"
#include <wx/wxprec.h>
#include <wx/display.h>
#include <wx/dcclient.h>
#include "dialog_splash.h"
#include "options.h"
#include "dialog_tip.h"
///////////////
// Constructor
SplashScreen::SplashScreen(wxWindow *parent)
: wxFrame (parent, -1, _T(""), wxDefaultPosition, wxSize(420,240), wxSTAY_ON_TOP | wxFRAME_NO_TASKBAR , _T("Splash"))
{
// Set parent
par = parent;
// Get splash
splash = wxBITMAP(splash);
#if wxUSE_DISPLAY == 1
// Center on current display
if (wxDisplay::GetCount() < 1) CentreOnParent();
else {
// Get parent position
wxRect parRect = parent->GetRect();
// Get display number
int point = wxDisplay::GetFromPoint(wxPoint(parRect.GetX() + parRect.GetWidth()/2,parRect.GetY() + parRect.GetHeight()/2));
if (point == wxNOT_FOUND) point = 0;
// Get display size
wxDisplay display(point);
wxRect dr = display.GetGeometry();
// Calculate position and center it there
wxRect window = GetScreenRect();
window = window.CenterIn(dr);
Move(window.GetLeft(),window.GetTop());
}
#else
// Center on window
CentreOnParent();
#endif
// Prepare
wxClientDC dc(this);
dc.DrawBitmap(splash,0,0);
}
//////////////
// Destructor
SplashScreen::~SplashScreen () {
}
///////////////
// Event table
BEGIN_EVENT_TABLE(SplashScreen, wxFrame)
EVT_PAINT(SplashScreen::OnPaint)
END_EVENT_TABLE()
///////////
// OnPaint
void SplashScreen::OnPaint(wxPaintEvent& event) {
wxPaintDC dc(this);
dc.DrawBitmap(splash,0,0);
}

64
aegisub/src/dialog_splash.h
View File

@ -1,64 +0,0 @@
// Copyright (c) 2005, Rodrigo Braz Monteiro
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
//
// * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
// * Neither the name of the Aegisub Group nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
//
// -----------------------------------------------------------------------------
//
// AEGISUB
//
// Website: http://aegisub.cellosoft.com
// Contact: mailto:zeratul@cellosoft.com
//
#ifndef SPLASH_H
#define SPLASH_H
////////////
// Includes
#include <wx/wxprec.h>
#include <wx/frame.h>
///////////////////////
// Splash screen class
class SplashScreen: public wxFrame {
private:
wxWindow *par;
wxBitmap splash;
public:
SplashScreen(wxWindow *parent);
~SplashScreen();
void OnPaint(wxPaintEvent& event);
DECLARE_EVENT_TABLE()
};
#endif

1
aegisub/src/ffmpegsource_common.h
View File

@ -41,7 +41,6 @@
#include <wx/wxprec.h> #include <wx/wxprec.h>
#include <wx/thread.h> #include <wx/thread.h>
#include "include/aegisub/aegisub.h" #include "include/aegisub/aegisub.h"
#define FFMS_BETA_10_COMPAT
#include <ffms.h> #include <ffms.h>
#include "dialog_progress.h" #include "dialog_progress.h"

19
aegisub/src/frame_main.cpp
View File

@ -61,7 +61,7 @@
#include "options.h" #include "options.h"
#include "main.h" #include "main.h"
#include "version.h" #include "version.h"
#include "dialog_splash.h" #include "dialog_styling_assistant.h"
#include "dialog_tip.h" #include "dialog_tip.h"
#include "audio_box.h" #include "audio_box.h"
#include "audio_display.h" #include "audio_display.h"
@ -124,19 +124,6 @@ FrameMain::FrameMain (wxArrayString args)
wxPNGHandler *png = new wxPNGHandler; wxPNGHandler *png = new wxPNGHandler;
wxImage::AddHandler(png); wxImage::AddHandler(png);
// Splash screen
// It doesn't work properly on wxMac, and the jumping dock icon
// signals the same as the splash screen either way.
SplashScreen *splash = 0;
#if !_DEBUG && !__WXMAC__
if (Options.AsBool(_T("Show Splash"))) {
splash = new SplashScreen(this);
splash->Show(true);
splash->Update();
}
else
#endif
wxSafeYield(); wxSafeYield();
// Storage for subs-file-local scripts // Storage for subs-file-local scripts
@ -210,10 +197,6 @@ FrameMain::FrameMain (wxArrayString args)
SetDisplayMode(-1, -1); SetDisplayMode(-1, -1);
Thaw(); Thaw();
if (splash) {
delete splash;
}
//ShowFullScreen(true,wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION); //ShowFullScreen(true,wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION);
StartupLog(_T("Leaving FrameMain constructor")); StartupLog(_T("Leaving FrameMain constructor"));
} }

1
aegisub/src/options.cpp
View File

@ -90,7 +90,6 @@ void OptionsManager::LoadDefaults(bool onlyDefaults,bool doOverride) {
// Broken on OS X during startup only. // Broken on OS X during startup only.
SetBool(_T("Tips enabled"),false); SetBool(_T("Tips enabled"),false);
SetBool(_T("Show splash"),true);
SetBool(_T("Local config"),false); SetBool(_T("Local config"),false);
SetInt(_T("Undo levels"),8); SetInt(_T("Undo levels"),8);
SetInt(_T("Recent timecodes max"),16); SetInt(_T("Recent timecodes max"),16);