mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 20:56:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1398 from akortunov/guifixes

Browse source 
Get only text from input fields (bug #4025)
This commit is contained in:
scrawl 2017-08-16 20:48:40 +00:00 committed by GitHub
commit d8ab6bcd1d
7 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ namespace MWGui
void AlchemyWindow::onCreateButtonClicked(MyGUI::Widget* _sender)
{
MWMechanics::Alchemy::Result result = mAlchemy->create (mNameEdit->getCaption ());
MWMechanics::Alchemy::Result result = mAlchemy->create (mNameEdit->getOnlyText());
MWBase::WindowManager *winMgr = MWBase::Environment::get().getWindowManager();
switch (result)

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

@ -483,7 +483,7 @@ namespace MWGui
std::string CreateClassDialog::getName() const
{
return mEditName->getCaption();
return mEditName->getOnlyText();
}
std::string CreateClassDialog::getDescription() const

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

@ -3,6 +3,7 @@
#include <iomanip>
#include <MyGUI_Button.h>
#include <MyGUI_EditBox.h>
#include <MyGUI_ScrollView.h>
#include <components/widgets/list.hpp>
@ -312,7 +313,7 @@ namespace MWGui
return;
}
if (mName->getCaption ().empty())
if (mName->getOnlyText().empty())
{
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage10}");
return;
@ -336,7 +337,7 @@ namespace MWGui
return;
}
mEnchanting.setNewItemName(mName->getCaption());
mEnchanting.setNewItemName(mName->getOnlyText());
mEnchanting.setEffect(mEffectList);
MWWorld::Ptr player = MWMechanics::getPlayer();

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

@ -58,7 +58,7 @@ namespace MWGui
MyGUI::Button* mTypeButton;
MyGUI::Button* mBuyButton;
MyGUI::TextBox* mName;
MyGUI::EditBox* mName;
MyGUI::TextBox* mEnchantmentPoints;
MyGUI::TextBox* mCastCost;
MyGUI::TextBox* mCharge;

4
apps/openmw/mwgui/savegamedialog.cpp
View file

@ -248,7 +248,7 @@ namespace MWGui
dialog->eventCancelClicked.clear();
return;
}
if (mSaveNameEdit->getCaption().empty())
if (mSaveNameEdit->getOnlyText().empty())
{
MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage65}");
return;
@ -275,7 +275,7 @@ namespace MWGui
if (mSaving)
{
MWBase::Environment::get().getStateManager()->saveGame (mSaveNameEdit->getCaption(), mCurrentSlot);
MWBase::Environment::get().getStateManager()->saveGame (mSaveNameEdit->getOnlyText(), mCurrentSlot);
}
else
{

4
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -373,7 +373,7 @@ namespace MWGui
return;
}
if (mNameEdit->getCaption () == "")
if (mNameEdit->getOnlyText() == "")
{
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage10}");
return;
@ -394,7 +394,7 @@ namespace MWGui
return;
}
mSpell.mName = mNameEdit->getCaption();
mSpell.mName = mNameEdit->getOnlyText();
int price = MyGUI::utility::parseInt(mPriceLabel->getCaption());

4
apps/openmw/mwgui/textinput.cpp
View file

@ -53,7 +53,7 @@ namespace MWGui
void TextInputDialog::onOkClicked(MyGUI::Widget* _sender)
{
if (mTextEdit->getCaption() == "")
if (mTextEdit->getOnlyText() == "")
{
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage37}");
MWBase::Environment::get().getWindowManager()->setKeyFocusWidget (mTextEdit);
@ -69,7 +69,7 @@ namespace MWGui
std::string TextInputDialog::getTextInput() const
{
return mTextEdit->getCaption();
return mTextEdit->getOnlyText();
}
void TextInputDialog::setTextInput(const std::string &text)