summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/DolphinWX/Src/Config.cpp9
-rw-r--r--Source/Core/DolphinWX/Src/Frame.cpp23
-rw-r--r--Source/Core/DolphinWX/Src/Frame.h2
-rw-r--r--Source/Core/DolphinWX/Src/GameListCtrl.cpp11
-rw-r--r--Source/Core/DolphinWX/Src/GameListCtrl.h1
-rw-r--r--Source/Core/DolphinWX/Src/Globals.h2
6 files changed, 37 insertions, 11 deletions
diff --git a/Source/Core/DolphinWX/Src/Config.cpp b/Source/Core/DolphinWX/Src/Config.cpp
index c26ccd5fd3..4ff5832675 100644
--- a/Source/Core/DolphinWX/Src/Config.cpp
+++ b/Source/Core/DolphinWX/Src/Config.cpp
@@ -113,10 +113,11 @@ void SConfig::LoadSettings()
ini.Get("Core", "DSPPlugin", &m_LocalCoreStartupParameter.m_strDSPPlugin, m_DefaultDSPPlugin.c_str());
ini.Get("Core", "PadPlugin", &m_LocalCoreStartupParameter.m_strPadPlugin, m_DefaultPADPlugin.c_str());
- ini.Get("Core", "HLEBios", &m_LocalCoreStartupParameter.bHLEBios, true);
- ini.Get("Core", "UseDynarec", &m_LocalCoreStartupParameter.bUseJIT, true);
- ini.Get("Core", "UseDualCore", &m_LocalCoreStartupParameter.bUseDualCore, false);
- ini.Get("Core", "LockThreads", &m_LocalCoreStartupParameter.bLockThreads, true);
+ ini.Get("Core", "HLEBios", &m_LocalCoreStartupParameter.bHLEBios, true);
+ ini.Get("Core", "UseDynarec", &m_LocalCoreStartupParameter.bUseJIT, true);
+ ini.Get("Core", "UseDualCore", &m_LocalCoreStartupParameter.bUseDualCore, false);
+ ini.Get("Core", "LockThreads", &m_LocalCoreStartupParameter.bLockThreads, true);
+ ini.Get("Core", "DefaultGCM", &m_LocalCoreStartupParameter.m_strDefaultGCM);
ini.Get("Core", "OptimizeQuantizers", &m_LocalCoreStartupParameter.bOptimizeQuantizers, true);
}
}
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index a88a5b0e5c..7f723b821c 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -86,6 +86,7 @@ EVT_MENU(IDM_HELPGOOGLECODE, CFrame::OnHelp)
EVT_MENU(IDM_HELPABOUT, CFrame::OnHelp)
EVT_MENU(wxID_REFRESH, CFrame::OnRefresh)
EVT_MENU(IDM_PLAY, CFrame::OnPlay)
+EVT_MENU(IDM_PAUSE, CFrame::OnPlay)
EVT_MENU(IDM_STOP, CFrame::OnStop)
EVT_MENU(IDM_PLUGIN_OPTIONS, CFrame::OnPluginOptions)
EVT_MENU(IDM_CONFIG_GFX_PLUGIN, CFrame::OnPluginGFX)
@@ -217,7 +218,7 @@ void CFrame::CreateMenu()
pOptionsMenu->Append(IDM_CONFIG_DSP_PLUGIN, _T("&DSP settings"));
pOptionsMenu->Append(IDM_CONFIG_PAD_PLUGIN, _T("&PAD settings"));
pOptionsMenu->AppendSeparator();
- pOptionsMenu->Append(IDM_TOGGLE_FULLSCREEN, _T("&Fullscreen"));
+ pOptionsMenu->Append(IDM_TOGGLE_FULLSCREEN, _T("&Fullscreen\tEsc"));
pOptionsMenu->AppendCheckItem(IDM_TOGGLE_DUALCORE, _T("&Dual-core (unstable!)"));
pOptionsMenu->Check(IDM_TOGGLE_DUALCORE, SConfig::GetInstance().m_LocalCoreStartupParameter.bUseDualCore);
m_pMenuBar->Append(pOptionsMenu, _T("&Options"));
@@ -254,7 +255,7 @@ void CFrame::PopulateToolbar(wxToolBar* toolBar)
toolBar->AddTool(wxID_REFRESH, _T("Refresh"), m_Bitmaps[Toolbar_Refresh], _T("Refresh"));
toolBar->AddTool(IDM_BROWSE, _T("Browse"), m_Bitmaps[Toolbar_Browse], _T("Browse for an ISO directory..."));
toolBar->AddSeparator();
- toolBar->AddTool(IDM_PLAY, _T("Play"), m_Bitmaps[Toolbar_Play], _T("Play"));
+ m_pToolPlay = toolBar->AddTool(IDM_PLAY, _T("Play"), m_Bitmaps[Toolbar_Play], _T("Play"));
toolBar->SetToolDisabledBitmap(IDM_PLAY, m_Bitmaps[Toolbar_Play_Dis]);
toolBar->AddTool(IDM_STOP, _T("Stop"), m_Bitmaps[Toolbar_Stop], _T("Stop"));
toolBar->SetToolDisabledBitmap(IDM_STOP, m_Bitmaps[Toolbar_Stop_Dis]);
@@ -575,6 +576,11 @@ void CFrame::UpdateGUI()
GetToolBar()->EnableTool(IDM_STOP, false);
GetToolBar()->EnableTool(IDM_PLAY, false);
+ m_pToolPlay->SetShortHelp(_T("Play"));
+ m_pToolPlay->SetLabel(_T("Play"));
+
+ m_pMenuItemPlay->SetText(_T("Play"));
+
m_pMenuItemPlay->Enable(false);
m_pMenuItemStop->Enable(false);
m_pMenuItemLoad->Enable(false);
@@ -595,21 +601,24 @@ void CFrame::UpdateGUI()
if (Core::GetState() == Core::CORE_RUN)
{
- GetToolBar()->SetToolNormalBitmap(IDM_PLAY, m_Bitmaps[Toolbar_Pause]);
- GetToolBar()->SetToolShortHelp(IDM_PLAY, _T("Pause"));
+ m_pToolPlay->SetNormalBitmap(m_Bitmaps[Toolbar_Pause]);
+ m_pToolPlay->SetShortHelp(_T("Pause"));
+ m_pToolPlay->SetLabel(_T("Pause"));
m_pMenuItemPlay->SetText(_T("Pause"));
}
else
{
- GetToolBar()->SetToolNormalBitmap(IDM_PLAY, m_Bitmaps[Toolbar_Play]);
- GetToolBar()->SetToolShortHelp(IDM_PLAY, _T("Play"));
+ m_pToolPlay->SetNormalBitmap(m_Bitmaps[Toolbar_Play]);
+ m_pToolPlay->SetShortHelp(_T("Play"));
+ m_pToolPlay->SetLabel(_T("Play"));
m_pMenuItemPlay->SetText(_T("Play"));
}
}
+ GetToolBar()->Realize();
}
-
+
// gamelistctrl
{
if (Core::GetState() == Core::CORE_UNINITIALIZED)
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index 6b6b5d777d..a032347631 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -83,6 +83,8 @@ class CFrame
wxMenuItem* m_pMenuItemLoad;
wxMenuItem* m_pMenuItemSave;
+ wxToolBarToolBase* m_pToolPlay;
+
wxBusyInfo* m_pBootProcessDialog;
void UpdateGUI();
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index da9da12257..f07a81dec2 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -46,6 +46,7 @@ EVT_LIST_ITEM_ACTIVATED(LIST_CTRL, CGameListCtrl::OnActivated)
EVT_LIST_COL_END_DRAG(LIST_CTRL, CGameListCtrl::OnColEndDrag)
EVT_MENU(IDM_EDITPATCHFILE, CGameListCtrl::OnEditPatchFile)
EVT_MENU(IDM_OPENCONTAININGFOLDER, CGameListCtrl::OnOpenContainingFolder)
+EVT_MENU(IDM_SETDEFAULTGCM, CGameListCtrl::OnSetDefaultGCM)
END_EVENT_TABLE()
@@ -340,6 +341,7 @@ CGameListCtrl::OnRightClick(wxMouseEvent& event)
std::string menu_text = StringFromFormat("Edit &patch file: %s.ini", unique_id.c_str());
popupMenu.Append(IDM_EDITPATCHFILE, wxString::FromAscii(menu_text.c_str())); //Pretty much everything in wxwidgets is a wxString, try to convert to those first!
popupMenu.Append(IDM_OPENCONTAININGFOLDER, wxString::FromAscii("Open &containing folder"));
+ popupMenu.Append(IDM_SETDEFAULTGCM, wxString::FromAscii("Set as &default ISO"));
PopupMenu(&popupMenu);
}
}
@@ -384,6 +386,15 @@ CGameListCtrl::OnOpenContainingFolder(wxCommandEvent& WXUNUSED (event)) {
}
void
+CGameListCtrl::OnSetDefaultGCM(wxCommandEvent& WXUNUSED (event)) {
+ const CISOFile *iso = GetSelectedISO();
+ if (!iso)
+ return;
+ SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDefaultGCM = iso->GetFileName();
+ SConfig::GetInstance().SaveSettings();
+}
+
+void
CGameListCtrl::OnEditPatchFile(wxCommandEvent& WXUNUSED (event))
{
const CISOFile *iso = GetSelectedISO();
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.h b/Source/Core/DolphinWX/Src/GameListCtrl.h
index 7148027562..e85e90af8a 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.h
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.h
@@ -67,6 +67,7 @@ class CGameListCtrl : public wxListCtrl
void OnSize(wxSizeEvent& event);
void OnEditPatchFile(wxCommandEvent& event);
void OnOpenContainingFolder(wxCommandEvent& event);
+ void OnSetDefaultGCM(wxCommandEvent& event);
virtual bool MSWDrawSubItem(wxPaintDC& rPaintDC, int item, int subitem);
diff --git a/Source/Core/DolphinWX/Src/Globals.h b/Source/Core/DolphinWX/Src/Globals.h
index 89ff5a2176..bdfbfd9d6d 100644
--- a/Source/Core/DolphinWX/Src/Globals.h
+++ b/Source/Core/DolphinWX/Src/Globals.h
@@ -43,11 +43,13 @@ enum
IDM_LOADSLOT9,
IDM_LOADSLOT10,
IDM_PLAY,
+ IDM_PAUSE,
IDM_STOP,
IDM_BROWSE,
IDM_MEMCARD,
IDM_EDITPATCHFILE,
IDM_OPENCONTAININGFOLDER,
+ IDM_SETDEFAULTGCM,
IDM_PLUGIN_OPTIONS,
IDM_CONFIG_GFX_PLUGIN,
IDM_CONFIG_DSP_PLUGIN,
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-28 13:07:55 +0000