diff --git a/Core/Dialog/PSPDialog.cpp b/Core/Dialog/PSPDialog.cpp index fb10fc59d..54c467dbd 100644 --- a/Core/Dialog/PSPDialog.cpp +++ b/Core/Dialog/PSPDialog.cpp @@ -201,21 +201,21 @@ void PSPDialog::DisplayButtons(int flags, const char *caption) strncpy(safeCaption, caption, 64); } - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); float x1 = 183.5f, x2 = 261.5f; if (GetCommonParam()->buttonSwap == 1) { x1 = 261.5f; x2 = 183.5f; } if (flags & DS_BUTTON_OK) { - const char *text = useCaption ? safeCaption : d->T("Enter"); + const char *text = useCaption ? safeCaption : di->T("Enter"); PPGeDrawImage(okButtonImg, x2, 258, 11.5f, 11.5f, 0, CalcFadedColor(0x80000000)); PPGeDrawImage(okButtonImg, x2, 256, 11.5f, 11.5f, 0, CalcFadedColor(0xFFFFFFFF)); PPGeDrawText(text, x2 + 15.5f, 254, PPGE_ALIGN_LEFT, FONT_SCALE, CalcFadedColor(0x80000000)); PPGeDrawText(text, x2 + 14.5f, 252, PPGE_ALIGN_LEFT, FONT_SCALE, CalcFadedColor(0xFFFFFFFF)); } if (flags & DS_BUTTON_CANCEL) { - const char *text = useCaption ? safeCaption : d->T("Back"); + const char *text = useCaption ? safeCaption : di->T("Back"); PPGeDrawText(text, x1 + 15.5f, 254, PPGE_ALIGN_LEFT, FONT_SCALE, CalcFadedColor(0x80000000)); PPGeDrawText(text, x1 + 14.5f, 252, PPGE_ALIGN_LEFT, FONT_SCALE, CalcFadedColor(0xFFFFFFFF)); PPGeDrawImage(cancelButtonImg, x1, 258, 11.5f, 11.5f, 0, CalcFadedColor(0x80000000)); diff --git a/Core/Dialog/PSPMsgDialog.cpp b/Core/Dialog/PSPMsgDialog.cpp index 54cb4865f..3b5456c15 100755 --- a/Core/Dialog/PSPMsgDialog.cpp +++ b/Core/Dialog/PSPMsgDialog.cpp @@ -155,18 +155,18 @@ void PSPMsgDialog::DisplayMessage(std::string text, bool hasYesNo, bool hasOK) if (hasYesNo) { - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); const char *choiceText; u32 yesColor, noColor; float x, w; if (yesnoChoice == 1) { - choiceText = d->T("Yes"); + choiceText = di->T("Yes"); x = 204.0f; yesColor = 0xFFFFFFFF; noColor = 0xFFFFFFFF; } else { - choiceText = d->T("No"); + choiceText = di->T("No"); x = 273.0f; yesColor = 0xFFFFFFFF; noColor = 0xFFFFFFFF; @@ -178,10 +178,10 @@ void PSPMsgDialog::DisplayMessage(std::string text, bool hasYesNo, bool hasOK) h2 += h + 5.0f; y = 135.0f - h; PPGeDrawRect(x - w, y2 - h, x + w, y2 + h, CalcFadedColor(0x6DCFCFCF)); - PPGeDrawText(d->T("Yes"), 204.0f, y2 + 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); - PPGeDrawText(d->T("Yes"), 203.0f, y2 - 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(yesColor)); - PPGeDrawText(d->T("No"), 273.0f, y2 + 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); - PPGeDrawText(d->T("No"), 272.0f, y2 - 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(noColor)); + PPGeDrawText(di->T("Yes"), 204.0f, y2 + 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); + PPGeDrawText(di->T("Yes"), 203.0f, y2 - 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(yesColor)); + PPGeDrawText(di->T("No"), 273.0f, y2 + 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); + PPGeDrawText(di->T("No"), 272.0f, y2 - 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(noColor)); if (IsButtonPressed(CTRL_LEFT) && yesnoChoice == 0) { yesnoChoice = 1; } @@ -192,7 +192,7 @@ void PSPMsgDialog::DisplayMessage(std::string text, bool hasYesNo, bool hasOK) } if (hasOK) { - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); float x, w; x = 240.0f; w = 15.0f; @@ -201,8 +201,8 @@ void PSPMsgDialog::DisplayMessage(std::string text, bool hasYesNo, bool hasOK) h2 += h + 5.0f; y = 135.0f - h; PPGeDrawRect(x - w, y2 - h, x + w, y2 + h, CalcFadedColor(0x6DCFCFCF)); - PPGeDrawText(d->T("OK"), 240.0f, y2 + 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); - PPGeDrawText(d->T("OK"), 239.0f, y2 - 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(di->T("OK"), 240.0f, y2 + 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); + PPGeDrawText(di->T("OK"), 239.0f, y2 - 1.0f, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0xFFFFFFFF)); ey = y2 + 25.0f; } diff --git a/Core/Dialog/PSPNetconfDialog.cpp b/Core/Dialog/PSPNetconfDialog.cpp index ded27c8cf..3df74563f 100644 --- a/Core/Dialog/PSPNetconfDialog.cpp +++ b/Core/Dialog/PSPNetconfDialog.cpp @@ -62,13 +62,13 @@ void PSPNetconfDialog::DrawBanner() { // TODO: Draw a hexagon icon PPGeDrawImage(10, 6, 12.0f, 12.0f, 1, 10, 1, 10, 10, 10, CalcFadedColor(0xFFFFFFFF)); - I18NCategory *d = GetI18NCategory("Dialog"); - PPGeDrawText(d->T("Network Connection"), 30, 11, PPGE_ALIGN_VCENTER, 0.6f, CalcFadedColor(0xFFFFFFFF)); + I18NCategory *di = GetI18NCategory("Dialog"); + PPGeDrawText(di->T("Network Connection"), 30, 11, PPGE_ALIGN_VCENTER, 0.6f, CalcFadedColor(0xFFFFFFFF)); } int PSPNetconfDialog::Update(int animSpeed) { UpdateButtons(); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *err = GetI18NCategory("Error"); const float WRAP_WIDTH = 254.0f; const int confirmBtnImage = g_Config.iButtonPreference == PSP_SYSTEMPARAM_BUTTON_CROSS ? I_CROSS : I_CIRCLE; @@ -83,7 +83,7 @@ int PSPNetconfDialog::Update(int animSpeed) { PPGeDrawRect(0, 0, 480, 272, CalcFadedColor(0x63636363)); PPGeDrawTextWrapped(err->T("PPSSPPDoesNotSupportInternet", "PPSSPP currently does not support connecting to the Internet for DLC, PSN, or game updates."), 241, 132, WRAP_WIDTH, PPGE_ALIGN_CENTER, 0.5f, CalcFadedColor(0xFFFFFFFF)); PPGeDrawImage(confirmBtnImage, 195, 250, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawText(d->T("OK"), 225, 252, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(di->T("OK"), 225, 252, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); if (IsButtonPressed(confirmBtn)) { StartFade(false); diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index 881fd3b7c..6ac4ed735 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -872,10 +872,10 @@ int PSPOskDialog::Update(int animSpeed) { PPGeDrawRect(0, 0, 480, 272, CalcFadedColor(0x63636363)); RenderKeyboard(); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); PPGeDrawImage(I_SQUARE, 365, 222, 16, 16, 0, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawText(d->T("Space"), 390, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(di->T("Space"), 390, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); if (g_Config.iButtonPreference != PSP_SYSTEMPARAM_BUTTON_CIRCLE) { PPGeDrawImage(I_CROSS, 45, 222, 16, 16, 0, CalcFadedColor(0xFFFFFFFF)); @@ -885,11 +885,11 @@ int PSPOskDialog::Update(int animSpeed) { PPGeDrawImage(I_CROSS, 45, 247, 16, 16, 0, CalcFadedColor(0xFFFFFFFF)); } - PPGeDrawText(d->T("Select"), 75, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawText(d->T("Delete"), 75, 247, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(di->T("Select"), 75, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(di->T("Delete"), 75, 247, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); PPGeDrawText("Start", 135, 220, PPGE_ALIGN_LEFT, 0.6f, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawText(d->T("Finish"), 185, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(di->T("Finish"), 185, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); int index = (currentKeyboardLanguage - 1) % OSK_LANGUAGE_COUNT; const char *countryCode; @@ -908,7 +908,7 @@ int PSPOskDialog::Update(int animSpeed) { if (strcmp(countryCode, "ko_KR")) { PPGeDrawText("Select", 135, 245, PPGE_ALIGN_LEFT, 0.6f, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawText(d->T("Shift"), 185, 247, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(di->T("Shift"), 185, 247, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); } PPGeDrawText("L", 235, 220, PPGE_ALIGN_LEFT, 0.6f, CalcFadedColor(0xFFFFFFFF)); diff --git a/Core/Dialog/PSPSaveDialog.cpp b/Core/Dialog/PSPSaveDialog.cpp index 8410b9600..3c67ed2a8 100755 --- a/Core/Dialog/PSPSaveDialog.cpp +++ b/Core/Dialog/PSPSaveDialog.cpp @@ -275,19 +275,19 @@ const std::string PSPSaveDialog::GetSelectedSaveDirName() const void PSPSaveDialog::DisplayBanner(int which) { - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); PPGeDrawRect(0, 0, 480, 23, CalcFadedColor(0x65636358)); const char *title; switch (which) { case DB_SAVE: - title = d->T("Save"); + title = di->T("Save"); break; case DB_LOAD: - title = d->T("Load"); + title = di->T("Load"); break; case DB_DELETE: - title = d->T("Delete"); + title = di->T("Delete"); break; default: title = ""; @@ -391,8 +391,8 @@ void PSPSaveDialog::DisplaySaveDataInfo1() { lock_guard guard(paramLock); if (param.GetFileInfo(currentSelectedSave).size == 0) { - I18NCategory *d = GetI18NCategory("Dialog"); - PPGeDrawText(d->T("NEW DATA"), 180, 136, PPGE_ALIGN_VCENTER, 0.6f, CalcFadedColor(0xFFFFFFFF)); + I18NCategory *di = GetI18NCategory("Dialog"); + PPGeDrawText(di->T("NEW DATA"), 180, 136, PPGE_ALIGN_VCENTER, 0.6f, CalcFadedColor(0xFFFFFFFF)); } else { char title[512]; char time[512]; @@ -524,18 +524,18 @@ void PSPSaveDialog::DisplayMessage(std::string text, bool hasYesNo) float h2 = h * (float)n / 2.0f; if (hasYesNo) { - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); const char *choiceText; u32 yesColor, noColor; float x, w; if (yesnoChoice == 1) { - choiceText = d->T("Yes"); + choiceText = di->T("Yes"); x = 302.0f; yesColor = 0xFFFFFFFF; noColor = 0xFFFFFFFF; } else { - choiceText = d->T("No"); + choiceText = di->T("No"); x = 366.0f; yesColor = 0xFFFFFFFF; noColor = 0xFFFFFFFF; @@ -547,10 +547,10 @@ void PSPSaveDialog::DisplayMessage(std::string text, bool hasYesNo) h2 += h + 4.0f; y = 132.0f - h; PPGeDrawRect(x - w, y2 - h, x + w, y2 + h, CalcFadedColor(0x40C0C0C0)); - PPGeDrawText(d->T("Yes"), 303.0f, y2+2, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); - PPGeDrawText(d->T("Yes"), 302.0f, y2, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(yesColor)); - PPGeDrawText(d->T("No"), 367.0f, y2+2, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); - PPGeDrawText(d->T("No"), 366.0f, y2, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(noColor)); + PPGeDrawText(di->T("Yes"), 303.0f, y2+2, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); + PPGeDrawText(di->T("Yes"), 302.0f, y2, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(yesColor)); + PPGeDrawText(di->T("No"), 367.0f, y2+2, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(0x80000000)); + PPGeDrawText(di->T("No"), 366.0f, y2, PPGE_ALIGN_CENTER, FONT_SCALE, CalcFadedColor(noColor)); if (IsButtonPressed(CTRL_LEFT) && yesnoChoice == 0) { yesnoChoice = 1; } @@ -606,7 +606,7 @@ int PSPSaveDialog::Update(int animSpeed) cancelButtonFlag = CTRL_CIRCLE; } - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); switch (display) { @@ -640,7 +640,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("Confirm Save", "Do you want to save this data?"), true); + DisplayMessage(di->T("Confirm Save", "Do you want to save this data?"), true); DisplayButtons(DS_BUTTON_OK | DS_BUTTON_CANCEL); DisplayBanner(DB_SAVE); @@ -661,7 +661,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("Confirm Overwrite","Do you want to overwrite the data?"), true); + DisplayMessage(di->T("Confirm Overwrite","Do you want to overwrite the data?"), true); DisplayButtons(DS_BUTTON_OK | DS_BUTTON_CANCEL); DisplayBanner(DB_SAVE); @@ -690,7 +690,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("Saving","Saving\nPlease Wait...")); + DisplayMessage(di->T("Saving","Saving\nPlease Wait...")); DisplayBanner(DB_SAVE); @@ -703,7 +703,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("SavingFailed", "Unable to save data.")); + DisplayMessage(di->T("SavingFailed", "Unable to save data.")); DisplayButtons(DS_BUTTON_CANCEL); DisplayBanner(DB_SAVE); @@ -730,7 +730,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("Save completed")); + DisplayMessage(di->T("Save completed")); DisplayButtons(DS_BUTTON_CANCEL); DisplayBanner(DB_SAVE); @@ -770,7 +770,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("ConfirmLoad", "Load this data?"), true); + DisplayMessage(di->T("ConfirmLoad", "Load this data?"), true); DisplayButtons(DS_BUTTON_OK | DS_BUTTON_CANCEL); DisplayBanner(DB_LOAD); @@ -795,7 +795,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("Loading","Loading\nPlease Wait...")); + DisplayMessage(di->T("Loading","Loading\nPlease Wait...")); DisplayBanner(DB_LOAD); @@ -808,7 +808,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("LoadingFailed", "Unable to load data.")); + DisplayMessage(di->T("LoadingFailed", "Unable to load data.")); DisplayButtons(DS_BUTTON_CANCEL); DisplayBanner(DB_LOAD); @@ -832,7 +832,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("Load completed")); + DisplayMessage(di->T("Load completed")); DisplayButtons(DS_BUTTON_CANCEL); DisplayBanner(DB_LOAD); @@ -852,7 +852,7 @@ int PSPSaveDialog::Update(int animSpeed) case DS_LOAD_NODATA: StartDraw(); - DisplayMessage(d->T("There is no data")); + DisplayMessage(di->T("There is no data")); DisplayButtons(DS_BUTTON_CANCEL); DisplayBanner(DB_LOAD); @@ -890,7 +890,7 @@ int PSPSaveDialog::Update(int animSpeed) DisplaySaveIcon(); DisplaySaveDataInfo2(); - DisplayMessage(d->T("DeleteConfirm", + DisplayMessage(di->T("DeleteConfirm", "This save data will be deleted.\nAre you sure you want to continue?"), true); @@ -917,7 +917,7 @@ int PSPSaveDialog::Update(int animSpeed) StartDraw(); - DisplayMessage(d->T("Deleting","Deleting\nPlease Wait...")); + DisplayMessage(di->T("Deleting","Deleting\nPlease Wait...")); DisplayBanner(DB_DELETE); @@ -927,7 +927,7 @@ int PSPSaveDialog::Update(int animSpeed) JoinIOThread(); StartDraw(); - DisplayMessage(d->T("DeleteFailed", "Unable to delete data.")); + DisplayMessage(di->T("DeleteFailed", "Unable to delete data.")); DisplayButtons(DS_BUTTON_CANCEL); DisplayBanner(DB_DELETE); @@ -945,7 +945,7 @@ int PSPSaveDialog::Update(int animSpeed) } StartDraw(); - DisplayMessage(d->T("Delete completed")); + DisplayMessage(di->T("Delete completed")); DisplayButtons(DS_BUTTON_CANCEL); DisplayBanner(DB_DELETE); @@ -962,7 +962,7 @@ int PSPSaveDialog::Update(int animSpeed) case DS_DELETE_NODATA: StartDraw(); - DisplayMessage(d->T("There is no data")); + DisplayMessage(di->T("There is no data")); DisplayButtons(DS_BUTTON_CANCEL); DisplayBanner(DB_DELETE); diff --git a/Core/Dialog/SavedataParam.cpp b/Core/Dialog/SavedataParam.cpp index e9a6821ac..c5c0f1d45 100644 --- a/Core/Dialog/SavedataParam.cpp +++ b/Core/Dialog/SavedataParam.cpp @@ -641,9 +641,9 @@ void SavedataParam::LoadCryptedSave(SceUtilitySavedataParam *param, u8 *data, u8 // Don't notify the user if we're not going to upgrade the save. if (!g_Config.bEncryptSave) { - I18NCategory *d = GetI18NCategory("Dialog"); - osm.Show(d->T("When you save, it will load on a PSP, but not an older PPSSPP"), 6.0f); - osm.Show(d->T("Old savedata detected"), 6.0f); + I18NCategory *di = GetI18NCategory("Dialog"); + osm.Show(di->T("When you save, it will load on a PSP, but not an older PPSSPP"), 6.0f); + osm.Show(di->T("Old savedata detected"), 6.0f); } } else { if (decryptMode == 5 && prevCryptMode == 3) { diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp index 952c70d36..5a62ff2b4 100644 --- a/UI/ControlMappingScreen.cpp +++ b/UI/ControlMappingScreen.cpp @@ -203,7 +203,7 @@ void ControlMappingScreen::CreateViews() { mappers_.clear(); I18NCategory *k = GetI18NCategory("KeyMapping"); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); root_ = new LinearLayout(ORIENT_HORIZONTAL); @@ -215,7 +215,7 @@ void ControlMappingScreen::CreateViews() { } leftColumn->Add(new Choice(k->T("Test Analogs")))->OnClick.Handle(this, &ControlMappingScreen::OnTestAnalogs); leftColumn->Add(new Spacer(new LinearLayoutParams(1.0f))); - leftColumn->Add(new Choice(d->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); + leftColumn->Add(new Choice(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); rightScroll_ = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)); rightScroll_->SetScrollToTop(false); @@ -435,7 +435,7 @@ bool AnalogTestScreen::key(const KeyInput &key) { void AnalogTestScreen::CreateViews() { using namespace UI; - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); root_ = new LinearLayout(ORIENT_VERTICAL); @@ -458,5 +458,5 @@ void AnalogTestScreen::CreateViews() { lastKeyEvent_ = root_->Add(new TextView("", new LayoutParams(FILL_PARENT, WRAP_CONTENT))); - root_->Add(new Button(d->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); + root_->Add(new Button(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); } diff --git a/UI/CwCheatScreen.cpp b/UI/CwCheatScreen.cpp index cf71bc89e..75a43e11b 100644 --- a/UI/CwCheatScreen.cpp +++ b/UI/CwCheatScreen.cpp @@ -61,7 +61,7 @@ void CwCheatScreen::CreateCodeList() { void CwCheatScreen::CreateViews() { using namespace UI; I18NCategory *cw = GetI18NCategory("CwCheats"); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); CreateCodeList(); g_Config.bReloadCheats = true; root_ = new LinearLayout(ORIENT_HORIZONTAL); @@ -69,7 +69,7 @@ void CwCheatScreen::CreateViews() { LinearLayout *leftColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(400, FILL_PARENT)); leftColumn->Add(new ItemHeader(cw->T("Options"))); - leftColumn->Add(new Choice(d->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); + leftColumn->Add(new Choice(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); //leftColumn->Add(new Choice(cw->T("Add Cheat")))->OnClick.Handle(this, &CwCheatScreen::OnAddCheat); leftColumn->Add(new Choice(cw->T("Import Cheats")))->OnClick.Handle(this, &CwCheatScreen::OnImportCheat); #if !defined(MOBILE_DEVICE) diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 7f15c202d..7b44a1f42 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -300,7 +300,7 @@ const char *GetCompilerABI() { void SystemInfoScreen::CreateViews() { // NOTE: Do not translate this section. It will change a lot and will be impossible to keep up. - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); using namespace UI; root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT)); @@ -308,7 +308,7 @@ void SystemInfoScreen::CreateViews() { ViewGroup *leftColumn = new AnchorLayout(new LinearLayoutParams(1.0f)); root_->Add(leftColumn); - root_->Add(new Choice(d->T("Back"), "", false, new AnchorLayoutParams(225, 64, 10, NONE, NONE, 10)))->OnClick.Handle(this, &UIScreen::OnBack); + root_->Add(new Choice(di->T("Back"), "", false, new AnchorLayoutParams(225, 64, 10, NONE, NONE, 10)))->OnClick.Handle(this, &UIScreen::OnBack); TabHolder *tabHolder = new TabHolder(ORIENT_VERTICAL, 225, new AnchorLayoutParams(10, 0, 10, 0, false)); @@ -544,7 +544,7 @@ bool AddressPromptScreen::key(const KeyInput &key) { // Three panes: Block chooser, MIPS view, ARM/x86 view void JitCompareScreen::CreateViews() { - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *dev = GetI18NCategory("Developer"); using namespace UI; @@ -572,7 +572,7 @@ void JitCompareScreen::CreateViews() { leftColumn->Add(new Choice(dev->T("FPU")))->OnClick.Handle(this, &JitCompareScreen::OnRandomFPUBlock); leftColumn->Add(new Choice(dev->T("VFPU")))->OnClick.Handle(this, &JitCompareScreen::OnRandomVFPUBlock); leftColumn->Add(new Choice(dev->T("Stats")))->OnClick.Handle(this, &JitCompareScreen::OnShowStats); - leftColumn->Add(new Choice(d->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); + leftColumn->Add(new Choice(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); blockName_ = leftColumn->Add(new TextView(dev->T("No block"))); blockAddr_ = leftColumn->Add(new TextEdit("", "", new LayoutParams(FILL_PARENT, WRAP_CONTENT))); blockAddr_->OnTextChange.Handle(this, &JitCompareScreen::OnAddressChange); diff --git a/UI/GameScreen.cpp b/UI/GameScreen.cpp index 60263c61f..7c4570df0 100644 --- a/UI/GameScreen.cpp +++ b/UI/GameScreen.cpp @@ -47,7 +47,7 @@ GameScreen::~GameScreen() { void GameScreen::CreateViews() { GameInfo *info = g_gameInfoCache.GetInfo(NULL, gamePath_, GAMEINFO_WANTBG | GAMEINFO_WANTSIZE); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *ga = GetI18NCategory("Game"); // Information in the top left. @@ -62,7 +62,7 @@ void GameScreen::CreateViews() { ViewGroup *leftColumn = new AnchorLayout(new LinearLayoutParams(1.0f)); root_->Add(leftColumn); - leftColumn->Add(new Choice(d->T("Back"), "", false, new AnchorLayoutParams(150, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle(this, &GameScreen::OnSwitchBack); + leftColumn->Add(new Choice(di->T("Back"), "", false, new AnchorLayoutParams(150, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle(this, &GameScreen::OnSwitchBack); if (info) { texvGameIcon_ = leftColumn->Add(new Thin3DTextureView(0, IS_DEFAULT, new AnchorLayoutParams(144 * 2, 80 * 2, 10, 10, NONE, NONE))); tvTitle_ = leftColumn->Add(new TextView(info->title, ALIGN_LEFT, false, new AnchorLayoutParams(10, 200, NONE, NONE))); @@ -137,10 +137,10 @@ void GameScreen::CallbackDeleteConfig(bool yes) UI::EventReturn GameScreen::OnDeleteConfig(UI::EventParams &e) { - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *ga = GetI18NCategory("Game"); screenManager()->push( - new PromptScreen(d->T("DeleteConfirmGameConfig", "Do you really want to delete the settings for this game?"), ga->T("ConfirmDelete"), d->T("Cancel"), + new PromptScreen(di->T("DeleteConfirmGameConfig", "Do you really want to delete the settings for this game?"), ga->T("ConfirmDelete"), di->T("Cancel"), std::bind(&GameScreen::CallbackDeleteConfig, this, placeholder::_1))); return UI::EVENT_DONE; @@ -223,7 +223,7 @@ UI::EventReturn GameScreen::OnGameSettings(UI::EventParams &e) { } UI::EventReturn GameScreen::OnDeleteSaveData(UI::EventParams &e) { - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *ga = GetI18NCategory("Game"); GameInfo *info = g_gameInfoCache.GetInfo(NULL, gamePath_, GAMEINFO_WANTBG | GAMEINFO_WANTSIZE); if (info) { @@ -231,7 +231,7 @@ UI::EventReturn GameScreen::OnDeleteSaveData(UI::EventParams &e) { std::vector saveDirs = info->GetSaveDataDirectories(); if (saveDirs.size()) { screenManager()->push( - new PromptScreen(d->T("DeleteConfirmAll", "Do you really want to delete all\nyour save data for this game?"), ga->T("ConfirmDelete"), d->T("Cancel"), + new PromptScreen(di->T("DeleteConfirmAll", "Do you really want to delete all\nyour save data for this game?"), ga->T("ConfirmDelete"), di->T("Cancel"), std::bind(&GameScreen::CallbackDeleteSaveData, this, placeholder::_1))); } } @@ -250,12 +250,12 @@ void GameScreen::CallbackDeleteSaveData(bool yes) { } UI::EventReturn GameScreen::OnDeleteGame(UI::EventParams &e) { - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *ga = GetI18NCategory("Game"); GameInfo *info = g_gameInfoCache.GetInfo(NULL, gamePath_, GAMEINFO_WANTBG | GAMEINFO_WANTSIZE); if (info) { screenManager()->push( - new PromptScreen(d->T("DeleteConfirmGame", "Do you really want to delete this game\nfrom your device? You can't undo this."), ga->T("ConfirmDelete"), d->T("Cancel"), + new PromptScreen(di->T("DeleteConfirmGame", "Do you really want to delete this game\nfrom your device? You can't undo this."), ga->T("ConfirmDelete"), di->T("Cancel"), std::bind(&GameScreen::CallbackDeleteGame, this, placeholder::_1))); } diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index e5755aa91..ad7049ef7 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -91,7 +91,7 @@ void GameSettingsScreen::CreateViews() { // Scrolling action menu to the right. using namespace UI; - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *gs = GetI18NCategory("Graphics"); I18NCategory *co = GetI18NCategory("Controls"); I18NCategory *a = GetI18NCategory("Audio"); @@ -111,11 +111,11 @@ void GameSettingsScreen::CreateViews() { if (vertical) { tabHolder = new TabHolder(ORIENT_HORIZONTAL, 200, new LinearLayoutParams(1.0f)); root_->Add(tabHolder); - root_->Add(new Choice(d->T("Back"), "", false, new LinearLayoutParams(0.0f)))->OnClick.Handle(this, &UIScreen::OnBack); + root_->Add(new Choice(di->T("Back"), "", false, new LinearLayoutParams(0.0f)))->OnClick.Handle(this, &UIScreen::OnBack); } else { tabHolder = new TabHolder(ORIENT_VERTICAL, 200, new AnchorLayoutParams(10, 0, 10, 0, false)); root_->Add(tabHolder); - root_->Add(new Choice(d->T("Back"), "", false, new AnchorLayoutParams(150, 64, 10, NONE, NONE, 10)))->OnClick.Handle(this, &UIScreen::OnBack); + root_->Add(new Choice(di->T("Back"), "", false, new AnchorLayoutParams(150, 64, 10, NONE, NONE, 10)))->OnClick.Handle(this, &UIScreen::OnBack); } root_->SetDefaultFocusView(tabHolder); @@ -864,11 +864,11 @@ void GameSettingsScreen::CallbackRenderingBackend(bool yes) { UI::EventReturn GameSettingsScreen::OnRenderingBackend(UI::EventParams &e) { #if defined(_WIN32) - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); // It only makes sense to show the restart prompt if the backend was actually changed. if (g_Config.iTempGPUBackend != g_Config.iGPUBackend) { - screenManager()->push(new PromptScreen(d->T("ChangingGPUBackends", "Changing GPU backends requires PPSSPP to restart. Restart now?"), d->T("Yes"), d->T("No"), + screenManager()->push(new PromptScreen(di->T("ChangingGPUBackends", "Changing GPU backends requires PPSSPP to restart. Restart now?"), di->T("Yes"), di->T("No"), std::bind(&GameSettingsScreen::CallbackRenderingBackend, this, placeholder::_1))); } #endif @@ -990,7 +990,7 @@ void DeveloperToolsScreen::CreateViews() { using namespace UI; root_ = new ScrollView(ORIENT_VERTICAL); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *dev = GetI18NCategory("Developer"); I18NCategory *gs = GetI18NCategory("Graphics"); I18NCategory *a = GetI18NCategory("Audio"); @@ -1031,7 +1031,7 @@ void DeveloperToolsScreen::CreateViews() { list->Add(new Choice(dev->T("Load language ini")))->OnClick.Handle(this, &DeveloperToolsScreen::OnLoadLanguageIni); list->Add(new Choice(dev->T("Save language ini")))->OnClick.Handle(this, &DeveloperToolsScreen::OnSaveLanguageIni); list->Add(new ItemHeader("")); - list->Add(new Choice(d->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); + list->Add(new Choice(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); } void DeveloperToolsScreen::onFinish(DialogResult result) { @@ -1046,17 +1046,17 @@ void GameSettingsScreen::CallbackRestoreDefaults(bool yes) { UI::EventReturn GameSettingsScreen::OnRestoreDefaultSettings(UI::EventParams &e) { I18NCategory *dev = GetI18NCategory("Developer"); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); if (g_Config.bGameSpecific) { screenManager()->push( - new PromptScreen(dev->T("RestoreGameDefaultSettings", "Are you sure you want to restore the game-specific settings back to the ppsspp defaults?\n"), d->T("OK"), d->T("Cancel"), + new PromptScreen(dev->T("RestoreGameDefaultSettings", "Are you sure you want to restore the game-specific settings back to the ppsspp defaults?\n"), di->T("OK"), di->T("Cancel"), std::bind(&GameSettingsScreen::CallbackRestoreDefaults, this, placeholder::_1))); } else { screenManager()->push( - new PromptScreen(dev->T("RestoreDefaultSettings", "Are you sure you want to restore all settings(except control mapping)\nback to their defaults?\nYou can't undo this.\nPlease restart PPSSPP after restoring settings."), d->T("OK"), d->T("Cancel"), + new PromptScreen(dev->T("RestoreDefaultSettings", "Are you sure you want to restore all settings(except control mapping)\nback to their defaults?\nYou can't undo this.\nPlease restart PPSSPP after restoring settings."), di->T("OK"), di->T("Cancel"), std::bind(&GameSettingsScreen::CallbackRestoreDefaults, this, placeholder::_1))); } @@ -1096,7 +1096,7 @@ UI::EventReturn DeveloperToolsScreen::OnJitAffectingSetting(UI::EventParams &e) void ProAdhocServerScreen::CreateViews() { using namespace UI; I18NCategory *s = GetI18NCategory("System"); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); tempProAdhocServer = g_Config.proAdhocServer; root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT)); @@ -1117,10 +1117,10 @@ void ProAdhocServerScreen::CreateViews() { rightColumn->Add(new Button("8"))->OnClick.Handle(this, &ProAdhocServerScreen::On8Click); rightColumn->Add(new Button("9"))->OnClick.Handle(this, &ProAdhocServerScreen::On9Click); rightColumn->Add(new Button("."))->OnClick.Handle(this, &ProAdhocServerScreen::OnPointClick); - rightColumn->Add(new Button(d->T("Delete")))->OnClick.Handle(this, &ProAdhocServerScreen::OnDeleteClick); - rightColumn->Add(new Button(d->T("Delete all")))->OnClick.Handle(this, &ProAdhocServerScreen::OnDeleteAllClick); - rightColumn->Add(new Button(d->T("OK")))->OnClick.Handle(this, &ProAdhocServerScreen::OnOKClick); - rightColumn->Add(new Button(d->T("Cancel")))->OnClick.Handle(this, &ProAdhocServerScreen::OnCancelClick); + rightColumn->Add(new Button(di->T("Delete")))->OnClick.Handle(this, &ProAdhocServerScreen::OnDeleteClick); + rightColumn->Add(new Button(di->T("Delete all")))->OnClick.Handle(this, &ProAdhocServerScreen::OnDeleteAllClick); + rightColumn->Add(new Button(di->T("OK")))->OnClick.Handle(this, &ProAdhocServerScreen::OnOKClick); + rightColumn->Add(new Button(di->T("Cancel")))->OnClick.Handle(this, &ProAdhocServerScreen::OnCancelClick); root_->Add(leftColumn); root_->Add(rightColumn); } diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index ad82a910b..03f3d34f0 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -1094,7 +1094,7 @@ void UmdReplaceScreen::CreateViews() { using namespace UI; Margins actionMenuMargins(0, 100, 15, 0); I18NCategory *m = GetI18NCategory("MainMenu"); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); TabHolder *leftColumn = new TabHolder(ORIENT_HORIZONTAL, 64, new LinearLayoutParams(1.0)); leftColumn->SetClip(true); @@ -1128,7 +1128,7 @@ void UmdReplaceScreen::CreateViews() { tabAllGames->OnHoldChoice.Handle(this, &UmdReplaceScreen::OnGameSelected); - rightColumnItems->Add(new Choice(d->T("Cancel")))->OnClick.Handle(this, &UmdReplaceScreen::OnCancel); + rightColumnItems->Add(new Choice(di->T("Cancel")))->OnClick.Handle(this, &UmdReplaceScreen::OnCancel); rightColumnItems->Add(new Choice(m->T("Game Settings")))->OnClick.Handle(this, &UmdReplaceScreen::OnGameSettings); if (g_Config.recentIsos.size() > 0) { diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp index d26a8bc25..9d3311639 100644 --- a/UI/MiscScreens.cpp +++ b/UI/MiscScreens.cpp @@ -212,9 +212,9 @@ void UIDialogScreenWithBackground::sendMessage(const char *message, const char * PromptScreen::PromptScreen(std::string message, std::string yesButtonText, std::string noButtonText, std::function callback) : message_(message), callback_(callback) { - I18NCategory *d = GetI18NCategory("Dialog"); - yesButtonText_ = d->T(yesButtonText.c_str()); - noButtonText_ = d->T(noButtonText.c_str()); + I18NCategory *di = GetI18NCategory("Dialog"); + yesButtonText_ = di->T(yesButtonText.c_str()); + noButtonText_ = di->T(noButtonText.c_str()); } void PromptScreen::CreateViews() { @@ -456,11 +456,11 @@ void LogoScreen::render() { void CreditsScreen::CreateViews() { using namespace UI; - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *c = GetI18NCategory("PSPCredits"); root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT)); - Button *back = root_->Add(new Button(d->T("Back"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 10, false))); + Button *back = root_->Add(new Button(di->T("Back"), new AnchorLayoutParams(260, 64, NONE, NONE, 10, 10, false))); back->OnClick.Handle(this, &CreditsScreen::OnOK); root_->SetDefaultFocusView(back); #ifndef GOLD diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index f6254e82e..7144748a0 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -424,10 +424,10 @@ UI::EventReturn GamePauseScreen::OnCreateConfig(UI::EventParams &e) } UI::EventReturn GamePauseScreen::OnDeleteConfig(UI::EventParams &e) { - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); I18NCategory *ga = GetI18NCategory("Game"); screenManager()->push( - new PromptScreen(d->T("DeleteConfirmGameConfig", "Do you really want to delete the settings for this game?"), ga->T("ConfirmDelete"), d->T("Cancel"), + new PromptScreen(di->T("DeleteConfirmGameConfig", "Do you really want to delete the settings for this game?"), ga->T("ConfirmDelete"), di->T("Cancel"), std::bind(&GamePauseScreen::CallbackDeleteConfig, this, placeholder::_1))); return UI::EVENT_DONE; diff --git a/UI/ReportScreen.cpp b/UI/ReportScreen.cpp index bd3a3db49..b8bd189bd 100644 --- a/UI/ReportScreen.cpp +++ b/UI/ReportScreen.cpp @@ -131,7 +131,7 @@ EventReturn ReportScreen::HandleChoice(EventParams &e) { void ReportScreen::CreateViews() { I18NCategory *rp = GetI18NCategory("Reporting"); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); Margins actionMenuMargins(0, 100, 15, 0); ViewGroup *leftColumn = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT, 0.4f)); LinearLayout *leftColumnItems = new LinearLayout(ORIENT_VERTICAL, new LayoutParams(WRAP_CONTENT, FILL_PARENT)); @@ -153,7 +153,7 @@ void ReportScreen::CreateViews() { submit_->SetEnabled(overall_ >= 0 && graphics_ >= 0 && speed_ >= 0 && gameplay_ >= 0); rightColumnItems->Add(new Spacer(25.0)); - rightColumnItems->Add(new Choice(d->T("Back"), "", false, new AnchorLayoutParams(150, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle(this, &UIScreen::OnBack); + rightColumnItems->Add(new Choice(di->T("Back"), "", false, new AnchorLayoutParams(150, WRAP_CONTENT, 10, NONE, NONE, 10)))->OnClick.Handle(this, &UIScreen::OnBack); root_ = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT, 1.0f)); root_->Add(leftColumn); diff --git a/UI/TiltAnalogSettingsScreen.cpp b/UI/TiltAnalogSettingsScreen.cpp index 23f46e187..fc7ae6a8c 100644 --- a/UI/TiltAnalogSettingsScreen.cpp +++ b/UI/TiltAnalogSettingsScreen.cpp @@ -24,7 +24,7 @@ void TiltAnalogSettingsScreen::CreateViews() { using namespace UI; I18NCategory *co = GetI18NCategory("Controls"); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); root_ = new ScrollView(ORIENT_VERTICAL); @@ -51,7 +51,7 @@ void TiltAnalogSettingsScreen::CreateViews() { root_->Add(settings); settings->Add(new ItemHeader("")); - settings->Add(new Choice(d->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); + settings->Add(new Choice(di->T("Back")))->OnClick.Handle(this, &UIScreen::OnBack); } void TiltAnalogSettingsScreen::update(InputState &input) { diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp index 35f2c1a16..b6f2cd17f 100644 --- a/UI/TouchControlLayoutScreen.cpp +++ b/UI/TouchControlLayoutScreen.cpp @@ -311,19 +311,19 @@ void TouchControlLayoutScreen::CreateViews() { using namespace UI; I18NCategory *co = GetI18NCategory("Controls"); - I18NCategory *d = GetI18NCategory("Dialog"); + I18NCategory *di = GetI18NCategory("Dialog"); root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT)); - Choice *reset = new Choice(d->T("Reset"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 84)); - Choice *back = new Choice(d->T("Back"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 10)); + Choice *reset = new Choice(di->T("Reset"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 84)); + Choice *back = new Choice(di->T("Back"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 10)); Choice *visibility = new Choice(co->T("Visibility"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 158)); // controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fButtonScale, 0.80, 2.0, co->T("Button Scaling"), screenManager())) // ->OnChange.Handle(this, &GameSettingsScreen::OnChangeControlScaling); mode_ = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 158 + 64 + 10)); - mode_->AddChoice(d->T("Move")); - mode_->AddChoice(d->T("Resize")); + mode_->AddChoice(di->T("Move")); + mode_->AddChoice(di->T("Resize")); mode_->SetSelection(0); reset->OnClick.Handle(this, &TouchControlLayoutScreen::OnReset);