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, 6 insertions, 14 deletions

diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 9d6050f8..1c292759 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -164,10 +164,10 @@ CharSelectDialog::CharSelectDialog(LoginData *loginData):
     addKeyListener(this);
 
     center();
-    mCharacterEntries[0]->requestFocus();
     setVisible(true);
 
     Net::getCharHandler()->setCharSelectDialog(this);
+    mCharacterEntries[0]->requestFocus();
 }
 
 CharSelectDialog::~CharSelectDialog()
@@ -328,10 +328,10 @@ CharacterDisplay::CharacterDisplay(CharSelectDialog *charSelectDialog):
     mCharacter(0),
     mPlayerBox(new PlayerBox)
 {
-    mButton = new Button("wwwwwwwww", "go", charSelectDialog);
-    mName = new Label("wwwwwwwwwwwwwwwwwwwwwwww");
-    mLevel = new Label("(888)");
-    mMoney = new Label("wwwwwwwww");
+    mButton = new Button("", "go", charSelectDialog);
+    mName = new Label("");
+    mLevel = new Label("");
+    mMoney = new Label("");
 
     mDelete = new Button(_("Delete"), "delete", charSelectDialog);
 
@@ -347,15 +347,7 @@ CharacterDisplay::CharacterDisplay(CharSelectDialog *charSelectDialog):
 
     update();
 
-    // Setting the width so that the largest label fits.
-    mName->adjustSize();
-    mMoney->adjustSize();
-    int width = 74;
-    if (width < 20 + mName->getWidth())
-        width = 20 + mName->getWidth();
-    if (width < 20 + mMoney->getWidth())
-        width = 20 + mMoney->getWidth();
-    h.reflowLayout(width, 112 + mName->getHeight() + mLevel->getHeight() +
+    h.reflowLayout(80, 112 + mName->getHeight() + mLevel->getHeight() +
             mMoney->getHeight() + mButton->getHeight() + mDelete->getHeight());
 }