ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Console log defaults to open/on now in all build types (not just devel/debug). 

Better fix for the bios selector thingie.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3078 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-05-25 14:22:15 +00:00
parent e6580d4b82
commit 04043586da
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/gui/AppConfig.cpp
View File

@ -487,7 +487,7 @@ AppConfig::ConsoleLogOptions::ConsoleLogOptions()
: DisplayPosition( wxDefaultPosition ) : DisplayPosition( wxDefaultPosition )
, DisplaySize( wxSize( 680, 560 ) ) , DisplaySize( wxSize( 680, 560 ) )
{ {
Visible = false; Visible = true;
AutoDock = true; AutoDock = true;
FontSize = 8; FontSize = 8;
} }

21
pcsx2/gui/ConsoleLogger.cpp
View File

@ -421,14 +421,6 @@ void ConsoleLogFrame::Newline()
Write( Color_Current, L"\n" ); Write( Color_Current, L"\n" );
} }
void ConsoleLogFrame::DoClose()
{
// instead of closing just hide the window to be able to Show() it later
Show(false);
if( wxWindow* main = GetParent() )
wxStaticCast( main, MainEmuFrame )->OnLogBoxHidden();
}
void ConsoleLogFrame::DockedMove() void ConsoleLogFrame::DockedMove()
{ {
SetPosition( m_conf.DisplayPosition ); SetPosition( m_conf.DisplayPosition );
@ -504,9 +496,18 @@ void ConsoleLogFrame::OnActivate( wxActivateEvent& evt )
void ConsoleLogFrame::OnCloseWindow(wxCloseEvent& event) void ConsoleLogFrame::OnCloseWindow(wxCloseEvent& event)
{ {
if( event.CanVeto() ) if( event.CanVeto() )
DoClose(); {
// instead of closing just hide the window to be able to Show() it later
Show( false );
// Can't do this via a Connect() on the MainFrame because Close events are not commands,
// and thus do not propagate up/down the event chain.
if( wxWindow* main = GetParent() )
wxStaticCast( main, MainEmuFrame )->OnLogBoxHidden();
}
else else
{ {
// This is sent when the app is exiting typically, so do a full close.
m_threadlogger = NULL; m_threadlogger = NULL;
wxGetApp().OnProgramLogClosed( GetId() ); wxGetApp().OnProgramLogClosed( GetId() );
event.Skip(); event.Skip();
@ -520,7 +521,7 @@ void ConsoleLogFrame::OnOpen(wxCommandEvent& WXUNUSED(event))
void ConsoleLogFrame::OnClose( wxCommandEvent& event ) void ConsoleLogFrame::OnClose( wxCommandEvent& event )
{ {
DoClose(); Close( false );
} }
void ConsoleLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) void ConsoleLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))

2
pcsx2/gui/ConsoleLogger.h
View File

@ -256,8 +256,6 @@ protected:
void OnFlushUnlockerTimer( wxTimerEvent& evt ); void OnFlushUnlockerTimer( wxTimerEvent& evt );
void OnFlushEvent( wxCommandEvent& event ); void OnFlushEvent( wxCommandEvent& event );
// common part of OnClose() and OnCloseWindow()
virtual void DoClose();
void DoFlushQueue(); void DoFlushQueue();
void DoFlushEvent( bool isPending ); void DoFlushEvent( bool isPending );

2
pcsx2/gui/MainFrame.cpp
View File

@ -469,9 +469,7 @@ MainEmuFrame::MainEmuFrame(wxWindow* parent, const wxString& title)
ConnectMenus(); ConnectMenus();
Connect( wxEVT_MOVE, wxMoveEventHandler (MainEmuFrame::OnMoveAround) ); Connect( wxEVT_MOVE, wxMoveEventHandler (MainEmuFrame::OnMoveAround) );
Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler (MainEmuFrame::OnCloseWindow) ); Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler (MainEmuFrame::OnCloseWindow) );
Connect( wxEVT_SET_FOCUS, wxFocusEventHandler (MainEmuFrame::OnFocus) ); Connect( wxEVT_SET_FOCUS, wxFocusEventHandler (MainEmuFrame::OnFocus) );
Connect( wxEVT_ACTIVATE, wxActivateEventHandler (MainEmuFrame::OnActivate) ); Connect( wxEVT_ACTIVATE, wxActivateEventHandler (MainEmuFrame::OnActivate) );
PushEventHandler( &wxGetApp().GetRecentIsoManager() ); PushEventHandler( &wxGetApp().GetRecentIsoManager() );

6
pcsx2/gui/Panels/BiosSelectorPanel.cpp
View File

@ -114,12 +114,12 @@ Panels::BiosSelectorPanel::~BiosSelectorPanel() throw ()
void Panels::BiosSelectorPanel::Apply() void Panels::BiosSelectorPanel::Apply()
{ {
// User never visited this tab, so there's nothing to apply.
if( !m_BiosList ) return;
int sel = m_ComboBox->GetSelection(); int sel = m_ComboBox->GetSelection();
if( sel == wxNOT_FOUND ) if( sel == wxNOT_FOUND )
{ {
// If we already have a bios, lets not worry about it.
if (g_Conf->BaseFilenames.Bios.IsOk() && wxFileName::FileExists(g_Conf->BaseFilenames.Bios.GetFullPath()) && !g_Conf->BaseFilenames.Bios.IsDir()) return;
throw Exception::CannotApplySettings( this, throw Exception::CannotApplySettings( this,
// English Log // English Log
L"User did not specify a valid BIOS selection.", L"User did not specify a valid BIOS selection.",