mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-06 09:45:33 +00:00
Code Issues Releases Wiki Activity

Move user string assignment to layout files

Browse source
This commit is contained in:
Capostrophic 2020-03-02 01:48:18 +03:00
parent 4b17d5da43
commit 54334932d9
8 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,9 +48,6 @@ CompanionWindow::CompanionWindow(DragAndDrop *dragAndDrop, MessageBoxManager* ma
getWidget(mEncumbranceBar, "EncumbranceBar"); getWidget(mEncumbranceBar, "EncumbranceBar");
getWidget(mFilterEdit, "FilterEdit"); getWidget(mFilterEdit, "FilterEdit");
getWidget(mItemView, "ItemView"); getWidget(mItemView, "ItemView");
mFilterEdit->setUserString("AcceptTab", "true");
mItemView->eventBackgroundClicked += MyGUI::newDelegate(this, &CompanionWindow::onBackgroundSelected); mItemView->eventBackgroundClicked += MyGUI::newDelegate(this, &CompanionWindow::onBackgroundSelected);
mItemView->eventItemClicked += MyGUI::newDelegate(this, &CompanionWindow::onItemSelected); mItemView->eventItemClicked += MyGUI::newDelegate(this, &CompanionWindow::onItemSelected);
mFilterEdit->eventEditTextChange += MyGUI::newDelegate(this, &CompanionWindow::onNameFilterChanged); mFilterEdit->eventEditTextChange += MyGUI::newDelegate(this, &CompanionWindow::onNameFilterChanged);

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

@ -91,8 +91,6 @@ namespace MWGui
getWidget(mArmorRating, "ArmorRating"); getWidget(mArmorRating, "ArmorRating");
getWidget(mFilterEdit, "FilterEdit"); getWidget(mFilterEdit, "FilterEdit");
mFilterEdit->setUserString("AcceptTab", "true");
mAvatarImage->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryWindow::onAvatarClicked); mAvatarImage->eventMouseButtonClick += MyGUI::newDelegate(this, &InventoryWindow::onAvatarClicked);
mAvatarImage->setRenderItemTexture(mPreviewTexture.get()); mAvatarImage->setRenderItemTexture(mPreviewTexture.get());
mAvatarImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f)); mAvatarImage->getSubWidgetMain()->_setUVSet(MyGUI::FloatRect(0.f, 0.f, 1.f, 1.f));

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

@ -45,8 +45,6 @@ namespace MWGui
getWidget(mEffectBox, "EffectsBox"); getWidget(mEffectBox, "EffectsBox");
getWidget(mFilterEdit, "FilterEdit"); getWidget(mFilterEdit, "FilterEdit");
mFilterEdit->setUserString("AcceptTab", "true");
mSpellView->eventSpellClicked += MyGUI::newDelegate(this, &SpellWindow::onModelIndexSelected); mSpellView->eventSpellClicked += MyGUI::newDelegate(this, &SpellWindow::onModelIndexSelected);
mFilterEdit->eventEditTextChange += MyGUI::newDelegate(this, &SpellWindow::onFilterChanged); mFilterEdit->eventEditTextChange += MyGUI::newDelegate(this, &SpellWindow::onFilterChanged);
deleteButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellWindow::onDeleteClicked); deleteButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellWindow::onDeleteClicked);

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

@ -71,8 +71,6 @@ namespace MWGui
getWidget(mBottomPane, "BottomPane"); getWidget(mBottomPane, "BottomPane");
getWidget(mFilterEdit, "FilterEdit"); getWidget(mFilterEdit, "FilterEdit");
mFilterEdit->setUserString("AcceptTab", "true");
getWidget(mItemView, "ItemView"); getWidget(mItemView, "ItemView");
mItemView->eventItemClicked += MyGUI::newDelegate(this, &TradeWindow::onItemSelected); mItemView->eventItemClicked += MyGUI::newDelegate(this, &TradeWindow::onItemSelected);

1
files/mygui/openmw_companion_window.layout
View file

@ -8,6 +8,7 @@
<Widget type="HBox" position="5 5 575 23" align="Left Top HStretch" name="_Filter"> <Widget type="HBox" position="5 5 575 23" align="Left Top HStretch" name="_Filter">
<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 23" name="FilterEdit"> <Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 23" name="FilterEdit">
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<UserString key="AcceptTab" value="true"/>
</Widget> </Widget>
</Widget> </Widget>
<!-- Items --> <!-- Items -->

3
files/mygui/openmw_inventory_window.layout
View file

@ -52,7 +52,8 @@
</Widget> </Widget>
<!-- Search box--> <!-- Search box-->
<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 23" name="FilterEdit"> <Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 23" name="FilterEdit">
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<UserString key="AcceptTab" value="true"/>
</Widget> </Widget>
</Widget> </Widget>

1
files/mygui/openmw_spell_window.layout
View file

@ -24,6 +24,7 @@
<!-- Search box--> <!-- Search box-->
<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="8 535 268 23" align="Left Bottom HStretch" name="FilterEdit"> <Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="8 535 268 23" align="Left Bottom HStretch" name="FilterEdit">
<UserString key="AcceptTab" value="true"/>
</Widget> </Widget>
</Widget> </Widget>

1
files/mygui/openmw_trade_window.layout
View file

@ -30,6 +30,7 @@
<!-- Search box--> <!-- Search box-->
<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 23" name="FilterEdit"> <Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 0 23" name="FilterEdit">
<UserString key="HStretch" value="true"/> <UserString key="HStretch" value="true"/>
<UserString key="AcceptTab" value="true"/>
</Widget> </Widget>
</Widget> </Widget>