Merge branch '1.0'

Conflicts:
	src/actorspritemanager.h
	src/beingmanager.cpp
	src/game.cpp
	src/gui/beingpopup.cpp
	src/gui/chat.cpp
	src/gui/chat.h
	src/gui/inventorywindow.h
	src/gui/itempopup.cpp
	src/gui/socialwindow.cpp
	src/gui/statuswindow.cpp
	src/gui/widgets/chattab.cpp
	src/gui/widgets/chattab.h
	src/net/tmwa/inventoryhandler.cpp
	src/net/tmwa/partyhandler.cpp
	src/party.cpp
	src/sound.cpp
	src/utils/stringutils.cpp
	src/utils/stringutils.h

1 files changed, 11 insertions, 3 deletions

diff --git a/src/gui/textdialog.cpp b/src/gui/textdialog.cpp
index 3e3aafe2..f88a6afa 100644
--- a/src/gui/textdialog.cpp
+++ b/src/gui/textdialog.cpp
@@ -21,6 +21,8 @@
 
 #include "gui/textdialog.h"
 
+#include "actorspritemanager.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/textfield.h"
@@ -30,14 +32,20 @@
 int TextDialog::instances = 0;
 
 TextDialog::TextDialog(const std::string &title, const std::string &msg,
-                       Window *parent):
-    Window(title, true, parent),
-    mTextField(new TextField)
+                       Window *parent, bool autoCompleteEnabled):
+    Window(title, true, parent)
 {
     gcn::Label *textLabel = new Label(msg);
     mOkButton = new Button(_("OK"), "OK", this);
     gcn::Button *cancelButton = new Button(_("Cancel"), "CANCEL", this);
 
+    // In TextField the escape key will either cause autoComplete or lose focus
+    mTextField = new TextField("", ! autoCompleteEnabled);
+    if (autoCompleteEnabled)
+        mTextField->setAutoComplete(actorSpriteManager->getPlayerNameLister());
+
+    mTextField->addActionListener(this);
+
     place(0, 0, textLabel, 4);
     place(0, 1, mTextField, 4);
     place(2, 2, mOkButton);