1 files changed, 55 insertions, 40 deletions

diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index c9ace303..48f2adb7 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -1,102 +1,117 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "button.h"
 #include "npc_text.h"
-
-#include <string>
-
 #include "scrollarea.h"
-#include "button.h"
 #include "textbox.h"
 
+#include "widgets/layout.h"
+
 #include "../npc.h"
 
 #include "../utils/gettext.h"
 
 NpcTextDialog::NpcTextDialog():
-    Window(_("NPC"))
+    Window(_("NPC")),
+    mState(NPC_TEXT_STATE_WAITING)
 {
     setResizable(true);
 
     setMinWidth(200);
     setMinHeight(150);
 
+    setDefaultSize(0, 0, 260, 200);
+
     mTextBox = new TextBox;
     mTextBox->setEditable(false);
+    mTextBox->setOpaque(false);
 
-    scrollArea = new ScrollArea(mTextBox);
-    okButton = new Button(_("OK"), "ok", this);
+    mScrollArea = new ScrollArea(mTextBox);
+    mButton = new Button(_("Waiting for server"), "ok", this);
 
-    setContentSize(260, 175);
-    scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    scrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
-    scrollArea->setDimension(gcn::Rectangle(
-                5, 5, 250, 160 - okButton->getHeight()));
-    okButton->setPosition(
-            260 - 5 - okButton->getWidth(),
-            175 - 5 - okButton->getHeight());
+    mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+    mScrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
 
-    add(scrollArea);
-    add(okButton);
+    place(0, 0, mScrollArea, 5).setPadding(3);
+    place(4, 1, mButton);
 
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
+
+    loadWindowState();
     setLocationRelativeTo(getParent());
 }
 
 void NpcTextDialog::setText(const std::string &text)
 {
     mText = text;
-    mTextBox->setTextWrapped(mText);
+    mTextBox->setTextWrapped(mText, mScrollArea->getWidth() - 15);
 }
 
 void NpcTextDialog::addText(const std::string &text)
 {
     setText(mText + text + "\n");
+    mScrollArea->setVerticalScrollAmount(mScrollArea->getVerticalMaxScroll());
 }
 
-void NpcTextDialog::widgetResized(const gcn::Event &event)
+void NpcTextDialog::showNextButton()
 {
-    Window::widgetResized(event);
-
-    const gcn::Rectangle &area = getChildrenArea();
-    const int width = area.width;
-    const int height = area.height;
-
-    scrollArea->setDimension(gcn::Rectangle(
-                5, 5, width - 10, height - 15 - okButton->getHeight()));
-    okButton->setPosition(
-            width - 5 - okButton->getWidth(),
-            height - 5 - okButton->getHeight());
+    mButton->setCaption(_("Next"));
+    mState = NPC_TEXT_STATE_NEXT;
+    mButton->setEnabled(true);
+}
 
-    // Set the text again so that it gets wrapped according to the new size
-    mTextBox->setTextWrapped(mText);
+void NpcTextDialog::showCloseButton()
+{
+    mButton->setCaption(_("Close"));
+    mState = NPC_TEXT_STATE_CLOSE;
+    mButton->setEnabled(true);
 }
 
 void NpcTextDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok")
     {
-        setText("");
-        setVisible(false);
-        if (current_npc)
+        if (mState == NPC_TEXT_STATE_NEXT && current_npc) {
             current_npc->nextDialog();
-        current_npc = 0;
+            addText("\n> Next\n");
+        } else if (mState == NPC_TEXT_STATE_CLOSE ||
+                (mState == NPC_TEXT_STATE_NEXT && !current_npc)) {
+            setText("");
+            setVisible(false);
+            if (current_npc) current_npc->handleDeath();
+        } else return;
     }
+    else return;
+
+    mButton->setEnabled(false);
+    mButton->setCaption(_("Waiting for server"));
+    mState = NPC_TEXT_STATE_WAITING;
+}
+
+void NpcTextDialog::widgetResized(const gcn::Event &event)
+{
+    Window::widgetResized(event);
+
+    setText(mText);
 }
+