From 6de6cf6d466ba90aadc2ee08f260011c11576ab1 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Tue, 11 Jan 2011 16:19:15 +0000 Subject: [PATCH] Don't bother quickly flashing the full pathname to the file loaded in the title bar. It is more usefully displayed using the overlay and long pathnames are not suitable for title bars and probably not even safe depending on the underlying windowing system. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6817 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Version.cpp | 6 +++--- Source/Core/Core/Src/Core.cpp | 12 ------------ Source/Core/DolphinWX/Src/AboutDolphin.cpp | 3 +-- Source/Core/DolphinWX/Src/FrameTools.cpp | 1 + Source/Plugins/Plugin_VideoDX11/Src/main.cpp | 2 +- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp index 7e271453d3..4f2f0b1d77 100644 --- a/Source/Core/Common/Src/Version.cpp +++ b/Source/Core/Common/Src/Version.cpp @@ -19,11 +19,11 @@ #include "svnrev.h" #ifdef _DEBUG -const char *svn_rev_str = "Dolphin Debug SVN r" SVN_REV_STR; +const char *svn_rev_str = "Dolphin Debug r" SVN_REV_STR; #elif defined DEBUGFAST -const char *svn_rev_str = "Dolphin Debugfast SVN r" SVN_REV_STR; +const char *svn_rev_str = "Dolphin Debugfast r" SVN_REV_STR; #else -const char *svn_rev_str = "Dolphin SVN r" SVN_REV_STR; +const char *svn_rev_str = "Dolphin r" SVN_REV_STR; #endif #ifdef _M_X64 diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index 22cf00ace2..47d380706b 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -413,10 +413,6 @@ THREAD_RETURN EmuThread(void *pArg) PowerPC::SetMode(PowerPC::MODE_INTERPRETER); CBoot::BootUp(); - if (g_pUpdateFPSDisplay != NULL) - g_pUpdateFPSDisplay(("Loading " + _CoreParameter.m_strFilename).c_str()); - Host_UpdateTitle(("Loading " + _CoreParameter.m_strFilename).c_str()); - // Setup our core, but can't use dynarec if we are compare server if (_CoreParameter.iCPUCore && (!_CoreParameter.bRunCompareServer || _CoreParameter.bRunCompareClient)) PowerPC::SetMode(PowerPC::MODE_JIT); @@ -435,10 +431,6 @@ THREAD_RETURN EmuThread(void *pArg) cpuThread = new Common::Thread(CpuThread, pArg); Common::SetCurrentThreadName("Video thread"); - if (g_pUpdateFPSDisplay != NULL) - g_pUpdateFPSDisplay(("Loaded " + _CoreParameter.m_strFilename).c_str()); - Host_UpdateTitle(("Loaded " + _CoreParameter.m_strFilename).c_str()); - // Update the window again because all stuff is initialized Host_UpdateDisasmDialog(); Host_UpdateMainFrame(); @@ -455,10 +447,6 @@ THREAD_RETURN EmuThread(void *pArg) cpuThread = new Common::Thread(CpuThread, pArg); Common::SetCurrentThreadName("Emuthread - Idle"); - if (g_pUpdateFPSDisplay != NULL) - g_pUpdateFPSDisplay(("Loaded " + _CoreParameter.m_strFilename).c_str()); - Host_UpdateTitle(("Loaded " + _CoreParameter.m_strFilename).c_str()); - // Update the window again because all stuff is initialized Host_UpdateDisasmDialog(); Host_UpdateMainFrame(); diff --git a/Source/Core/DolphinWX/Src/AboutDolphin.cpp b/Source/Core/DolphinWX/Src/AboutDolphin.cpp index 81613861fb..1498b697ed 100644 --- a/Source/Core/DolphinWX/Src/AboutDolphin.cpp +++ b/Source/Core/DolphinWX/Src/AboutDolphin.cpp @@ -47,8 +47,7 @@ void AboutDolphin::CreateGUIControls() sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO, wxBitmap(iDolphinLogo), wxDefaultPosition, wxDefaultSize, 0); - std::string Text = std::string("") + - "Dolphin SVN revision " + svn_rev_str + "\n" + std::string Text = std::string(svn_rev_str) + "\n" "Copyright (c) 2003-2010+ Dolphin Team\n" "\n" "Dolphin is a Gamecube/Wii emulator, which was\n" diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index f0c6b45da3..7649206497 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -945,6 +945,7 @@ void CFrame::DoStop() X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()), X11Utils::XWindowFromHandle(GetHandle()), false); #endif + m_RenderFrame->SetTitle(svn_rev_str); // Destroy the renderer frame when not rendering to main m_RenderParent->Disconnect(wxID_ANY, wxEVT_SIZE, diff --git a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp index afe0efc159..a42635ef0b 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/main.cpp @@ -122,7 +122,7 @@ unsigned int Callback_PeekMessages() void UpdateFPSDisplay(const char *text) { - char temp[100]; + char temp[512]; sprintf_s(temp, sizeof temp, "%s | DX11 | %s", svn_rev_str, text); SetWindowTextA(EmuWindow::GetWnd(), temp); }