mirror of
https://github.com/RPCSX/rpcsx.git
synced 2026-04-05 06:26:49 +00:00
Clean up UI code.
- Use Bind instead of connect. It's recommended for anyone using wx 2.9+ - Remove AppConnector. All this did was destroy objects used in the UI. However, wxWidgets handles this. So it's redundant. - Misc other unimportant changes.
This commit is contained in:
Lioncash
parent
db1ca2f89f
commit
b877879db6
37 changed files with 451 additions and 542 deletions
|
|
@ -2,7 +2,7 @@
|
|||
#include "PADManager.h"
|
||||
|
||||
PADManager::PADManager(wxWindow* parent)
|
||||
: wxDialog(parent, wxID_ANY, "PAD Settings", wxDefaultPosition)
|
||||
: wxDialog(parent, wxID_ANY, "PAD Settings")
|
||||
, m_button_id(0)
|
||||
, m_key_pressed(false)
|
||||
, m_emu_paused(false)
|
||||
|
|
@ -13,62 +13,62 @@ PADManager::PADManager(wxWindow* parent)
|
|||
m_emu_paused = true;
|
||||
}
|
||||
|
||||
wxBoxSizer* s_panel(new wxBoxSizer(wxHORIZONTAL));
|
||||
wxBoxSizer* s_subpanel(new wxBoxSizer(wxVERTICAL));
|
||||
wxBoxSizer* s_subpanel2(new wxBoxSizer(wxVERTICAL));
|
||||
wxBoxSizer* s_panel = new wxBoxSizer(wxHORIZONTAL);
|
||||
wxBoxSizer* s_subpanel = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer* s_subpanel2 = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
// Left Analog Stick
|
||||
wxStaticBoxSizer* s_round_stick_l( new wxStaticBoxSizer( wxVERTICAL, this, _("Left Analog Stick") ) );
|
||||
wxBoxSizer* s_subpanel_lstick_1( new wxBoxSizer( wxVERTICAL) );
|
||||
wxBoxSizer* s_subpanel_lstick_2( new wxBoxSizer( wxHORIZONTAL) );
|
||||
wxBoxSizer* s_subpanel_lstick_3( new wxBoxSizer( wxVERTICAL) );
|
||||
wxStaticBoxSizer* s_round_stick_l = new wxStaticBoxSizer(wxVERTICAL, this, _("Left Analog Stick"));
|
||||
wxBoxSizer* s_subpanel_lstick_1 = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer* s_subpanel_lstick_2 = new wxBoxSizer(wxHORIZONTAL);
|
||||
wxBoxSizer* s_subpanel_lstick_3 = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
// D-Pad
|
||||
wxStaticBoxSizer* s_round_pad_controls( new wxStaticBoxSizer( wxVERTICAL, this, _("D-Pad") ) );
|
||||
wxBoxSizer* s_subpanel_pad_1( new wxBoxSizer( wxVERTICAL) );
|
||||
wxBoxSizer* s_subpanel_pad_2( new wxBoxSizer( wxHORIZONTAL) );
|
||||
wxBoxSizer* s_subpanel_pad_3( new wxBoxSizer( wxVERTICAL) );
|
||||
wxStaticBoxSizer* s_round_pad_controls = new wxStaticBoxSizer(wxVERTICAL, this, _("D-Pad"));
|
||||
wxBoxSizer* s_subpanel_pad_1 = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer* s_subpanel_pad_2 = new wxBoxSizer(wxHORIZONTAL);
|
||||
wxBoxSizer* s_subpanel_pad_3 = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
// Left shifts
|
||||
wxStaticBoxSizer* s_round_pad_shifts_l( new wxStaticBoxSizer( wxVERTICAL, this, _("Left Shifts") ) );
|
||||
wxStaticBoxSizer* s_round_pad_l1( new wxStaticBoxSizer( wxVERTICAL, this, _("L1") ) );
|
||||
wxStaticBoxSizer* s_round_pad_l2( new wxStaticBoxSizer( wxVERTICAL, this, _("L2") ) );
|
||||
wxStaticBoxSizer* s_round_pad_l3( new wxStaticBoxSizer( wxVERTICAL, this, _("L3") ) );
|
||||
wxStaticBoxSizer* s_round_pad_shifts_l = new wxStaticBoxSizer(wxVERTICAL, this, _("Left Shifts"));
|
||||
wxStaticBoxSizer* s_round_pad_l1 = new wxStaticBoxSizer(wxVERTICAL, this, _("L1"));
|
||||
wxStaticBoxSizer* s_round_pad_l2 = new wxStaticBoxSizer(wxVERTICAL, this, _("L2"));
|
||||
wxStaticBoxSizer* s_round_pad_l3 = new wxStaticBoxSizer(wxVERTICAL, this, _("L3"));
|
||||
|
||||
// Start / Select
|
||||
wxStaticBoxSizer* s_round_pad_system( new wxStaticBoxSizer( wxVERTICAL, this, _("System") ) );
|
||||
wxStaticBoxSizer* s_round_pad_select( new wxStaticBoxSizer( wxVERTICAL, this, _("Select") ) );
|
||||
wxStaticBoxSizer* s_round_pad_start( new wxStaticBoxSizer( wxVERTICAL, this, _("Start") ) );
|
||||
wxStaticBoxSizer* s_round_pad_system = new wxStaticBoxSizer(wxVERTICAL, this, _("System"));
|
||||
wxStaticBoxSizer* s_round_pad_select = new wxStaticBoxSizer(wxVERTICAL, this, _("Select"));
|
||||
wxStaticBoxSizer* s_round_pad_start = new wxStaticBoxSizer(wxVERTICAL, this, _("Start"));
|
||||
|
||||
// Right shifts
|
||||
wxStaticBoxSizer* s_round_pad_shifts_r( new wxStaticBoxSizer( wxVERTICAL, this, _("Right Shifts") ) );
|
||||
wxStaticBoxSizer* s_round_pad_r1( new wxStaticBoxSizer( wxVERTICAL, this, _("R1") ) );
|
||||
wxStaticBoxSizer* s_round_pad_r2( new wxStaticBoxSizer( wxVERTICAL, this, _("R2") ) );
|
||||
wxStaticBoxSizer* s_round_pad_r3( new wxStaticBoxSizer( wxVERTICAL, this, _("R3") ) );
|
||||
wxStaticBoxSizer* s_round_pad_shifts_r = new wxStaticBoxSizer(wxVERTICAL, this, _("Right Shifts"));
|
||||
wxStaticBoxSizer* s_round_pad_r1 = new wxStaticBoxSizer(wxVERTICAL, this, _("R1"));
|
||||
wxStaticBoxSizer* s_round_pad_r2 = new wxStaticBoxSizer(wxVERTICAL, this, _("R2"));
|
||||
wxStaticBoxSizer* s_round_pad_r3 = new wxStaticBoxSizer(wxVERTICAL, this, _("R3"));
|
||||
|
||||
// Action buttons
|
||||
wxStaticBoxSizer* s_round_pad_buttons( new wxStaticBoxSizer( wxVERTICAL, this, _("Buttons") ) );
|
||||
wxStaticBoxSizer* s_round_pad_square( new wxStaticBoxSizer( wxVERTICAL, this, _("Square") ) );
|
||||
wxStaticBoxSizer* s_round_pad_cross( new wxStaticBoxSizer( wxVERTICAL, this, _("Cross") ) );
|
||||
wxStaticBoxSizer* s_round_pad_circle( new wxStaticBoxSizer( wxVERTICAL, this, _("Circle") ) );
|
||||
wxStaticBoxSizer* s_round_pad_triangle( new wxStaticBoxSizer( wxVERTICAL, this, _("Triangle") ) );
|
||||
wxBoxSizer* s_subpanel_buttons_1( new wxBoxSizer( wxVERTICAL) );
|
||||
wxBoxSizer* s_subpanel_buttons_2( new wxBoxSizer( wxHORIZONTAL) );
|
||||
wxBoxSizer* s_subpanel_buttons_3( new wxBoxSizer( wxVERTICAL) );
|
||||
wxStaticBoxSizer* s_round_pad_buttons = new wxStaticBoxSizer(wxVERTICAL, this, _("Buttons"));
|
||||
wxStaticBoxSizer* s_round_pad_square = new wxStaticBoxSizer(wxVERTICAL, this, _("Square"));
|
||||
wxStaticBoxSizer* s_round_pad_cross = new wxStaticBoxSizer(wxVERTICAL, this, _("Cross"));
|
||||
wxStaticBoxSizer* s_round_pad_circle = new wxStaticBoxSizer(wxVERTICAL, this, _("Circle"));
|
||||
wxStaticBoxSizer* s_round_pad_triangle = new wxStaticBoxSizer(wxVERTICAL, this, _("Triangle"));
|
||||
wxBoxSizer* s_subpanel_buttons_1 = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer* s_subpanel_buttons_2 = new wxBoxSizer(wxHORIZONTAL);
|
||||
wxBoxSizer* s_subpanel_buttons_3 = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
// Right Analog Stick
|
||||
wxStaticBoxSizer* s_round_stick_r( new wxStaticBoxSizer( wxVERTICAL, this, _("Right Analog Stick") ) );
|
||||
wxBoxSizer* s_subpanel_rstick_1( new wxBoxSizer( wxVERTICAL) );
|
||||
wxBoxSizer* s_subpanel_rstick_2( new wxBoxSizer( wxHORIZONTAL) );
|
||||
wxBoxSizer* s_subpanel_rstick_3( new wxBoxSizer( wxVERTICAL) );
|
||||
wxStaticBoxSizer* s_round_stick_r = new wxStaticBoxSizer(wxVERTICAL, this, _("Right Analog Stick"));
|
||||
wxBoxSizer* s_subpanel_rstick_1 = new wxBoxSizer(wxVERTICAL);
|
||||
wxBoxSizer* s_subpanel_rstick_2 = new wxBoxSizer(wxHORIZONTAL);
|
||||
wxBoxSizer* s_subpanel_rstick_3 = new wxBoxSizer(wxVERTICAL);
|
||||
|
||||
// Ok / Cancel
|
||||
wxBoxSizer* s_b_panel(new wxBoxSizer(wxHORIZONTAL));
|
||||
|
||||
wxBoxSizer* s_reset_panel(new wxBoxSizer(wxHORIZONTAL));
|
||||
|
||||
#define ButtonParameters wxEmptyString, wxDefaultPosition, wxSize(60,-1)
|
||||
#define SizerFlags wxSizerFlags().Border(wxALL, 3).Center()
|
||||
#define ButtonParameters wxEmptyString, wxDefaultPosition, wxSize(60,-1)
|
||||
#define SizerFlags wxSizerFlags().Border(wxALL, 3).Center()
|
||||
|
||||
|
||||
// Buttons
|
||||
|
|
@ -206,45 +206,45 @@ PADManager::PADManager(wxWindow* parent)
|
|||
s_panel->Add(s_round_pad_buttons);
|
||||
s_panel->Add(s_round_stick_r);
|
||||
|
||||
this->SetSizerAndFit(s_panel);
|
||||
SetSizerAndFit(s_panel);
|
||||
|
||||
// Connect buttons
|
||||
m_app_connector.Connect(wxID_ANY, wxEVT_KEY_UP, wxKeyEventHandler(PADManager::OnKeyUp), (wxObject*)0, this);
|
||||
m_app_connector.Connect(wxID_ANY, wxEVT_KEY_DOWN, wxKeyEventHandler(PADManager::OnKeyDown), (wxObject*)0, this);
|
||||
Connect(b_up_lstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_down_lstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_left_lstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_right_lstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
// Bind buttons
|
||||
Bind(wxEVT_KEY_UP, &PADManager::OnKeyUp, this);
|
||||
Bind(wxEVT_KEY_DOWN, &PADManager::OnKeyDown, this);
|
||||
b_up_lstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_down_lstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_left_lstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_right_lstick->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
|
||||
Connect(b_up->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (PADManager::OnButtonClicked));
|
||||
Connect(b_down->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_left->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_right->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
b_up ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_down ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_left ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_right->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
|
||||
Connect(b_shift_l1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_shift_l2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_shift_l3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
b_shift_l1->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_shift_l2->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_shift_l3->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
|
||||
Connect(b_start->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_select->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
b_start ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_select->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
|
||||
Connect(b_shift_r1->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_shift_r2->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_shift_r3->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
b_shift_r1->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_shift_r2->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_shift_r3->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
|
||||
Connect(b_square->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_cross->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_circle->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_triangle->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
b_square ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_cross ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_circle ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_triangle->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
|
||||
Connect(b_up_rstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_down_rstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_left_rstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_right_rstick->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
b_up_rstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_down_rstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_left_rstick ->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_right_rstick->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
|
||||
Connect(b_ok->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_reset->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
Connect(b_cancel->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(PADManager::OnButtonClicked));
|
||||
b_ok->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_reset->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
b_cancel->Bind(wxEVT_BUTTON, &PADManager::OnButtonClicked, this);
|
||||
}
|
||||
|
||||
void PADManager::OnKeyDown(wxKeyEvent &keyEvent)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue