Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-28 21:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 40

Merge branch 'merchantrepairrepaired' into 'master'
Some checks failed
Build and test / MacOS (push) Has been cancelled
Details
Build and test / Read .env file and expose it as output (push) Has been cancelled
Details
Build and test / Ubuntu (push) Has been cancelled
Details
Build and test / Windows (2019) (push) Has been cancelled
Details
Build and test / Windows (2022) (push) Has been cancelled
Details

Browse source 
Merchant repair menu layout tweaks

See merge request OpenMW/openmw!4588
This commit is contained in:
Alexei Kotov 2025-04-24 18:30:36 +03:00
commit cc98703b43
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -75,7 +75,7 @@ namespace MWGui
int price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mActor, x, true);
std::string name{ iter->getClass().getName(*iter) };
name += " - " + MyGUI::utility::toString(price)
name += " - " + MyGUI::utility::toString(price)
+ MWBase::Environment::get().getESMStore()->get<ESM::GameSetting>().find("sgp")->mValue.getString();
items.emplace_back(name, price, *iter);

20
files/data/mygui/openmw_merchantrepair.layout
View file

@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 418 248" align="Center" name="_Main">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 420 250" align="Center" name="_Main">
<Property key="Visible" value="false"/>
<Widget type="TextBox" skin="SandText" position="8 24 418 24" align="Right Top">
<Property key="TextAlign" value="Left"/>
<Property key="Caption" value="#{sRepairServiceTitle}"/>
</Widget>
<Widget type="TextBox" skin="NormalText" position="0 3 418 24" align="Right Top">
<Widget type="TextBox" skin="NormalText" position="0 3 412 24" align="Right Top">
<Property key="TextAlign" value="Center"/>
<Property key="Caption" value="#{sServiceRepairTitle}"/>
</Widget>
<Widget type="TextBox" skin="SandText" position="6 22 412 24" align="Right Top">
<Property key="TextAlign" value="Left"/>
<Property key="Caption" value="#{sRepairServiceTitle}"/>
</Widget>
<Widget type="Widget" skin="MW_Box" position="10 46 389 156" align="Left Stretch">
<Widget type="ScrollView" skin="MW_ScrollView" position="4 4 381 145" align="Left Top Stretch" name="RepairView">
<Widget type="Widget" skin="MW_Box" position="6 42 400 165" align="Left Stretch">
<Widget type="ScrollView" skin="MW_ScrollView" position="4 3 381 145" align="Left Top Stretch" name="RepairView">
<Property key="CanvasAlign" value="Left"/>
</Widget>
</Widget>
<Widget type="TextBox" skin="SandText" position="10 208 300 24" name="PlayerGold" align="Right Top">
<Widget type="TextBox" skin="SandText" position="6 212 300 24" name="PlayerGold" align="Right Top">
<Property key="TextAlign" value="Left"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="343 209 56 24" name="OkButton" align="Right Top">
<Widget type="AutoSizedButton" skin="MW_Button" position="350 212 56 24" name="OkButton" align="Right Top">
<Property key="ExpandDirection" value="Left"/>
<Property key="Caption" value="#{Interface:OK}"/>
</Widget>