From 95f83570f4f723090f8e98120b6cd97aa88f1ec3 Mon Sep 17 00:00:00 2001 From: vnctdj Date: Wed, 1 Jul 2015 23:54:35 +0200 Subject: [PATCH] Consistently use *km for the KeyMapping i18n category --- UI/ControlMappingScreen.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 5a62ff2b4b..d93b5da508 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -202,18 +202,18 @@ void ControlMappingScreen::CreateViews() { using namespace UI; mappers_.clear(); - I18NCategory *k = GetI18NCategory("KeyMapping"); + I18NCategory *km = GetI18NCategory("KeyMapping"); I18NCategory *di = GetI18NCategory("Dialog"); root_ = new LinearLayout(ORIENT_HORIZONTAL); LinearLayout *leftColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(200, FILL_PARENT)); - leftColumn->Add(new Choice(k->T("Clear All")))->OnClick.Handle(this, &ControlMappingScreen::OnClearMapping); - leftColumn->Add(new Choice(k->T("Default All")))->OnClick.Handle(this, &ControlMappingScreen::OnDefaultMapping); + leftColumn->Add(new Choice(km->T("Clear All")))->OnClick.Handle(this, &ControlMappingScreen::OnClearMapping); + leftColumn->Add(new Choice(km->T("Default All")))->OnClick.Handle(this, &ControlMappingScreen::OnDefaultMapping); if (KeyMap::GetSeenPads().size()) { - leftColumn->Add(new Choice(k->T("Autoconfigure")))->OnClick.Handle(this, &ControlMappingScreen::OnAutoConfigure); + leftColumn->Add(new Choice(km->T("Autoconfigure")))->OnClick.Handle(this, &ControlMappingScreen::OnAutoConfigure); } - leftColumn->Add(new Choice(k->T("Test Analogs")))->OnClick.Handle(this, &ControlMappingScreen::OnTestAnalogs); + leftColumn->Add(new Choice(km->T("Test Analogs")))->OnClick.Handle(this, &ControlMappingScreen::OnTestAnalogs); leftColumn->Add(new Spacer(new LinearLayoutParams(1.0f))); leftColumn->Add(new Choice(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); @@ -260,8 +260,8 @@ UI::EventReturn ControlMappingScreen::OnAutoConfigure(UI::EventParams ¶ms) { for (auto s = seenPads.begin(), end = seenPads.end(); s != end; ++s) { items.push_back(*s); } - I18NCategory *keyI18N = GetI18NCategory("KeyMapping"); - ListPopupScreen *autoConfList = new ListPopupScreen(keyI18N->T("Autoconfigure for device"), items, -1); + I18NCategory *km = GetI18NCategory("KeyMapping"); + ListPopupScreen *autoConfList = new ListPopupScreen(km->T("Autoconfigure for device"), items, -1); screenManager()->push(autoConfList); return UI::EVENT_DONE; } @@ -289,11 +289,11 @@ void ControlMappingScreen::KeyMapped(int pspkey) { // Notification to let us re void KeyMappingNewKeyDialog::CreatePopupContents(UI::ViewGroup *parent) { using namespace UI; - I18NCategory *keyI18N = GetI18NCategory("KeyMapping"); + I18NCategory *km = GetI18NCategory("KeyMapping"); std::string pspButtonName = KeyMap::GetPspButtonName(this->pspBtn_); - parent->Add(new TextView(std::string(keyI18N->T("Map a new key for")) + " " + pspButtonName, new LinearLayoutParams(Margins(10,0)))); + parent->Add(new TextView(std::string(km->T("Map a new key for")) + " " + pspButtonName, new LinearLayoutParams(Margins(10,0)))); } bool KeyMappingNewKeyDialog::key(const KeyInput &key) {