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

Merge pull request #343 from OpenMW/master

Browse source 
Add OpenMW commits up to 23 Nov 2017
This commit is contained in:
David Cernat 2017-11-23 04:51:13 +02:00 committed by GitHub
commit 656453725b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 60 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwgui/journalwindow.cpp
View file

@ -203,9 +203,20 @@ namespace
int cancelLeft = getWidget<MyGUI::Widget>(CancelBTN)->getPosition().left; int cancelLeft = getWidget<MyGUI::Widget>(CancelBTN)->getPosition().left;
int cancelRight = getWidget<MyGUI::Widget>(CancelBTN)->getPosition().left + getWidget<MyGUI::Widget>(CancelBTN)->getSize().width; int cancelRight = getWidget<MyGUI::Widget>(CancelBTN)->getPosition().left + getWidget<MyGUI::Widget>(CancelBTN)->getSize().width;
getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(cancelLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
getWidget<MyGUI::Widget>(QuestsBTN)->setPosition(cancelRight, getWidget<MyGUI::Widget>(QuestsBTN)->getPosition().top); getWidget<MyGUI::Widget>(QuestsBTN)->setPosition(cancelRight, getWidget<MyGUI::Widget>(QuestsBTN)->getPosition().top);
// Usually Topics, Quests, and Cancel buttons have the 64px width, so we can place the Topics left-up from the Cancel button, and the Quests right-up from the Cancel button.
// But in some installations, e.g. German one, the Topics button has the 128px width, so we should place it exactly left from the Quests button.
if (getWidget<MyGUI::Widget>(TopicsBTN)->getSize().width == 64)
{
getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(cancelLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
}
else
{
int questLeft = getWidget<MyGUI::Widget>(QuestsBTN)->getPosition().left;
getWidget<MyGUI::Widget>(TopicsBTN)->setPosition(questLeft - topicsWidth, getWidget<MyGUI::Widget>(TopicsBTN)->getPosition().top);
}
mQuestMode = false; mQuestMode = false;
mAllQuests = false; mAllQuests = false;
mOptionsMode = false; mOptionsMode = false;

1
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -541,6 +541,7 @@ namespace MWGui
delete mDragAndDrop; delete mDragAndDrop;
delete mSoulgemDialog; delete mSoulgemDialog;
delete mCursorManager; delete mCursorManager;
delete mToolTips;
cleanupGarbage(); cleanupGarbage();

6
cmake/FindSDL2.cmake
View file

@ -70,10 +70,10 @@ endif()
libfind_pkg_detect(SDL2 sdl2 libfind_pkg_detect(SDL2 sdl2
FIND_PATH SDL.h FIND_PATH SDL.h
HINTS $ENV{SDL2DIR} HINTS $ENV{SDL2DIR}
PATH_SUFFIXES include SDL2 PATH_SUFFIXES include SDL2 include/SDL2
FIND_LIBRARY SDL2 FIND_LIBRARY SDL2
HINTS $ENV{SDL2DIR} HINTS $ENV{SDL2DIR}
PATH_SUFFIXES ${_sdl_lib_suffix} PATH_SUFFIXES lib ${_sdl_lib_suffix}
) )
libfind_version_n_header(SDL2 NAMES SDL_version.h DEFINES SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_PATCHLEVEL) libfind_version_n_header(SDL2 NAMES SDL_version.h DEFINES SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_PATCHLEVEL)
@ -85,7 +85,7 @@ IF(NOT SDL2_BUILDING_LIBRARY AND NOT APPLE)
libfind_pkg_detect(SDL2MAIN sdl2 libfind_pkg_detect(SDL2MAIN sdl2
FIND_LIBRARY SDL2main FIND_LIBRARY SDL2main
HINTS $ENV{SDL2DIR} HINTS $ENV{SDL2DIR}
PATH_SUFFIXES ${_sdl_lib_suffix} PATH_SUFFIXES lib ${_sdl_lib_suffix}
) )
set(SDL2MAIN_FIND_QUIETLY TRUE) set(SDL2MAIN_FIND_QUIETLY TRUE)
libfind_process(SDL2MAIN) libfind_process(SDL2MAIN)

2
components/widgets/numericeditbox.cpp
View file

@ -87,7 +87,7 @@ namespace Gui
setValue(std::max(mValue-1, mMinValue)); setValue(std::max(mValue-1, mMinValue));
eventValueChanged(mValue); eventValueChanged(mValue);
} }
else else if (character == 0 || (character >= '0' && character <= '9'))
Base::onKeyButtonPressed(key, character); Base::onKeyButtonPressed(key, character);
} }

