diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp index 35ff668df0..782994b858 100644 --- a/apps/openmw/mwgui/alchemywindow.cpp +++ b/apps/openmw/mwgui/alchemywindow.cpp @@ -95,7 +95,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.x = "#{sCreate}"; mControllerButtons.y = "#{sMagicEffects}"; mControllerButtons.r3 = "#{sInfo}"; diff --git a/apps/openmw/mwgui/bookwindow.cpp b/apps/openmw/mwgui/bookwindow.cpp index beba6e5968..0ad31680b7 100644 --- a/apps/openmw/mwgui/bookwindow.cpp +++ b/apps/openmw/mwgui/bookwindow.cpp @@ -68,7 +68,7 @@ namespace MWGui mControllerButtons.l1 = "#{sPrev}"; mControllerButtons.r1 = "#{sNext}"; - mControllerButtons.b = "#{sClose}"; + mControllerButtons.b = "#{Interface:Close}"; center(); } diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp index 121793c3af..b0dbc6c779 100644 --- a/apps/openmw/mwgui/class.cpp +++ b/apps/openmw/mwgui/class.cpp @@ -885,7 +885,7 @@ namespace MWGui cancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SelectSpecializationDialog::onCancelClicked); mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } SelectSpecializationDialog::~SelectSpecializationDialog() {} @@ -967,7 +967,7 @@ namespace MWGui mAttributeButtons[0]->setStateSelected(true); mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } } @@ -1067,7 +1067,7 @@ namespace MWGui mSkillButtons[0]->setStateSelected(true); mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } } @@ -1156,7 +1156,7 @@ namespace MWGui // Make sure the edit box has focus MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit); - mControllerButtons.a = "#{sOk}"; + mControllerButtons.a = "#{Interface:OK}"; } DescriptionDialog::~DescriptionDialog() {} diff --git a/apps/openmw/mwgui/companionwindow.cpp b/apps/openmw/mwgui/companionwindow.cpp index 5053ebbde4..fcbaf146ec 100644 --- a/apps/openmw/mwgui/companionwindow.cpp +++ b/apps/openmw/mwgui/companionwindow.cpp @@ -65,7 +65,7 @@ namespace MWGui setCoord(200, 0, 600, 300); mControllerButtons.a = "#{sTake}"; - mControllerButtons.b = "#{sClose}"; + mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.l2 = "#{sInventory}"; } diff --git a/apps/openmw/mwgui/confirmationdialog.cpp b/apps/openmw/mwgui/confirmationdialog.cpp index f858b9628a..b0a0f62580 100644 --- a/apps/openmw/mwgui/confirmationdialog.cpp +++ b/apps/openmw/mwgui/confirmationdialog.cpp @@ -23,8 +23,8 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mDisableGamepadCursor = true; - mControllerButtons.a = "#{sOk}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.a = "#{Interface:OK}"; + mControllerButtons.b = "#{Interface:Cancel}"; } } diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index 6efff1517d..84fd945e79 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/apps/openmw/mwgui/container.cpp @@ -60,7 +60,7 @@ namespace MWGui setCoord(200, 0, 600, 300); mControllerButtons.a = "#{sTake}"; - mControllerButtons.b = "#{sClose}"; + mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.x = "#{sTakeAll}"; mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.l2 = "#{sInventory}"; diff --git a/apps/openmw/mwgui/countdialog.cpp b/apps/openmw/mwgui/countdialog.cpp index 1f31871e33..063bf061c9 100644 --- a/apps/openmw/mwgui/countdialog.cpp +++ b/apps/openmw/mwgui/countdialog.cpp @@ -28,8 +28,8 @@ namespace MWGui // make sure we read the enter key being pressed to accept multiple items mItemEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &CountDialog::onEnterKeyPressed); - mControllerButtons.a = "#{sOk}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.a = "#{Interface:OK}"; + mControllerButtons.b = "#{Interface:Cancel}"; } void CountDialog::openCountDialog(const std::string& item, const std::string& message, const int maxCount) diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 49ceafbfd8..587c4d03c5 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -91,7 +91,7 @@ namespace MWGui mDisableGamepadCursor = Settings::gui().mControllerMenus; mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } void PersuasionDialog::adjustAction(MyGUI::Widget* action, int& totalHeight) diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp index 7a1c1532f6..056862fdce 100644 --- a/apps/openmw/mwgui/enchantingdialog.cpp +++ b/apps/openmw/mwgui/enchantingdialog.cpp @@ -61,7 +61,7 @@ namespace MWGui mName->eventEditSelectAccept += MyGUI::newDelegate(this, &EnchantingDialog::onAccept); mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.y = "#{OMWEngine:EnchantType}"; mControllerButtons.l1 = "#{sItem}"; mControllerButtons.r1 = "#{sSoulGem}"; diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index 0a5715334a..37e3f0a65d 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/apps/openmw/mwgui/inventorywindow.cpp @@ -983,21 +983,21 @@ namespace MWGui { case MWGui::GM_Companion: mControllerButtons.a = "#{OMWEngine:InventorySelect}"; - mControllerButtons.b = "#{sClose}"; + mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.x.clear(); mControllerButtons.y.clear(); mControllerButtons.r2 = "#{sCompanionShare}"; break; case MWGui::GM_Container: mControllerButtons.a = "#{OMWEngine:InventorySelect}"; - mControllerButtons.b = "#{sClose}"; + mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.x = "#{sTakeAll}"; mControllerButtons.y.clear(); mControllerButtons.r2 = "#{sContainer}"; break; case MWGui::GM_Barter: mControllerButtons.a = "#{sSell}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.x = "#{sOffer}"; mControllerButtons.y.clear(); mControllerButtons.r2 = "#{sBarter}"; diff --git a/apps/openmw/mwgui/itemselection.cpp b/apps/openmw/mwgui/itemselection.cpp index ad2b141d8d..8dc806fdd2 100644 --- a/apps/openmw/mwgui/itemselection.cpp +++ b/apps/openmw/mwgui/itemselection.cpp @@ -30,7 +30,7 @@ namespace MWGui center(); mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.r3 = "#{sInfo}"; } diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp index 9b7b8096e5..90db26a519 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/apps/openmw/mwgui/journalwindow.cpp @@ -698,7 +698,7 @@ namespace MWGui::ControllerButtonStr* getControllerButtons() override { - mControllerButtons.b = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{sClose}"; + mControllerButtons.b = mOptionsMode || mStates.size() > 1 ? "#{sBack}" : "#{Interface:Close}"; mControllerButtons.l1 = mOptionsMode ? "" : "#{sPrev}"; mControllerButtons.r1 = mOptionsMode ? "" : "#{sNext}"; mControllerButtons.r3 = mOptionsMode && mQuestMode ? "#{OMWEngine:JournalShowAll}" : ""; diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp index 38cfbc1e58..6d9f5fd34b 100644 --- a/apps/openmw/mwgui/mapwindow.cpp +++ b/apps/openmw/mwgui/mapwindow.cpp @@ -1471,8 +1471,8 @@ namespace MWGui if (Settings::gui().mControllerMenus) { - mControllerButtons.a = "#{sOk}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.a = "#{Interface:OK}"; + mControllerButtons.b = "#{Interface:Cancel}"; } } diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp index db0f3bf1a2..58b05cf612 100644 --- a/apps/openmw/mwgui/merchantrepair.cpp +++ b/apps/openmw/mwgui/merchantrepair.cpp @@ -33,7 +33,7 @@ namespace MWGui { mDisableGamepadCursor = true; mControllerButtons.a = "#{sRepair}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } } diff --git a/apps/openmw/mwgui/messagebox.cpp b/apps/openmw/mwgui/messagebox.cpp index 8020a4c3d5..d1f0727971 100644 --- a/apps/openmw/mwgui/messagebox.cpp +++ b/apps/openmw/mwgui/messagebox.cpp @@ -285,7 +285,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mDisableGamepadCursor = true; - mControllerButtons.a = "#{sOk}"; + mControllerButtons.a = "#{Interface:OK}"; // If we have more than one button, we need to set the focus to the first one. if (mButtons.size() > 1) diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp index 419cb26420..786ab197c8 100644 --- a/apps/openmw/mwgui/quickkeysmenu.cpp +++ b/apps/openmw/mwgui/quickkeysmenu.cpp @@ -62,7 +62,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sOK}"; + mControllerButtons.b = "#{Interface:OK}"; } } @@ -537,7 +537,7 @@ namespace MWGui mDisableGamepadCursor = true; mItemButton->setStateSelected(true); mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } center(); @@ -683,7 +683,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } center(); diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp index 2dfb47fa23..9c1e71c3fd 100644 --- a/apps/openmw/mwgui/recharge.cpp +++ b/apps/openmw/mwgui/recharge.cpp @@ -41,7 +41,7 @@ namespace MWGui mGemIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onSelectItem); mControllerButtons.a = "#{OMWEngine:RechargeSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.y = "#{sSoulGem}"; } diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp index 8962ae2abd..13a3923d07 100644 --- a/apps/openmw/mwgui/repair.cpp +++ b/apps/openmw/mwgui/repair.cpp @@ -41,7 +41,7 @@ namespace MWGui mToolIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onSelectItem); mControllerButtons.a = "#{sRepair}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.y = "#{OMWEngine:RepairTool}"; } diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp index b096c5c9c9..35a6de2950 100644 --- a/apps/openmw/mwgui/savegamedialog.cpp +++ b/apps/openmw/mwgui/savegamedialog.cpp @@ -68,7 +68,7 @@ namespace MWGui mDeleteButton->setNeedKeyFocus(false); mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } void SaveGameDialog::onSlotActivated(MyGUI::ListBox* sender, size_t pos) diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp index 59fb1f2d20..3986aa44bd 100644 --- a/apps/openmw/mwgui/scrollwindow.cpp +++ b/apps/openmw/mwgui/scrollwindow.cpp @@ -40,7 +40,7 @@ namespace MWGui mTakeButton->eventKeyButtonPressed += MyGUI::newDelegate(this, &ScrollWindow::onKeyButtonPressed); mControllerScrollWidget = mTextView; - mControllerButtons.b = "#{sClose}"; + mControllerButtons.b = "#{Interface:Close}"; mControllerButtons.dpad = "#{sScrolldown}"; center(); diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp index 406beb506f..11a06c7b44 100644 --- a/apps/openmw/mwgui/settingswindow.cpp +++ b/apps/openmw/mwgui/settingswindow.cpp @@ -461,7 +461,7 @@ namespace MWGui } mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sOk}"; + mControllerButtons.b = "#{Interface:OK}"; mControllerButtons.lStick = "#{sMouse}"; } diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp index 4b6811e605..1f6270baf0 100644 --- a/apps/openmw/mwgui/spellbuyingwindow.cpp +++ b/apps/openmw/mwgui/spellbuyingwindow.cpp @@ -39,7 +39,7 @@ namespace MWGui { mDisableGamepadCursor = true; mControllerButtons.a = "#{sBuy}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.r3 = "#{sInfo}"; } } diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp index 976c2eebd8..25d8499193 100644 --- a/apps/openmw/mwgui/spellcreationdialog.cpp +++ b/apps/openmw/mwgui/spellcreationdialog.cpp @@ -101,8 +101,8 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; - mControllerButtons.x = "#{sOk}"; + mControllerButtons.b = "#{Interface:Cancel}"; + mControllerButtons.x = "#{Interface:OK}"; } } @@ -599,7 +599,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.x = "#{sBuy}"; mControllerButtons.r3 = "#{sInfo}"; } diff --git a/apps/openmw/mwgui/textinput.cpp b/apps/openmw/mwgui/textinput.cpp index 7612cf4c67..9e75d0ba01 100644 --- a/apps/openmw/mwgui/textinput.cpp +++ b/apps/openmw/mwgui/textinput.cpp @@ -26,7 +26,7 @@ namespace MWGui // Make sure the edit box has focus MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(mTextEdit); - mControllerButtons.a = "#{sOk}"; + mControllerButtons.a = "#{Interface:OK}"; } void TextInputDialog::setNextButtonShow(bool shown) diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp index b15311e167..ab0b58933a 100644 --- a/apps/openmw/mwgui/tradewindow.cpp +++ b/apps/openmw/mwgui/tradewindow.cpp @@ -189,7 +189,7 @@ namespace MWGui SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)); mControllerButtons.a = "#{sBuy}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mControllerButtons.x = "#{sOffer}"; mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.l2 = "#{sInventory}"; diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp index be8359cde5..ef11d8f16c 100644 --- a/apps/openmw/mwgui/trainingwindow.cpp +++ b/apps/openmw/mwgui/trainingwindow.cpp @@ -41,7 +41,7 @@ namespace MWGui { mDisableGamepadCursor = true; mControllerButtons.a = "#{sBuy}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } } diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp index 38eee1b85c..185a7be3cf 100644 --- a/apps/openmw/mwgui/travelwindow.cpp +++ b/apps/openmw/mwgui/travelwindow.cpp @@ -42,7 +42,7 @@ namespace MWGui { mDisableGamepadCursor = true; mControllerButtons.a = "#{sTravel}"; - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; } } diff --git a/apps/openmw/mwgui/waitdialog.cpp b/apps/openmw/mwgui/waitdialog.cpp index fcd7b21181..0943863a69 100644 --- a/apps/openmw/mwgui/waitdialog.cpp +++ b/apps/openmw/mwgui/waitdialog.cpp @@ -80,7 +80,7 @@ namespace MWGui mTimeAdvancer.eventInterrupted += MyGUI::newDelegate(this, &WaitDialog::onWaitingInterrupted); mTimeAdvancer.eventFinished += MyGUI::newDelegate(this, &WaitDialog::onWaitingFinished); - mControllerButtons.b = "#{sCancel}"; + mControllerButtons.b = "#{Interface:Cancel}"; mDisableGamepadCursor = Settings::gui().mControllerMenus; }