From 45a837068e3d3a6a1478fb429d41ad26cb02ba9b Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 21 Feb 2011 21:29:52 +0000 Subject: [PATCH] Merge r4829, r4831 from trunk (Kill the splash screen) Originally committed to SVN as r5349. --- .../aegisub_vs2008/aegisub_vs2008.vcproj | 8 -- aegisub/src/Makefile.am | 1 - aegisub/src/dialog_options.cpp | 1 - aegisub/src/dialog_splash.cpp | 110 ------------------ aegisub/src/dialog_splash.h | 64 ---------- aegisub/src/ffmpegsource_common.h | 1 - aegisub/src/frame_main.cpp | 19 +-- aegisub/src/options.cpp | 1 - 8 files changed, 1 insertion(+), 204 deletions(-) delete mode 100644 aegisub/src/dialog_splash.cpp delete mode 100644 aegisub/src/dialog_splash.h diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj index 980f0d3ce..27a824b9f 100644 --- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj +++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj @@ -1256,14 +1256,6 @@ RelativePath="..\..\src\dialog_spellchecker.h" > - - - - diff --git a/aegisub/src/Makefile.am b/aegisub/src/Makefile.am index 8fcf8c8d6..b9ff73f18 100644 --- a/aegisub/src/Makefile.am +++ b/aegisub/src/Makefile.am @@ -287,7 +287,6 @@ aegisub_2_1_SOURCES = \ dialog_selection.cpp \ dialog_shift_times.cpp \ dialog_spellchecker.cpp \ - dialog_splash.cpp \ dialog_style_editor.cpp \ dialog_style_manager.cpp \ dialog_styling_assistant.cpp \ diff --git a/aegisub/src/dialog_options.cpp b/aegisub/src/dialog_options.cpp index cc7c060cd..b44cea3f3 100644 --- a/aegisub/src/dialog_options.cpp +++ b/aegisub/src/dialog_options.cpp @@ -111,7 +111,6 @@ DialogOptions::DialogOptions(wxWindow *parent) wxSizer *genSizer1 = new wxStaticBoxSizer(wxHORIZONTAL,generalPage,_("Startup")); 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")); #ifdef __WXMSW__ AddCheckBox(generalPage,genSizer4,_("Check File Associations on Start"),_T("Show Associations")); diff --git a/aegisub/src/dialog_splash.cpp b/aegisub/src/dialog_splash.cpp deleted file mode 100644 index 9a2943b87..000000000 --- a/aegisub/src/dialog_splash.cpp +++ /dev/null @@ -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 -#include -#include -#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); -} - diff --git a/aegisub/src/dialog_splash.h b/aegisub/src/dialog_splash.h deleted file mode 100644 index 18c223d4f..000000000 --- a/aegisub/src/dialog_splash.h +++ /dev/null @@ -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 -#include - - -/////////////////////// -// 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 diff --git a/aegisub/src/ffmpegsource_common.h b/aegisub/src/ffmpegsource_common.h index b614bf3b4..097abb59c 100644 --- a/aegisub/src/ffmpegsource_common.h +++ b/aegisub/src/ffmpegsource_common.h @@ -41,7 +41,6 @@ #include #include #include "include/aegisub/aegisub.h" -#define FFMS_BETA_10_COMPAT #include #include "dialog_progress.h" diff --git a/aegisub/src/frame_main.cpp b/aegisub/src/frame_main.cpp index cc1da5185..1869356d2 100644 --- a/aegisub/src/frame_main.cpp +++ b/aegisub/src/frame_main.cpp @@ -61,7 +61,7 @@ #include "options.h" #include "main.h" #include "version.h" -#include "dialog_splash.h" +#include "dialog_styling_assistant.h" #include "dialog_tip.h" #include "audio_box.h" #include "audio_display.h" @@ -124,19 +124,6 @@ FrameMain::FrameMain (wxArrayString args) wxPNGHandler *png = new wxPNGHandler; 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(); // Storage for subs-file-local scripts @@ -210,10 +197,6 @@ FrameMain::FrameMain (wxArrayString args) SetDisplayMode(-1, -1); Thaw(); - if (splash) { - delete splash; - } - //ShowFullScreen(true,wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION); StartupLog(_T("Leaving FrameMain constructor")); } diff --git a/aegisub/src/options.cpp b/aegisub/src/options.cpp index 5a889c6aa..065e22512 100644 --- a/aegisub/src/options.cpp +++ b/aegisub/src/options.cpp @@ -90,7 +90,6 @@ void OptionsManager::LoadDefaults(bool onlyDefaults,bool doOverride) { // Broken on OS X during startup only. SetBool(_T("Tips enabled"),false); - SetBool(_T("Show splash"),true); SetBool(_T("Local config"),false); SetInt(_T("Undo levels"),8); SetInt(_T("Recent timecodes max"),16);