4
files/mygui/openmw_alchemy_window.layout
View file

@ -76,9 +76,7 @@
<Widget type="HBox" skin="" position="110 374 452 24" align="Bottom Right"> <Widget type="HBox" skin="" position="110 374 452 24" align="Bottom Right">
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="CreateButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="CreateButton">
<Property key="Caption" value="#{sCreate}"/> <Property key="Caption" value="#{sCreate}"/>

4
files/mygui/openmw_chargen_birth.layout
View file

@ -17,9 +17,7 @@
<!-- Dialog buttons --> <!-- Dialog buttons -->
<Widget type="HBox" position="0 338 511 24"> <Widget type="HBox" position="0 338 511 24">
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="BackButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
<Property key="Caption" value="#{sBack}"/> <Property key="Caption" value="#{sBack}"/>
</Widget> </Widget>

4
files/mygui/openmw_chargen_class.layout
View file

@ -74,9 +74,7 @@
<!-- Dialog buttons --> <!-- Dialog buttons -->
<Widget type="HBox" position="0 276 475 24"> <Widget type="HBox" position="0 276 475 24">
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="BackButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
<Property key="Caption" value="#{sBack}"/> <Property key="Caption" value="#{sBack}"/>
</Widget> </Widget>

4
files/mygui/openmw_chargen_create_class.layout
View file

@ -75,9 +75,7 @@
<!-- Dialog buttons --> <!-- Dialog buttons -->
<Widget type="HBox" position="0 158 482 24"> <Widget type="HBox" position="0 158 482 24">
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="DescriptionButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="DescriptionButton">
<Property key="Caption" value="#{sCreateClassMenu1}"/> <Property key="Caption" value="#{sCreateClassMenu1}"/>
</Widget> </Widget>

4
files/mygui/openmw_chargen_race.layout
View file

@ -76,9 +76,7 @@
<!-- Dialog buttons --> <!-- Dialog buttons -->
<Widget type="HBox" position="0 393 572 24"> <Widget type="HBox" position="0 393 572 24">
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="471 397 53 23" name="BackButton"> <Widget type="AutoSizedButton" skin="MW_Button" position="471 397 53 23" name="BackButton">
<Property key="Caption" value="#{sBack}"/> <Property key="Caption" value="#{sBack}"/>

4
files/mygui/openmw_chargen_review.layout
View file

@ -112,9 +112,7 @@
<!-- Dialogue Buttons --> <!-- Dialogue Buttons -->
<Widget type="HBox" position="0 388 525 24"> <Widget type="HBox" position="0 388 525 24">
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="BackButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="BackButton">
<Property key="Caption" value="#{sBack}"/> <Property key="Caption" value="#{sBack}"/>
</Widget> </Widget>

4
files/mygui/openmw_edit_effect.layout
View file

@ -94,9 +94,7 @@
</Widget> </Widget>
<Widget type="HBox" position="8 266 336 24"> <Widget type="HBox" position="8 266 336 24">
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="DeleteButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="DeleteButton">
<Property key="Caption" value="#{sDelete}"/> <Property key="Caption" value="#{sDelete}"/>

4
files/mygui/openmw_edit_note.layout
View file

@ -16,9 +16,7 @@
<Widget type="HBox" position="13 200 303 24"> <Widget type="HBox" position="13 200 303 24">
<Property key="Spacing" value="6"/> <Property key="Spacing" value="6"/>
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="DeleteButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="DeleteButton">
<Property key="Caption" value="#{sDelete}"/> <Property key="Caption" value="#{sDelete}"/>
</Widget> </Widget>

8
files/mygui/openmw_enchanting_dialog.layout
View file

