diff options
| author | Fiora <fioraaeterna@gmail.com> | 2015-06-14 18:53:49 -0700 |
|---|---|---|
| committer | Fiora <fioraaeterna@gmail.com> | 2015-06-14 18:53:49 -0700 |
| commit | c68bb0bdecc5a9745cb9c2b9be2ffed997bccf59 (patch) | |
| tree | 8973bb2d769b9febc5f17ca24a05b2feaca618d1 /Source/Core | |
| parent | 87b45de634bbbc0ce4eaf5e4c41555b4b1ecb5e6 (diff) | |
| parent | 57f7129295cbcdfae1238ca325e208a716e2921d (diff) | |
Merge pull request #2456 from aserna3/master
UI improvements to Add AR Code and Add Patch windows.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/ARCodeAddEdit.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Source/Core/DolphinWX/ARCodeAddEdit.cpp b/Source/Core/DolphinWX/ARCodeAddEdit.cpp index 00a2578d97..c34393d3d6 100644 --- a/Source/Core/DolphinWX/ARCodeAddEdit.cpp +++ b/Source/Core/DolphinWX/ARCodeAddEdit.cpp @@ -30,7 +30,7 @@ CARCodeAddEdit::CARCodeAddEdit(int _selection, std::vector<ActionReplay::ARCode> Bind(wxEVT_BUTTON, &CARCodeAddEdit::SaveCheatData, this, wxID_OK); ActionReplay::ARCode tempEntries; - wxString currentName = _("Insert name here..."); + wxString currentName; if (selection == wxNOT_FOUND) { @@ -47,6 +47,8 @@ CARCodeAddEdit::CARCodeAddEdit(int _selection, std::vector<ActionReplay::ARCode> wxGridBagSizer* sgEntry = new wxGridBagSizer(0, 0); wxStaticText* EditCheatNameText = new wxStaticText(this, wxID_ANY, _("Name:")); + wxStaticText* EditCheatCodeText = new wxStaticText(this, wxID_ANY, _("Code:")); + EditCheatName = new wxTextCtrl(this, wxID_ANY, wxEmptyString); EditCheatName->SetValue(currentName); @@ -56,12 +58,14 @@ CARCodeAddEdit::CARCodeAddEdit(int _selection, std::vector<ActionReplay::ARCode> EntrySelection->Bind(wxEVT_SPIN, &CARCodeAddEdit::ChangeEntry, this); EditCheatCode = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize(300, 100), wxTE_MULTILINE); + UpdateTextCtrl(tempEntries); sgEntry->Add(EditCheatNameText, wxGBPosition(0, 0), wxGBSpan(1, 1), wxALIGN_CENTER | wxALL, 5); + sgEntry->Add(EditCheatCodeText, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALIGN_CENTER | wxALL, 5); sgEntry->Add(EditCheatName, wxGBPosition(0, 1), wxGBSpan(1, 1), wxEXPAND | wxALL, 5); sgEntry->Add(EntrySelection, wxGBPosition(0, 2), wxGBSpan(2, 1), wxEXPAND | wxALL, 5); - sgEntry->Add(EditCheatCode, wxGBPosition(1, 0), wxGBSpan(1, 2), wxEXPAND | wxALL, 5); + sgEntry->Add(EditCheatCode, wxGBPosition(1, 1), wxGBSpan(1, 1), wxEXPAND | wxALL, 5); sgEntry->AddGrowableCol(1); sgEntry->AddGrowableRow(1); sbEntry->Add(sgEntry, 1, wxEXPAND | wxALL); @@ -176,8 +180,5 @@ void CARCodeAddEdit::UpdateTextCtrl(ActionReplay::ARCode arCode) for (auto& op : arCode.ops) EditCheatCode->AppendText(wxString::Format("%08X %08X\n", op.cmd_addr, op.value)); } - else - { - EditCheatCode->SetValue(_("Insert Encrypted or Decrypted code here...")); - } } + |