mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 05:47:56 -07:00
Removed the about from all the plugins and dolphin config screen. then added the about on some plugins config screens and renamed the wiimote_test.cpp
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@787 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
parent
c0af02df49
commit
22b2b36711
@ -22,7 +22,7 @@ namespace Common
|
||||
DynamicLibrary CPlugin::m_hInstLib;
|
||||
|
||||
void(__cdecl * CPlugin::m_GetDllInfo) (PLUGIN_INFO * _PluginInfo) = 0;
|
||||
void(__cdecl * CPlugin::m_DllAbout) (HWND _hParent) = 0;
|
||||
//void(__cdecl * CPlugin::m_DllAbout) (HWND _hParent) = 0;
|
||||
void(__cdecl * CPlugin::m_DllConfig) (HWND _hParent) = 0;
|
||||
void(__cdecl * CPlugin::m_DllDebugger) (HWND _hParent) = 0; // phew, is this the last one? how many
|
||||
// of these can you have?
|
||||
@ -31,7 +31,7 @@ void
|
||||
CPlugin::Release(void)
|
||||
{
|
||||
m_GetDllInfo = 0;
|
||||
m_DllAbout = 0;
|
||||
//m_DllAbout = 0;
|
||||
m_DllConfig = 0;
|
||||
m_DllDebugger = 0;
|
||||
|
||||
@ -44,7 +44,6 @@ CPlugin::Load(const char* _szName)
|
||||
if (m_hInstLib.Load(_szName))
|
||||
{
|
||||
m_GetDllInfo = (void (__cdecl*)(PLUGIN_INFO*))m_hInstLib.Get("GetDllInfo");
|
||||
m_DllAbout = (void (__cdecl*)(HWND))m_hInstLib.Get("DllAbout");
|
||||
m_DllConfig = (void (__cdecl*)(HWND))m_hInstLib.Get("DllConfig");
|
||||
m_DllDebugger = (void (__cdecl*)(HWND))m_hInstLib.Get("DllDebugger");
|
||||
return(true);
|
||||
@ -74,13 +73,13 @@ void CPlugin::Config(HWND _hwnd)
|
||||
}
|
||||
}
|
||||
|
||||
void CPlugin::About(HWND _hwnd)
|
||||
{
|
||||
if (m_DllAbout != 0)
|
||||
{
|
||||
m_DllAbout(_hwnd);
|
||||
}
|
||||
}
|
||||
//void CPlugin::About(HWND _hwnd)
|
||||
//{
|
||||
// if (m_DllAbout != 0)
|
||||
// {
|
||||
// m_DllAbout(_hwnd);
|
||||
// }
|
||||
//}
|
||||
|
||||
void CPlugin::Debug(HWND _hwnd)
|
||||
{
|
||||
|
@ -43,7 +43,6 @@ class CPlugin
|
||||
static DynamicLibrary m_hInstLib;
|
||||
|
||||
static void (__cdecl * m_GetDllInfo)(PLUGIN_INFO* _PluginInfo);
|
||||
static void (__cdecl * m_DllAbout)(HWND _hParent);
|
||||
static void (__cdecl * m_DllConfig)(HWND _hParent);
|
||||
static void (__cdecl * m_DllDebugger)(HWND _hParent);
|
||||
};
|
||||
|
@ -23,7 +23,6 @@ namespace PluginDSP
|
||||
|
||||
// Function Pointer
|
||||
TGetDllInfo GetDllInfo = 0;
|
||||
TDllAbout DllAbout = 0;
|
||||
TDllConfig DllConfig = 0;
|
||||
TDllDebugger DllDebugger = 0;
|
||||
TDSP_Initialize DSP_Initialize = 0;
|
||||
@ -52,7 +51,6 @@ void UnloadPlugin()
|
||||
|
||||
// Set Functions to NULL
|
||||
GetDllInfo = 0;
|
||||
DllAbout = 0;
|
||||
DllConfig = 0;
|
||||
DllDebugger = 0;
|
||||
DSP_Initialize = 0;
|
||||
@ -73,7 +71,6 @@ bool LoadPlugin(const char *_Filename)
|
||||
if (plugin.Load(_Filename))
|
||||
{
|
||||
GetDllInfo = reinterpret_cast<TGetDllInfo> (plugin.Get("GetDllInfo"));
|
||||
DllAbout = reinterpret_cast<TDllAbout> (plugin.Get("DllAbout"));
|
||||
DllConfig = reinterpret_cast<TDllConfig> (plugin.Get("DllConfig"));
|
||||
DllDebugger = reinterpret_cast<TDllDebugger> (plugin.Get("DllDebugger"));
|
||||
DSP_Initialize = reinterpret_cast<TDSP_Initialize> (plugin.Get("DSP_Initialize"));
|
||||
|
@ -28,7 +28,7 @@ void UnloadPlugin();
|
||||
|
||||
// Function Types
|
||||
typedef void (__cdecl* TGetDllInfo)(PLUGIN_INFO*);
|
||||
typedef void (__cdecl* TDllAbout)(HWND);
|
||||
//typedef void (__cdecl* TDllAbout)(HWND);
|
||||
typedef void (__cdecl* TDllConfig)(HWND);
|
||||
typedef void (__cdecl* TDllDebugger)(HWND);
|
||||
typedef void (__cdecl* TDSP_Initialize)(DSPInitialize);
|
||||
@ -43,7 +43,6 @@ typedef void (__cdecl* TDSP_DoState)(unsigned char **ptr, int mode);
|
||||
|
||||
// Function Pointers
|
||||
extern TGetDllInfo GetDllInfo;
|
||||
extern TDllAbout DllAbout;
|
||||
extern TDllConfig DllConfig;
|
||||
extern TDllDebugger DllDebugger;
|
||||
extern TDSP_Initialize DSP_Initialize;
|
||||
|
@ -24,7 +24,7 @@ namespace PluginPAD
|
||||
// Function Pointers
|
||||
TGetDllInfo GetDllInfo = 0;
|
||||
TPAD_Shutdown PAD_Shutdown = 0;
|
||||
TDllAbout DllAbout = 0;
|
||||
//TDllAbout DllAbout = 0;
|
||||
TDllConfig DllConfig = 0;
|
||||
TPAD_Initialize PAD_Initialize = 0;
|
||||
TPAD_GetStatus PAD_GetStatus = 0;
|
||||
@ -45,7 +45,7 @@ void UnloadPlugin()
|
||||
// Set Functions to 0
|
||||
GetDllInfo = 0;
|
||||
PAD_Shutdown = 0;
|
||||
DllAbout = 0;
|
||||
//DllAbout = 0;
|
||||
DllConfig = 0;
|
||||
PAD_Initialize = 0;
|
||||
PAD_GetStatus = 0;
|
||||
@ -57,7 +57,6 @@ bool LoadPlugin(const char *_Filename)
|
||||
if (plugin.Load(_Filename))
|
||||
{
|
||||
GetDllInfo = reinterpret_cast<TGetDllInfo> (plugin.Get("GetDllInfo"));
|
||||
DllAbout = reinterpret_cast<TDllAbout> (plugin.Get("DllAbout"));
|
||||
DllConfig = reinterpret_cast<TDllConfig> (plugin.Get("DllConfig"));
|
||||
PAD_Initialize = reinterpret_cast<TPAD_Initialize> (plugin.Get("PAD_Initialize"));
|
||||
PAD_Shutdown = reinterpret_cast<TPAD_Shutdown> (plugin.Get("PAD_Shutdown"));
|
||||
@ -66,7 +65,6 @@ bool LoadPlugin(const char *_Filename)
|
||||
PAD_GetAttachedPads = reinterpret_cast<TPAD_GetAttachedPads>(plugin.Get("PAD_GetAttachedPads"));
|
||||
|
||||
if ((GetDllInfo != 0) &&
|
||||
(DllAbout != 0) &&
|
||||
(DllConfig != 0) &&
|
||||
(PAD_Initialize != 0) &&
|
||||
(PAD_Shutdown != 0) &&
|
||||
|
@ -29,7 +29,6 @@ void UnloadPlugin();
|
||||
|
||||
// Function Types
|
||||
typedef void (__cdecl* TGetDllInfo)(PLUGIN_INFO*);
|
||||
typedef void (__cdecl* TDllAbout)(HWND);
|
||||
typedef void (__cdecl* TDllConfig)(HWND);
|
||||
typedef void (__cdecl* TPAD_Initialize)(SPADInitialize);
|
||||
typedef void (__cdecl* TPAD_Shutdown)();
|
||||
@ -40,7 +39,6 @@ typedef unsigned int (__cdecl* TPAD_GetAttachedPads)();
|
||||
// Function Pointers
|
||||
extern TGetDllInfo GetDllInfo;
|
||||
extern TPAD_Shutdown PAD_Shutdown;
|
||||
extern TDllAbout DllAbout;
|
||||
extern TDllConfig DllConfig;
|
||||
extern TPAD_Initialize PAD_Initialize;
|
||||
extern TPAD_GetStatus PAD_GetStatus;
|
||||
|
@ -24,7 +24,6 @@ namespace PluginVideo
|
||||
|
||||
// Function Pointer
|
||||
TGetDllInfo GetDllInfo = 0;
|
||||
TDllAbout DllAbout = 0;
|
||||
TDllConfig DllConfig = 0;
|
||||
TVideo_Initialize Video_Initialize = 0;
|
||||
TVideo_Prepare Video_Prepare = 0;
|
||||
@ -49,7 +48,6 @@ void UnloadPlugin()
|
||||
{
|
||||
// set Functions to 0
|
||||
GetDllInfo = 0;
|
||||
DllAbout = 0;
|
||||
DllConfig = 0;
|
||||
Video_Initialize = 0;
|
||||
Video_Prepare = 0;
|
||||
@ -68,7 +66,6 @@ bool LoadPlugin(const char *_Filename)
|
||||
if (plugin.Load(_Filename))
|
||||
{
|
||||
GetDllInfo = reinterpret_cast<TGetDllInfo> (plugin.Get("GetDllInfo"));
|
||||
DllAbout = reinterpret_cast<TDllAbout> (plugin.Get("DllAbout"));
|
||||
DllConfig = reinterpret_cast<TDllConfig> (plugin.Get("DllConfig"));
|
||||
Video_Initialize = reinterpret_cast<TVideo_Initialize> (plugin.Get("Video_Initialize"));
|
||||
Video_Prepare = reinterpret_cast<TVideo_Prepare> (plugin.Get("Video_Prepare"));
|
||||
@ -81,7 +78,7 @@ bool LoadPlugin(const char *_Filename)
|
||||
Video_DoState = reinterpret_cast<TVideo_DoState> (plugin.Get("Video_DoState"));
|
||||
Video_Stop = reinterpret_cast<TVideo_Stop> (plugin.Get("Video_Stop"));
|
||||
if ((GetDllInfo != 0) &&
|
||||
(DllAbout != 0) &&
|
||||
//(DllAbout != 0) &&
|
||||
(DllConfig != 0) &&
|
||||
(Video_Initialize != 0) &&
|
||||
(Video_Prepare != 0) &&
|
||||
|
@ -32,7 +32,7 @@ void UnloadPlugin();
|
||||
|
||||
// Function Types
|
||||
typedef void (__cdecl* TGetDllInfo)(PLUGIN_INFO*);
|
||||
typedef void (__cdecl* TDllAbout)(HWND);
|
||||
//typedef void (__cdecl* TDllAbout)(HWND);
|
||||
typedef void (__cdecl* TDllConfig)(HWND);
|
||||
typedef void (__cdecl* TVideo_Initialize)(SVideoInitialize*);
|
||||
typedef void (__cdecl* TVideo_Prepare)();
|
||||
@ -47,7 +47,6 @@ typedef void (__cdecl* TVideo_Stop)();
|
||||
|
||||
// Function Pointers
|
||||
extern TGetDllInfo GetDllInfo;
|
||||
extern TDllAbout DllAbout;
|
||||
extern TDllConfig DllConfig;
|
||||
extern TVideo_Initialize Video_Initialize;
|
||||
extern TVideo_Prepare Video_Prepare;
|
||||
|
@ -24,7 +24,6 @@ namespace PluginWiimote
|
||||
|
||||
// Function Pointer
|
||||
TGetDllInfo GetDllInfo = 0;
|
||||
TDllAbout DllAbout = 0;
|
||||
TDllConfig DllConfig = 0;
|
||||
TWiimote_Initialize Wiimote_Initialize = 0;
|
||||
TWiimote_Shutdown Wiimote_Shutdown = 0;
|
||||
@ -47,7 +46,6 @@ namespace PluginWiimote
|
||||
|
||||
// Set Functions to NULL
|
||||
GetDllInfo = 0;
|
||||
DllAbout = 0;
|
||||
DllConfig = 0;
|
||||
Wiimote_Initialize = 0;
|
||||
Wiimote_Shutdown = 0;
|
||||
@ -63,7 +61,6 @@ namespace PluginWiimote
|
||||
{
|
||||
LOG(MASTER_LOG, "getting Wiimote Plugin function pointers...");
|
||||
GetDllInfo = reinterpret_cast<TGetDllInfo> (plugin.Get("GetDllInfo"));
|
||||
DllAbout = reinterpret_cast<TDllAbout> (plugin.Get("DllAbout"));
|
||||
DllConfig = reinterpret_cast<TDllConfig> (plugin.Get("DllConfig"));
|
||||
Wiimote_Initialize = reinterpret_cast<TWiimote_Initialize> (plugin.Get("Wiimote_Initialize"));
|
||||
Wiimote_Shutdown = reinterpret_cast<TWiimote_Shutdown> (plugin.Get("Wiimote_Shutdown"));
|
||||
@ -73,7 +70,6 @@ namespace PluginWiimote
|
||||
Wiimote_DoState = reinterpret_cast<TWiimote_DoState> (plugin.Get("Wiimote_DoState"));
|
||||
|
||||
LOG(MASTER_LOG, "%s: 0x%p", "GetDllInfo", GetDllInfo);
|
||||
LOG(MASTER_LOG, "%s: 0x%p", "DllAbout", DllAbout);
|
||||
LOG(MASTER_LOG, "%s: 0x%p", "DllConfig", DllConfig);
|
||||
LOG(MASTER_LOG, "%s: 0x%p", "Wiimote_Initialize", Wiimote_Initialize);
|
||||
LOG(MASTER_LOG, "%s: 0x%p", "Wiimote_Shutdown", Wiimote_Shutdown);
|
||||
|
@ -28,7 +28,7 @@ void UnloadPlugin();
|
||||
|
||||
// Function Types
|
||||
typedef void (__cdecl* TGetDllInfo)(PLUGIN_INFO*);
|
||||
typedef void (__cdecl* TDllAbout)(HWND);
|
||||
//typedef void (__cdecl* TDllAbout)(HWND);
|
||||
typedef void (__cdecl* TDllConfig)(HWND);
|
||||
typedef void (__cdecl* TWiimote_Initialize)(SWiimoteInitialize);
|
||||
typedef void (__cdecl* TWiimote_Shutdown)();
|
||||
@ -39,7 +39,6 @@ typedef void (__cdecl* TWiimote_DoState)(void *ptr, int mode);
|
||||
|
||||
// Function Pointers
|
||||
extern TGetDllInfo GetDllInfo;
|
||||
extern TDllAbout DllAbout;
|
||||
extern TDllConfig DllConfig;
|
||||
extern TWiimote_Initialize Wiimote_Initialize;
|
||||
extern TWiimote_Shutdown Wiimote_Shutdown;
|
||||
|
@ -43,16 +43,12 @@ EVT_BUTTON(ID_REMOVEISOPATH, CConfigMain::AddRemoveISOPaths)
|
||||
EVT_FILEPICKER_CHANGED(ID_DEFAULTISO, CConfigMain::DefaultISOChanged)
|
||||
EVT_DIRPICKER_CHANGED(ID_DVDROOT, CConfigMain::DVDRootChanged)
|
||||
EVT_CHOICE(ID_GRAPHIC_CB, CConfigMain::OnSelectionChanged)
|
||||
EVT_BUTTON(ID_GRAPHIC_ABOUT, CConfigMain::OnAbout)
|
||||
EVT_BUTTON(ID_GRAPHIC_CONFIG, CConfigMain::OnConfig)
|
||||
EVT_CHOICE(ID_DSP_CB, CConfigMain::OnSelectionChanged)
|
||||
EVT_BUTTON(ID_DSP_ABOUT, CConfigMain::OnAbout)
|
||||
EVT_BUTTON(ID_DSP_CONFIG, CConfigMain::OnConfig)
|
||||
EVT_CHOICE(ID_PAD_CB, CConfigMain::OnSelectionChanged)
|
||||
EVT_BUTTON(ID_PAD_ABOUT, CConfigMain::OnAbout)
|
||||
EVT_BUTTON(ID_PAD_CONFIG, CConfigMain::OnConfig)
|
||||
EVT_CHOICE(ID_WIIMOTE_CB, CConfigMain::OnSelectionChanged)
|
||||
EVT_BUTTON(ID_WIIMOTE_ABOUT, CConfigMain::OnAbout)
|
||||
EVT_BUTTON(ID_WIIMOTE_CONFIG, CConfigMain::OnConfig)
|
||||
|
||||
END_EVENT_TABLE()
|
||||
@ -171,29 +167,26 @@ void CConfigMain::CreateGUIControls()
|
||||
sPaths->Layout();
|
||||
|
||||
// Plugin page
|
||||
//TODO: reposition the config buttons.
|
||||
GraphicSelection = new wxChoice(PluginPage, ID_GRAPHIC_CB, wxDefaultPosition, wxDefaultSize, NULL, 0, wxDefaultValidator);
|
||||
GraphicAbout = new wxButton(PluginPage, ID_GRAPHIC_ABOUT, wxT("About..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
GraphicConfig = new wxButton(PluginPage, ID_GRAPHIC_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
GraphicText = new wxStaticText(PluginPage, ID_GRAPHIC_TEXT, wxT("GFX:"), wxDefaultPosition, wxDefaultSize);
|
||||
|
||||
FillChoiceBox(GraphicSelection, PLUGIN_TYPE_VIDEO, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strVideoPlugin);
|
||||
|
||||
DSPSelection = new wxChoice(PluginPage, ID_DSP_CB, wxDefaultPosition, wxDefaultSize, NULL, 0, wxDefaultValidator);
|
||||
DSPAbout = new wxButton(PluginPage, ID_DSP_ABOUT, wxT("About..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
DSPConfig = new wxButton(PluginPage, ID_DSP_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
DSPText = new wxStaticText(PluginPage, ID_DSP_TEXT, wxT("DSP:"), wxDefaultPosition, wxDefaultSize);
|
||||
|
||||
FillChoiceBox(DSPSelection, PLUGIN_TYPE_DSP, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strDSPPlugin);
|
||||
|
||||
PADSelection = new wxChoice(PluginPage, ID_PAD_CB, wxDefaultPosition, wxDefaultSize, NULL, 0, wxDefaultValidator);
|
||||
PADAbout = new wxButton(PluginPage, ID_PAD_ABOUT, wxT("About..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
PADConfig = new wxButton(PluginPage, ID_PAD_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
PADText = new wxStaticText(PluginPage, ID_PAD_TEXT, wxT("PAD:"), wxDefaultPosition, wxDefaultSize);
|
||||
|
||||
FillChoiceBox(PADSelection, PLUGIN_TYPE_PAD, SConfig::GetInstance().m_LocalCoreStartupParameter.m_strPadPlugin);
|
||||
|
||||
WiimoteSelection = new wxChoice(PluginPage, ID_WIIMOTE_CB, wxDefaultPosition, wxDefaultSize, NULL, 0, wxDefaultValidator);
|
||||
WiimoteAbout = new wxButton(PluginPage, ID_WIIMOTE_ABOUT, wxT("About..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
WiimoteConfig = new wxButton(PluginPage, ID_WIIMOTE_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
WiimoteText = new wxStaticText(PluginPage, ID_WIIMOTE_TEXT, wxT("Wiimote:"), wxDefaultPosition, wxDefaultSize);
|
||||
|
||||
@ -203,22 +196,18 @@ void CConfigMain::CreateGUIControls()
|
||||
sPlugins->Add(GraphicText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxLEFT, 5);
|
||||
sPlugins->Add(GraphicSelection, wxGBPosition(0, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
|
||||
sPlugins->Add(GraphicConfig, wxGBPosition(1, 1), wxGBSpan(1, 1), wxLEFT|wxBOTTOM, 5);
|
||||
sPlugins->Add(GraphicAbout, wxGBPosition(1, 2), wxGBSpan(1, 1), wxLEFT|wxBOTTOM, 5);
|
||||
|
||||
sPlugins->Add(DSPText, wxGBPosition(2, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxLEFT, 5);
|
||||
sPlugins->Add(DSPSelection, wxGBPosition(2, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
|
||||
sPlugins->Add(DSPConfig, wxGBPosition(3, 1), wxGBSpan(1, 1), wxLEFT|wxBOTTOM, 5);
|
||||
sPlugins->Add(DSPAbout, wxGBPosition(3, 2), wxGBSpan(1, 1), wxLEFT|wxBOTTOM, 5);
|
||||
|
||||
sPlugins->Add(PADText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxLEFT, 5);
|
||||
sPlugins->Add(PADSelection, wxGBPosition(4, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
|
||||
sPlugins->Add(PADConfig, wxGBPosition(5, 1), wxGBSpan(1, 1), wxLEFT|wxBOTTOM, 5);
|
||||
sPlugins->Add(PADAbout, wxGBPosition(5, 2), wxGBSpan(1, 1), wxLEFT|wxBOTTOM, 5);
|
||||
|
||||
sPlugins->Add(WiimoteText, wxGBPosition(6, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxLEFT, 5);
|
||||
sPlugins->Add(WiimoteSelection, wxGBPosition(6, 1), wxGBSpan(1, 2), wxEXPAND|wxALL, 5);
|
||||
sPlugins->Add(WiimoteConfig, wxGBPosition(7, 1), wxGBSpan(1, 1), wxLEFT|wxBOTTOM, 5);
|
||||
sPlugins->Add(WiimoteAbout, wxGBPosition(7, 2), wxGBSpan(1, 1), wxLEFT|wxBOTTOM, 5);
|
||||
|
||||
PluginPage->SetSizer(sPlugins);
|
||||
sPlugins->Layout();
|
||||
@ -329,28 +318,6 @@ void CConfigMain::OnSelectionChanged(wxCommandEvent& WXUNUSED (event))
|
||||
Apply->Enable();
|
||||
}
|
||||
|
||||
void CConfigMain::OnAbout(wxCommandEvent& event)
|
||||
{
|
||||
switch (event.GetId())
|
||||
{
|
||||
case ID_GRAPHIC_ABOUT:
|
||||
CallAbout(GraphicSelection);
|
||||
break;
|
||||
|
||||
case ID_DSP_ABOUT:
|
||||
CallAbout(DSPSelection);
|
||||
break;
|
||||
|
||||
case ID_PAD_ABOUT:
|
||||
CallAbout(PADSelection);
|
||||
break;
|
||||
|
||||
case ID_WIIMOTE_ABOUT:
|
||||
CallAbout(WiimoteSelection);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void CConfigMain::OnConfig(wxCommandEvent& event)
|
||||
{
|
||||
switch (event.GetId())
|
||||
@ -413,19 +380,6 @@ void CConfigMain::CallConfig(wxChoice* _pChoice)
|
||||
}
|
||||
}
|
||||
|
||||
void CConfigMain::CallAbout(wxChoice* _pChoice)
|
||||
{
|
||||
int Index = _pChoice->GetSelection();
|
||||
|
||||
if (Index >= 0)
|
||||
{
|
||||
const CPluginInfo* pInfo = static_cast<CPluginInfo*>(_pChoice->GetClientData(Index));
|
||||
|
||||
if (pInfo != NULL)
|
||||
CPluginManager::GetInstance().OpenAbout((HWND) this->GetHandle(), pInfo->GetFileName().c_str());
|
||||
}
|
||||
}
|
||||
|
||||
void CConfigMain::DoApply()
|
||||
{
|
||||
Apply->Disable();
|
||||
|
@ -35,7 +35,6 @@ class CConfigMain
|
||||
virtual ~CConfigMain();
|
||||
void OKClick(wxCommandEvent& event);
|
||||
void OnSelectionChanged(wxCommandEvent& event);
|
||||
void OnAbout(wxCommandEvent& event);
|
||||
void OnConfig(wxCommandEvent& event);
|
||||
|
||||
private:
|
||||
@ -76,18 +75,14 @@ class CConfigMain
|
||||
wxDirPickerCtrl* DVDRoot;
|
||||
|
||||
wxStaticText* PADText;
|
||||
wxButton* PADAbout;
|
||||
wxButton* PADConfig;
|
||||
wxChoice* PADSelection;
|
||||
wxButton* DSPAbout;
|
||||
wxButton* DSPConfig;
|
||||
wxStaticText* DSPText;
|
||||
wxChoice* DSPSelection;
|
||||
wxButton* GraphicAbout;
|
||||
wxButton* GraphicConfig;
|
||||
wxStaticText* GraphicText;
|
||||
wxChoice* GraphicSelection;
|
||||
wxButton* WiimoteAbout;
|
||||
wxButton* WiimoteConfig;
|
||||
wxStaticText* WiimoteText;
|
||||
wxChoice* WiimoteSelection;
|
||||
@ -152,7 +147,7 @@ class CConfigMain
|
||||
void FillChoiceBox(wxChoice* _pChoice, int _PluginType, const std::string& _SelectFilename);
|
||||
|
||||
void CallConfig(wxChoice* _pChoice);
|
||||
void CallAbout(wxChoice* _pChoice);
|
||||
//void CallAbout(wxChoice* _pChoice);
|
||||
|
||||
void DoApply();
|
||||
|
||||
|
@ -99,16 +99,6 @@ void CPluginManager::ScanForPlugins(wxWindow* _wxWindow)
|
||||
}
|
||||
}
|
||||
|
||||
void CPluginManager::OpenAbout(void* _Parent, const char *_rFilename)
|
||||
{
|
||||
if (Common::CPlugin::Load(_rFilename))
|
||||
{
|
||||
Common::CPlugin::About((HWND)_Parent);
|
||||
Common::CPlugin::Release();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CPluginManager::OpenConfig(void* _Parent, const char *_rFilename)
|
||||
{
|
||||
if (Common::CPlugin::Load(_rFilename))
|
||||
|
@ -41,7 +41,6 @@ class CPluginManager
|
||||
public:
|
||||
static CPluginManager& GetInstance() {return(m_Instance);}
|
||||
void ScanForPlugins(wxWindow* _wxWindow);
|
||||
void OpenAbout(void* _Parent, const char *_rFilename);
|
||||
void OpenConfig(void* _Parent, const char *_rFilename);
|
||||
void OpenDebug(void* _Parent, const char *_rFilename);
|
||||
const CPluginInfos& GetPluginInfos() {return(m_PluginInfos);}
|
||||
|
@ -39,15 +39,6 @@ typedef struct
|
||||
//
|
||||
EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
|
||||
|
||||
// __________________________________________________________________________________________________
|
||||
// Function: DllAbout
|
||||
// Purpose: This function is optional function that is provided
|
||||
// to give further information about the DLL.
|
||||
// input: a handle to the window that calls this function
|
||||
// output: none
|
||||
//
|
||||
EXPORT void CALL DllAbout(HWND _hParent);
|
||||
|
||||
// __________________________________________________________________________________________________
|
||||
// Function: DllConfig
|
||||
// Purpose: This function is optional function that is provided
|
||||
|
@ -64,15 +64,6 @@ typedef struct
|
||||
//
|
||||
EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
|
||||
|
||||
// __________________________________________________________________________________________________
|
||||
// Function: DllAbout
|
||||
// Purpose: This function is optional function that is provided
|
||||
// to give further information about the DLL.
|
||||
// input: a handle to the window that calls this function
|
||||
// output: none
|
||||
//
|
||||
EXPORT void CALL DllAbout(HWND _hParent);
|
||||
|
||||
// __________________________________________________________________________________________________
|
||||
// Function: DllConfig
|
||||
// Purpose: This function is optional function that is provided
|
||||
|
@ -87,15 +87,6 @@ typedef struct
|
||||
|
||||
EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
|
||||
|
||||
// __________________________________________________________________________________________________
|
||||
// Function: DllAbout
|
||||
// Purpose: This function is optional function that is provided
|
||||
// to give further information about the DLL.
|
||||
// input: a handle to the window that calls this function
|
||||
// output: none
|
||||
//
|
||||
EXPORT void CALL DllAbout(HWND _hParent);
|
||||
|
||||
// __________________________________________________________________________________________________
|
||||
// Function: DllConfig
|
||||
// Purpose: This function is optional function that is provided
|
||||
|
@ -38,15 +38,6 @@ typedef struct
|
||||
//
|
||||
EXPORT void CALL GetDllInfo(PLUGIN_INFO* _pPluginInfo);
|
||||
|
||||
// __________________________________________________________________________________________________
|
||||
// Function: DllAbout
|
||||
// Purpose: This function is optional function that is provided
|
||||
// to give further information about the DLL.
|
||||
// input: a handle to the window that calls this function
|
||||
// output: none
|
||||
//
|
||||
EXPORT void CALL DllAbout(HWND _hParent);
|
||||
|
||||
// __________________________________________________________________________________________________
|
||||
// Function: DllConfig
|
||||
// Purpose: This function is optional function that is provided
|
||||
|
@ -18,6 +18,7 @@
|
||||
|
||||
#include "ConfigDlg.h"
|
||||
#include "../PadSimple.h"
|
||||
#include <wx/aboutdlg.h>
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "../DirectInputBase.h"
|
||||
@ -28,6 +29,7 @@ DInput m_dinput;
|
||||
BEGIN_EVENT_TABLE(ConfigDialog,wxDialog)
|
||||
EVT_CLOSE(ConfigDialog::OnClose)
|
||||
EVT_BUTTON(ID_CLOSE,ConfigDialog::OnCloseClick)
|
||||
EVT_BUTTON(ID_PAD_ABOUT,ConfigDialog::DllAbout)
|
||||
EVT_CHOICE(ID_DEVICENAME,ConfigDialog::DeviceChanged)
|
||||
EVT_CHECKBOX(ID_ATTACHED,ConfigDialog::AttachedCheck)
|
||||
EVT_CHECKBOX(ID_DISABLE,ConfigDialog::DisableCheck)
|
||||
@ -93,7 +95,8 @@ inline void AddControl(wxPanel *pan, wxButton **button, wxStaticBoxSizer *sizer,
|
||||
}
|
||||
|
||||
void ConfigDialog::CreateGUIControls()
|
||||
{
|
||||
{
|
||||
wxButton* AboutButton;
|
||||
// Notebook
|
||||
m_Notebook = new wxNotebook(this, ID_NOTEBOOK, wxDefaultPosition, wxDefaultSize);
|
||||
|
||||
@ -109,11 +112,13 @@ void ConfigDialog::CreateGUIControls()
|
||||
|
||||
// Standard buttons
|
||||
m_Close = new wxButton(this, ID_CLOSE, wxT("Close"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
AboutButton = new wxButton(this, ID_PAD_ABOUT, wxT("About"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
|
||||
// Put notebook and standard buttons in sizers
|
||||
wxBoxSizer* sSButtons;
|
||||
sSButtons = new wxBoxSizer(wxHORIZONTAL);
|
||||
sSButtons->Add(0, 0, 1, wxEXPAND, 5);
|
||||
sSButtons->Add(AboutButton,0,wxALL, 5);
|
||||
sSButtons->Add(m_Close, 0, wxALL, 5);
|
||||
|
||||
wxBoxSizer* sMain;
|
||||
@ -205,6 +210,7 @@ void ConfigDialog::CreateGUIControls()
|
||||
sPage[i]->Add(sStick[i], wxGBPosition(1, 2), wxGBSpan(2, 1), wxALL, 1);
|
||||
sPage[i]->Add(sDPad[i], wxGBPosition(1, 3), wxGBSpan(2, 1), wxALL, 1);
|
||||
sPage[i]->Add(sCStick[i], wxGBPosition(1, 4), wxGBSpan(2, 1), wxALL, 1);
|
||||
sPage[i]->Add(AboutButton,wxGBPosition(5,1),wxGBSpan(1, 1),wxALL,5);
|
||||
m_Controller[i]->SetSizer(sPage[i]);
|
||||
sPage[i]->Layout();
|
||||
|
||||
@ -345,3 +351,11 @@ void ConfigDialog::OnButtonClick(wxCommandEvent& event)
|
||||
wxKeyEventHandler(ConfigDialog::OnKeyDown),
|
||||
(wxObject*)NULL, this);
|
||||
}
|
||||
void ConfigDialog::DllAbout(wxCommandEvent& event)
|
||||
{
|
||||
wxAboutDialogInfo info;
|
||||
info.AddDeveloper(_T("ector"));
|
||||
info.AddDeveloper(_T("F|RES"));
|
||||
info.SetDescription(_T("Simple keyboard and XInput plugin for dolphin"));
|
||||
wxAboutBox(info);
|
||||
}
|
@ -104,6 +104,7 @@ class ConfigDialog : public wxDialog
|
||||
ID_ATTACHED,
|
||||
ID_DISABLE,
|
||||
ID_RUMBLE,
|
||||
ID_PAD_ABOUT,
|
||||
|
||||
ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
|
||||
};
|
||||
@ -118,6 +119,7 @@ class ConfigDialog : public wxDialog
|
||||
void DisableCheck(wxCommandEvent& event);
|
||||
void RumbleCheck(wxCommandEvent& event);
|
||||
void OnButtonClick(wxCommandEvent& event);
|
||||
void DllAbout(wxCommandEvent& event);
|
||||
|
||||
int keyPress;
|
||||
wxButton *clickedButton;
|
||||
|
@ -163,17 +163,6 @@ void GetDllInfo(PLUGIN_INFO* _PluginInfo)
|
||||
|
||||
}
|
||||
|
||||
|
||||
void DllAbout(HWND _hParent)
|
||||
{
|
||||
wxAboutDialogInfo info;
|
||||
info.AddDeveloper(_T("ector"));
|
||||
info.AddDeveloper(_T("F|RES"));
|
||||
info.SetDescription(_T("Simple keyboard and XInput plugin for dolphin"));
|
||||
wxAboutBox(info);
|
||||
}
|
||||
|
||||
|
||||
void DllConfig(HWND _hParent)
|
||||
{
|
||||
LoadConfig();
|
||||
|
@ -20,11 +20,13 @@
|
||||
#include "../Globals.h"
|
||||
|
||||
#include "../TextureMngr.h"
|
||||
#include <wx/aboutdlg.h>
|
||||
|
||||
BEGIN_EVENT_TABLE(ConfigDialog,wxDialog)
|
||||
EVT_CLOSE(ConfigDialog::OnClose)
|
||||
EVT_BUTTON(ID_CANCEL,ConfigDialog::OKClick)
|
||||
EVT_BUTTON(ID_OK,ConfigDialog::OKClick)
|
||||
EVT_BUTTON(ID_GRAPHIC_ABOUT,ConfigDialog::DllAbout)
|
||||
EVT_CHECKBOX(ID_FULLSCREEN,ConfigDialog::FullScreenCheck)
|
||||
EVT_CHECKBOX(ID_RENDERTOMAINWINDOW,ConfigDialog::RenderMainCheck)
|
||||
EVT_COMBOBOX(ID_FULLSCREENCB,ConfigDialog::FSCB)
|
||||
@ -69,7 +71,7 @@ void ConfigDialog::CreateGUIControls()
|
||||
//buttons
|
||||
m_OK = new wxButton(this, ID_OK, wxT("OK"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
m_Cancel = new wxButton(this, ID_CANCEL, wxT("Cancel"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
|
||||
|
||||
//put notebook and buttons in sizers
|
||||
wxBoxSizer* sButtons;
|
||||
sButtons = new wxBoxSizer(wxHORIZONTAL);
|
||||
@ -84,6 +86,8 @@ void ConfigDialog::CreateGUIControls()
|
||||
|
||||
this->SetSizer(sMain);
|
||||
this->Layout();
|
||||
//other buttons & stuff
|
||||
wxButton* AboutButton;
|
||||
|
||||
//page1
|
||||
m_Fullscreen = new wxCheckBox(m_PageVideo, ID_FULLSCREEN, wxT("Fullscreen"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
@ -108,6 +112,7 @@ void ConfigDialog::CreateGUIControls()
|
||||
wxString tmp;
|
||||
tmp<<g_Config.iMultisampleMode;
|
||||
m_AliasModeCB->SetValue(tmp);
|
||||
AboutButton = new wxButton(m_PageVideo, ID_GRAPHIC_ABOUT, wxT("About"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
|
||||
//page2
|
||||
m_ForceFiltering = new wxCheckBox(m_PageEnhancements, ID_FORCEFILTERING, wxT("Force bi/trilinear filtering (May cause small glitches)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
|
||||
@ -158,6 +163,7 @@ void ConfigDialog::CreateGUIControls()
|
||||
sPage1->Add(m_WindowResolutionCB, wxGBPosition(3, 1), wxGBSpan(1, 1), wxALL, 5);
|
||||
sPage1->Add(AAText, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALIGN_CENTER_VERTICAL|wxALL, 5);
|
||||
sPage1->Add(m_AliasModeCB, wxGBPosition(4, 1), wxGBSpan(1, 1), wxALL, 5);
|
||||
sPage1->Add(AboutButton,wxGBPosition(5,1),wxGBSpan(1, 1),wxALL,5);
|
||||
m_PageVideo->SetSizer(sPage1);
|
||||
sPage1->Layout();
|
||||
|
||||
@ -303,3 +309,10 @@ void ConfigDialog::TexturePathChange(wxFileDirPickerEvent& event)
|
||||
// the combobox, this event wil not be fired.
|
||||
strcpy(g_Config.texDumpPath,event.GetPath().mb_str());
|
||||
}
|
||||
void ConfigDialog::DllAbout(wxCommandEvent& event)
|
||||
{
|
||||
wxAboutDialogInfo info;
|
||||
info.AddDeveloper(_T("zerofrog(@gmail.com)"));
|
||||
info.SetDescription(_T("Vertex/Pixel Shader 2.0 or higher, framebuffer objects, multiple render targets"));
|
||||
wxAboutBox(info);
|
||||
}
|
@ -61,6 +61,7 @@ class ConfigDialog : public wxDialog
|
||||
void TexFmtOverlayChange(wxCommandEvent& event);
|
||||
void DumpTexturesChange(wxCommandEvent& event);
|
||||
void TexturePathChange(wxFileDirPickerEvent& event);
|
||||
void DllAbout(wxCommandEvent& event);
|
||||
|
||||
private:
|
||||
|
||||
@ -115,6 +116,7 @@ class ConfigDialog : public wxDialog
|
||||
ID_NOTEBOOK,
|
||||
ID_PAGEVIDEO,
|
||||
ID_PAGEENHANCEMENTS,
|
||||
ID_GRAPHIC_ABOUT,
|
||||
////GUI Enum Control ID End
|
||||
ID_DUMMY_VALUE_ //don't remove this value unless you have other enum values
|
||||
};
|
||||
|
@ -15,7 +15,6 @@
|
||||
// Official SVN repository and contact information can be found at
|
||||
// http://code.google.com/p/dolphin-emu/
|
||||
|
||||
#include <wx/aboutdlg.h>
|
||||
#include "Globals.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
@ -59,15 +58,6 @@ void GetDllInfo (PLUGIN_INFO* _PluginInfo)
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void DllAbout(HWND _hParent)
|
||||
{
|
||||
wxAboutDialogInfo info;
|
||||
info.AddDeveloper(_T("zerofrog(@gmail.com)"));
|
||||
info.SetDescription(_T("Vertex/Pixel Shader 2.0 or higher, framebuffer objects, multiple render targets"));
|
||||
wxAboutBox(info);
|
||||
}
|
||||
|
||||
void DllConfig(HWND _hParent)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
|
@ -512,11 +512,11 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Src\wiimote_hid.h"
|
||||
RelativePath=".\Src\Wiimote.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\Src\Wiimote_Test.cpp"
|
||||
RelativePath=".\Src\wiimote_hid.h"
|
||||
>
|
||||
</File>
|
||||
</Files>
|
||||
|
Loading…
Reference in New Issue
Block a user