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

apps/openmw/mwgui/alchemywindow.cpp

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

apps/openmw/mwgui/birth.cpp

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

apps/openmw/mwgui/class.cpp

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

apps/openmw/mwgui/dialogue.cpp

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

apps/openmw/mwgui/race.cpp

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

apps/openmw/mwgui/spellcreationdialog.cpp

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