WiimoteConfigDiag: Split UI sizer creation into their own functions.
This commit is contained in:
Lioncash
parent
d17a054e75
commit
94d033020e
|
|
@ -1,3 +1,4 @@
|
||||||
|
#include <array>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
@ -34,197 +35,12 @@ WiimoteConfigDiag::WiimoteConfigDiag(wxWindow* const parent, InputConfig& config
|
||||||
{
|
{
|
||||||
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
|
wxBoxSizer* const main_sizer = new wxBoxSizer(wxVERTICAL);
|
||||||
|
|
||||||
|
// Combine all UI controls into their own encompassing sizer.
|
||||||
|
wxBoxSizer* control_sizer = new wxBoxSizer(wxVERTICAL);
|
||||||
|
control_sizer->Add(CreateGamecubeSizer(), 0, wxEXPAND | wxALL, 5);
|
||||||
|
control_sizer->Add(CreateWiimoteConfigSizer(), 0, wxEXPAND | wxALL, 5);
|
||||||
|
|
||||||
// "Wiimotes" controls
|
main_sizer->Add(control_sizer, 0, wxEXPAND);
|
||||||
wxStaticText* wiimote_label[4];
|
|
||||||
wxChoice* wiimote_source_ch[4];
|
|
||||||
|
|
||||||
for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
|
|
||||||
{
|
|
||||||
wxString wiimote_str = wxString::Format(_("Wiimote %i"), i + 1);
|
|
||||||
|
|
||||||
const wxString src_choices[] = { _("None"),
|
|
||||||
_("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote") };
|
|
||||||
|
|
||||||
// reserve four ids, so that we can calculate the index from the ids later on
|
|
||||||
// Stupid wx 2.8 doesn't support reserving sequential IDs, so we need to do that more complicated..
|
|
||||||
int source_ctrl_id = wxWindow::NewControlId();
|
|
||||||
m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, i));
|
|
||||||
|
|
||||||
int config_bt_id = wxWindow::NewControlId();
|
|
||||||
m_wiimote_index_from_conf_bt_id.insert(std::pair<wxWindowID, unsigned int>(config_bt_id, i));
|
|
||||||
|
|
||||||
wiimote_label[i] = new wxStaticText(this, wxID_ANY, wiimote_str);
|
|
||||||
wiimote_source_ch[i] = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, sizeof(src_choices)/sizeof(*src_choices), src_choices);
|
|
||||||
wiimote_source_ch[i]->Bind(wxEVT_CHOICE, &WiimoteConfigDiag::SelectSource, this);
|
|
||||||
wiimote_configure_bt[i] = new wxButton(this, config_bt_id, _("Configure"));
|
|
||||||
wiimote_configure_bt[i]->Bind(wxEVT_BUTTON, &WiimoteConfigDiag::ConfigEmulatedWiimote, this);
|
|
||||||
|
|
||||||
m_orig_wiimote_sources[i] = g_wiimote_sources[i];
|
|
||||||
wiimote_source_ch[i]->Select(m_orig_wiimote_sources[i]);
|
|
||||||
if (m_orig_wiimote_sources[i] != WIIMOTE_SRC_EMU && m_orig_wiimote_sources[i] != WIIMOTE_SRC_HYBRID)
|
|
||||||
wiimote_configure_bt[i]->Disable();
|
|
||||||
}
|
|
||||||
|
|
||||||
// "Wiimotes" layout
|
|
||||||
// TODO: Give sizers better names
|
|
||||||
wxStaticBoxSizer* const wiimote_group = new wxStaticBoxSizer(wxVERTICAL,this, _("Wiimotes"));
|
|
||||||
wxBoxSizer* const wiimote_control_section = new wxBoxSizer(wxHORIZONTAL);
|
|
||||||
wxFlexGridSizer* const wiimote_sizer = new wxFlexGridSizer(3, 5, 5);
|
|
||||||
for (unsigned int i = 0; i < 4; ++i)
|
|
||||||
{
|
|
||||||
wiimote_sizer->Add(wiimote_label[i], 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
wiimote_sizer->Add(wiimote_source_ch[i], 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
wiimote_sizer->Add(wiimote_configure_bt[i]);
|
|
||||||
}
|
|
||||||
wiimote_control_section->Add(wiimote_sizer, 1, wxEXPAND, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
// "BalanceBoard" layout
|
|
||||||
wxStaticBoxSizer* const bb_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Balance Board"));
|
|
||||||
wxFlexGridSizer* const bb_sizer = new wxFlexGridSizer(1, 5, 5);
|
|
||||||
int source_ctrl_id = wxWindow::NewControlId();
|
|
||||||
m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, WIIMOTE_BALANCE_BOARD));
|
|
||||||
const wxString src_choices[] = { _("None"), _("Real Balance Board") };
|
|
||||||
wxChoice* bb_source = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, sizeof(src_choices)/sizeof(*src_choices), src_choices);
|
|
||||||
bb_source->Bind(wxEVT_CHOICE, &WiimoteConfigDiag::SelectSource, this);
|
|
||||||
|
|
||||||
m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] = g_wiimote_sources[WIIMOTE_BALANCE_BOARD];
|
|
||||||
bb_source->Select(m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] ? 1 : 0);
|
|
||||||
|
|
||||||
bb_sizer->Add(bb_source, 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
|
|
||||||
bb_group->Add(bb_sizer, 1, wxEXPAND, 5 );
|
|
||||||
|
|
||||||
|
|
||||||
// "Real wiimotes" controls
|
|
||||||
wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"));
|
|
||||||
refresh_btn->Bind(wxEVT_BUTTON, &WiimoteConfigDiag::RefreshRealWiimotes, this);
|
|
||||||
|
|
||||||
wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimotes"));
|
|
||||||
|
|
||||||
wxBoxSizer* const real_wiimotes_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
||||||
|
|
||||||
if (!WiimoteReal::g_wiimote_scanner.IsReady())
|
|
||||||
real_wiimotes_group->Add(new wxStaticText(this, -1, _("A supported bluetooth device could not be found.\n"
|
|
||||||
"You must manually connect your wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5);
|
|
||||||
|
|
||||||
wxCheckBox* const continuous_scanning = new wxCheckBox(this, wxID_ANY, _("Continuous Scanning"));
|
|
||||||
continuous_scanning->Bind(wxEVT_CHECKBOX, &WiimoteConfigDiag::OnContinuousScanning, this);
|
|
||||||
continuous_scanning->SetValue(SConfig::GetInstance().m_WiimoteContinuousScanning);
|
|
||||||
|
|
||||||
real_wiimotes_sizer->Add(continuous_scanning, 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
real_wiimotes_sizer->AddStretchSpacer(1);
|
|
||||||
real_wiimotes_sizer->Add(refresh_btn, 0, wxALL | wxALIGN_CENTER, 5);
|
|
||||||
|
|
||||||
real_wiimotes_group->Add(real_wiimotes_sizer, 0, wxEXPAND);
|
|
||||||
|
|
||||||
// "General Settings" controls
|
|
||||||
const wxString str[] = { _("Bottom"), _("Top") };
|
|
||||||
wxChoice* const WiiSensBarPos = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, str);
|
|
||||||
wxSlider* const WiiSensBarSens = new wxSlider(this, wxID_ANY, 0, 0, 4);
|
|
||||||
wxSlider* const WiimoteSpkVolume = new wxSlider(this, wxID_ANY, 0, 0, 127);
|
|
||||||
wxCheckBox* const WiimoteMotor = new wxCheckBox(this, wxID_ANY, _("Wiimote Motor"));
|
|
||||||
|
|
||||||
auto wiimote_speaker = new wxCheckBox(this, wxID_ANY, _("Enable Speaker Data"));
|
|
||||||
wiimote_speaker->Bind(wxEVT_CHECKBOX, &WiimoteConfigDiag::OnEnableSpeaker, this);
|
|
||||||
wiimote_speaker->SetValue(SConfig::GetInstance().m_WiimoteEnableSpeaker);
|
|
||||||
|
|
||||||
wxStaticText* const WiiSensBarPosText = new wxStaticText(this, wxID_ANY, _("Sensor Bar Position:"));
|
|
||||||
wxStaticText* const WiiSensBarSensText = new wxStaticText(this, wxID_ANY, _("IR Sensitivity:"));
|
|
||||||
wxStaticText* const WiiSensBarSensMinText = new wxStaticText(this, wxID_ANY, _("Min"));
|
|
||||||
wxStaticText* const WiiSensBarSensMaxText = new wxStaticText(this, wxID_ANY, _("Max"));
|
|
||||||
wxStaticText* const WiimoteSpkVolumeText = new wxStaticText(this, wxID_ANY, _("Speaker Volume:"));
|
|
||||||
wxStaticText* const WiimoteSpkVolumeMinText = new wxStaticText(this, wxID_ANY, _("Min"));
|
|
||||||
wxStaticText* const WiimoteSpkVolumeMaxText = new wxStaticText(this, wxID_ANY, _("Max"));
|
|
||||||
|
|
||||||
// With some GTK themes, no minimum size will be applied - so do this manually here
|
|
||||||
WiiSensBarSens->SetMinSize(wxSize(100,-1));
|
|
||||||
WiimoteSpkVolume->SetMinSize(wxSize(100,-1));
|
|
||||||
|
|
||||||
|
|
||||||
// Disable some controls when emulation is running
|
|
||||||
if (Core::GetState() != Core::CORE_UNINITIALIZED)
|
|
||||||
{
|
|
||||||
WiiSensBarPos->Disable();
|
|
||||||
WiiSensBarSens->Disable();
|
|
||||||
WiimoteSpkVolume->Disable();
|
|
||||||
WiimoteMotor->Disable();
|
|
||||||
WiiSensBarPosText->Disable();
|
|
||||||
WiiSensBarSensText->Disable();
|
|
||||||
WiiSensBarSensMinText->Disable();
|
|
||||||
WiiSensBarSensMaxText->Disable();
|
|
||||||
WiimoteSpkVolumeText->Disable();
|
|
||||||
WiimoteSpkVolumeMinText->Disable();
|
|
||||||
WiimoteSpkVolumeMaxText->Disable();
|
|
||||||
if (NetPlay::IsNetPlayRunning())
|
|
||||||
{
|
|
||||||
bb_source->Disable();
|
|
||||||
for (int i = 0; i < 4; ++i)
|
|
||||||
{
|
|
||||||
wiimote_label[i]->Disable();
|
|
||||||
wiimote_source_ch[i]->Disable();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// "General Settings" initialization
|
|
||||||
WiiSensBarPos->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.BAR"));
|
|
||||||
WiiSensBarSens->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u32>("BT.SENS"));
|
|
||||||
WiimoteSpkVolume->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.SPKV"));
|
|
||||||
WiimoteMotor->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<bool>("BT.MOT"));
|
|
||||||
|
|
||||||
WiiSensBarPos->Bind(wxEVT_CHOICE, &WiimoteConfigDiag::OnSensorBarPos, this);
|
|
||||||
WiiSensBarSens->Bind(wxEVT_SLIDER, &WiimoteConfigDiag::OnSensorBarSensitivity, this);
|
|
||||||
WiimoteSpkVolume->Bind(wxEVT_SLIDER, &WiimoteConfigDiag::OnSpeakerVolume, this);
|
|
||||||
WiimoteMotor->Bind(wxEVT_CHECKBOX, &WiimoteConfigDiag::OnMotor, this);
|
|
||||||
|
|
||||||
|
|
||||||
// "General Settings" layout
|
|
||||||
wxStaticBoxSizer* const general_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("General Settings"));
|
|
||||||
wxFlexGridSizer* const choice_sizer = new wxFlexGridSizer(2, 5, 5);
|
|
||||||
|
|
||||||
wxBoxSizer* const sensbarsens_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
||||||
sensbarsens_sizer->Add(WiiSensBarSensMinText, 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
sensbarsens_sizer->Add(WiiSensBarSens);
|
|
||||||
sensbarsens_sizer->Add(WiiSensBarSensMaxText, 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
|
|
||||||
wxBoxSizer* const spkvol_sizer = new wxBoxSizer(wxHORIZONTAL);
|
|
||||||
spkvol_sizer->Add(WiimoteSpkVolumeMinText, 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
spkvol_sizer->Add(WiimoteSpkVolume);
|
|
||||||
spkvol_sizer->Add(WiimoteSpkVolumeMaxText, 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
|
|
||||||
choice_sizer->Add(WiiSensBarPosText, 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
choice_sizer->Add(WiiSensBarPos);
|
|
||||||
choice_sizer->Add(WiiSensBarSensText, 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
choice_sizer->Add(sensbarsens_sizer);
|
|
||||||
choice_sizer->Add(WiimoteSpkVolumeText, 0, wxALIGN_CENTER_VERTICAL);
|
|
||||||
choice_sizer->Add(spkvol_sizer);
|
|
||||||
|
|
||||||
wxGridSizer* const general_wiimote_sizer = new wxGridSizer(1, 5, 5);
|
|
||||||
general_wiimote_sizer->Add(WiimoteMotor);
|
|
||||||
general_wiimote_sizer->Add(wiimote_speaker, 0);
|
|
||||||
|
|
||||||
general_sizer->Add(choice_sizer);
|
|
||||||
general_sizer->Add(general_wiimote_sizer);
|
|
||||||
|
|
||||||
// Combine all wiimote UI.
|
|
||||||
wiimote_group->Add(wiimote_control_section, 0, wxEXPAND | wxALL);
|
|
||||||
wiimote_group->AddSpacer(5);
|
|
||||||
wiimote_group->Add(bb_group, 0, wxEXPAND | wxALL);
|
|
||||||
wiimote_group->Add(real_wiimotes_group, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM);
|
|
||||||
wiimote_group->Add(general_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM);
|
|
||||||
|
|
||||||
// Combine all Wiimote UI controls into their own encompassing sizer.
|
|
||||||
wxBoxSizer* wiimote_section = new wxBoxSizer(wxVERTICAL);
|
|
||||||
wiimote_section->Add(CreateGamecubeSizer(), 0, wxEXPAND | wxALL, 5);
|
|
||||||
wiimote_section->Add(wiimote_group, 0, wxEXPAND | wxALL, 5);
|
|
||||||
/*wiimote_section->Add(bb_group, 0, wxEXPAND | wxALL, 5);
|
|
||||||
wiimote_section->Add(real_wiimotes_group, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
|
|
||||||
wiimote_section->Add(general_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);*/
|
|
||||||
|
|
||||||
// TODO: Rename wiimote_section to something else.
|
|
||||||
main_sizer->Add(wiimote_section, 0, wxEXPAND);
|
|
||||||
main_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
|
main_sizer->Add(CreateButtonSizer(wxOK | wxCANCEL), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM, 5);
|
||||||
|
|
||||||
Bind(wxEVT_BUTTON, &WiimoteConfigDiag::Save, this, wxID_OK);
|
Bind(wxEVT_BUTTON, &WiimoteConfigDiag::Save, this, wxID_OK);
|
||||||
|
|
@ -276,6 +92,209 @@ wxStaticBoxSizer* WiimoteConfigDiag::CreateGamecubeSizer()
|
||||||
return gamecube_static_sizer;
|
return gamecube_static_sizer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
wxStaticBoxSizer* WiimoteConfigDiag::CreateWiimoteConfigSizer()
|
||||||
|
{
|
||||||
|
wxStaticText* wiimote_label[4];
|
||||||
|
wxChoice* wiimote_source_ch[4];
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
|
||||||
|
{
|
||||||
|
wxString wiimote_str = wxString::Format(_("Wiimote %i"), i + 1);
|
||||||
|
|
||||||
|
static const std::array<wxString, 4> src_choices = {{
|
||||||
|
_("None"), _("Emulated Wiimote"), _("Real Wiimote"), _("Hybrid Wiimote")
|
||||||
|
}};
|
||||||
|
|
||||||
|
// reserve four ids, so that we can calculate the index from the ids later on
|
||||||
|
// Stupid wx 2.8 doesn't support reserving sequential IDs, so we need to do that more complicated..
|
||||||
|
int source_ctrl_id = wxWindow::NewControlId();
|
||||||
|
m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, i));
|
||||||
|
|
||||||
|
int config_bt_id = wxWindow::NewControlId();
|
||||||
|
m_wiimote_index_from_conf_bt_id.insert(std::pair<wxWindowID, unsigned int>(config_bt_id, i));
|
||||||
|
|
||||||
|
wiimote_label[i] = new wxStaticText(this, wxID_ANY, wiimote_str);
|
||||||
|
wiimote_source_ch[i] = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, src_choices.size(), src_choices.data());
|
||||||
|
wiimote_source_ch[i]->Bind(wxEVT_CHOICE, &WiimoteConfigDiag::SelectSource, this);
|
||||||
|
wiimote_configure_bt[i] = new wxButton(this, config_bt_id, _("Configure"));
|
||||||
|
wiimote_configure_bt[i]->Bind(wxEVT_BUTTON, &WiimoteConfigDiag::ConfigEmulatedWiimote, this);
|
||||||
|
|
||||||
|
m_orig_wiimote_sources[i] = g_wiimote_sources[i];
|
||||||
|
wiimote_source_ch[i]->Select(m_orig_wiimote_sources[i]);
|
||||||
|
if (m_orig_wiimote_sources[i] != WIIMOTE_SRC_EMU && m_orig_wiimote_sources[i] != WIIMOTE_SRC_HYBRID)
|
||||||
|
wiimote_configure_bt[i]->Disable();
|
||||||
|
}
|
||||||
|
|
||||||
|
// "Wiimotes" layout
|
||||||
|
wxStaticBoxSizer* const wiimote_group = new wxStaticBoxSizer(wxVERTICAL,this, _("Wiimotes"));
|
||||||
|
wxBoxSizer* const wiimote_control_section = new wxBoxSizer(wxHORIZONTAL);
|
||||||
|
wxFlexGridSizer* const wiimote_sizer = new wxFlexGridSizer(3, 5, 5);
|
||||||
|
for (unsigned int i = 0; i < 4; ++i)
|
||||||
|
{
|
||||||
|
wiimote_sizer->Add(wiimote_label[i], 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
wiimote_sizer->Add(wiimote_source_ch[i], 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
wiimote_sizer->Add(wiimote_configure_bt[i]);
|
||||||
|
}
|
||||||
|
wiimote_control_section->Add(wiimote_sizer, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
// TODO: Move to wiimote sizer creation.
|
||||||
|
// Disable some controls when emulation is running
|
||||||
|
if (Core::GetState() != Core::CORE_UNINITIALIZED && NetPlay::IsNetPlayRunning())
|
||||||
|
{
|
||||||
|
for (int i = 0; i < 4; ++i)
|
||||||
|
{
|
||||||
|
wiimote_label[i]->Disable();
|
||||||
|
wiimote_source_ch[i]->Disable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Combine all wiimote UI.
|
||||||
|
wiimote_group->Add(wiimote_control_section, 0, wxEXPAND | wxALL);
|
||||||
|
wiimote_group->AddSpacer(5);
|
||||||
|
wiimote_group->Add(CreateBalanceBoardSizer(), 0, wxEXPAND | wxALL);
|
||||||
|
wiimote_group->Add(CreateRealWiimoteSizer(), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM);
|
||||||
|
wiimote_group->Add(CreateGeneralWiimoteSettingsSizer(), 0, wxEXPAND | wxLEFT | wxRIGHT | wxBOTTOM);
|
||||||
|
|
||||||
|
return wiimote_group;
|
||||||
|
}
|
||||||
|
|
||||||
|
wxStaticBoxSizer* WiimoteConfigDiag::CreateBalanceBoardSizer()
|
||||||
|
{
|
||||||
|
wxStaticBoxSizer* const bb_group = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Balance Board"));
|
||||||
|
wxFlexGridSizer* const bb_sizer = new wxFlexGridSizer(1, 5, 5);
|
||||||
|
int source_ctrl_id = wxWindow::NewControlId();
|
||||||
|
|
||||||
|
m_wiimote_index_from_ctrl_id.insert(std::pair<wxWindowID, unsigned int>(source_ctrl_id, WIIMOTE_BALANCE_BOARD));
|
||||||
|
|
||||||
|
static const std::array<wxString, 2> src_choices = {{
|
||||||
|
("None"), _("Real Balance Board")
|
||||||
|
}};
|
||||||
|
|
||||||
|
wxChoice* const bb_source = new wxChoice(this, source_ctrl_id, wxDefaultPosition, wxDefaultSize, src_choices.size(), src_choices.data());
|
||||||
|
bb_source->Bind(wxEVT_CHOICE, &WiimoteConfigDiag::SelectSource, this);
|
||||||
|
|
||||||
|
m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] = g_wiimote_sources[WIIMOTE_BALANCE_BOARD];
|
||||||
|
bb_source->Select(m_orig_wiimote_sources[WIIMOTE_BALANCE_BOARD] ? 1 : 0);
|
||||||
|
|
||||||
|
bb_sizer->Add(bb_source, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
|
||||||
|
bb_group->Add(bb_sizer, 1, wxEXPAND, 5);
|
||||||
|
|
||||||
|
// Disable when emulation is running.
|
||||||
|
if (Core::GetState() != Core::CORE_UNINITIALIZED)
|
||||||
|
bb_source->Disable();
|
||||||
|
|
||||||
|
return bb_group;
|
||||||
|
}
|
||||||
|
|
||||||
|
wxStaticBoxSizer* WiimoteConfigDiag::CreateRealWiimoteSizer()
|
||||||
|
{
|
||||||
|
// "Real wiimotes" controls
|
||||||
|
wxButton* const refresh_btn = new wxButton(this, -1, _("Refresh"));
|
||||||
|
refresh_btn->Bind(wxEVT_BUTTON, &WiimoteConfigDiag::RefreshRealWiimotes, this);
|
||||||
|
|
||||||
|
wxStaticBoxSizer* const real_wiimotes_group = new wxStaticBoxSizer(wxVERTICAL, this, _("Real Wiimotes"));
|
||||||
|
wxBoxSizer* const real_wiimotes_sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||||
|
|
||||||
|
if (!WiimoteReal::g_wiimote_scanner.IsReady())
|
||||||
|
real_wiimotes_group->Add(new wxStaticText(this, -1, _("A supported bluetooth device could not be found.\n"
|
||||||
|
"You must manually connect your wiimotes.")), 0, wxALIGN_CENTER | wxALL, 5);
|
||||||
|
|
||||||
|
wxCheckBox* const continuous_scanning = new wxCheckBox(this, wxID_ANY, _("Continuous Scanning"));
|
||||||
|
continuous_scanning->Bind(wxEVT_CHECKBOX, &WiimoteConfigDiag::OnContinuousScanning, this);
|
||||||
|
continuous_scanning->SetValue(SConfig::GetInstance().m_WiimoteContinuousScanning);
|
||||||
|
|
||||||
|
real_wiimotes_sizer->Add(continuous_scanning, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
real_wiimotes_sizer->AddStretchSpacer(1);
|
||||||
|
real_wiimotes_sizer->Add(refresh_btn, 0, wxALL | wxALIGN_CENTER, 5);
|
||||||
|
|
||||||
|
real_wiimotes_group->Add(real_wiimotes_sizer, 0, wxEXPAND);
|
||||||
|
|
||||||
|
return real_wiimotes_group;
|
||||||
|
}
|
||||||
|
|
||||||
|
wxStaticBoxSizer* WiimoteConfigDiag::CreateGeneralWiimoteSettingsSizer()
|
||||||
|
{
|
||||||
|
const wxString str[] = { _("Bottom"), _("Top") };
|
||||||
|
wxChoice* const WiiSensBarPos = new wxChoice(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 2, str);
|
||||||
|
wxSlider* const WiiSensBarSens = new wxSlider(this, wxID_ANY, 0, 0, 4);
|
||||||
|
wxSlider* const WiimoteSpkVolume = new wxSlider(this, wxID_ANY, 0, 0, 127);
|
||||||
|
wxCheckBox* const WiimoteMotor = new wxCheckBox(this, wxID_ANY, _("Wiimote Motor"));
|
||||||
|
|
||||||
|
auto wiimote_speaker = new wxCheckBox(this, wxID_ANY, _("Enable Speaker Data"));
|
||||||
|
wiimote_speaker->Bind(wxEVT_CHECKBOX, &WiimoteConfigDiag::OnEnableSpeaker, this);
|
||||||
|
wiimote_speaker->SetValue(SConfig::GetInstance().m_WiimoteEnableSpeaker);
|
||||||
|
|
||||||
|
wxStaticText* const WiiSensBarPosText = new wxStaticText(this, wxID_ANY, _("Sensor Bar Position:"));
|
||||||
|
wxStaticText* const WiiSensBarSensText = new wxStaticText(this, wxID_ANY, _("IR Sensitivity:"));
|
||||||
|
wxStaticText* const WiiSensBarSensMinText = new wxStaticText(this, wxID_ANY, _("Min"));
|
||||||
|
wxStaticText* const WiiSensBarSensMaxText = new wxStaticText(this, wxID_ANY, _("Max"));
|
||||||
|
wxStaticText* const WiimoteSpkVolumeText = new wxStaticText(this, wxID_ANY, _("Speaker Volume:"));
|
||||||
|
wxStaticText* const WiimoteSpkVolumeMinText = new wxStaticText(this, wxID_ANY, _("Min"));
|
||||||
|
wxStaticText* const WiimoteSpkVolumeMaxText = new wxStaticText(this, wxID_ANY, _("Max"));
|
||||||
|
|
||||||
|
// With some GTK themes, no minimum size will be applied - so do this manually here
|
||||||
|
WiiSensBarSens->SetMinSize(wxSize(100,-1));
|
||||||
|
WiimoteSpkVolume->SetMinSize(wxSize(100,-1));
|
||||||
|
|
||||||
|
// Disable some controls when emulation is running
|
||||||
|
if (Core::GetState() != Core::CORE_UNINITIALIZED)
|
||||||
|
{
|
||||||
|
WiiSensBarPos->Disable();
|
||||||
|
WiiSensBarSens->Disable();
|
||||||
|
WiimoteSpkVolume->Disable();
|
||||||
|
WiimoteMotor->Disable();
|
||||||
|
WiiSensBarPosText->Disable();
|
||||||
|
WiiSensBarSensText->Disable();
|
||||||
|
WiiSensBarSensMinText->Disable();
|
||||||
|
WiiSensBarSensMaxText->Disable();
|
||||||
|
WiimoteSpkVolumeText->Disable();
|
||||||
|
WiimoteSpkVolumeMinText->Disable();
|
||||||
|
WiimoteSpkVolumeMaxText->Disable();
|
||||||
|
}
|
||||||
|
|
||||||
|
// "General Settings" initialization
|
||||||
|
WiiSensBarPos->SetSelection(SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.BAR"));
|
||||||
|
WiiSensBarSens->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u32>("BT.SENS"));
|
||||||
|
WiimoteSpkVolume->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<u8>("BT.SPKV"));
|
||||||
|
WiimoteMotor->SetValue(SConfig::GetInstance().m_SYSCONF->GetData<bool>("BT.MOT"));
|
||||||
|
|
||||||
|
WiiSensBarPos->Bind(wxEVT_CHOICE, &WiimoteConfigDiag::OnSensorBarPos, this);
|
||||||
|
WiiSensBarSens->Bind(wxEVT_SLIDER, &WiimoteConfigDiag::OnSensorBarSensitivity, this);
|
||||||
|
WiimoteSpkVolume->Bind(wxEVT_SLIDER, &WiimoteConfigDiag::OnSpeakerVolume, this);
|
||||||
|
WiimoteMotor->Bind(wxEVT_CHECKBOX, &WiimoteConfigDiag::OnMotor, this);
|
||||||
|
|
||||||
|
// "General Settings" layout
|
||||||
|
wxStaticBoxSizer* const general_sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("General Settings"));
|
||||||
|
wxFlexGridSizer* const choice_sizer = new wxFlexGridSizer(2, 5, 5);
|
||||||
|
|
||||||
|
wxBoxSizer* const sensbarsens_sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||||
|
sensbarsens_sizer->Add(WiiSensBarSensMinText, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
sensbarsens_sizer->Add(WiiSensBarSens);
|
||||||
|
sensbarsens_sizer->Add(WiiSensBarSensMaxText, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
|
||||||
|
wxBoxSizer* const spkvol_sizer = new wxBoxSizer(wxHORIZONTAL);
|
||||||
|
spkvol_sizer->Add(WiimoteSpkVolumeMinText, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
spkvol_sizer->Add(WiimoteSpkVolume);
|
||||||
|
spkvol_sizer->Add(WiimoteSpkVolumeMaxText, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
|
||||||
|
choice_sizer->Add(WiiSensBarPosText, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
choice_sizer->Add(WiiSensBarPos);
|
||||||
|
choice_sizer->Add(WiiSensBarSensText, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
choice_sizer->Add(sensbarsens_sizer);
|
||||||
|
choice_sizer->Add(WiimoteSpkVolumeText, 0, wxALIGN_CENTER_VERTICAL);
|
||||||
|
choice_sizer->Add(spkvol_sizer);
|
||||||
|
|
||||||
|
wxGridSizer* const general_wiimote_sizer = new wxGridSizer(1, 5, 5);
|
||||||
|
general_wiimote_sizer->Add(WiimoteMotor);
|
||||||
|
general_wiimote_sizer->Add(wiimote_speaker, 0);
|
||||||
|
|
||||||
|
general_sizer->Add(choice_sizer);
|
||||||
|
general_sizer->Add(general_wiimote_sizer);
|
||||||
|
|
||||||
|
return general_sizer;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void WiimoteConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev)
|
void WiimoteConfigDiag::ConfigEmulatedWiimote(wxCommandEvent& ev)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -61,6 +61,10 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxStaticBoxSizer* CreateGamecubeSizer();
|
wxStaticBoxSizer* CreateGamecubeSizer();
|
||||||
|
wxStaticBoxSizer* CreateWiimoteConfigSizer();
|
||||||
|
wxStaticBoxSizer* CreateBalanceBoardSizer();
|
||||||
|
wxStaticBoxSizer* CreateRealWiimoteSizer();
|
||||||
|
wxStaticBoxSizer* CreateGeneralWiimoteSettingsSizer();
|
||||||
void Cancel(wxCommandEvent& event);
|
void Cancel(wxCommandEvent& event);
|
||||||
|
|
||||||
InputConfig& m_config;
|
InputConfig& m_config;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue