mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-01 12:36:42 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master' into next

Browse source
This commit is contained in:
Marc Zinnschlag 2012-11-05 22:46:42 +01:00
commit a7da929496
6 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,6 +132,8 @@ namespace MWGui
openContainer (MWBase::Environment::get().getWorld()->getPlayer().getPlayer()); // this sets mPtr openContainer (MWBase::Environment::get().getWorld()->getPlayer().getPlayer()); // this sets mPtr
setFilter (ContainerBase::Filter_Ingredients); setFilter (ContainerBase::Filter_Ingredients);
mNameEdit->setCaption("");
mAlchemy.setAlchemist (mPtr); mAlchemy.setAlchemist (mPtr);
int index = 0; int index = 0;

6
apps/openmw/mwgui/birth.cpp
View file

@ -48,7 +48,7 @@ BirthDialog::BirthDialog(MWBase::WindowManager& parWindowManager)
getWidget(okButton, "OKButton"); getWidget(okButton, "OKButton");
okButton->setCaption(mWindowManager.getGameSettingString("sOK", "")); okButton->setCaption(mWindowManager.getGameSettingString("sOK", ""));
okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &BirthDialog::onOkClicked); okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &BirthDialog::onOkClicked);
okButton->setTextColour(MyGUI::Colour(0.6f, 0.56f, 0.45f)); okButton->setEnabled(false);
updateBirths(); updateBirths();
updateSpells(); updateSpells();
@ -85,7 +85,7 @@ void BirthDialog::setBirthId(const std::string &birthId)
mBirthList->setIndexSelected(i); mBirthList->setIndexSelected(i);
MyGUI::ButtonPtr okButton; MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton"); getWidget(okButton, "OKButton");
okButton->setTextColour(MyGUI::Colour(0.75f, 0.6f, 0.35f)); okButton->setEnabled(true);
break; break;
} }
} }
@ -114,7 +114,7 @@ void BirthDialog::onSelectBirth(MyGUI::ListBox* _sender, size_t _index)
MyGUI::ButtonPtr okButton; MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton"); getWidget(okButton, "OKButton");
okButton->setTextColour(MyGUI::Colour(0.75f, 0.6f, 0.35f)); okButton->setEnabled(true);
const std::string *birthId = mBirthList->getItemDataAt<std::string>(_index); const std::string *birthId = mBirthList->getItemDataAt<std::string>(_index);
if (boost::iequals(mCurrentBirthId, *birthId)) if (boost::iequals(mCurrentBirthId, *birthId))

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

@ -104,7 +104,7 @@ PickClassDialog::PickClassDialog(MWBase::WindowManager& parWindowManager)
MyGUI::ButtonPtr okButton; MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton"); getWidget(okButton, "OKButton");
okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PickClassDialog::onOkClicked); okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PickClassDialog::onOkClicked);
okButton->setTextColour(MyGUI::Colour(0.6f, 0.56f, 0.45f)); okButton->setEnabled(false);
updateClasses(); updateClasses();
updateStats(); updateStats();
@ -140,7 +140,7 @@ void PickClassDialog::setClassId(const std::string &classId)
mClassList->setIndexSelected(i); mClassList->setIndexSelected(i);
MyGUI::ButtonPtr okButton; MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton"); getWidget(okButton, "OKButton");
okButton->setTextColour(MyGUI::Colour(0.75f, 0.6f, 0.35f)); okButton->setEnabled(true);
break; break;
} }
} }
@ -169,7 +169,7 @@ void PickClassDialog::onSelectClass(MyGUI::ListBox* _sender, size_t _index)
MyGUI::ButtonPtr okButton; MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton"); getWidget(okButton, "OKButton");
okButton->setTextColour(MyGUI::Colour(0.75f, 0.6f, 0.35f)); okButton->setEnabled(true);
const std::string *classId = mClassList->getItemDataAt<std::string>(_index); const std::string *classId = mClassList->getItemDataAt<std::string>(_index);
if (boost::iequals(mCurrentClassId, *classId)) if (boost::iequals(mCurrentClassId, *classId))

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

@ -170,7 +170,7 @@ void DialogueWindow::startDialogue(MWWorld::Ptr actor, std::string npcName)
setTitle(npcName); setTitle(npcName);
mTopicsList->clear(); mTopicsList->clear();
mHistory->eraseText(0,mHistory->getTextLength()); mHistory->setCaption("");
updateOptions(); updateOptions();
} }
@ -192,8 +192,8 @@ void DialogueWindow::setKeywords(std::list<std::string> keyWords)
if (mServices & Service_CreateSpells) if (mServices & Service_CreateSpells)
mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sSpellmakingMenuTitle")->getString()); mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sSpellmakingMenuTitle")->getString());
if (mServices & Service_Enchant) // if (mServices & Service_Enchant)
mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sEnchanting")->getString()); // mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sEnchanting")->getString());
if (mServices & Service_Training) if (mServices & Service_Training)
mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sServiceTrainingTitle")->getString()); mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.find("sServiceTrainingTitle")->getString());

6
apps/openmw/mwgui/race.cpp
View file

@ -80,7 +80,7 @@ RaceDialog::RaceDialog(MWBase::WindowManager& parWindowManager)
getWidget(okButton, "OKButton"); getWidget(okButton, "OKButton");
okButton->setCaption(mWindowManager.getGameSettingString("sOK", "")); okButton->setCaption(mWindowManager.getGameSettingString("sOK", ""));
okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onOkClicked); okButton->eventMouseButtonClick += MyGUI::newDelegate(this, &RaceDialog::onOkClicked);
okButton->setTextColour(MyGUI::Colour(0.6f, 0.56f, 0.45f)); okButton->setEnabled(false);
updateRaces(); updateRaces();
updateSkills(); updateSkills();
@ -124,7 +124,7 @@ void RaceDialog::setRaceId(const std::string &raceId)
mRaceList->setIndexSelected(i); mRaceList->setIndexSelected(i);
MyGUI::ButtonPtr okButton; MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton"); getWidget(okButton, "OKButton");
okButton->setTextColour(MyGUI::Colour(0.75f, 0.6f, 0.35f)); okButton->setEnabled(true);
break; break;
} }
} }
@ -208,7 +208,7 @@ void RaceDialog::onSelectRace(MyGUI::ListBox* _sender, size_t _index)
MyGUI::ButtonPtr okButton; MyGUI::ButtonPtr okButton;
getWidget(okButton, "OKButton"); getWidget(okButton, "OKButton");
okButton->setTextColour(MyGUI::Colour(0.75f, 0.6f, 0.35f)); okButton->setEnabled(true);
const std::string *raceId = mRaceList->getItemDataAt<std::string>(_index); const std::string *raceId = mRaceList->getItemDataAt<std::string>(_index);
if (boost::iequals(mCurrentRaceId, *raceId)) if (boost::iequals(mCurrentRaceId, *raceId))
return; return;

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

@ -291,6 +291,7 @@ namespace MWGui
void SpellCreationDialog::startSpellMaking (MWWorld::Ptr actor) void SpellCreationDialog::startSpellMaking (MWWorld::Ptr actor)
{ {
mPtr = actor; mPtr = actor;
mNameEdit->setCaption("");
startEditing(); startEditing();
} }