@ -36,9 +36,7 @@
<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="Spacer"/>
<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}"/>
@ -141,9 +139,7 @@
<UserString key="Caption_Text" value="#{sEnchantmentHelp7}"/> <UserString key="Caption_Text" value="#{sEnchantmentHelp7}"/>
</Widget> </Widget>
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="NormalText" name="PriceTextLabel"> <Widget type="AutoSizedTextBox" skin="NormalText" name="PriceTextLabel">
<Property key="Caption" value="#{sBarterDialog7}"/> <Property key="Caption" value="#{sBarterDialog7}"/>

4
files/mygui/openmw_levelup_dialog.layout
View file

@ -156,9 +156,7 @@
<Widget type="HBox" skin="" position="0 0 330 24"> <Widget type="HBox" skin="" position="0 0 330 24">
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" position="0 0 0 24" name="OkButton"> <Widget type="AutoSizedButton" skin="MW_Button" position="0 0 0 24" name="OkButton">
<Property key="Caption" value="#{sOk}"/> <Property key="Caption" value="#{sOk}"/>
</Widget> </Widget>

4
files/mygui/openmw_recharge_dialog.layout
View file

@ -27,9 +27,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
<Property key="Caption" value="#{sCancel}"/> <Property key="Caption" value="#{sCancel}"/>

4
files/mygui/openmw_repair.layout
View file

@ -34,9 +34,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
<Property key="Caption" value="#{sCancel}"/> <Property key="Caption" value="#{sCancel}"/>

4
files/mygui/openmw_spellcreation_dialog.layout
View file

@ -68,9 +68,7 @@
<Widget type="HBox" position="0 336 558 60"> <Widget type="HBox" position="0 336 558 60">
<Property key="Padding" value="16"/> <Property key="Padding" value="16"/>
<Widget type="Widget" position="0 0 0 0"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="NormalText"> <Widget type="AutoSizedTextBox" skin="NormalText">
<Property key="Caption" value="#{sBarterDialog7}"/> <Property key="Caption" value="#{sBarterDialog7}"/>

8
files/mygui/openmw_tooltips.layout
View file

@ -103,9 +103,7 @@
<Widget type="VBox"> <Widget type="VBox">
<UserString key="VStretch" value="true"/> <UserString key="VStretch" value="true"/>
<Widget type="ImageBox" skin="ImageBox" position="8 8 32 32" align="Left Top" name="HandToHandImage"/> <Widget type="ImageBox" skin="ImageBox" position="8 8 32 32" align="Left Top" name="HandToHandImage"/>
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="VStretch" value="true"/>
</Widget>
</Widget> </Widget>
<Widget type="AutoSizedTextBox" skin="SandText" position="44 8 248 284" align="Left Top" name="HandToHandText"> <Widget type="AutoSizedTextBox" skin="SandText" position="44 8 248 284" align="Left Top" name="HandToHandText">
@ -122,9 +120,7 @@
<Widget type="VBox"> <Widget type="VBox">
<UserString key="VStretch" value="true"/> <UserString key="VStretch" value="true"/>
<Widget type="ImageBox" skin="ImageBox" position="8 8 32 32" align="Left Top" name="HealthImage"/> <Widget type="ImageBox" skin="ImageBox" position="8 8 32 32" align="Left Top" name="HealthImage"/>
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="VStretch" value="true"/>
</Widget>
</Widget> </Widget>
<Widget type="AutoSizedEditBox" skin="SandText" position="44 8 392 0" align="Left Top" name="HealthDescription"> <Widget type="AutoSizedEditBox" skin="SandText" position="44 8 392 0" align="Left Top" name="HealthDescription">

45
files/mygui/openmw_trade_window.layout
View file

