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

Get rid of the splash screen. If you want it back, you better make it a) not broken, and b) actually useful as a startup diagnostics tool. If you can't do both, get out. 

Originally committed to SVN as r4829.
This commit is contained in:
Karl Blomster 2010-11-06 19:44:21 +00:00
parent 50f8389615
commit 65b5907a4c
4 changed files with 0 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aegisub/src/Makefile.am
View File

@ -221,7 +221,6 @@ aegisub_3_0_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 \

117
aegisub/src/dialog_splash.cpp
View File

@ -1,117 +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 Project http://www.aegisub.org/
//
// $Id$
/// @file dialog_splash.cpp
/// @brief Splash screen
/// @ingroup configuration_ui
///
////////////
// Includes
#include "config.h"
#ifndef AGI_PRE
#include <wx/dcclient.h>
#include <wx/display.h>
#include <wx/string.h>
#endif
#include "dialog_splash.h"
#include "libresrc/libresrc.h"
/// @brief Constructor
/// @param parent
///
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 = GETIMAGE(splash_misc);
#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);
}
/// @brief Destructor
///
SplashScreen::~SplashScreen () {
}
///////////////
// Event table
BEGIN_EVENT_TABLE(SplashScreen, wxFrame)
EVT_PAINT(SplashScreen::OnPaint)
END_EVENT_TABLE()
/// @brief OnPaint
/// @param event
///
void SplashScreen::OnPaint(wxPaintEvent& event) {
wxPaintDC dc(this);
dc.DrawBitmap(splash,0,0);
}

68
aegisub/src/dialog_splash.h
View File

@ -1,68 +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 Project http://www.aegisub.org/
//
// $Id$
/// @file dialog_splash.h
/// @see dialog_splash.cpp
/// @ingroup configuration_ui
///
////////////
// Includes
#ifndef AGI_PRE
#include <wx/frame.h>
#endif
/// DOCME
/// @class SplashScreen
/// @brief DOCME
///
/// DOCME
class SplashScreen: public wxFrame {
private:
/// DOCME
wxWindow *par;
/// DOCME
wxBitmap splash;
public:
SplashScreen(wxWindow *parent);
~SplashScreen();
void OnPaint(wxPaintEvent& event);
DECLARE_EVENT_TABLE()
};

18
aegisub/src/frame_main.cpp
View File

@ -57,7 +57,6 @@
#include "compat.h"
#include "dialog_detached_video.h"
#include "dialog_search_replace.h"
#include "dialog_splash.h"
#include "dialog_styling_assistant.h"
#include "dialog_version_check.h"
#include "drop.h"
@ -123,19 +122,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 (OPT_GET("App/Splash")->GetBool()) {
splash = new SplashScreen(this);
splash->Show(true);
splash->Update();
}
else
#endif
wxSafeYield();
// Storage for subs-file-local scripts
@ -214,10 +200,6 @@ FrameMain::FrameMain (wxArrayString args)
SetDisplayMode(1, 1);
Thaw();
if (splash) {
delete splash;
}
//ShowFullScreen(true,wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION);
StartupLog(_T("Leaving FrameMain constructor"));
}