piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

CodeWindow: Made boot to pause optional, readded the tooltips in the Release build

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1784 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson
2009-01-05 02:52:55 +00:00
parent 6359f53343
commit 6c57f63280
9 changed files with 343 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,7 @@ bool BootCore(const std::string& _rFilename)
{
// StartUp.bUseDualCore = code_frame->UseDualCore();
StartUp.bUseJIT = !g_pCodeWindow->UseInterpreter();
StartUp.bBootToPause = g_pCodeWindow->BootToPause();
StartUp.bAutomaticStart = g_pCodeWindow->AutomaticStart();
}
else
@ -202,7 +203,7 @@ bool BootCore(const std::string& _rFilename)
#if defined(HAVE_WX) && HAVE_WX
// Boot to pause or not
Core::SetState((g_pCodeWindow && !StartUp.bAutomaticStart)
Core::SetState((g_pCodeWindow && StartUp.bBootToPause)
? Core::CORE_PAUSE : Core::CORE_RUN);
#else
Core::SetState(Core::CORE_RUN);

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

@ -134,9 +134,9 @@ void CFrame::CreateMenu()
wxMenu* pOptionsMenu = new wxMenu;
m_pPluginOptions = pOptionsMenu->Append(IDM_CONFIG_MAIN, _T("Co&nfigure..."));
pOptionsMenu->AppendSeparator();
pOptionsMenu->Append(IDM_CONFIG_GFX_PLUGIN, _T("&GFX settings"));
pOptionsMenu->Append(IDM_CONFIG_GFX_PLUGIN, _T("&Graphics settings"));
pOptionsMenu->Append(IDM_CONFIG_DSP_PLUGIN, _T("&DSP settings"));
pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _T("&PAD settings"));
pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _T("&Pad settings"));
pOptionsMenu->Append(IDM_CONFIG_WIIMOTE_PLUGIN, _T("&Wiimote settings"));
#ifdef _WIN32
pOptionsMenu->AppendSeparator();
@ -193,7 +193,7 @@ void CFrame::PopulateToolbar(wxToolBar* toolBar)
#endif
toolBar->AddSeparator();
toolBar->AddTool(IDM_CONFIG_MAIN, _T("Config"), m_Bitmaps[Toolbar_PluginOptions], _T("Configure..."));
toolBar->AddTool(IDM_CONFIG_GFX_PLUGIN, _T("Gfx"), m_Bitmaps[Toolbar_PluginGFX], _T("Gfx settings"));
toolBar->AddTool(IDM_CONFIG_GFX_PLUGIN, _T("Gfx"), m_Bitmaps[Toolbar_PluginGFX], _T("Graphics settings"));
toolBar->AddTool(IDM_CONFIG_DSP_PLUGIN, _T("DSP"), m_Bitmaps[Toolbar_PluginDSP], _T("DSP settings"));
toolBar->AddTool(IDM_CONFIG_PAD_PLUGIN, _T("Pad"), m_Bitmaps[Toolbar_PluginPAD], _T("Pad settings"));
toolBar->AddTool(IDM_CONFIG_WIIMOTE_PLUGIN, _T("Wiimote"), m_Bitmaps[Toolbar_Wiimote], _T("Wiimote settings"));

22
Source/Core/DolphinWX/Src/Globals.h
View File

@ -16,7 +16,6 @@
// http://code.google.com/p/dolphin-emu/
////////////////////////////////////////////////////////////////////////////////////////
// File description
/* <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@ -26,23 +25,22 @@
////////////////////////*/
////////////////////////////////////////////////////////////////////////////////////////
// Settings
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
// Build with music modification. Define MUSICMOD here.
#include "../../../Branches/MusicMod/Main/Src/Setup.h"
//////////////////////////
#ifndef _GLOBALS_H
#define _GLOBALS_H
#include "Common.h"
////////////////////////////////////////////////////////////////////////////////////////
// Build with music modification
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#include "../../../Branches/MusicMod/Main/Src/Setup.h" // Define MUSICMOD here
//////////////////////////
enum
{
IDM_LOADSTATE = 200, // File
IDM_LOADSTATE = 200, // File menu
IDM_SAVESTATE,
IDM_SAVESLOT1,
IDM_SAVESLOT2,
@ -68,12 +66,12 @@ enum
IDM_STOP,
IDM_BROWSE,
IDM_MEMCARD, // Misc
IDM_MEMCARD, // Misc menu
IDM_CHEATS,
IDM_CHANGEDISC,
IDM_PROPERTIES,
IDM_HELPABOUT,
IDM_HELPABOUT, // Help menu
IDM_HELPWEBSITE,
IDM_HELPGOOGLECODE,