Skip to content

Commit

Permalink
Mapping UI: Reorganize wiimote extension layouts a bit so things fit …
Browse files Browse the repository at this point in the history 
…better.
  • Loading branch information
@jordan-woyak
jordan-woyak committed Dec 29, 2018
1 parent 9700730 commit def5c6e
Showing 1 changed file with 22 additions and 16 deletions.
38 changes: 22 additions & 16 deletions Source/Core/DolphinQt/Config/Mapping/WiimoteEmuExtension.cpp
View file
Expand Up @@ -54,14 +54,14 @@ void WiimoteEmuExtension::CreateDrumsLayout()
auto* hbox = new QHBoxLayout(); auto* hbox = new QHBoxLayout();
m_drums_box = new QGroupBox(tr("Drums"), this); m_drums_box = new QGroupBox(tr("Drums"), this);


hbox->addWidget(CreateGroupBox( hbox->addWidget(CreateGroupBox(tr("Stick"),
tr("Buttons"), Wiimote::GetDrumsGroup(GetPort(), WiimoteEmu::DrumsGroup::Buttons))); Wiimote::GetDrumsGroup(GetPort(), WiimoteEmu::DrumsGroup::Stick)));


auto* vbox = new QVBoxLayout(); auto* vbox = new QVBoxLayout();
vbox->addWidget( vbox->addWidget(
CreateGroupBox(tr("Pads"), Wiimote::GetDrumsGroup(GetPort(), WiimoteEmu::DrumsGroup::Pads))); CreateGroupBox(tr("Pads"), Wiimote::GetDrumsGroup(GetPort(), WiimoteEmu::DrumsGroup::Pads)));
vbox->addWidget(CreateGroupBox(tr("Stick"), vbox->addWidget(CreateGroupBox(
Wiimote::GetDrumsGroup(GetPort(), WiimoteEmu::DrumsGroup::Stick))); tr("Buttons"), Wiimote::GetDrumsGroup(GetPort(), WiimoteEmu::DrumsGroup::Buttons)));
hbox->addLayout(vbox); hbox->addLayout(vbox);


m_drums_box->setLayout(hbox); m_drums_box->setLayout(hbox);
Expand Down Expand Up @@ -107,23 +107,26 @@ void WiimoteEmuExtension::CreateGuitarLayout()
m_guitar_box = new QGroupBox(tr("Guitar"), this); m_guitar_box = new QGroupBox(tr("Guitar"), this);


auto* vbox = new QVBoxLayout(); auto* vbox = new QVBoxLayout();
vbox->addWidget(CreateGroupBox(
tr("Buttons"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Buttons)));
vbox->addWidget(CreateGroupBox( vbox->addWidget(CreateGroupBox(
tr("Stick"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Stick))); tr("Stick"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Stick)));
vbox->addWidget(CreateGroupBox(
tr("Slider Bar"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::SliderBar)));
hbox->addLayout(vbox); hbox->addLayout(vbox);


auto* vbox2 = new QVBoxLayout(); auto* vbox2 = new QVBoxLayout();
vbox2->addWidget(CreateGroupBox( vbox2->addWidget(CreateGroupBox(
tr("Strum"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Strum))); tr("Strum"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Strum)));
vbox2->addWidget(CreateGroupBox( vbox2->addWidget(CreateGroupBox(
tr("Frets"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Frets))); tr("Frets"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Frets)));
vbox2->addWidget(CreateGroupBox(
tr("Whammy"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Whammy)));
hbox->addLayout(vbox2); hbox->addLayout(vbox2);


auto* vbox3 = new QVBoxLayout();
vbox3->addWidget(CreateGroupBox(
tr("Buttons"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Buttons)));
vbox3->addWidget(CreateGroupBox(
tr("Whammy"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::Whammy)));
vbox3->addWidget(CreateGroupBox(
tr("Slider Bar"), Wiimote::GetGuitarGroup(GetPort(), WiimoteEmu::GuitarGroup::SliderBar)));
hbox->addLayout(vbox3);

m_guitar_box->setLayout(hbox); m_guitar_box->setLayout(hbox);
} }


Expand All @@ -134,24 +137,27 @@ void WiimoteEmuExtension::CreateTurntableLayout()


hbox->addWidget(CreateGroupBox( hbox->addWidget(CreateGroupBox(
tr("Stick"), Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::Stick))); tr("Stick"), Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::Stick)));
hbox->addWidget(CreateGroupBox(
tr("Buttons"), Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::Buttons)));


auto* vbox = new QVBoxLayout(); auto* vbox = new QVBoxLayout();
vbox->addWidget(CreateGroupBox(
tr("Buttons"), Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::Buttons)));
vbox->addWidget(CreateGroupBox( vbox->addWidget(CreateGroupBox(
tr("Effect"), Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::EffectDial))); tr("Effect"), Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::EffectDial)));
vbox->addWidget( hbox->addLayout(vbox);

auto* vbox2 = new QVBoxLayout();
vbox2->addWidget(
// i18n: "Table" refers to a turntable // i18n: "Table" refers to a turntable
CreateGroupBox(tr("Left Table"), CreateGroupBox(tr("Left Table"),
Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::LeftTable))); Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::LeftTable)));
vbox->addWidget(CreateGroupBox( vbox2->addWidget(CreateGroupBox(
// i18n: "Table" refers to a turntable // i18n: "Table" refers to a turntable
tr("Right Table"), tr("Right Table"),
Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::RightTable))); Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::RightTable)));
vbox->addWidget( vbox2->addWidget(
CreateGroupBox(tr("Crossfade"), CreateGroupBox(tr("Crossfade"),
Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::Crossfade))); Wiimote::GetTurntableGroup(GetPort(), WiimoteEmu::TurntableGroup::Crossfade)));
hbox->addLayout(vbox); hbox->addLayout(vbox2);


m_turntable_box->setLayout(hbox); m_turntable_box->setLayout(hbox);
} }
Expand Down

0 comments on commit def5c6e

Please sign in to comment.