mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 20:19:57 +00:00
Code Issues Releases Wiki Activity

fix class name typo

Browse source
This commit is contained in:
scrawl 2012-03-22 15:10:29 +01:00
parent 161d519206
commit 26aae9d2ce
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/dialogue.hpp
View file

@ -21,7 +21,7 @@ namespace MWWorld
namespace MWGui namespace MWGui
{ {
class DialogeHistory; class DialogueHistory;
using namespace MyGUI; using namespace MyGUI;
@ -60,7 +60,7 @@ namespace MWGui
*/ */
std::string parseText(std::string text); std::string parseText(std::string text);
DialogeHistory* history; DialogueHistory* history;
MyGUI::ListPtr topicsList; MyGUI::ListPtr topicsList;
MyGUI::ProgressPtr pDispositionBar; MyGUI::ProgressPtr pDispositionBar;
MyGUI::EditPtr pDispositionText; MyGUI::EditPtr pDispositionText;

8
apps/openmw/mwgui/dialogue_history.cpp
View file

@ -13,7 +13,7 @@
using namespace MWGui; using namespace MWGui;
using namespace Widgets; using namespace Widgets;
UString DialogeHistory::getColorAtPos(size_t _pos) UString DialogueHistory::getColorAtPos(size_t _pos)
{ {
UString colour = TextIterator::convertTagColour(getTextColour()); UString colour = TextIterator::convertTagColour(getTextColour());
TextIterator iterator(getCaption()); TextIterator iterator(getCaption());
@ -29,7 +29,7 @@ UString DialogeHistory::getColorAtPos(size_t _pos)
return colour; return colour;
} }
UString DialogeHistory::getColorTextAt(size_t _pos) UString DialogueHistory::getColorTextAt(size_t _pos)
{ {
bool breakOnNext = false; bool breakOnNext = false;
UString colour = TextIterator::convertTagColour(getTextColour()); UString colour = TextIterator::convertTagColour(getTextColour());
@ -59,7 +59,7 @@ UString DialogeHistory::getColorTextAt(size_t _pos)
return ""; return "";
} }
void DialogeHistory::addDialogHeading(const UString& parText) void DialogueHistory::addDialogHeading(const UString& parText)
{ {
UString head("\n#D8C09A"); UString head("\n#D8C09A");
head.append(parText); head.append(parText);
@ -67,7 +67,7 @@ void DialogeHistory::addDialogHeading(const UString& parText)
addText(head); addText(head);
} }
void DialogeHistory::addDialogText(const UString& parText) void DialogueHistory::addDialogText(const UString& parText)
{ {
addText(parText); addText(parText);
addText("\n"); addText("\n");

4
apps/openmw/mwgui/dialogue_history.hpp
View file

@ -5,9 +5,9 @@
namespace MWGui namespace MWGui
{ {
using namespace MyGUI; using namespace MyGUI;
class DialogeHistory : public MyGUI::EditBox class DialogueHistory : public MyGUI::EditBox
{ {
MYGUI_RTTI_DERIVED( DialogeHistory ) MYGUI_RTTI_DERIVED( DialogueHistory )
public: public:
Widget* getClient() { return mClient; } Widget* getClient() { return mClient; }
UString getColorAtPos(size_t _pos); UString getColorAtPos(size_t _pos);

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

@ -37,7 +37,7 @@ WindowManager::WindowManager(MWWorld::Environment& environment,
gui = mGuiManager->getGui(); gui = mGuiManager->getGui();
//Register own widgets with MyGUI //Register own widgets with MyGUI
MyGUI::FactoryManager::getInstance().registerFactory<DialogeHistory>("Widget"); MyGUI::FactoryManager::getInstance().registerFactory<DialogueHistory>("Widget");
// Get size info from the Gui object // Get size info from the Gui object
assert(gui); assert(gui);

2
extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_layout.xml vendored
View file

@ -9,7 +9,7 @@
</Widget> </Widget>
<!-- The Dialogue history --> <!-- The Dialogue history -->
<Widget type="DialogeHistory" skin="MW_TextBoxEdit" position="8 39 400 375" name="History" align="ALIGN_LEFT ALIGN_TOP STRETCH"> <Widget type="DialogueHistory" skin="MW_TextBoxEdit" position="8 39 400 375" name="History" align="ALIGN_LEFT ALIGN_TOP STRETCH">
<Property key="Edit_Static" value="true"/> <Property key="Edit_Static" value="true"/>
<Property key="Edit_WordWrap" value="true"/> <Property key="Edit_WordWrap" value="true"/>
<Property key="Text_FontHeight" value="18"/> <Property key="Text_FontHeight" value="18"/>