diff options
| author | John Peterson <jpeterson57@gmail.com> | 2009-11-12 18:57:35 +0000 |
|---|---|---|
| committer | John Peterson <jpeterson57@gmail.com> | 2009-11-12 18:57:35 +0000 |
| commit | 71506bc0f7c7fcf445a71d7973c3cebc73dd0ba6 (patch) | |
| tree | 749d3f053cd067c9401b6a91e83c76adb06d035b /Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp | |
| parent | b858befba24c8a31cab82dd7534b91e5606db5e9 (diff) | |
Wiimote and nJoy > Gamepad changes
1. Added LiveUpdates, while the configuration window is open nJoy and Wiimote will check for connected/disconnected pads
2. Removed the 'Nintendo RVL-CNT-01' device from the device list, and other SDL devices with no axes/buttons
3. Added SDL (from the current SVN) to get debugging information for SDL.dll
4. Added 'Upright Wiimote' option to emulated Wiimote options
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4534 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp index e3ced1e631..b23b91e211 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigBasicDlg.cpp @@ -34,6 +34,7 @@ BEGIN_EVENT_TABLE(WiimoteBasicConfigDialog,wxDialog) EVT_CHECKBOX(ID_CONNECT_REAL, WiimoteBasicConfigDialog::GeneralSettingsChanged) EVT_CHECKBOX(ID_USE_REAL, WiimoteBasicConfigDialog::GeneralSettingsChanged) EVT_CHECKBOX(ID_SIDEWAYSDPAD, WiimoteBasicConfigDialog::GeneralSettingsChanged) + EVT_CHECKBOX(ID_UPRIGHTWIIMOTE, WiimoteBasicConfigDialog::GeneralSettingsChanged) EVT_CHECKBOX(ID_MOTIONPLUSCONNECTED, WiimoteBasicConfigDialog::GeneralSettingsChanged) EVT_CHOICE(ID_EXTCONNECTED, WiimoteBasicConfigDialog::GeneralSettingsChanged) // IR cursor @@ -207,9 +208,9 @@ void WiimoteBasicConfigDialog::CreateGUIControls() // Emulated Wiimote m_SidewaysDPad[i] = new wxCheckBox(m_Controller[i], ID_SIDEWAYSDPAD, wxT("Sideways D-Pad")); m_SidewaysDPad[i]->SetValue(g_Config.bSidewaysDPad); - - m_SizeEmu[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Emulated Wiimote")); - m_SizeEmu[i]->Add(m_SidewaysDPad[i], 0, wxEXPAND | wxALL, 5); + m_UprightWiimote[i] = new wxCheckBox(m_Controller[i], ID_UPRIGHTWIIMOTE, wxT("Upright Wiimote")); + m_UprightWiimote[i]->SetValue(g_Config.Trigger.Upright); + m_UprightWiimote[i]->SetToolTip(wxT("Treat the upright position as neutral for roll and pitch")); //IR Pointer m_TextScreenWidth[i] = new wxStaticText(m_Controller[i], wxID_ANY, wxT("Width: 000")); @@ -251,6 +252,12 @@ void WiimoteBasicConfigDialog::CreateGUIControls() m_CheckAR169[i]->Enable(false); m_Crop[i]->Enable(false); + // Sizers + + m_SizeEmu[i] = new wxStaticBoxSizer(wxVERTICAL, m_Controller[i], wxT("Emulated Wiimote")); + m_SizeEmu[i]->Add(m_SidewaysDPad[i], 0, wxEXPAND | wxALL, 5); + m_SizeEmu[i]->Add(m_UprightWiimote[i], 0, wxEXPAND | (wxLEFT | wxDOWN | wxRIGHT), 5); + m_SizerIRPointerScreen[i] = new wxBoxSizer(wxHORIZONTAL); m_SizerIRPointerScreen[i]->Add(m_TextAR[i], 0, wxEXPAND | (wxTOP), 0); m_SizerIRPointerScreen[i]->Add(m_CheckAR43[i], 0, wxEXPAND | (wxLEFT), 5); @@ -391,6 +398,9 @@ void WiimoteBasicConfigDialog::GeneralSettingsChanged(wxCommandEvent& event) case ID_SIDEWAYSDPAD: g_Config.bSidewaysDPad = m_SidewaysDPad[Page]->IsChecked(); + break; + case ID_UPRIGHTWIIMOTE: + g_Config.Trigger.Upright = m_UprightWiimote[Page]->IsChecked(); break; case ID_MOTIONPLUSCONNECTED: |