ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make hotkey dialogue display in two columns. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7146 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
smelenchuk 2011-02-12 07:09:49 +00:00
parent e867341e4f
commit 8895d6a250
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/Src/HotkeyDlg.cpp
View File

@ -184,6 +184,8 @@ void HotkeyConfigDialog::OnButtonClick(wxCommandEvent& event)
DoGetButtons(ClickedButton->GetId()); DoGetButtons(ClickedButton->GetId());
} }
#define HOTKEY_NUM_COLUMNS 2
void HotkeyConfigDialog::CreateHotkeyGUIControls(void) void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
{ {
static const wxChar* hkText[] = static const wxChar* hkText[] =
@ -234,9 +236,12 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
// A small type font // A small type font
wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL);
wxStaticBoxSizer *sHotkeys = new wxStaticBoxSizer(wxVERTICAL, this, _("Hotkeys")); wxStaticBoxSizer *sHotkeyBox = new wxStaticBoxSizer(wxVERTICAL, this, _("Hotkeys"));
wxGridSizer *sHotkeys = new wxGridSizer(HOTKEY_NUM_COLUMNS, 0, 0);
// Header line // Header line
for (int i = 0; i < HOTKEY_NUM_COLUMNS; i++)
{
wxBoxSizer *HeaderSizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *HeaderSizer = new wxBoxSizer(wxHORIZONTAL);
wxStaticText *StaticTextHeader = new wxStaticText(this, wxID_ANY, _("Action")); wxStaticText *StaticTextHeader = new wxStaticText(this, wxID_ANY, _("Action"));
HeaderSizer->Add(StaticTextHeader, 1, wxALL, 2); HeaderSizer->Add(StaticTextHeader, 1, wxALL, 2);
@ -244,6 +249,7 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
StaticTextHeader = new wxStaticText(this, wxID_ANY, _("Key"), wxDefaultPosition, size); StaticTextHeader = new wxStaticText(this, wxID_ANY, _("Key"), wxDefaultPosition, size);
HeaderSizer->Add(StaticTextHeader, 0, wxALL, 2); HeaderSizer->Add(StaticTextHeader, 0, wxALL, 2);
sHotkeys->Add(HeaderSizer, 0, wxEXPAND | wxALL, 1); sHotkeys->Add(HeaderSizer, 0, wxEXPAND | wxALL, 1);
}
for (int i = 0; i < NUM_HOTKEYS; i++) for (int i = 0; i < NUM_HOTKEYS; i++)
{ {
@ -265,13 +271,15 @@ void HotkeyConfigDialog::CreateHotkeyGUIControls(void)
sHotkeys->Add(sHotkey, 0, wxEXPAND | wxALL, 1); sHotkeys->Add(sHotkey, 0, wxEXPAND | wxALL, 1);
} }
sHotkeyBox->Add(sHotkeys);
m_Close = new wxButton(this, ID_CLOSE, _("Close")); m_Close = new wxButton(this, ID_CLOSE, _("Close"));
wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer* sButtons = new wxBoxSizer(wxHORIZONTAL);
sButtons->AddStretchSpacer(); sButtons->AddStretchSpacer();
sButtons->Add(m_Close, 0, (wxLEFT), 5); sButtons->Add(m_Close, 0, (wxLEFT), 5);
wxBoxSizer *sMainSizer = new wxBoxSizer(wxVERTICAL); wxBoxSizer *sMainSizer = new wxBoxSizer(wxVERTICAL);
sMainSizer->Add(sHotkeys, 0, wxEXPAND | wxALL, 5); sMainSizer->Add(sHotkeyBox, 0, wxEXPAND | wxALL, 5);
sMainSizer->Add(sButtons, 0, wxEXPAND | (wxLEFT | wxRIGHT | wxDOWN), 5); sMainSizer->Add(sButtons, 0, wxEXPAND | (wxLEFT | wxRIGHT | wxDOWN), 5);
SetSizer(sMainSizer); SetSizer(sMainSizer);
Layout(); Layout();