krageon
/
openmw-tes3coop
forked from teamnwah/openmw-tes3coop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #209 from OpenMW/master

Browse Source 
Add OpenMW commits up to 30 Apr 2017
0.6.1
David Cernat 8 years ago committed by GitHub
parent eda74ddf44 9f1527b7da
commit f2ec6ce02c
10 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File

7
apps/openmw/mwgui/merchantrepair.cpp
Unescape Escape View File

@ -21,6 +21,7 @@
namespace MWGui namespace MWGui
{ {
const int MerchantRepair::sLineHeight = 18;
MerchantRepair::MerchantRepair() MerchantRepair::MerchantRepair()
: WindowBase("openmw_merchantrepair.layout") : WindowBase("openmw_merchantrepair.layout")
@ -79,16 +80,16 @@ void MerchantRepair::startRepair(const MWWorld::Ptr &actor)
0, 0,
currentY, currentY,
0, 0,
18, sLineHeight,
MyGUI::Align::Default MyGUI::Align::Default
); );
currentY += 18; currentY += sLineHeight;
button->setUserString("Price", MyGUI::utility::toString(price)); button->setUserString("Price", MyGUI::utility::toString(price));
button->setUserData(MWWorld::Ptr(*iter)); button->setUserData(MWWorld::Ptr(*iter));
button->setCaptionWithReplacing(name); button->setCaptionWithReplacing(name);
button->setSize(button->getTextSize().width,18); button->setSize(mList->getWidth(),sLineHeight);
button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel); button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel);
button->setUserString("ToolTipType", "ItemPtr"); button->setUserString("ToolTipType", "ItemPtr");
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onRepairButtonClick); button->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onRepairButtonClick);

1
apps/openmw/mwgui/merchantrepair.hpp
Unescape Escape View File

@ -30,6 +30,7 @@ protected:
void onRepairButtonClick(MyGUI::Widget* sender); void onRepairButtonClick(MyGUI::Widget* sender);
void onOkButtonClick(MyGUI::Widget* sender); void onOkButtonClick(MyGUI::Widget* sender);
static const int sLineHeight;
}; };
} }

4
apps/openmw/mwgui/spellbuyingwindow.cpp
Unescape Escape View File

