mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-19 20:53:52 +00:00
Code Issues Releases Wiki Activity

Add a button to delete spells from spellwindow

Browse source
This commit is contained in:
Ilya Zhuravlev 2019-04-24 19:22:47 -04:00
parent 7941fd6780
commit 6c96b5653b
5 changed files with 43 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwgui/spellmodel.cpp
View file

@ -148,6 +148,17 @@ namespace MWGui
return mSpells.size();
}
SpellModel::ModelIndex SpellModel::getSelectedIndex() const
{
ModelIndex selected = -1;
for (SpellModel::ModelIndex i = 0; i<int(getItemCount()); ++i)
{
if (getItem(i).mSelected)
selected = i;
}
return selected;
}
Spell SpellModel::getItem(ModelIndex index) const
{
if (index < 0 || index >= int(mSpells.size()))

2
apps/openmw/mwgui/spellmodel.hpp
View file

@ -48,6 +48,8 @@ namespace MWGui
///< throws for invalid index
size_t getItemCount() const;
ModelIndex getSelectedIndex() const;
///< returns -1 if nothing is selected
private:
MWWorld::Ptr mActor;

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

@ -1,5 +1,6 @@
#include "spellwindow.hpp"
#include <MyGUI_Button.h>
#include <MyGUI_EditBox.h>
#include <MyGUI_InputManager.h>
@ -36,14 +37,18 @@ namespace MWGui
{
mSpellIcons = new SpellIcons();
MyGUI::Button *deleteSpellBtn = nullptr;
getWidget(mSpellView, "SpellView");
getWidget(mEffectBox, "EffectsBox");
getWidget(mFilterEdit, "FilterEdit");
getWidget(deleteSpellBtn, "DeleteSpellButton");
mFilterEdit->setUserString("IgnoreTabKey", "y");
mSpellView->eventSpellClicked += MyGUI::newDelegate(this, &SpellWindow::onModelIndexSelected);
mFilterEdit->eventEditTextChange += MyGUI::newDelegate(this, &SpellWindow::onFilterChanged);
deleteSpellBtn->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellWindow::onDeleteClicked);
setCoord(498, 300, 302, 300);
}
@ -185,6 +190,17 @@ namespace MWGui
mSpellView->setModel(new SpellModel(MWMechanics::getPlayer(), sender->getCaption()));
}
void SpellWindow::onDeleteClicked(MyGUI::Widget *widget)
{
SpellModel::ModelIndex selected = mSpellView->getModel()->getSelectedIndex();
if (selected < 0)
return;
const Spell& spell = mSpellView->getModel()->getItem(selected);
if (spell.mType != Spell::Type_EnchantedItem)
askDeleteSpell(spell.mId);
}
void SpellWindow::onSpellSelected(const std::string& spellId)
{
MWWorld::Ptr player = MWMechanics::getPlayer();
@ -222,12 +238,9 @@ namespace MWGui
mSpellView->setModel(new SpellModel(MWMechanics::getPlayer(), ""));
SpellModel::ModelIndex selected = 0;
for (SpellModel::ModelIndex i = 0; i<int(mSpellView->getModel()->getItemCount()); ++i)
{
if (mSpellView->getModel()->getItem(i).mSelected)
selected = i;
}
SpellModel::ModelIndex selected = mSpellView->getModel()->getSelectedIndex();
if (selected < 0)
selected = 0;
selected += next ? 1 : -1;
int itemcount = mSpellView->getModel()->getItemCount();

1
apps/openmw/mwgui/spellwindow.hpp
View file

@ -33,6 +33,7 @@ namespace MWGui
void onSpellSelected(const std::string& spellId);
void onModelIndexSelected(SpellModel::ModelIndex index);
void onFilterChanged(MyGUI::EditBox *sender);
void onDeleteClicked(MyGUI::Widget *widget);
void onDeleteSpellAccept();
void askDeleteSpell(const std::string& spellId);

12
files/mygui/openmw_spell_window.layout
View file

@ -13,8 +13,16 @@
<Widget type="SpellView" skin="MW_SpellView" position="8 38 268 490" align="Left Top Stretch" name="SpellView">
</Widget>
<!-- Search box-->
<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="8 535 268 23" align="Left Bottom HStretch" name="FilterEdit">
<Widget type="Widget" position="8 535 268 23" align="Left Bottom HStretch">
<!-- Spell deletion button -->
<Widget type="Button" skin="MW_Button" align="Right Bottom" position="150 0 118 24" name="DeleteSpellButton">
<Property key="Caption" value="Delete Spell"/>
<Property key="NeedKey" value="false"/>
</Widget>
<!-- Search box-->
<Widget type="EditBox" skin="MW_TextBoxEditWithBorder" position="0 0 142 23" align="Left Bottom HStretch" name="FilterEdit">
</Widget>
</Widget>
</Widget>