From 21286aa3762b9dabd9459866fc2c77d1ea35ec44 Mon Sep 17 00:00:00 2001 From: Andrew Lanzone Date: Sun, 1 Jun 2025 23:27:49 -0700 Subject: [PATCH] Change 'Back' to 'Cancel' in button prompts to match windows --- apps/openmw/mwgui/alchemywindow.cpp | 2 +- apps/openmw/mwgui/container.cpp | 2 +- apps/openmw/mwgui/dialogue.cpp | 2 +- apps/openmw/mwgui/enchantingdialog.cpp | 2 +- apps/openmw/mwgui/inventorywindow.cpp | 4 ++- apps/openmw/mwgui/itemselection.cpp | 2 +- apps/openmw/mwgui/merchantrepair.cpp | 2 +- apps/openmw/mwgui/recharge.cpp | 2 +- apps/openmw/mwgui/repair.cpp | 2 +- apps/openmw/mwgui/savegamedialog.cpp | 2 +- apps/openmw/mwgui/spellbuyingwindow.cpp | 2 +- apps/openmw/mwgui/spellcreationdialog.cpp | 4 +-- apps/openmw/mwgui/tradewindow.cpp | 2 +- apps/openmw/mwgui/trainingwindow.cpp | 2 +- apps/openmw/mwgui/travelwindow.cpp | 2 +- .../mygui/openmw_controllerbuttons.layout | 26 +++++++++---------- 16 files changed, 31 insertions(+), 29 deletions(-) diff --git a/apps/openmw/mwgui/alchemywindow.cpp b/apps/openmw/mwgui/alchemywindow.cpp index 32334962fb..270b0f1cfe 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 = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; mControllerButtons.x = "#{sCreate}"; mControllerButtons.y = "#{sMagicEffects}"; mControllerButtons.r3 = "#{sInfo}"; diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp index c6c810c80e..9fe098f6d5 100644 --- a/apps/openmw/mwgui/container.cpp +++ b/apps/openmw/mwgui/container.cpp @@ -58,7 +58,7 @@ namespace MWGui setCoord(200, 0, 600, 300); mControllerButtons.a = "#{sTake}"; - mControllerButtons.b = "#{sBack}"; + mControllerButtons.b = "#{sClose}"; mControllerButtons.x = "#{sTakeAll}"; mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.l2 = "#{sInventory}"; diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 1a8808c8dc..ff04d5237b 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 = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; } void PersuasionDialog::adjustAction(MyGUI::Widget* action, int& totalHeight) diff --git a/apps/openmw/mwgui/enchantingdialog.cpp b/apps/openmw/mwgui/enchantingdialog.cpp index d0d9fb7401..b5e0444f25 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 = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; mControllerButtons.y = "Cast Type"; mControllerButtons.l1 = "#{sItem}"; mControllerButtons.r1 = "#{sSoulGem}"; diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index 008e96356c..d9061ebc9e 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/apps/openmw/mwgui/inventorywindow.cpp @@ -132,7 +132,6 @@ namespace MWGui if (Settings::gui().mControllerMenus) { - mControllerButtons.b = "#{sBack}"; mControllerButtons.r3 = "#{sInfo}"; } @@ -888,12 +887,14 @@ namespace MWGui case MWGui::GM_Companion: case MWGui::GM_Container: mControllerButtons.a = "Put"; + mControllerButtons.b = "#{sClose}"; mControllerButtons.x = "#{sTakeAll}"; mControllerButtons.y = ""; mControllerButtons.r2 = "#{sContainer}"; break; case MWGui::GM_Barter: mControllerButtons.a = "#{sSell}"; + mControllerButtons.b = "#{sCancel}"; mControllerButtons.x = "#{sOffer}"; mControllerButtons.y = ""; mControllerButtons.r2 = "#{sBarter}"; @@ -901,6 +902,7 @@ namespace MWGui case MWGui::GM_Inventory: default: mControllerButtons.a = "#{sEquip}"; + mControllerButtons.b = "#{sBack}"; mControllerButtons.x = "#{sDrop}"; mControllerButtons.y = "#{sUnequip}"; mControllerButtons.r2 = ""; diff --git a/apps/openmw/mwgui/itemselection.cpp b/apps/openmw/mwgui/itemselection.cpp index ec4ecb9d0f..ad2b141d8d 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 = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; mControllerButtons.r3 = "#{sInfo}"; } diff --git a/apps/openmw/mwgui/merchantrepair.cpp b/apps/openmw/mwgui/merchantrepair.cpp index e8155ea790..c720971c5b 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 = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; } } diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp index 605a9a1a94..7fe1be9266 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 = "Recharge"; - mControllerButtons.b = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; mControllerButtons.y = "#{sSoulGem}"; } diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp index 6f5d256d86..32ddf58702 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 = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; mControllerButtons.y = "Tool"; } diff --git a/apps/openmw/mwgui/savegamedialog.cpp b/apps/openmw/mwgui/savegamedialog.cpp index af75152e4b..0f6bfefb54 100644 --- a/apps/openmw/mwgui/savegamedialog.cpp +++ b/apps/openmw/mwgui/savegamedialog.cpp @@ -67,7 +67,7 @@ namespace MWGui mDeleteButton->setNeedKeyFocus(false); mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sClose}"; + mControllerButtons.b = "#{sCancel}"; } void SaveGameDialog::onSlotActivated(MyGUI::ListBox* sender, size_t pos) diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp index 1c986180a8..48d7134b8a 100644 --- a/apps/openmw/mwgui/spellbuyingwindow.cpp +++ b/apps/openmw/mwgui/spellbuyingwindow.cpp @@ -36,7 +36,7 @@ namespace MWGui { mDisableGamepadCursor = true; mControllerButtons.a = "#{sBuy}"; - mControllerButtons.b = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; } } diff --git a/apps/openmw/mwgui/spellcreationdialog.cpp b/apps/openmw/mwgui/spellcreationdialog.cpp index f096beddcb..cc54fb0ceb 100644 --- a/apps/openmw/mwgui/spellcreationdialog.cpp +++ b/apps/openmw/mwgui/spellcreationdialog.cpp @@ -100,7 +100,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; mControllerButtons.x = "#{sOk}"; } } @@ -598,7 +598,7 @@ namespace MWGui if (Settings::gui().mControllerMenus) { mControllerButtons.a = "#{sSelect}"; - mControllerButtons.b = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; mControllerButtons.x = "#{sBuy}"; } } diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp index 69b16dfc93..379c18f59d 100644 --- a/apps/openmw/mwgui/tradewindow.cpp +++ b/apps/openmw/mwgui/tradewindow.cpp @@ -170,7 +170,7 @@ namespace MWGui setCoord(400, 0, 400, 300); mControllerButtons.a = "#{sBuy}"; - mControllerButtons.b = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; mControllerButtons.x = "#{sOffer}"; mControllerButtons.r3 = "#{sInfo}"; mControllerButtons.l2 = "#{sInventory}"; diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp index 65e468ebd4..d5c4f7efbc 100644 --- a/apps/openmw/mwgui/trainingwindow.cpp +++ b/apps/openmw/mwgui/trainingwindow.cpp @@ -42,7 +42,7 @@ namespace MWGui { mDisableGamepadCursor = true; mControllerButtons.a = "#{sBuy}"; - mControllerButtons.b = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; } } diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp index eeb2df868f..d205fcba31 100644 --- a/apps/openmw/mwgui/travelwindow.cpp +++ b/apps/openmw/mwgui/travelwindow.cpp @@ -47,7 +47,7 @@ namespace MWGui { mDisableGamepadCursor = true; mControllerButtons.a = "#{sTravel}"; - mControllerButtons.b = "#{sBack}"; + mControllerButtons.b = "#{sCancel}"; } } diff --git a/files/data/mygui/openmw_controllerbuttons.layout b/files/data/mygui/openmw_controllerbuttons.layout index 42c89e10b4..ffcfeaee16 100644 --- a/files/data/mygui/openmw_controllerbuttons.layout +++ b/files/data/mygui/openmw_controllerbuttons.layout @@ -101,19 +101,6 @@ - - - - - - - - - - - - - @@ -179,6 +166,19 @@ + + + + + + + + + + + + +