3 files changed, 132 insertions, 0 deletions
diff --git a/src/gui/widgets/extendednamesmodel.cpp b/src/gui/widgets/extendednamesmodel.cpp
new file mode 100644
index 000000000..1cc6561dc
--- /dev/null
+++ b/src/gui/widgets/extendednamesmodel.cpp
@@ -0,0 +1,70 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  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.
+ *
+ *  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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/widgets/extendednamesmodel.h"
+
+#include "logger.h"
+
+#include "utils/gettext.h"
+
+#include <guichan/exception.hpp>
+#include <guichan/font.hpp>
+
+#include "debug.h"
+
+ExtendedNamesModel::ExtendedNamesModel()
+{
+}
+
+ExtendedNamesModel::~ExtendedNamesModel()
+{
+    clear();
+}
+
+int ExtendedNamesModel::getNumberOfElements()
+{
+    return static_cast<int>(mNames.size());
+}
+
+std::string ExtendedNamesModel::getElementAt(int i)
+{
+    if (i >= getNumberOfElements() || i < 0)
+        return _("???");
+
+    return mNames[i];
+}
+
+Image *ExtendedNamesModel::getImageAt(int i)
+{
+    if (i >= static_cast<int>(mImages.size()) || i < 0)
+        return nullptr;
+
+    return mImages[i];
+}
+
+void ExtendedNamesModel::clear()
+{
+    mNames.clear();
+    for (std::vector<Image*>::iterator it = mImages.begin(),
+         it_end = mImages.end(); it != it_end; ++ it)
+    {
+        (*it)->decRef();
+    }
+}
diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h
new file mode 100644
index 000000000..5a15949a9
--- /dev/null
+++ b/src/gui/widgets/extendednamesmodel.h
@@ -0,0 +1,59 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2012  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  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.
+ *
+ *  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 this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_WIDGETS_EXTENDEDNAMESMODEL_H
+#define GUI_WIDGETS_EXTENDEDNAMESMODEL_H
+
+#include "utils/stringvector.h"
+
+#include "gui/widgets/extendedlistmodel.h"
+
+#include "resources/image.h"
+
+class ExtendedNamesModel : public ExtendedListModel
+{
+    public:
+        ExtendedNamesModel();
+
+        virtual ~ExtendedNamesModel();
+
+        virtual int getNumberOfElements();
+
+        virtual std::string getElementAt(int i);
+
+        virtual Image *getImageAt(int i);
+
+        StringVect &getNames()
+        { return mNames; }
+
+        std::vector<Image*> &getImages()
+        { return mImages; }
+
+        size_t size()
+        { return mNames.size(); }
+
+        void clear();
+
+    protected:
+        StringVect mNames;
+        std::vector<Image*> mImages;
+};
+
+#endif
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h
index e1dbf0a89..1064a8875 100644
--- a/src/gui/widgets/namesmodel.h
+++ b/src/gui/widgets/namesmodel.h
@@ -42,6 +42,9 @@ class NamesModel : public gcn::ListModel
         size_t size()
         { return mNames.size(); }
 
+        void clear()
+        { mNames.clear(); }
+
     protected:
         StringVect mNames;
 };