-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Completely redo All configuration dialog
Hotkeys Make a new class that inherits from InputConfigDialog with a specialised constructor. The changes are mainly the top portion and it now uses tabs to categorise the hotkeys. Redo the GCPad configuration dialog The layout is similar, but it now allows flexibility to change it more easily. Redo the GC Keyboard configuration dialog Same layout. Redo completely the Wiimote configuration dialog Separated the controls into 2 tabs to make them less imposing overall. Redo the Nunchuk configuration dialog Similar layout, except for 2 control group sizers. Redo the Classic controller configuration dialog Same layout. Redo the Guitar input configuration dialog Stacked 2 sets of group together. Redo the Turntable configuration dialog More stacked groups and the window is much less wide.
- Loading branch information
Showing
24 changed files
with
1,007 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| // Copyright 2016 Dolphin Emulator Project | ||
| // Licensed under GPLv2+ | ||
| // Refer to the license.txt file included. | ||
|
|
||
| #include "DolphinWX/Input/ClassicInputConfigDiag.h" | ||
|
|
||
| #include "Core/HW/Wiimote.h" | ||
|
|
||
| enum class ClassicGroup; | ||
|
|
||
| ClassicInputConfigDialog::ClassicInputConfigDialog(wxWindow* const parent, InputConfig& config, | ||
| const wxString& name, const int port_num) | ||
| : InputConfigDialog(parent, config, name, port_num) | ||
| { | ||
| const int space5 = FromDIP(5); | ||
|
|
||
| auto* const group_box_buttons = new ControlGroupBox( | ||
| Wiimote::GetClassicGroup(port_num, WiimoteEmu::ClassicGroup::Buttons), this, this); | ||
| auto* const group_box_dpad = new ControlGroupBox( | ||
| Wiimote::GetClassicGroup(port_num, WiimoteEmu::ClassicGroup::Dpad), this, this); | ||
| auto* const group_box_left_stick = new ControlGroupBox( | ||
| Wiimote::GetClassicGroup(port_num, WiimoteEmu::ClassicGroup::LeftStick), this, this); | ||
| auto* const group_box_right_stick = new ControlGroupBox( | ||
| Wiimote::GetClassicGroup(port_num, WiimoteEmu::ClassicGroup::RightStick), this, this); | ||
| auto* const group_box_triggers = new ControlGroupBox( | ||
| Wiimote::GetClassicGroup(port_num, WiimoteEmu::ClassicGroup::Triggers), this, this); | ||
|
|
||
| auto* const controls_sizer = new wxBoxSizer(wxHORIZONTAL); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_buttons, 0, wxEXPAND); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_dpad, 0, wxEXPAND); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_left_stick, 0, wxEXPAND); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_right_stick, 0, wxEXPAND); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_triggers, 0, wxEXPAND); | ||
| controls_sizer->AddSpacer(space5); | ||
|
|
||
| auto* const szr_main = new wxBoxSizer(wxVERTICAL); | ||
| szr_main->AddSpacer(space5); | ||
| szr_main->Add(controls_sizer, 1, wxEXPAND | wxLEFT | wxRIGHT, space5); | ||
| szr_main->AddSpacer(space5); | ||
| szr_main->Add(CreateButtonSizer(wxCLOSE | wxNO_DEFAULT), 0, wxEXPAND | wxLEFT | wxRIGHT, space5); | ||
| szr_main->AddSpacer(space5); | ||
|
|
||
| SetSizerAndFit(szr_main); | ||
| Center(); | ||
| UpdateGUI(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // Copyright 2016 Dolphin Emulator Project | ||
| // Licensed under GPLv2+ | ||
| // Refer to the license.txt file included. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "DolphinWX/Input/InputConfigDiag.h" | ||
|
|
||
| class ClassicInputConfigDialog final : public InputConfigDialog | ||
| { | ||
| public: | ||
| ClassicInputConfigDialog(wxWindow* parent, InputConfig& config, const wxString& name, | ||
| int port_num = 0); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // Copyright 2016 Dolphin Emulator Project | ||
| // Licensed under GPLv2+ | ||
| // Refer to the license.txt file included. | ||
|
|
||
| #include "DolphinWX/Input/DrumsInputConfigDiag.h" | ||
|
|
||
| #include "Core/HW/Wiimote.h" | ||
|
|
||
| enum class DrumsGroup; | ||
|
|
||
| DrumsInputConfigDialog::DrumsInputConfigDialog(wxWindow* const parent, InputConfig& config, | ||
| const wxString& name, const int port_num) | ||
| : InputConfigDialog(parent, config, name, port_num) | ||
| { | ||
| const int space5 = FromDIP(5); | ||
|
|
||
| auto* const group_box_buttons = new ControlGroupBox( | ||
| Wiimote::GetDrumsGroup(port_num, WiimoteEmu::DrumsGroup::Buttons), this, this); | ||
| auto* const group_box_pads = new ControlGroupBox( | ||
| Wiimote::GetDrumsGroup(port_num, WiimoteEmu::DrumsGroup::Pads), this, this); | ||
|
|
||
| auto* const buttons_pads_sizer = new wxBoxSizer(wxVERTICAL); | ||
| buttons_pads_sizer->Add(group_box_buttons); | ||
| buttons_pads_sizer->AddSpacer(space5); | ||
| buttons_pads_sizer->Add(group_box_pads); | ||
|
|
||
| auto* const group_box_stick = new ControlGroupBox( | ||
| Wiimote::GetDrumsGroup(port_num, WiimoteEmu::DrumsGroup::Stick), this, this); | ||
|
|
||
| auto* const controls_sizer = new wxBoxSizer(wxHORIZONTAL); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(buttons_pads_sizer, 0, wxEXPAND); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_stick, 0, wxEXPAND); | ||
| controls_sizer->AddSpacer(space5); | ||
|
|
||
| auto* const szr_main = new wxBoxSizer(wxVERTICAL); | ||
| szr_main->AddSpacer(space5); | ||
| szr_main->Add(controls_sizer, 1, wxEXPAND | wxLEFT | wxRIGHT, space5); | ||
| szr_main->AddSpacer(space5); | ||
| szr_main->Add(CreateButtonSizer(wxCLOSE | wxNO_DEFAULT), 0, wxEXPAND | wxLEFT | wxRIGHT, space5); | ||
| szr_main->AddSpacer(space5); | ||
|
|
||
| SetSizerAndFit(szr_main); | ||
| Center(); | ||
| UpdateGUI(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| // Copyright 2016 Dolphin Emulator Project | ||
| // Licensed under GPLv2+ | ||
| // Refer to the license.txt file included. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "DolphinWX/Input/InputConfigDiag.h" | ||
|
|
||
| class DrumsInputConfigDialog final : public InputConfigDialog | ||
| { | ||
| public: | ||
| DrumsInputConfigDialog(wxWindow* parent, InputConfig& config, const wxString& name, | ||
| int port_num = 0); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| // Copyright 2016 Dolphin Emulator Project | ||
| // Licensed under GPLv2+ | ||
| // Refer to the license.txt file included. | ||
|
|
||
| #include "DolphinWX/Input/GCKeyboardInputConfigDiag.h" | ||
|
|
||
| #include "Core/HW/GCKeyboard.h" | ||
| #include "Core/HW/GCKeyboardEmu.h" | ||
|
|
||
| enum class KeyboardGroup; | ||
|
|
||
| GCKeyboardInputConfigDialog::GCKeyboardInputConfigDialog(wxWindow* const parent, | ||
| InputConfig& config, const wxString& name, | ||
| const int port_num) | ||
| : InputConfigDialog(parent, config, name, port_num) | ||
| { | ||
| const int space5 = FromDIP(5); | ||
|
|
||
| auto* const device_chooser = CreateDeviceChooserGroupBox(); | ||
| auto* const reset_sizer = CreaterResetGroupBox(wxHORIZONTAL); | ||
| auto* const profile_chooser = CreateProfileChooserGroupBox(); | ||
|
|
||
| auto* const group_box_keys0x = | ||
| new ControlGroupBox(Keyboard::GetGroup(port_num, KeyboardGroup::Kb0x), this, this); | ||
| auto* const group_box_keys1x = | ||
| new ControlGroupBox(Keyboard::GetGroup(port_num, KeyboardGroup::Kb1x), this, this); | ||
| auto* const group_box_keys2x = | ||
| new ControlGroupBox(Keyboard::GetGroup(port_num, KeyboardGroup::Kb2x), this, this); | ||
| auto* const group_box_keys3x = | ||
| new ControlGroupBox(Keyboard::GetGroup(port_num, KeyboardGroup::Kb3x), this, this); | ||
| auto* const group_box_keys4x = | ||
| new ControlGroupBox(Keyboard::GetGroup(port_num, KeyboardGroup::Kb4x), this, this); | ||
| auto* const group_box_keys5x = | ||
| new ControlGroupBox(Keyboard::GetGroup(port_num, KeyboardGroup::Kb5x), this, this); | ||
| auto* const group_box_options = | ||
| new ControlGroupBox(Keyboard::GetGroup(port_num, KeyboardGroup::Options), this, this); | ||
|
|
||
| auto* const key5x_options_sizer = new wxBoxSizer(wxVERTICAL); | ||
| key5x_options_sizer->Add(group_box_keys5x); | ||
| key5x_options_sizer->AddSpacer(space5); | ||
| key5x_options_sizer->Add(group_box_options); | ||
|
|
||
| auto* const controls_sizer = new wxBoxSizer(wxHORIZONTAL); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_keys0x, 0, wxEXPAND | wxTOP, space5); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_keys1x, 0, wxEXPAND | wxTOP, space5); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_keys2x, 0, wxEXPAND | wxTOP, space5); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_keys3x, 0, wxEXPAND | wxTOP, space5); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(group_box_keys4x, 0, wxEXPAND | wxTOP, space5); | ||
| controls_sizer->AddSpacer(space5); | ||
| controls_sizer->Add(key5x_options_sizer, 0, wxEXPAND | wxTOP, space5); | ||
| controls_sizer->AddSpacer(space5); | ||
|
|
||
| auto* const dio = new wxBoxSizer(wxHORIZONTAL); | ||
| dio->AddSpacer(space5); | ||
| dio->Add(device_chooser, 2, wxEXPAND); | ||
| dio->AddSpacer(space5); | ||
| dio->Add(reset_sizer, 1, wxEXPAND); | ||
| dio->AddSpacer(space5); | ||
| dio->Add(profile_chooser, 2, wxEXPAND); | ||
| dio->AddSpacer(space5); | ||
|
|
||
| auto* const szr_main = new wxBoxSizer(wxVERTICAL); | ||
| szr_main->AddSpacer(space5); | ||
| szr_main->Add(dio); | ||
| szr_main->AddSpacer(space5); | ||
| szr_main->Add(controls_sizer, 1, wxEXPAND | wxLEFT | wxRIGHT, space5); | ||
| szr_main->AddSpacer(space5); | ||
| szr_main->Add(CreateButtonSizer(wxCLOSE | wxNO_DEFAULT), 0, wxEXPAND | wxLEFT | wxRIGHT, space5); | ||
| szr_main->AddSpacer(space5); | ||
|
|
||
| SetSizerAndFit(szr_main); | ||
| Center(); | ||
|
|
||
| UpdateDeviceComboBox(); | ||
| UpdateProfileComboBox(); | ||
|
|
||
| UpdateGUI(); | ||
| } |
Oops, something went wrong.