From 1b13d8557c8666e1017fd70a455830dbdcb9f46c Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Mon, 10 Aug 2009 20:34:17 -0600
Subject: Add SpecialsWindow

THis replaces the MagicWindow that the TMWServ build used and will be
usable going forward for eAthena.
---
 src/gui/specialswindow.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 src/gui/specialswindow.h

(limited to 'src/gui/specialswindow.h')

diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
new file mode 100644
index 00000000..17c29597
--- /dev/null
+++ b/src/gui/specialswindow.h
@@ -0,0 +1,69 @@
+/*
+ *  The Mana World
+ *  Copyright (C) 2009  The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  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, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef SPECIALSWINDOW_H
+#define SPECIALSWINDOW_H
+
+#include "gui/widgets/window.h"
+
+#include "guichanfwd.h"
+
+#include <guichan/actionlistener.hpp>
+
+#include <map>
+
+class Label;
+class ScrollArea;
+class Tab;
+class TabbedArea;
+
+struct SpecialInfo;
+
+class SpecialsWindow : public Window, public gcn::ActionListener {
+    public:
+        SpecialsWindow();
+
+        ~SpecialsWindow();
+
+        /**
+         * Called when receiving actions from widget.
+         */
+        void action(const gcn::ActionEvent &actionEvent);
+
+        void logic();
+
+        /**
+         * Update the given special's display
+         */
+        std::string update(int id);
+
+        void loadSpecials(const std::string &file);
+
+    private:
+        typedef std::map<int, SpecialInfo*> SpecialMap;
+        SpecialMap mSpecials;
+        Tab *mCurrentTab;
+        TabbedArea *mTabs;
+};
+
+extern SpecialsWindow *specialsWindow;
+
+#endif // SPECIALSWINDOW_H
-- 
cgit v1.2.3-70-g09d2


From 7f83b173354b3e9efe0b9c99879d8db5bc800e17 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Fri, 14 Aug 2009 20:31:49 -0600
Subject: Remove some uneeded code

This should've been removed earlier with the layout fixes.
---
 src/gui/skilldialog.cpp    | 10 ----------
 src/gui/skilldialog.h      |  3 ---
 src/gui/specialswindow.cpp | 10 ----------
 src/gui/specialswindow.h   |  3 ---
 4 files changed, 26 deletions(-)

(limited to 'src/gui/specialswindow.h')

diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index f6ab226a..6e7b3e70 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -122,16 +122,6 @@ void SkillDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void SkillDialog::logic()
-{
-    Window::logic();
-
-    Tab *tab = dynamic_cast<Tab*>(mTabs->getSelectedTab());
-    if (tab != mCurrentTab) {
-        mCurrentTab = tab;
-    }
-}
-
 std::string SkillDialog::update(int id)
 {
     SkillMap::iterator i = mSkills.find(id);
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index 8fa7443d..12cb3581 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -54,8 +54,6 @@ class SkillDialog : public Window, public gcn::ActionListener
          */
         void action(const gcn::ActionEvent &event);
 
-        void logic();
-
         /**
          * Update the given skill's display
          */
@@ -73,7 +71,6 @@ class SkillDialog : public Window, public gcn::ActionListener
     private:
         typedef std::map<int, SkillInfo*> SkillMap;
         SkillMap mSkills;
-        Tab *mCurrentTab;
         TabbedArea *mTabs;
         Label *mPointsLabel;
 };
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 5d2ab676..35839b39 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -126,16 +126,6 @@ void SpecialsWindow::action(const gcn::ActionEvent &event)
     }
 }
 
-void SpecialsWindow::logic()
-{
-    Window::logic();
-
-    Tab *tab = dynamic_cast<Tab*>(mTabs->getSelectedTab());
-    if (tab != mCurrentTab) {
-        mCurrentTab = tab;
-    }
-}
-
 std::string SpecialsWindow::update(int id)
 {
     // TODO
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index 17c29597..cc2a68b3 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -48,8 +48,6 @@ class SpecialsWindow : public Window, public gcn::ActionListener {
          */
         void action(const gcn::ActionEvent &actionEvent);
 
-        void logic();
-
         /**
          * Update the given special's display
          */
@@ -60,7 +58,6 @@ class SpecialsWindow : public Window, public gcn::ActionListener {
     private:
         typedef std::map<int, SpecialInfo*> SpecialMap;
         SpecialMap mSpecials;
-        Tab *mCurrentTab;
         TabbedArea *mTabs;
 };
 
-- 
cgit v1.2.3-70-g09d2