Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@787 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
daco65
2008-10-07 18:05:56 +00:00
parent c0af02df49
commit 22b2b36711
26 changed files with 52 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
+15 -1
View File
@@ -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);
}
Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.h
+2
View File
@@ -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;
Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
-11
View File
@@ -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();
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
+14 -1
View File
@@ -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);
}
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h
+2
View File
@@ -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
};
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
-10
View File
@@ -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)
Source/Plugins/Plugin_Wiimote_Test/Plugin_Wiimote_Test.vcproj
+2 -2
View File
@@ -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>
Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote_Test.cpp → Source/Plugins/Plugin_Wiimote_Test/Src/Wiimote.cpp
View File