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

more gui files cleanup

Browse source
This commit is contained in:
scrawl 2012-05-19 16:00:00 +02:00
parent 7a4de0ed1d
commit 4fb30544d4
9 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -603,9 +603,6 @@ ContainerWindow::ContainerWindow(WindowManager& parWindowManager,DragAndDrop* dr
mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onCloseButtonClicked); mCloseButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onCloseButtonClicked);
mTakeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onTakeAllButtonClicked); mTakeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ContainerWindow::onTakeAllButtonClicked);
setText("CloseButton", MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sClose")->str);
setText("TakeButton", MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sTakeAll")->str);
// adjust buttons size to fit text // adjust buttons size to fit text
int closeButtonWidth = mCloseButton->getTextSize().width+24; int closeButtonWidth = mCloseButton->getTextSize().width+24;
int takeButtonWidth = mTakeButton->getTextSize().width+24; int takeButtonWidth = mTakeButton->getTextSize().width+24;

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

@ -69,7 +69,6 @@ DialogueWindow::DialogueWindow(WindowManager& parWindowManager)
MyGUI::ButtonPtr byeButton; MyGUI::ButtonPtr byeButton;
getWidget(byeButton, "ByeButton"); getWidget(byeButton, "ByeButton");
byeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &DialogueWindow::onByeClicked); byeButton->eventMouseButtonClick += MyGUI::newDelegate(this, &DialogueWindow::onByeClicked);
byeButton->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGoodbye")->str);
getWidget(pDispositionBar, "Disposition"); getWidget(pDispositionBar, "Disposition");
getWidget(pDispositionText,"DispositionText"); getWidget(pDispositionText,"DispositionText");

3
apps/openmw/mwgui/hud.cpp
View file

@ -77,9 +77,6 @@ HUD::HUD(int width, int height, int fpsLevel, DragAndDrop* dragAndDrop)
getWidget(trianglecounter, "TriangleCounter"); getWidget(trianglecounter, "TriangleCounter");
getWidget(batchcounter, "BatchCounter"); getWidget(batchcounter, "BatchCounter");
compass->setImageTexture("textures\\compass.dds");
crosshair->setImageTexture("textures\\target.dds");
// These are just demo values, you should replace these with // These are just demo values, you should replace these with
// real calls from outside the class later. // real calls from outside the class later.
setWeapIcon("icons\\w\\tx_knife_iron.dds"); setWeapIcon("icons\\w\\tx_knife_iron.dds");

5
apps/openmw/mwgui/map_window.cpp
View file

@ -95,11 +95,6 @@ MapWindow::MapWindow(WindowManager& parWindowManager) :
mGlobal(false) mGlobal(false)
{ {
setCoord(500,0,320,300); setCoord(500,0,320,300);
setText("WorldButton", "World");
setImage("Compass", "textures\\compass.dds");
// Obviously you should override this later on
setCellName("No Cell Loaded");
getWidget(mLocalMap, "LocalMap"); getWidget(mLocalMap, "LocalMap");
getWidget(mGlobalMap, "GlobalMap"); getWidget(mGlobalMap, "GlobalMap");

8
files/mygui/openmw_container_window_layout.xml
View file

@ -12,8 +12,12 @@
</Widget> </Widget>
<!-- buttons position adjusted at runtime to fit text --> <!-- buttons position adjusted at runtime to fit text -->
<Widget type="Button" skin="MW_Button" position="0 235 75 24" name="TakeButton" align="Right Bottom"/> <Widget type="Button" skin="MW_Button" position="0 235 75 24" name="TakeButton" align="Right Bottom">
<Widget type="Button" skin="MW_Button" position="0 235 60 24" name="CloseButton" align="Right Bottom"/> <Property key="Caption" value="#{sTakeAll}"/>
</Widget>
<Widget type="Button" skin="MW_Button" position="0 235 60 24" name="CloseButton" align="Right Bottom">
<Property key="Caption" value="#{sClose}"/>
</Widget>
</Widget> </Widget>
</MyGUI> </MyGUI>

2
files/mygui/openmw_dialogue_window_layout.xml
View file

@ -24,7 +24,7 @@
<!-- The Goodbye button --> <!-- The Goodbye button -->
<Widget type="Button" skin="MW_Button" position="432 366 132 23" name="ByeButton" align="Right Bottom"> <Widget type="Button" skin="MW_Button" position="432 366 132 23" name="ByeButton" align="Right Bottom">
<Property key="Caption" value="Goodbye"/> <Property key="Caption" value="#{sGoodbye}"/>
</Widget> </Widget>
</Widget> </Widget>
</MyGUI> </MyGUI>

11
files/mygui/openmw_hud_layout.xml
View file

@ -62,7 +62,10 @@
<Widget type="ImageBox" skin="ImageBox" position="512 512 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1"> <Widget type="ImageBox" skin="ImageBox" position="512 512 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1">
<Widget type="ImageBox" skin="ImageBox" position="0 0 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1_fog"> <Widget type="ImageBox" skin="ImageBox" position="0 0 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1_fog">
<Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="Left Bottom" name="Compass"/> <!-- Player arrow -->
<Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="ALIGN_BOTTOM ALIGN_LEFT" name="Compass">
<Property key="ImageTexture" value="textures\compass.dds"/>
</Widget>
</Widget> </Widget>
</Widget> </Widget>
@ -85,9 +88,9 @@
</Widget> </Widget>
<!-- Crosshair --> <!-- Crosshair -->
<Widget type="ImageBox" skin="ImageBox" position="0 0 32 32" align="Center Center" name="Crosshair">
<Widget type="ImageBox" skin="ImageBox" position="0 0 32 <Property key="ImageTexture" value="textures\target.dds"/>
32" align="Center Center" name="Crosshair"/> </Widget>
<!-- Basic FPSCounter box --> <!-- Basic FPSCounter box -->
<Widget type="Widget" skin="HUD_Box" position="12 12 28 21" align="Left Top" <Widget type="Widget" skin="HUD_Box" position="12 12 28 21" align="Left Top"

4
files/mygui/openmw_map_window_layout.xml
View file

@ -31,7 +31,9 @@
<Widget type="ImageBox" skin="ImageBox" position="512 512 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1"> <Widget type="ImageBox" skin="ImageBox" position="512 512 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1">
<Widget type="ImageBox" skin="ImageBox" position="0 0 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1_fog"> <Widget type="ImageBox" skin="ImageBox" position="0 0 512 512" align="ALIGN_TOP ALIGN_LEFT" name="Map_1_1_fog">
<!-- Player arrow --> <!-- Player arrow -->
<Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="ALIGN_TOP ALIGN_LEFT" name="Compass"/> <Widget type="ImageBox" skin="RotatingSkin" position="0 0 32 32" align="ALIGN_TOP ALIGN_LEFT" name="Compass">
<Property key="ImageTexture" value="textures\compass.dds"/>
</Widget>
</Widget> </Widget>
</Widget> </Widget>

2
files/mygui/openmw_trade_window_layout.xml
View file

@ -58,7 +58,7 @@
<Property key="Caption" value="#{sCancel}"/> <Property key="Caption" value="#{sCancel}"/>
</Widget> </Widget>
<Widget type="Button" skin="MW_Button" position="0 60 60 24" name="OfferButton" align="Right Top"> <Widget type="Button" skin="MW_Button" position="0 60 60 24" name="OfferButton" align="Right Top">
<Property key="Caption" value="#{sBarterDialog8"/> <Property key="Caption" value="#{sBarterDialog8}"/>
</Widget> </Widget>
</Widget> </Widget>