summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-17 17:03:48 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-17 17:03:48 +0300
commit4f1f8531f01f918761b01999b603f4d210375258 (patch)
tree0e944210617ed7bb6adba1d5143b07138861f40c
parentd6403f567ec8f8f999294237633e37e46f62f1aa (diff)
downloadplus-4f1f8531f01f918761b01999b603f4d210375258.tar.gz
plus-4f1f8531f01f918761b01999b603f4d210375258.tar.bz2
plus-4f1f8531f01f918761b01999b603f4d210375258.tar.xz
plus-4f1f8531f01f918761b01999b603f4d210375258.zip
Move socialpickuptab into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/widgets/tabs/socialpickuptab.h73
-rw-r--r--src/gui/windows/socialwindow.cpp44
4 files changed, 76 insertions, 43 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6427bdd32..fdeaf0115 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -265,6 +265,7 @@ SET(SRCS
gui/widgets/tabs/socialguildtab2.h
gui/widgets/tabs/socialnavigationtab.h
gui/widgets/tabs/socialpartytab.h
+ gui/widgets/tabs/socialpickuptab.h
gui/widgets/tabs/socialplayerstab.h
gui/widgets/tabs/socialtab.h
gui/widgets/tabs/tab.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 7387cfe1f..d8429b968 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -363,6 +363,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/tabs/socialguildtab2.h \
gui/widgets/tabs/socialnavigationtab.h \
gui/widgets/tabs/socialpartytab.h \
+ gui/widgets/tabs/socialpickuptab.h \
gui/widgets/tabs/socialplayerstab.h \
gui/widgets/tabs/socialtab.h \
gui/widgets/tabs/tab.cpp \
diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h
new file mode 100644
index 000000000..28a83ed0b
--- /dev/null
+++ b/src/gui/widgets/tabs/socialpickuptab.h
@@ -0,0 +1,73 @@
+/*
+ * The ManaPlus Client
+ * 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_SOCIALPICKUPTAB_H
+#define GUI_WIDGETS_TABS_SOCIALPICKUPTAB_H
+
+#include "gui/widgets/tabs/socialtab.h"
+
+#include "utils/delete2.h"
+#include "utils/gettext.h"
+
+#include "localconsts.h"
+
+class SocialPickupTab final : public SocialTab
+{
+ public:
+ SocialPickupTab(const Widget2 *const widget,
+ const bool showBackground) :
+ SocialTab(widget),
+ mBeings(new BeingsListModel)
+ {
+ mList = new AvatarListBox(this, mBeings);
+ mList->postInit();
+ mScroll = new ScrollArea(this, mList, showBackground,
+ "social_background.xml");
+
+ mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
+ mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
+
+ // TRANSLATORS: Pickup filter tab name in social window. Should be small
+ setCaption(_("Pik"));
+ }
+
+ A_DELETE_COPY(SocialPickupTab)
+
+ ~SocialPickupTab()
+ {
+ delete2(mList)
+ delete2(mScroll)
+ delete2(mBeings)
+ }
+
+ void updateList() override final
+ {
+ updateAtkListStart();
+ // TRANSLATORS: items group name in social window
+ addAvatars(PickupItem, _("Pickup items"), PICKUP);
+ // TRANSLATORS: items group name in social window
+ addAvatars(IgnorePickupItem, _("Ignore items"), NOPICKUP);
+ }
+
+ private:
+ BeingsListModel *mBeings;
+};
+
+#endif // GUI_WIDGETS_TABS_SOCIALPICKUPTAB_H
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index db37bb626..4c19a18f5 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -60,6 +60,7 @@
#include "gui/widgets/tabs/socialguildtab2.h"
#include "gui/widgets/tabs/socialnavigationtab.h"
#include "gui/widgets/tabs/socialpartytab.h"
+#include "gui/widgets/tabs/socialpickuptab.h"
#include "gui/widgets/tabs/socialplayerstab.h"
#include "net/net.h"
@@ -100,49 +101,6 @@ namespace
} friendSorter;
} // namespace
-class SocialPickupTab final : public SocialTab
-{
-public:
- SocialPickupTab(const Widget2 *const widget,
- const bool showBackground) :
- SocialTab(widget),
- mBeings(new BeingsListModel)
- {
- mList = new AvatarListBox(this, mBeings);
- mList->postInit();
- mScroll = new ScrollArea(this, mList, showBackground,
- "social_background.xml");
-
- mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO);
- mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS);
-
- // TRANSLATORS: Pickup filter tab name in social window. Should be small
- setCaption(_("Pik"));
- }
-
- A_DELETE_COPY(SocialPickupTab)
-
- ~SocialPickupTab()
- {
- delete2(mList)
- delete2(mScroll)
- delete2(mBeings)
- }
-
- void updateList() override final
- {
- updateAtkListStart();
- // TRANSLATORS: items group name in social window
- addAvatars(PickupItem, _("Pickup items"), PICKUP);
- // TRANSLATORS: items group name in social window
- addAvatars(IgnorePickupItem, _("Ignore items"), NOPICKUP);
- }
-
-private:
- BeingsListModel *mBeings;
-};
-
-
class SocialFriendsTab final : public SocialTab
{
public: