summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-16 21:24:21 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-16 21:24:21 +0300
commit0f51cc8fb7f07c0d7d8354685897df193426de9e (patch)
tree647abdacd0ba02cc047e7a06ce834495209c321f
parent770c08beb380bcd626c0aebc2ae0faf790f39d37 (diff)
downloadmanaverse-0f51cc8fb7f07c0d7d8354685897df193426de9e.tar.gz
manaverse-0f51cc8fb7f07c0d7d8354685897df193426de9e.tar.bz2
manaverse-0f51cc8fb7f07c0d7d8354685897df193426de9e.tar.xz
manaverse-0f51cc8fb7f07c0d7d8354685897df193426de9e.zip
Move skilltab into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/widgets/tabs/skilltab.h72
-rw-r--r--src/gui/windows/skilldialog.cpp42
4 files changed, 77 insertions, 39 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 125f5e965..f401efa42 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -259,6 +259,7 @@ SET(SRCS
gui/widgets/sliderlist.cpp
gui/widgets/sliderlist.h
gui/widgets/tabs/shortcuttab.h
+ gui/widgets/tabs/skilltab.h
gui/widgets/tabs/tab.cpp
gui/widgets/tabs/tab.h
gui/widgets/tabbedarea.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index aaa0bb61c..42fb2195f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -357,6 +357,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/sliderlist.cpp \
gui/widgets/sliderlist.h \
gui/widgets/tabs/shortcuttab.h \
+ gui/widgets/tabs/skilltab.h \
gui/widgets/tabs/tab.cpp \
gui/widgets/tabs/tab.h \
gui/widgets/tabbedarea.cpp \
diff --git a/src/gui/widgets/tabs/skilltab.h b/src/gui/widgets/tabs/skilltab.h
new file mode 100644
index 000000000..5dc6fb14a
--- /dev/null
+++ b/src/gui/widgets/tabs/skilltab.h
@@ -0,0 +1,72 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2014 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_TABS_SKILLTAB_H
+#define GUI_WIDGETS_TABS_SKILLTAB_H
+
+#include "gui/windows/skilldialog.h"
+
+#include "gui/widgets/tabs/tab.h"
+
+#include "utils/delete2.h"
+
+#include "localconsts.h"
+
+class SkillTab final : public Tab
+{
+ public:
+ SkillTab(const Widget2 *const widget,
+ const std::string &name,
+ SkillListBox *const listBox) :
+ Tab(widget),
+ mListBox(listBox)
+ {
+ setCaption(name);
+ }
+
+ A_DELETE_COPY(SkillTab)
+
+ ~SkillTab()
+ {
+ delete2(mListBox)
+ }
+
+ SkillInfo *getSelectedInfo() const
+ {
+ if (mListBox)
+ return mListBox->getSelectedInfo();
+ else
+ return nullptr;
+ }
+
+ protected:
+ void setCurrent() override
+ {
+ if (skillDialog)
+ skillDialog->updateTabSelection();
+ }
+
+ private:
+ SkillListBox *mListBox;
+};
+
+#endif // GUI_WIDGETS_TABS_SKILLTAB_H
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index f930c9b44..76296cfe4 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -46,9 +46,11 @@
#include "gui/widgets/label.h"
#include "gui/widgets/listbox.h"
#include "gui/widgets/scrollarea.h"
-#include "gui/widgets/tabs/tab.h"
#include "gui/widgets/tabbedarea.h"
+#include "gui/widgets/tabs/skilltab.h"
+#include "gui/widgets/tabs/tab.h"
+
#include "net/net.h"
#include "net/playerhandler.h"
#include "net/skillhandler.h"
@@ -61,44 +63,6 @@
#include "debug.h"
-class SkillTab final : public Tab
-{
- public:
- SkillTab(const Widget2 *const widget,
- const std::string &name,
- SkillListBox *const listBox) :
- Tab(widget),
- mListBox(listBox)
- {
- setCaption(name);
- }
-
- A_DELETE_COPY(SkillTab)
-
- ~SkillTab()
- {
- delete2(mListBox)
- }
-
- SkillInfo *getSelectedInfo() const
- {
- if (mListBox)
- return mListBox->getSelectedInfo();
- else
- return nullptr;
- }
-
- protected:
- void setCurrent() override
- {
- if (skillDialog)
- skillDialog->updateTabSelection();
- }
-
- private:
- SkillListBox *mListBox;
-};
-
SkillDialog::SkillDialog() :
// TRANSLATORS: skills dialog name
Window(_("Skills"), false, nullptr, "skills.xml"),