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

Merge pull request #1303 from akortunov/guifixes

Browse Source 
Character generation layout fixes
0.6.1
scrawl 8 years ago committed by GitHub
parent a1661af864 2b28d1a6d2
commit 2638327593
10 changed files with 73 additions and 58 deletions
Show Stats Download Patch File Download Diff File

2
apps/openmw/mwgui/levelupdialog.cpp
Unescape Escape View File

@ -89,7 +89,7 @@ namespace MWGui
void LevelupDialog::resetCoins() void LevelupDialog::resetCoins()
{ {
const int coinSpacing = 10; const int coinSpacing = 33;
int curX = mCoinBox->getWidth()/2 - (coinSpacing*(mCoinCount - 1) + 16*mCoinCount)/2; int curX = mCoinBox->getWidth()/2 - (coinSpacing*(mCoinCount - 1) + 16*mCoinCount)/2;
for (unsigned int i=0; i<sMaxCoins; ++i) for (unsigned int i=0; i<sMaxCoins; ++i)
{ {

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

@ -27,16 +27,23 @@
</Widget> </Widget>
<!-- Favorite Attributes --> <!-- Favorite Attributes -->
<Widget type="TextBox" skin="HeaderText" position="0 41 166 18" name="FavoriteAttributesT" align="Left Top"> <Widget type="VBox" skin="" position="0 39 166 72" align="Stretch">
<Property key="Caption" value="#{sChooseClassMenu2}"/> <Property key="Spacing" value="0"/>
<Property key="TextAlign" value="Left Top"/>
<UserString key="ToolTipType" value="Layout"/> <!-- Favorite Attributes -->
<UserString key="ToolTipLayout" value="TextToolTip"/> <Widget type="AutoSizedEditBox" skin="HeaderText" position="0 0 166 18" name="FavoriteAttributesT" align="Left Top">
<UserString key="Caption_Text" value="#{sCreateClassMenuHelp2}"/> <Property key="Caption" value="#{sChooseClassMenu2}"/>
</Widget> <Property key="TextAlign" value="Left Top"/>
<UserString key="ToolTipType" value="Layout"/>
<UserString key="ToolTipLayout" value="TextToolTip"/>
<UserString key="Caption_Text" value="#{sCreateClassMenuHelp2}"/>
<Property key="MultiLine" value="true"/>
<Property key="WordWrap" value="true"/>
</Widget>
<Widget type="MWAttribute" skin="MW_StatName" position="0 59 166 18" name="FavoriteAttribute0" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 0 166 18" name="FavoriteAttribute0" align="Left Top"/>
<Widget type="MWAttribute" skin="MW_StatName" position="0 77 166 18" name="FavoriteAttribute1" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 0 166 18" name="FavoriteAttribute1" align="Left Top"/>
</Widget>
<!-- Major Skills --> <!-- Major Skills -->
<Widget type="TextBox" skin="HeaderText" position="166 0 162 18" name="MajorSkillT" align="Left Top"> <Widget type="TextBox" skin="HeaderText" position="166 0 162 18" name="MajorSkillT" align="Left Top">

28
files/mygui/openmw_chargen_create_class.layout
Unescape Escape View File

@ -26,22 +26,30 @@
<Property key="TextAlign" value="Left Top"/> <Property key="TextAlign" value="Left Top"/>
</Widget> </Widget>
<!-- Favorite Attributes --> <Widget type="VBox" skin="" position="0 41 166 72" align="Stretch">
<Widget type="TextBox" skin="HeaderText" position="0 41 166 18" name="FavoriteAttributesT" align="Left Top"> <Property key="Spacing" value="0"/>
<Property key="Caption" value="#{sChooseClassMenu2}"/>
<Property key="TextAlign" value="Left Top"/> <!-- Favorite Attributes -->
<UserString key="ToolTipType" value="Layout"/> <Widget type="AutoSizedEditBox" skin="HeaderText" position="0 0 166 18" name="FavoriteAttributesT" align="Left Top">
<UserString key="ToolTipLayout" value="TextToolTip"/> <Property key="Caption" value="#{sChooseClassMenu2}"/>
<UserString key="Caption_Text" value="#{sCreateClassMenuHelp2}"/> <Property key="TextAlign" value="Left Top"/>
</Widget> <UserString key="ToolTipType" value="Layout"/>
<UserString key="ToolTipLayout" value="TextToolTip"/>
<UserString key="Caption_Text" value="#{sCreateClassMenuHelp2}"/>
<Property key="MultiLine" value="true"/>
<Property key="WordWrap" value="true"/>
</Widget>
<Widget type="MWAttribute" skin="MW_StatNameButton" position="0 59 166 18" name="FavoriteAttribute0" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 0 166 18" name="FavoriteAttribute0" align="Left Top"/>
<Widget type="MWAttribute" skin="MW_StatNameButton" position="0 77 166 18" name="FavoriteAttribute1" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 0 166 18" name="FavoriteAttribute1" align="Left Top"/>
</Widget>
<!-- Major Skills --> <!-- Major Skills -->
<Widget type="TextBox" skin="HeaderText" position="166 0 166 18" name="MajorSkillT" align="Left Top"> <Widget type="TextBox" skin="HeaderText" position="166 0 166 18" name="MajorSkillT" align="Left Top">
<Property key="Caption" value="#{sChooseClassMenu3}"/> <Property key="Caption" value="#{sChooseClassMenu3}"/>
<Property key="TextAlign" value="Left Top"/> <Property key="TextAlign" value="Left Top"/>
<Property key="MultiLine" value="true"/>
<Property key="WordWrap" value="true"/>
</Widget> </Widget>
<Widget type="MWSkill" skin="MW_StatNameButton" position="166 18 166 18" name="MajorSkill0" align="Left Top"/> <Widget type="MWSkill" skin="MW_StatNameButton" position="166 18 166 18" name="MajorSkill0" align="Left Top"/>

2
files/mygui/openmw_chargen_race.layout
Unescape Escape View File

@ -57,7 +57,7 @@
<Widget type="TextBox" skin="HeaderText" position="261 16 132 18" name="RaceT" align="Left Top"> <Widget type="TextBox" skin="HeaderText" position="261 16 132 18" name="RaceT" align="Left Top">
<Property key="TextAlign" value="Left Top"/> <Property key="TextAlign" value="Left Top"/>
</Widget> </Widget>
<Widget type="ListBox" skin="MW_List" position="264 39 132 161" name="RaceList"> <Widget type="ListBox" skin="MW_List" position="264 39 132 150" name="RaceList">
</Widget> </Widget>
<!-- Spell powers --> <!-- Spell powers -->

22
files/mygui/openmw_chargen_select_attribute.layout
Unescape Escape View File

@ -1,23 +1,23 @@
<?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 217 234" align="Center" name="_Main"> <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 217 234" align="Center" name="_Main">
<Widget type="Widget" skin="" position="14 14 186 203" align="Stretch"> <Widget type="Widget" skin="" position="14 14 200 203" align="HCenter VStretch">
<!-- Label --> <!-- Label -->
<Widget type="TextBox" skin="HeaderText" position="0 0 186 18" name="LabelT" align="Left Top"> <Widget type="TextBox" skin="HeaderText" position="0 0 200 18" name="LabelT" align="HCenter Top">
<Property key="Caption" value="#{sAttributesMenu1}"/> <Property key="Caption" value="#{sAttributesMenu1}"/>
<Property key="TextAlign" value="HCenter Top"/> <Property key="TextAlign" value="HCenter Top"/>
</Widget> </Widget>
<!-- Attribute list --> <!-- Attribute list -->
<Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 28 186 18" name="Attribute0" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 28 200 18" name="Attribute0" align="Left Top"/>
<Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 46 186 18" name="Attribute1" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 46 200 18" name="Attribute1" align="Left Top"/>
<Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 64 186 18" name="Attribute2" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 64 200 18" name="Attribute2" align="Left Top"/>
<Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 82 186 18" name="Attribute3" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 82 200 18" name="Attribute3" align="Left Top"/>
<Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 100 186 18" name="Attribute4" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 100 200 18" name="Attribute4" align="Left Top"/>
<Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 118 186 18" name="Attribute5" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 118 200 18" name="Attribute5" align="Left Top"/>
<Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 136 186 18" name="Attribute6" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 136 200 18" name="Attribute6" align="Left Top"/>
<Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 154 186 18" name="Attribute7" align="Left Top"/> <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 154 200 18" name="Attribute7" align="Left Top"/>
<!-- Dialog buttons --> <!-- Dialog buttons -->
<Widget type="AutoSizedButton" skin="MW_Button" position="120 180 66 21" name="CancelButton"> <Widget type="AutoSizedButton" skin="MW_Button" position="120 180 66 21" name="CancelButton">

2
files/mygui/openmw_chargen_select_skill.layout
Unescape Escape View File

@ -1,6 +1,6 @@
<?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 477 270" align="Center" name="_Main"> <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 477 270" align="Center" name="_Main">
<Widget type="Widget" skin="" position="17 14 447 239" align="Stretch"> <Widget type="Widget" skin="" position="17 14 447 239" align="Stretch">
<!-- Label --> <!-- Label -->

6
files/mygui/openmw_chargen_select_specialization.layout
Unescape Escape View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Layout"> <MyGUI type="Layout">
<!-- correct size is 247 144, adjust when skin is changed to a dialog --> <!-- correct size is 247 144, adjust when skin is changed to a dialog -->
<Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 247 144" align="Center" name="_Main"> <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 247 144" align="Center" name="_Main">
<Widget type="Widget" skin="" position="14 14 216 113" align="Stretch"> <Widget type="Widget" skin="" position="14 14 216 113" align="Stretch">
<!-- Label --> <!-- Label -->
<Widget type="TextBox" skin="HeaderText" position="0 0 216 18" name="LabelT" align="Left Top"> <Widget type="TextBox" skin="HeaderText" position="0 0 216 18" name="LabelT" align="Center Top">
<Property key="Caption" value="#{sSpecializationMenu1}"/> <Property key="Caption" value="#{sSpecializationMenu1}"/>
<Property key="TextAlign" value="Left Top"/> <Property key="TextAlign" value="Center Top"/>
</Widget> </Widget>
<!-- Specialization list --> <!-- Specialization list -->

2
files/mygui/openmw_infobox.layout
Unescape Escape View File

@ -11,6 +11,6 @@
</Widget> </Widget>
<!-- Button bar, buttons are created as children --> <!-- Button bar, buttons are created as children -->
<Widget type="Widget" skin="" position="72 98 400 150" name="ButtonBar" align="Top HCenter" /> <Widget type="Widget" skin="" position="72 98 450 150" name="ButtonBar" align="Top HCenter" />
</Widget> </Widget>
</MyGUI> </MyGUI>

38
files/mygui/openmw_levelup_dialog.layout
Unescape Escape View File

@ -2,7 +2,7 @@
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 0 0" align="Center" name="_Main"> <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 0 0" align="Center" name="_Main">
<Property key="Padding" value="12"/> <Property key="Padding" value="10"/>
<Property key="Spacing" value="8"/> <Property key="Spacing" value="8"/>
<Property key="AutoResize" value="true"/> <Property key="AutoResize" value="true"/>
@ -22,25 +22,25 @@
<Property key="Static" value="true"/> <Property key="Static" value="true"/>
</Widget> </Widget>
<Widget type="Widget" skin="" position="0 0 100 16" name="Coins"> <Widget type="Widget" skin="" position="0 0 150 16" name="Coins">
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<UserString key="VStretch" value="false"/> <UserString key="VStretch" value="false"/>
</Widget> </Widget>
<Widget type="Widget" skin="" position="0 280 391 100" name="AssignWidget"> <Widget type="Widget" skin="" position="0 280 420 84" name="AssignWidget">
<UserString key="HStretch" value="false"/> <UserString key="HStretch" value="false"/>
<UserString key="VStretch" value="false"/> <UserString key="VStretch" value="false"/>
<Widget type="TextBox" skin="SandTextVCenter" position="22 0 100 24" name="AttribMultiplier1"/> <Widget type="TextBox" skin="SandTextVCenter" position="32 0 100 20" name="AttribMultiplier1"/>
<Widget type="TextBox" skin="SandTextVCenter" position="22 24 100 24" name="AttribMultiplier2"/> <Widget type="TextBox" skin="SandTextVCenter" position="32 20 100 20" name="AttribMultiplier2"/>
<Widget type="TextBox" skin="SandTextVCenter" position="22 48 100 24" name="AttribMultiplier3"/> <Widget type="TextBox" skin="SandTextVCenter" position="32 40 100 20" name="AttribMultiplier3"/>
<Widget type="TextBox" skin="SandTextVCenter" position="22 72 100 24" name="AttribMultiplier4"/> <Widget type="TextBox" skin="SandTextVCenter" position="32 60 100 20" name="AttribMultiplier4"/>
<Widget type="TextBox" skin="SandTextVCenter" position="218 0 100 24" name="AttribMultiplier5"/> <Widget type="TextBox" skin="SandTextVCenter" position="218 0 100 20" name="AttribMultiplier5"/>
<Widget type="TextBox" skin="SandTextVCenter" position="218 24 100 24" name="AttribMultiplier6"/> <Widget type="TextBox" skin="SandTextVCenter" position="218 20 100 20" name="AttribMultiplier6"/>
<Widget type="TextBox" skin="SandTextVCenter" position="218 48 100 24" name="AttribMultiplier7"/> <Widget type="TextBox" skin="SandTextVCenter" position="218 40 100 20" name="AttribMultiplier7"/>
<Widget type="TextBox" skin="SandTextVCenter" position="218 72 100 24" name="AttribMultiplier8"/> <Widget type="TextBox" skin="SandTextVCenter" position="218 60 100 20" name="AttribMultiplier8"/>
<Widget type="HBox" position="42 0 200 24"> <Widget type="HBox" position="52 0 200 20">
<Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib1"> <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib1">
<UserString key="TextPadding" value="0 0"/> <UserString key="TextPadding" value="0 0"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
@ -54,7 +54,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="HBox" position="42 24 200 24"> <Widget type="HBox" position="52 20 200 20">
<Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib2"> <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib2">
<UserString key="TextPadding" value="0 0"/> <UserString key="TextPadding" value="0 0"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
@ -68,7 +68,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="HBox" position="42 48 200 24"> <Widget type="HBox" position="52 40 200 20">
<Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib3"> <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib3">
<UserString key="TextPadding" value="0 0"/> <UserString key="TextPadding" value="0 0"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
@ -82,7 +82,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="HBox" position="42 72 200 24"> <Widget type="HBox" position="52 60 200 20">
<Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib4"> <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib4">
<UserString key="TextPadding" value="0 0"/> <UserString key="TextPadding" value="0 0"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
@ -97,7 +97,7 @@
</Widget> </Widget>
<Widget type="HBox" position="238 0 200 24"> <Widget type="HBox" position="238 0 200 20">
<Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib5"> <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib5">
<UserString key="TextPadding" value="0 0"/> <UserString key="TextPadding" value="0 0"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
@ -111,7 +111,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="HBox" position="238 24 200 24"> <Widget type="HBox" position="238 20 200 20">
<Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib6"> <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib6">
<UserString key="TextPadding" value="0 0"/> <UserString key="TextPadding" value="0 0"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
@ -125,7 +125,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="HBox" position="238 48 200 24"> <Widget type="HBox" position="238 40 200 20">
<Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib7"> <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib7">
<UserString key="TextPadding" value="0 0"/> <UserString key="TextPadding" value="0 0"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>
@ -139,7 +139,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="HBox" position="238 72 200 24"> <Widget type="HBox" position="238 60 200 20">
<Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib8"> <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib8">
<UserString key="TextPadding" value="0 0"/> <UserString key="TextPadding" value="0 0"/>
<UserString key="ToolTipType" value="Layout"/> <UserString key="ToolTipType" value="Layout"/>

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

@ -127,7 +127,7 @@
<Resource type="ResourceSkin" name="MW_List" size="516 516" align="Left Top"> <Resource type="ResourceSkin" name="MW_List" size="516 516" align="Left Top">
<Property key="NeedKey" value="true"/> <Property key="NeedKey" value="true"/>
<Property key="SkinLine" value="MW_ListLine"/> <Property key="SkinLine" value="MW_ListLine"/>
<Property key="HeightLine" value="20"/> <Property key="HeightLine" value="18"/>
<Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/> <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
@ -140,7 +140,7 @@
<Resource type="ResourceSkin" name="MW_PopupList" size="516 516" align="Left Top"> <Resource type="ResourceSkin" name="MW_PopupList" size="516 516" align="Left Top">
<Property key="NeedKey" value="true"/> <Property key="NeedKey" value="true"/>
<Property key="SkinLine" value="MW_ListLine"/> <Property key="SkinLine" value="MW_ListLine"/>
<Property key="HeightLine" value="20"/> <Property key="HeightLine" value="18"/>
<Child type="Widget" skin="BlackBG" offset="0 0 516 516" align="Stretch"/> <Child type="Widget" skin="BlackBG" offset="0 0 516 516" align="Stretch"/>
<Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/> <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>

Write Preview
Loading…
Cancel
Save