@ -3,7 +3,7 @@
<MyGUI type="Layout"> <MyGUI type="Layout">
<Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 600 360" name="_Main"> <Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 600 360" name="_Main">
<Property key="Visible" value="false"/> <Property key="Visible" value="false"/>
<Property key="MinSize" value="380 245"/> <Property key="MinSize" value="428 245"/>
<!-- Categories --> <!-- Categories -->
<Widget type="HBox" position="8 8 566 24" align="Left Top HStretch" name="Categories"> <Widget type="HBox" position="8 8 566 24" align="Left Top HStretch" name="Categories">
@ -34,32 +34,39 @@
</Widget> </Widget>
<Widget type="Widget" skin="" position="8 231 566 92" name="BottomPane" align="Left Bottom HStretch"> <Widget type="Widget" skin="" position="8 231 566 92" name="BottomPane" align="Left Bottom HStretch">
<Widget type="TextBox" skin="SandText" position="192 0 374 24" name="PlayerGold" align="Left Top HStretch"> <Widget type="HBox" position="0 0 566 24" align="Left Top HStretch">
<Property key="TextAlign" value="Right"/> <Widget type="Button" skin="MW_Button" position="0 0 40 24" name="IncreaseButton" align="Left Top">
</Widget> <Property key="Caption" value="+"/>
<Widget type="TextBox" skin="SandText" position="192 28 374 24" name="MerchantGold" align="Left Top HStretch"> <Property key="NeedKey" value="false"/>
<Property key="TextAlign" value="Right"/> </Widget>
<Widget type="AutoSizedTextBox" skin="SandText" position="48 0 140 24" name="TotalBalanceLabel" align="Left Top">
<Property key="TextAlign" value="Left VCenter"/>
</Widget>
<Widget type="Spacer" />
<Widget type="AutoSizedTextBox" skin="SandText" position="0 0 374 24" name="PlayerGold" align="Right Top">
<Property key="TextAlign" value="Right"/>
</Widget>
</Widget> </Widget>
<Widget type="Button" skin="MW_Button" position="0 0 40 24" name="IncreaseButton" align="Left Top"> <Widget type="HBox" position="0 28 566 24" align="Left Top HStretch">
<Property key="Caption" value="+"/> <Widget type="Button" skin="MW_Button" position="0 0 40 24" name="DecreaseButton" align="Left Top">
</Widget> <Property key="Caption" value="-"/>
<Widget type="Button" skin="MW_Button" position="0 28 40 24" name="DecreaseButton" align="Left Top"> <Property key="NeedKey" value="false"/>
<Property key="Caption" value="-"/> </Widget>
</Widget> <Widget type="NumericEditBox" skin="MW_TextEdit" position="48 0 140 24" name="TotalBalance" align="Left Top">
<Property key="TextAlign" value="Center"/>
<Widget type="TextBox" skin="SandText" position="48 0 140 24" name="TotalBalanceLabel" align="Left Top "/> </Widget>
<Widget type="NumericEditBox" skin="MW_TextEdit" position="48 28 140 24" name="TotalBalance" align="Left Top"> <Widget type="Spacer" />
<Property key="TextAlign" value="Center"/> <Widget type="AutoSizedTextBox" skin="SandText" position="0 0 374 24" name="MerchantGold" align="Right Top">
<Property key="TextAlign" value="Right"/>
</Widget>
</Widget> </Widget>
<Widget type="HBox" position="0 60 566 24" align="Left Bottom HStretch"> <Widget type="HBox" position="0 60 566 24" align="Left Bottom HStretch">
<Widget type="AutoSizedButton" skin="MW_Button" name="MaxSaleButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="MaxSaleButton">
<Property key="Caption" value="#{sMaxSale}"/> <Property key="Caption" value="#{sMaxSale}"/>
</Widget> </Widget>
<Widget type="Widget"> <Widget type="Spacer" />
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="OfferButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="OfferButton">
<Property key="Caption" value="#{sBarterDialog8}"/> <Property key="Caption" value="#{sBarterDialog8}"/>
</Widget> </Widget>

4
files/mygui/openmw_wait_dialog.layout
View file

@ -26,9 +26,7 @@
<Widget type="HBox"> <Widget type="HBox">
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<Widget type="Widget"> <Widget type="Spacer"/>
<UserString key="HStretch" value="true"/>
</Widget>
<Widget type="AutoSizedButton" skin="MW_Button" name="UntilHealedButton"> <Widget type="AutoSizedButton" skin="MW_Button" name="UntilHealedButton">
<Property key="Caption" value="#{sUntilHealed}"/> <Property key="Caption" value="#{sUntilHealed}"/>