mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2026-01-05 01:43:11 +00:00
Code Issues Releases Wiki Activity

Change 'Back' to 'Cancel' in button prompts to match windows

Browse source
This commit is contained in:
Andrew Lanzone 2025-06-01 23:27:49 -07:00
parent 51f9ce890e
commit 21286aa376
16 changed files with 31 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/alchemywindow.cpp
View file

@ -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}";

2
apps/openmw/mwgui/container.cpp
View file

@ -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}";

2
apps/openmw/mwgui/dialogue.cpp
View file

@ -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)

2
apps/openmw/mwgui/enchantingdialog.cpp
View file

@ -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}";

4
apps/openmw/mwgui/inventorywindow.cpp
View file

@ -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 = "";

2
apps/openmw/mwgui/itemselection.cpp
View file

@ -30,7 +30,7 @@ namespace MWGui
center();
mControllerButtons.a = "#{sSelect}";
mControllerButtons.b = "#{sBack}";
mControllerButtons.b = "#{sCancel}";
mControllerButtons.r3 = "#{sInfo}";
}

2
apps/openmw/mwgui/merchantrepair.cpp
View file

@ -33,7 +33,7 @@ namespace MWGui
{
mDisableGamepadCursor = true;
mControllerButtons.a = "#{sRepair}";
mControllerButtons.b = "#{sBack}";
mControllerButtons.b = "#{sCancel}";
}
}

2
apps/openmw/mwgui/recharge.cpp
View file

@ -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}";
}

2
apps/openmw/mwgui/repair.cpp
View file

@ -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";
}

2
apps/openmw/mwgui/savegamedialog.cpp
View file

@ -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)

2
apps/openmw/mwgui/spellbuyingwindow.cpp
View file

@ -36,7 +36,7 @@ namespace MWGui
{
mDisableGamepadCursor = true;
mControllerButtons.a = "#{sBuy}";
mControllerButtons.b = "#{sBack}";
mControllerButtons.b = "#{sCancel}";
}
}

4
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -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}";
}
}

2
apps/openmw/mwgui/tradewindow.cpp
View file

@ -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}";

2
apps/openmw/mwgui/trainingwindow.cpp
View file

@ -42,7 +42,7 @@ namespace MWGui
{
mDisableGamepadCursor = true;
mControllerButtons.a = "#{sBuy}";
mControllerButtons.b = "#{sBack}";
mControllerButtons.b = "#{sCancel}";
}
}

2
apps/openmw/mwgui/travelwindow.cpp
View file

@ -47,7 +47,7 @@ namespace MWGui
{
mDisableGamepadCursor = true;
mControllerButtons.a = "#{sTravel}";
mControllerButtons.b = "#{sBack}";
mControllerButtons.b = "#{sCancel}";
}
}

26
files/data/mygui/openmw_controllerbuttons.layout
View file

@ -101,19 +101,6 @@
<Property key="ReadOnly" value="true"/>
</Widget>
<Widget type="ImageBox" skin="ImageBox" align="Stretch" position="0 0 24 24" name="BtnXImage">
<Property key="ImageTexture" value="textures\omw_steam_button_x.dds"/>
<Property key="Colour" value="#ccb589"/>
<Property key="Alpha" value="0.7"/>
</Widget>
<Widget type="TextBox" skin="HeaderText" align="Center" position="0 0 0 48" name="BtnXText">
<Property key="Caption" value=""/>
<Property key="TextAlign" value="Left"/>
<Property key="TextShadow" value="true"/>
<Property key="TextShadowColour" value="0 0 0"/>
<Property key="ReadOnly" value="true"/>
</Widget>
<Widget type="ImageBox" skin="ImageBox" align="Stretch" position="0 0 24 24" name="BtnYImage">
<Property key="ImageTexture" value="textures\omw_steam_button_y.dds"/>
<Property key="Colour" value="#ccb589"/>
@ -179,6 +166,19 @@
<Property key="ReadOnly" value="true"/>
</Widget>
<Widget type="ImageBox" skin="ImageBox" align="Stretch" position="0 0 24 24" name="BtnXImage">
<Property key="ImageTexture" value="textures\omw_steam_button_x.dds"/>
<Property key="Colour" value="#ccb589"/>
<Property key="Alpha" value="0.7"/>
</Widget>
<Widget type="TextBox" skin="HeaderText" align="Center" position="0 0 0 48" name="BtnXText">
<Property key="Caption" value=""/>
<Property key="TextAlign" value="Left"/>
<Property key="TextShadow" value="true"/>
<Property key="TextShadowColour" value="0 0 0"/>
<Property key="ReadOnly" value="true"/>
</Widget>
<Widget type="ImageBox" skin="ImageBox" align="Stretch" position="0 0 24 24" name="BtnBImage">
<Property key="ImageTexture" value="textures\omw_steam_button_b.dds"/>
<Property key="Colour" value="#ccb589"/>