diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index 5cbe5e2ca2..5fde06f75d 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/apps/openmw/mwgui/inventorywindow.cpp @@ -151,7 +151,7 @@ namespace MWGui image->setImageTexture(MWBase::Environment::get().getInputManager()->getControllerButtonIcon( SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)); - mControllerButtons.mR3 = "#{sInfo}"; + mControllerButtons.mR3 = "#{Interface:Info}"; } adjustPanes(); @@ -973,7 +973,7 @@ namespace MWGui case MWGui::GM_Container: mControllerButtons.mA = "#{OMWEngine:InventorySelect}"; mControllerButtons.mB = "#{Interface:Close}"; - mControllerButtons.mX = "#{sTakeAll}"; + mControllerButtons.mX = "#{Interface:TakeAll}"; mControllerButtons.mR2 = "#{sContainer}"; break; case MWGui::GM_Barter: @@ -985,7 +985,7 @@ namespace MWGui case MWGui::GM_Inventory: default: mControllerButtons.mA = "#{sEquip}"; - mControllerButtons.mB = "#{sBack}"; + mControllerButtons.mB = "#{Interface:Back}"; mControllerButtons.mX = "#{sDrop}"; mControllerButtons.mR2.clear(); break; diff --git a/apps/openmw/mwgui/itemselection.cpp b/apps/openmw/mwgui/itemselection.cpp index 5d06b685d6..4a809d06ad 100644 --- a/apps/openmw/mwgui/itemselection.cpp +++ b/apps/openmw/mwgui/itemselection.cpp @@ -29,9 +29,9 @@ namespace MWGui center(); - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:Cancel}"; - mControllerButtons.mR3 = "#{sInfo}"; + mControllerButtons.mR3 = "#{Interface:Info}"; } bool ItemSelectionDialog::exit() diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp index 4d60d90101..8d7cfac586 100644 --- a/apps/openmw/mwgui/journalwindow.cpp +++ b/apps/openmw/mwgui/journalwindow.cpp @@ -224,7 +224,7 @@ namespace if (isRussian) // Cyrillic is either (10 + 10 + 10) or (15 + 15) mIndexRowCount = MWGui::getCyrillicIndexPageCount(); - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mX = "#{OMWEngine:JournalQuests}"; mControllerButtons.mY = "#{sTopics}"; diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp index 160906a11f..149489e798 100644 --- a/apps/openmw/mwgui/levelupdialog.cpp +++ b/apps/openmw/mwgui/levelupdialog.cpp @@ -94,8 +94,8 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mDisableGamepadCursor = true; - mControllerButtons.mA = "#{sSelect}"; - mControllerButtons.mX = "#{sDone}"; + mControllerButtons.mA = "#{Interface:Select}"; + mControllerButtons.mX = "#{Interface:Done}"; mOkButton->setCaption( MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); } diff --git a/apps/openmw/mwgui/mapwindow.cpp b/apps/openmw/mwgui/mapwindow.cpp index 8b2871dfcb..f80871d3ef 100644 --- a/apps/openmw/mwgui/mapwindow.cpp +++ b/apps/openmw/mwgui/mapwindow.cpp @@ -834,7 +834,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { - mControllerButtons.mB = "#{sBack}"; + mControllerButtons.mB = "#{Interface:Back}"; mControllerButtons.mX = global ? "#{sLocal}" : "#{sWorld}"; mControllerButtons.mY = "#{sCenter}"; mControllerButtons.mDpad = Settings::map().mAllowZooming ? "" : "#{sMove}"; diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp index 09d869169b..0b33c6fa0f 100644 --- a/apps/openmw/mwgui/quickkeysmenu.cpp +++ b/apps/openmw/mwgui/quickkeysmenu.cpp @@ -61,7 +61,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:OK}"; } } @@ -539,7 +539,7 @@ namespace MWGui { mDisableGamepadCursor = true; mItemButton->setStateSelected(true); - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:Cancel}"; } @@ -701,7 +701,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:Cancel}"; } diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp index 6f5f9ef061..fe01a60894 100644 --- a/apps/openmw/mwgui/race.cpp +++ b/apps/openmw/mwgui/race.cpp @@ -108,9 +108,9 @@ namespace MWGui if (Settings::gui().mControllerMenus) { - mControllerButtons.mLStick = "#{sMouse}"; - mControllerButtons.mA = "#{sSelect}"; - mControllerButtons.mB = "#{sBack}"; + mControllerButtons.mLStick = "#{Interface:Mouse}"; + mControllerButtons.mA = "#{Interface:Select}"; + mControllerButtons.mB = "#{Interface:Back}"; mControllerButtons.mY = "#{sSex}"; mControllerButtons.mL1 = "#{sHair}"; mControllerButtons.mR1 = "#{sFace}"; @@ -130,13 +130,13 @@ namespace MWGui { okButton->setCaption( MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sNext", {}))); - mControllerButtons.mX = "#{sNext}"; + mControllerButtons.mX = "#{Interface:Next}"; } else if (Settings::gui().mControllerMenus) { okButton->setCaption( MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); - mControllerButtons.mX = "#{sDone}"; + mControllerButtons.mX = "#{Interface:Done}"; } else okButton->setCaption( diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp index bbb26c29ac..d2c648ee2b 100644 --- a/apps/openmw/mwgui/recharge.cpp +++ b/apps/openmw/mwgui/recharge.cpp @@ -42,7 +42,7 @@ namespace MWGui mControllerButtons.mA = "#{OMWEngine:RechargeSelect}"; mControllerButtons.mB = "#{Interface:Cancel}"; - mControllerButtons.mY = "#{sSoulGem}"; + mControllerButtons.mY = "#{Interface:Soul}"; } void Recharge::onOpen() diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp index 1f51fa869f..53e5020dcf 100644 --- a/apps/openmw/mwgui/review.cpp +++ b/apps/openmw/mwgui/review.cpp @@ -123,9 +123,9 @@ namespace MWGui if (Settings::gui().mControllerMenus) { setControllerFocus(mButtons, mControllerFocus, true); - mControllerButtons.mA = "#{sSelect}"; - mControllerButtons.mB = "#{sBack}"; - mControllerButtons.mX = "#{sDone}"; + mControllerButtons.mA = "#{Interface:Select}"; + mControllerButtons.mB = "#{Interface:Back}"; + mControllerButtons.mX = "#{Interface:Done}"; okButton->setCaption( MyGUI::UString(MWBase::Environment::get().getWindowManager()->getGameSettingString("sDone", {}))); } diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp index ef6f41ded9..b5bcc2c334 100644 --- a/apps/openmw/mwgui/savegamedialog.cpp +++ b/apps/openmw/mwgui/savegamedialog.cpp @@ -67,7 +67,7 @@ namespace MWGui // To avoid accidental deletions mDeleteButton->setNeedKeyFocus(false); - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:Cancel}"; } diff --git a/apps/openmw/mwgui/scrollwindow.cpp b/apps/openmw/mwgui/scrollwindow.cpp index 80534d9b83..de1ceaa573 100644 --- a/apps/openmw/mwgui/scrollwindow.cpp +++ b/apps/openmw/mwgui/scrollwindow.cpp @@ -130,7 +130,10 @@ namespace MWGui ControllerButtons* ScrollWindow::getControllerButtons() { - mControllerButtons.mA = mTakeButton->getVisible() ? "#{sTake}" : ""; + if (mTakeButton->getVisible()) + mControllerButtons.mA = "#{Interface:Take}"; + else + mControllerButtons.mA.clear(); return &mControllerButtons; } diff --git a/apps/openmw/mwgui/settingswindow.cpp b/apps/openmw/mwgui/settingswindow.cpp index d9c82d89e7..d292c84a74 100644 --- a/apps/openmw/mwgui/settingswindow.cpp +++ b/apps/openmw/mwgui/settingswindow.cpp @@ -452,9 +452,9 @@ namespace MWGui i++; } - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:OK}"; - mControllerButtons.mLStick = "#{sMouse}"; + mControllerButtons.mLStick = "#{Interface:Mouse}"; } void SettingsWindow::onTabChanged(MyGUI::TabControl* /*sender*/, size_t /*index*/) diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp index 70648a7477..7ace160350 100644 --- a/apps/openmw/mwgui/spellbuyingwindow.cpp +++ b/apps/openmw/mwgui/spellbuyingwindow.cpp @@ -38,9 +38,9 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mDisableGamepadCursor = true; - mControllerButtons.mA = "#{sBuy}"; + mControllerButtons.mA = "#{Interface:Buy}"; mControllerButtons.mB = "#{Interface:Cancel}"; - mControllerButtons.mR3 = "#{sInfo}"; + mControllerButtons.mR3 = "#{Interface:Info}"; } } diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp index 994bd09b38..6d27b4e4d2 100644 --- a/apps/openmw/mwgui/spellcreationdialog.cpp +++ b/apps/openmw/mwgui/spellcreationdialog.cpp @@ -100,7 +100,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:Cancel}"; mControllerButtons.mX = "#{Interface:OK}"; } @@ -599,10 +599,10 @@ namespace MWGui if (Settings::gui().mControllerMenus) { - mControllerButtons.mA = "#{sSelect}"; + mControllerButtons.mA = "#{Interface:Select}"; mControllerButtons.mB = "#{Interface:Cancel}"; - mControllerButtons.mX = "#{sBuy}"; - mControllerButtons.mR3 = "#{sInfo}"; + mControllerButtons.mX = "#{Interface:Buy}"; + mControllerButtons.mR3 = "#{Interface:Info}"; } } diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp index 78c7fabbff..3b088ae518 100644 --- a/apps/openmw/mwgui/spellwindow.cpp +++ b/apps/openmw/mwgui/spellwindow.cpp @@ -62,9 +62,9 @@ namespace MWGui if (Settings::gui().mControllerMenus) { setPinButtonVisible(false); - mControllerButtons.mA = "#{sSelect}"; - mControllerButtons.mB = "#{sBack}"; - mControllerButtons.mR3 = "#{sInfo}"; + mControllerButtons.mA = "#{Interface:Select}"; + mControllerButtons.mB = "#{Interface:Back}"; + mControllerButtons.mR3 = "#{Interface:Info}"; } } diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp index 4cd85834f1..73b526a44b 100644 --- a/apps/openmw/mwgui/statswindow.cpp +++ b/apps/openmw/mwgui/statswindow.cpp @@ -84,9 +84,9 @@ namespace MWGui if (Settings::gui().mControllerMenus) { setPinButtonVisible(false); - mControllerButtons.mLStick = "#{sMouse}"; + mControllerButtons.mLStick = "#{Interface:Mouse}"; mControllerButtons.mRStick = "#{sScrolldown}"; - mControllerButtons.mB = "#{sBack}"; + mControllerButtons.mB = "#{Interface:Back}"; } onWindowResize(t); diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp index bf73ad9398..bc57cb2c08 100644 --- a/apps/openmw/mwgui/tradewindow.cpp +++ b/apps/openmw/mwgui/tradewindow.cpp @@ -188,11 +188,11 @@ namespace MWGui image->setImageTexture(MWBase::Environment::get().getInputManager()->getControllerButtonIcon( SDL_CONTROLLER_BUTTON_RIGHTSHOULDER)); - mControllerButtons.mA = "#{sBuy}"; + mControllerButtons.mA = "#{Interface:Buy}"; mControllerButtons.mB = "#{Interface:Cancel}"; mControllerButtons.mX = "#{sOffer}"; - mControllerButtons.mR3 = "#{sInfo}"; - mControllerButtons.mL2 = "#{sInventory}"; + mControllerButtons.mR3 = "#{Interface:Info}"; + mControllerButtons.mL2 = "#{Interface:Inventory}"; } } diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp index 60fc0b4621..0d60e20e67 100644 --- a/apps/openmw/mwgui/trainingwindow.cpp +++ b/apps/openmw/mwgui/trainingwindow.cpp @@ -40,7 +40,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mDisableGamepadCursor = true; - mControllerButtons.mA = "#{sBuy}"; + mControllerButtons.mA = "#{Interface:Buy}"; mControllerButtons.mB = "#{Interface:Cancel}"; } }