1 files changed, 35 insertions, 43 deletions

diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp
index c55255ea..82e05fd5 100644
--- a/src/gui/npclistdialog.cpp
+++ b/src/gui/npclistdialog.cpp
@@ -1,35 +1,40 @@
 /*
  *  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 "npclistdialog.h"
-
 #include <sstream>
 
 #include "button.h"
-#include "scrollarea.h"
 #include "listbox.h"
+#include "npc_text.h"
+#include "npclistdialog.h"
+#include "scrollarea.h"
+
+#include "widgets/layout.h"
 
 #include "../npc.h"
 
 #include "../utils/gettext.h"
+#include "../utils/strprintf.h"
+
+extern NpcTextDialog *npcTextDialog;
 
 NpcListDialog::NpcListDialog():
     Window(_("NPC"))
@@ -39,30 +44,25 @@ NpcListDialog::NpcListDialog():
     setMinWidth(200);
     setMinHeight(150);
 
+    setDefaultSize(0, 0, 260, 200);
+
     mItemList = new ListBox(this);
-    scrollArea = new ScrollArea(mItemList);
-    okButton = new Button(_("OK"), "ok", this);
-    cancelButton = new Button(_("Cancel"), "cancel", this);
+    mItemList->setWrappingEnabled(true);
+    gcn::ScrollArea *scrollArea = new ScrollArea(mItemList);
+    gcn::Button *okButton = new Button(_("OK"), "ok", this);
+    gcn::Button *cancelButton = new Button(_("Cancel"), "cancel", this);
 
     setContentSize(260, 175);
     scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
-    scrollArea->setDimension(gcn::Rectangle(
-                5, 5, 250, 160 - okButton->getHeight()));
-    cancelButton->setPosition(
-            260 - 5 - cancelButton->getWidth(),
-            175 - 5 - cancelButton->getHeight());
-    okButton->setPosition(
-            cancelButton->getX() - 5 - okButton->getWidth(),
-            cancelButton->getY());
 
-    mItemList->setActionEventId("item");
+    place(0, 0, scrollArea, 5).setPadding(3);
+    place(3, 1, okButton);
+    place(4, 1, cancelButton);
 
-    mItemList->addActionListener(this);
-
-    add(scrollArea);
-    add(okButton);
-    add(cancelButton);
+    Layout &layout = getLayout();
+    layout.setRowHeight(0, Layout::AUTO_SET);
 
+    loadWindowState();
     setLocationRelativeTo(getParent());
 }
 
@@ -81,33 +81,23 @@ void NpcListDialog::addItem(const std::string &item)
     mItems.push_back(item);
 }
 
-void NpcListDialog::reset()
+void NpcListDialog::parseItems(const std::string &itemString)
 {
-    mItems.clear();
+    std::istringstream iss(itemString);
+
+    std::string tmp;
+    while (getline(iss, tmp, ':'))
+        mItems.push_back(tmp);
 }
 
-void NpcListDialog::widgetResized(const gcn::Event &event)
+void NpcListDialog::reset()
 {
-    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()));
-    cancelButton->setPosition(
-            width - 5 - cancelButton->getWidth(),
-            height - 5 - cancelButton->getHeight());
-    okButton->setPosition(
-            cancelButton->getX() - 5 - okButton->getWidth(),
-            cancelButton->getY());
+    mItems.clear();
 }
 
 void NpcListDialog::action(const gcn::ActionEvent &event)
 {
     int choice = 0;
-
     if (event.getId() == "ok")
     {
         // Send the selected index back to the server
@@ -115,11 +105,14 @@ void NpcListDialog::action(const gcn::ActionEvent &event)
         if (selectedIndex > -1)
         {
             choice = selectedIndex + 1;
+            npcTextDialog->addText(strprintf("\n> \"%s\"\n",
+                                              mItems[selectedIndex].c_str()));
         }
     }
     else if (event.getId() == "cancel")
     {
         choice = 0xff; // 0xff means cancel
+        npcTextDialog->addText(_("\n> Cancel\n"));
     }
 
     if (choice)
@@ -127,6 +120,5 @@ void NpcListDialog::action(const gcn::ActionEvent &event)
         setVisible(false);
         reset();
         current_npc->dialogChoice(choice);
-        current_npc = 0;
     }
 }