The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-15 16:59:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't bother quickly flashing the full pathname to the file loaded

Browse Source 
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
This commit is contained in:
Soren Jorvang 2011-01-11 16:19:15 +00:00
parent 5a175c16c3
commit 6de6cf6d46
5 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/Src/Version.cpp
View File

@ -19,11 +19,11 @@
#include "svnrev.h" #include "svnrev.h"
#ifdef _DEBUG #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 #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 #else
const char *svn_rev_str = "Dolphin SVN r" SVN_REV_STR; const char *svn_rev_str = "Dolphin r" SVN_REV_STR;
#endif #endif
#ifdef _M_X64 #ifdef _M_X64

12
Source/Core/Core/Src/Core.cpp
View File

@ -413,10 +413,6 @@ THREAD_RETURN EmuThread(void *pArg)
PowerPC::SetMode(PowerPC::MODE_INTERPRETER); PowerPC::SetMode(PowerPC::MODE_INTERPRETER);
CBoot::BootUp(); 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 // Setup our core, but can't use dynarec if we are compare server
if (_CoreParameter.iCPUCore && (!_CoreParameter.bRunCompareServer || _CoreParameter.bRunCompareClient)) if (_CoreParameter.iCPUCore && (!_CoreParameter.bRunCompareServer || _CoreParameter.bRunCompareClient))
PowerPC::SetMode(PowerPC::MODE_JIT); PowerPC::SetMode(PowerPC::MODE_JIT);
@ -435,10 +431,6 @@ THREAD_RETURN EmuThread(void *pArg)
cpuThread = new Common::Thread(CpuThread, pArg); cpuThread = new Common::Thread(CpuThread, pArg);
Common::SetCurrentThreadName("Video thread"); 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 // Update the window again because all stuff is initialized
Host_UpdateDisasmDialog(); Host_UpdateDisasmDialog();
Host_UpdateMainFrame(); Host_UpdateMainFrame();
@ -455,10 +447,6 @@ THREAD_RETURN EmuThread(void *pArg)
cpuThread = new Common::Thread(CpuThread, pArg); cpuThread = new Common::Thread(CpuThread, pArg);
Common::SetCurrentThreadName("Emuthread - Idle"); 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 // Update the window again because all stuff is initialized
Host_UpdateDisasmDialog(); Host_UpdateDisasmDialog();
Host_UpdateMainFrame(); Host_UpdateMainFrame();

3
Source/Core/DolphinWX/Src/AboutDolphin.cpp
View File

@ -47,8 +47,7 @@ void AboutDolphin::CreateGUIControls()
sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO, sbDolphinLogo = new wxStaticBitmap(this, ID_LOGO,
wxBitmap(iDolphinLogo), wxDefaultPosition, wxDefaultSize, 0); wxBitmap(iDolphinLogo), wxDefaultPosition, wxDefaultSize, 0);
std::string Text = std::string("") + std::string Text = std::string(svn_rev_str) + "\n"
"Dolphin SVN revision " + svn_rev_str + "\n"
"Copyright (c) 2003-2010+ Dolphin Team\n" "Copyright (c) 2003-2010+ Dolphin Team\n"
"\n" "\n"
"Dolphin is a Gamecube/Wii emulator, which was\n" "Dolphin is a Gamecube/Wii emulator, which was\n"

1
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -945,6 +945,7 @@ void CFrame::DoStop()
X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()), X11Utils::InhibitScreensaver(X11Utils::XDisplayFromHandle(GetHandle()),
X11Utils::XWindowFromHandle(GetHandle()), false); X11Utils::XWindowFromHandle(GetHandle()), false);
#endif #endif
m_RenderFrame->SetTitle(svn_rev_str);
// Destroy the renderer frame when not rendering to main // Destroy the renderer frame when not rendering to main
m_RenderParent->Disconnect(wxID_ANY, wxEVT_SIZE, m_RenderParent->Disconnect(wxID_ANY, wxEVT_SIZE,

2
Source/Plugins/Plugin_VideoDX11/Src/main.cpp
View File

@ -122,7 +122,7 @@ unsigned int Callback_PeekMessages()
void UpdateFPSDisplay(const char *text) void UpdateFPSDisplay(const char *text)
{ {
char temp[100]; char temp[512];
sprintf_s(temp, sizeof temp, "%s | DX11 | %s", svn_rev_str, text); sprintf_s(temp, sizeof temp, "%s | DX11 | %s", svn_rev_str, text);
SetWindowTextA(EmuWindow::GetWnd(), temp); SetWindowTextA(EmuWindow::GetWnd(), temp);
} }