@ -37,8 +37,6 @@ namespace MWGui
, mLastPos(0) , mLastPos(0)
, mCurrentY(0) , mCurrentY(0)
{ {
setCoord(0, 0, 450, 300);
getWidget(mCancelButton, "CancelButton"); getWidget(mCancelButton, "CancelButton");
getWidget(mPlayerGold, "PlayerGold"); getWidget(mPlayerGold, "PlayerGold");
getWidget(mSpellsView, "SpellsView"); getWidget(mSpellsView, "SpellsView");
@ -79,7 +77,7 @@ namespace MWGui
toAdd->setUserData(price); toAdd->setUserData(price);
toAdd->setCaptionWithReplacing(spell->mName+" - "+MyGUI::utility::toString(price)+"#{sgp}"); toAdd->setCaptionWithReplacing(spell->mName+" - "+MyGUI::utility::toString(price)+"#{sgp}");
toAdd->setSize(toAdd->getTextSize().width,sLineHeight); toAdd->setSize(mSpellsView->getWidth(),sLineHeight);
toAdd->eventMouseWheel += MyGUI::newDelegate(this, &SpellBuyingWindow::onMouseWheel); toAdd->eventMouseWheel += MyGUI::newDelegate(this, &SpellBuyingWindow::onMouseWheel);
toAdd->setUserString("ToolTipType", "Spell"); toAdd->setUserString("ToolTipType", "Spell");
toAdd->setUserString("Spell", spellId); toAdd->setUserString("Spell", spellId);

4
apps/openmw/mwgui/travelwindow.cpp
Unescape Escape View File

@ -28,8 +28,6 @@ namespace MWGui
WindowBase("openmw_travel_window.layout") WindowBase("openmw_travel_window.layout")
, mCurrentY(0) , mCurrentY(0)
{ {
setCoord(0, 0, 450, 300);
getWidget(mCancelButton, "CancelButton"); getWidget(mCancelButton, "CancelButton");
getWidget(mPlayerGold, "PlayerGold"); getWidget(mPlayerGold, "PlayerGold");
getWidget(mSelect, "Select"); getWidget(mSelect, "Select");
@ -96,7 +94,7 @@ namespace MWGui
toAdd->setUserString("price",oss.str()); toAdd->setUserString("price",oss.str());
toAdd->setCaptionWithReplacing("#{sCell=" + name + "} - " + MyGUI::utility::toString(price)+"#{sgp}"); toAdd->setCaptionWithReplacing("#{sCell=" + name + "} - " + MyGUI::utility::toString(price)+"#{sgp}");
toAdd->setSize(toAdd->getTextSize().width,sLineHeight); toAdd->setSize(mDestinationsView->getWidth(),sLineHeight);
toAdd->eventMouseWheel += MyGUI::newDelegate(this, &TravelWindow::onMouseWheel); toAdd->eventMouseWheel += MyGUI::newDelegate(this, &TravelWindow::onMouseWheel);
toAdd->setUserString("Destination", name); toAdd->setUserString("Destination", name);
toAdd->setUserData(pos); toAdd->setUserData(pos);

5
files/mygui/openmw_alchemy_window.layout
Unescape Escape View File

@ -6,12 +6,13 @@
<!-- Name --> <!-- Name -->
<Widget type="TextBox" skin="SandText" position="10 10 65 24"> <Widget type="TextBox" skin="SandText" position="10 8 65 30">
<Property key="Caption" value="#{sName}"/> <Property key="Caption" value="#{sName}"/>
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
</Widget> </Widget>
<Widget type="EditBox" skin="MW_TextEdit" position="70 10 492 24" align="Top Left HStretch" name="NameEdit"/> <Widget type="EditBox" skin="MW_TextEdit" position="70 8 492 30" align="Top Left HStretch" name="NameEdit">
</Widget>
<!-- Apparatus --> <!-- Apparatus -->

25
files/mygui/openmw_enchanting_dialog.layout
Unescape Escape View File

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 400" align="Center" name="_Main"> <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 560 448" align="Center" name="_Main">
<Widget type="HBox" position="12 12 250 30"> <Widget type="HBox" position="12 9 273 30">
<Property key="Spacing" value="8"/>
<Widget type="AutoSizedTextBox" skin="NormalText"> <Widget type="AutoSizedTextBox" skin="NormalText">
<Property key="Caption" value="#{sName}"/> <Property key="Caption" value="#{sName}"/>
@ -23,7 +24,7 @@
<!-- Item --> <!-- Item -->
<Widget type="HBox" position="12 48 400 59"> <Widget type="HBox" position="12 48 265 59">
<Property key="Spacing" value="8"/> <Property key="Spacing" value="8"/>
<Widget type="AutoSizedTextBox" skin="NormalText"> <Widget type="AutoSizedTextBox" skin="NormalText">
@ -35,7 +36,9 @@
<Widget type="ItemWidget" skin="MW_ItemIconBox" position="0 0 50 50" name="ItemBox"> <Widget type="ItemWidget" skin="MW_ItemIconBox" position="0 0 50 50" name="ItemBox">
</Widget> </Widget>
<Widget type="Widget" position="0 0 8 0"/> <Widget type="Widget" position="0 0 8 0">
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="NormalText"> <Widget type="AutoSizedTextBox" skin="NormalText">
<Property key="Caption" value="#{sSoulGem}"/> <Property key="Caption" value="#{sSoulGem}"/>
@ -49,7 +52,7 @@
</Widget> </Widget>
<!-- Values --> <!-- Values -->
<Widget type="VBox" position="320 8 222 72"> <Widget type="VBox" position="320 7 222 72">
<Widget type="HBox"> <Widget type="HBox">
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<Widget type="AutoSizedTextBox" skin="NormalText"> <Widget type="AutoSizedTextBox" skin="NormalText">
@ -95,29 +98,29 @@
</Widget> </Widget>
<!-- Available effects --> <!-- Available effects -->
<Widget type="TextBox" skin="NormalText" position="12 108 300 24"> <Widget type="TextBox" skin="NormalText" position="12 109 300 24">
<Property key="Caption" value="#{sMagicEffects}"/> <Property key="Caption" value="#{sMagicEffects}"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
<UserString key="ToolTipLayout" value="TextToolTip"/> <UserString key="ToolTipLayout" value="TextToolTip"/>
<UserString key="Caption_Text" value="#{sEnchantmentHelp9}"/> <UserString key="Caption_Text" value="#{sEnchantmentHelp9}"/>
</Widget> </Widget>
<Widget type="MWList" skin="MW_SimpleList" position="12 136 202 209" name="AvailableEffects"> <Widget type="MWList" skin="MW_SimpleList" position="12 136 202 269" name="AvailableEffects">
</Widget> </Widget>
<!-- Used effects --> <!-- Used effects -->
<Widget type="TextBox" skin="NormalText" position="226 108 300 24"> <Widget type="TextBox" skin="NormalText" position="226 109 300 24">
<Property key="Caption" value="#{sEffects}"/> <Property key="Caption" value="#{sEffects}"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
<UserString key="ToolTipLayout" value="TextToolTip"/> <UserString key="ToolTipLayout" value="TextToolTip"/>
<UserString key="Caption_Text" value="#{sEnchantmentHelp10}"/> <UserString key="Caption_Text" value="#{sEnchantmentHelp10}"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="226 136 316 209"> <Widget type="Widget" skin="MW_Box" position="226 136 316 269">
<Widget type="ScrollView" skin="MW_ScrollViewH" position="4 4 308 201" name="UsedEffects"> <Widget type="ScrollView" skin="MW_ScrollViewH" position="4 4 308 261" name="UsedEffects">
<Property key="CanvasAlign" value="Left Top"/> <Property key="CanvasAlign" value="Left Top"/>
</Widget> </Widget>
</Widget> </Widget>
<Widget type="HBox" position="0 340 558 60"> <Widget type="HBox" position="0 392 558 60">
<Property key="Padding" value="16"/> <Property key="Padding" value="16"/>
<Widget type="AutoSizedButton" skin="MW_Button" name="TypeButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="TypeButton">

10
files/mygui/openmw_merchantrepair.layout
Unescape Escape View File

@ -4,25 +4,25 @@
<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 418 248" align="Center" name="_Main">
<Property key="Visible" value="false"/> <Property key="Visible" value="false"/>
<Widget type="TextBox" skin="SandText" position="8 18 418 24" align="Right Top"> <Widget type="TextBox" skin="SandText" position="8 24 418 24" align="Right Top">
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
<Property key="Caption" value="#{sRepairServiceTitle}"/> <Property key="Caption" value="#{sRepairServiceTitle}"/>
</Widget> </Widget>
<Widget type="TextBox" skin="NormalText" position="0 0 418 24" align="Right Top"> <Widget type="TextBox" skin="NormalText" position="0 3 418 24" align="Right Top">
<Property key="TextAlign" value="Center"/> <Property key="TextAlign" value="Center"/>
<Property key="Caption" value="#{sServiceRepairTitle}"/> <Property key="Caption" value="#{sServiceRepairTitle}"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="10 46 389 156" align="Left Stretch"> <Widget type="Widget" skin="MW_Box" position="10 46 389 156" align="Left Stretch">
<Widget type="ScrollView" skin="MW_ScrollView" position="4 4 381 147" align="Left Top Stretch" name="RepairView"> <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 381 145" align="Left Top Stretch" name="RepairView">
<Property key="CanvasAlign" value="Left"/> <Property key="CanvasAlign" value="Left"/>
</Widget> </Widget>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="10 206 300 24" name="PlayerGold" align="Right Top"> <Widget type="TextBox" skin="SandText" position="10 208 300 24" name="PlayerGold" align="Right Top">
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
</Widget> </Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="343 210 56 24" name="OkButton" align="Right Top"> <Widget type="AutoSizedButton" skin="MW_Button" position="343 209 56 24" name="OkButton" align="Right Top">
<Property key="ExpandDirection" value="Left"/> <Property key="ExpandDirection" value="Left"/>
<Property key="Caption" value="#{sOK}"/> <Property key="Caption" value="#{sOK}"/>
</Widget> </Widget>

4
files/mygui/openmw_scroll.skin.xml
Unescape Escape View File

@ -4,12 +4,12 @@
<Resource type="ResourceSkin" name="MW_ScrollView" size="516 516"> <Resource type="ResourceSkin" name="MW_ScrollView" size="516 516">
<Child type="Widget" skin="" offset="0 0 502 516" align="Stretch" name="Client"/> <Child type="Widget" skin="" offset="0 0 502 516" align="Stretch" name="Client"/>
<Child type="MWScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="Right Top VStretch" name="VScroll"/> <Child type="MWScrollBar" skin="MW_VScroll" offset="498 3 14 513" align="Right Top VStretch" name="VScroll"/>
</Resource> </Resource>
<Resource type="ResourceSkin" name="MW_ScrollViewH" size="516 516"> <Resource type="ResourceSkin" name="MW_ScrollViewH" size="516 516">
<Child type="Widget" skin="" offset="0 0 516 502" align="Stretch" name="Client"/> <Child type="Widget" skin="" offset="0 0 516 502" align="Stretch" name="Client"/>
<Child type="MWScrollBar" skin="MW_HScroll" offset="3 498 509 14" align="Left Bottom HStretch" name="HScroll"/> <Child type="MWScrollBar" skin="MW_HScroll" offset="3 498 513 14" align="Left Bottom HStretch" name="HScroll"/>
</Resource> </Resource>
</MyGUI> </MyGUI>

14
files/mygui/openmw_spell_buying_window.layout
Unescape Escape View File

@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 306" align="Center" name="_Main"> <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 288" align="Center" name="_Main">
<Property key="Visible" value="false"/> <Property key="Visible" value="false"/>
<Widget type="TextBox" skin="SandText" position="8 10 450 18" align="Right Top"> <Widget type="TextBox" skin="SandText" position="8 24 450 18" align="Right Top">
<Property key="TextAlign" value="Left"/> <Property key="TextAlign" value="Left"/>
<Property key="Caption" value="#{sSpellServiceTitle}"/> <Property key="Caption" value="#{sSpellServiceTitle}"/>
</Widget> </Widget>
<Widget type="TextBox" skin="NormalText" position="0 0 450 18" align="Right Top"> <Widget type="TextBox" skin="NormalText" position="0 4 434 18" align="Center Top">
<Property key="TextAlign" value="Center"/> <Property key="TextAlign" value="Center"/>
<Property key="Caption" value="#{sServiceSpellsTitle}"/> <Property key="Caption" value="#{sServiceSpellsTitle}"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="Left Stretch"> <Widget type="Widget" skin="MW_Box" position="6 41 429 204" align="Left Stretch">
<Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="Left Top Stretch" name="SpellsView"> <Widget type="ScrollView" skin="MW_ScrollView" position="2 2 427 198" align="Left Top Stretch" name="SpellsView">
<Property key="CanvasAlign" value="Left"/> <Property key="CanvasAlign" value="Left"/>
</Widget> </Widget>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top"> <Widget type="TextBox" skin="SandText" position="8 250 24 24" name="PlayerGold" align="Right Top">
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Right"/>
</Widget> </Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="375 260 60 24" name="CancelButton" align="Right Top"> <Widget type="AutoSizedButton" skin="MW_Button" position="375 251 60 24" name="CancelButton" align="Right Top">
<Property key="ExpandDirection" value="Left"/> <Property key="ExpandDirection" value="Left"/>
<Property key="Caption" value="#{sOK}"/> <Property key="Caption" value="#{sOK}"/>
</Widget> </Widget>

18
files/mygui/openmw_travel_window.layout
Unescape Escape View File

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 304" align="Center" name="_Main"> <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 500 250" align="Center" name="_Main">
<Property key="Visible" value="false"/> <Property key="Visible" value="false"/>
<Widget type="TextBox" skin="SandText" position="8 10 24 24" name="Select" align="Right Top"> <Widget type="TextBox" skin="SandText" position="8 22 24 24" name="Select" align="Right Top">
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Right"/>
<Property key="Caption" value="#{sTravelServiceTitle}"/> <Property key="Caption" value="#{sTravelServiceTitle}"/>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="0 0 24 24" name="Travel" align="Right Top"> <Widget type="TextBox" skin="NormalText" position="0 4 484 24" name="Travel" align="Center Top">
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Center"/>
<Property key="Caption" value="#D8C09A#{sServiceTravelTitle}"/> <Property key="Caption" value="#{sServiceTravelTitle}"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="Left Stretch"> <Widget type="Widget" skin="MW_Box" position="6 42 480 165" align="Left Stretch">
<Widget type="ScrollView" skin="MW_ScrollView" position="4 4 422 217" align="Left Top Stretch" name="DestinationsView"> <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 472 160" align="Left Top Stretch" name="DestinationsView">
<Property key="CanvasAlign" value="Left"/> <Property key="CanvasAlign" value="Left"/>
</Widget> </Widget>
</Widget> </Widget>
<Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top"> <Widget type="TextBox" skin="SandText" position="6 211 24 24" name="PlayerGold" align="Right Top">
<Property key="TextAlign" value="Right"/> <Property key="TextAlign" value="Right"/>
</Widget> </Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="375 261 60 24" name="CancelButton" align="Right Top"> <Widget type="AutoSizedButton" skin="MW_Button" position="425 212 60 24" name="CancelButton" align="Right Top">
<Property key="ExpandDirection" value="Left"/> <Property key="ExpandDirection" value="Left"/>
<Property key="Caption" value="#{sCancel}"/> <Property key="Caption" value="#{sCancel}"/>
</Widget> </Widget>

Write Preview
Loading…
Cancel
Save