1 files changed, 26 insertions, 82 deletions
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 3d010daa..0600d106 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -1,95 +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
  */
 
-#ifndef _TMW_SKILL_H
-#define _TMW_SKILL_H
+#ifndef SKILL_H
+#define SKILL_H
 
 #include <vector>
-#include <list>
 
-#include <guichan/listmodel.hpp>
 #include <guichan/actionlistener.hpp>
 
 #include "window.h"
-#include "gccontainer.h"
 
-#include "../guichanfwd.h"
-
-class ProgressBar;
-class Icon;
-
-class Skill_Tab : public GCContainer, public gcn::ActionListener
-{
-    public:
-        /**
-         * The type of this skill tab
-         */
-        const std::string type;
-
-        /**
-         * Constructor
-         */
-        Skill_Tab(const std::string &type);
-
-        /**
-         * Update this tab
-         */
-        void update();
-
-        /**
-         * Called when receiving actions from widget.
-         */
-        void action(const gcn::ActionEvent &event) {}
-
-    private:
-         /**
-         * Update the information of a skill at
-         * the given index
-         */
-        void updateSkill(int index);
-
-        /**
-         * Gets the number of skills in this particular
-         * type of tab.
-         */
-        int getSkillNum();
-
-        /**
-         * Get the first enumeration of this skill tab's
-         * skill type.
-         */
-        int getSkillBegin();
-
-        /**
-         * Get the icon associated with the given index
-         */
-        Icon* getIcon(int index);
-
-        std::vector<Icon *> mSkillIcons;
-        std::vector<gcn::Label *> mSkillNameLabels;
-        std::vector<gcn::Label *> mSkillLevelLabels;
-        std::vector<gcn::Label *> mSkillExpLabels;
-        std::vector<ProgressBar *> mSkillProgress;
+struct SKILL {
+    short id;      /**< Index into "skill_db" array */
+    short lv, sp;
 };
 
+class GuiTable;
+class SkillGuiTableModel;
 
 /**
  * The skill dialog.
@@ -109,31 +54,30 @@ class SkillDialog : public Window, public gcn::ActionListener
          */
         ~SkillDialog();
 
-        /**
-         * Called when receiving actions from widget.
-         */
         void action(const gcn::ActionEvent &event);
 
-        /**
-         * Update the tabs in this dialog
-         */
         void update();
 
-        /**
-          * Draw this window.
-          */
-        void draw(gcn::Graphics *g);
-
-    private:
+        int getNumberOfElements();
 
+        bool hasSkill(int id);
+        void addSkill(int id, int lv, int sp);
+        void setSkill(int id, int lv, int sp);
+        void cleanList();
 
-        std::list<Skill_Tab*> mTabs;
+        const std::vector<SKILL*>& getSkills() const { return mSkillList; }
 
+    private:
+        GuiTable *mTable;
+        ScrollArea *skillScrollArea;
+        SkillGuiTableModel *mTableModel;
+        gcn::Label *mPointsLabel;
+        gcn::Button *mIncButton;
+        gcn::Button *mUseButton;
+
+        std::vector<SKILL*> mSkillList;
 };
 
-
-
-
 extern SkillDialog *skillDialog;
 
 #endif