From 9de5161f9d55e4e2ece1653e6cb7decf5b3f0b9b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 May 2014 21:20:31 +0300 Subject: Simplify social tabs code. --- src/gui/widgets/tabs/skilltab.h | 2 ++ src/gui/widgets/tabs/socialattacktab.h | 10 +++------- src/gui/widgets/tabs/socialfriendstab.h | 8 +------- src/gui/widgets/tabs/socialguildtab.h | 8 +------- src/gui/widgets/tabs/socialguildtab2.h | 8 +------- src/gui/widgets/tabs/socialnavigationtab.h | 8 +------- src/gui/widgets/tabs/socialpartytab.h | 8 +------- src/gui/widgets/tabs/socialpickuptab.h | 8 +------- src/gui/widgets/tabs/socialplayerstab.h | 8 +------- src/gui/widgets/tabs/socialtab.h | 19 +++++++++++++++++++ 10 files changed, 31 insertions(+), 56 deletions(-) (limited to 'src') diff --git a/src/gui/widgets/tabs/skilltab.h b/src/gui/widgets/tabs/skilltab.h index 5dc6fb14a..330485c40 100644 --- a/src/gui/widgets/tabs/skilltab.h +++ b/src/gui/widgets/tabs/skilltab.h @@ -31,6 +31,8 @@ #include "localconsts.h" +class SkillListBox; + class SkillTab final : public Tab { public: diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h index 6c0b6ea68..0f902caaf 100644 --- a/src/gui/widgets/tabs/socialattacktab.h +++ b/src/gui/widgets/tabs/socialattacktab.h @@ -28,6 +28,8 @@ #include "localconsts.h" +class BeingsListModel; + #define addAvatars(mob, str, type) \ {\ ava = new Avatar(str);\ @@ -88,13 +90,7 @@ class SocialAttackTab final : public SocialTab 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); + createControls(mBeings, showBackground); // TRANSLATORS: Attack filter tab name in social window. // TRANSLATORS: Should be small diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h index 776fd6f4b..35d5c4215 100644 --- a/src/gui/widgets/tabs/socialfriendstab.h +++ b/src/gui/widgets/tabs/socialfriendstab.h @@ -64,13 +64,7 @@ class SocialFriendsTab final : public SocialTab 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); + createControls(mBeings, showBackground); getPlayersAvatars(); setCaption(name); diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h index d88387930..4647f5f07 100644 --- a/src/gui/widgets/tabs/socialguildtab.h +++ b/src/gui/widgets/tabs/socialguildtab.h @@ -54,13 +54,7 @@ class SocialGuildTab final : public SocialTab, setSelectedTabColor(&getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED), &getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED_OUTLINE)); - mList = new AvatarListBox(this, guild); - mList->postInit(); - mScroll = new ScrollArea(this, mList, showBackground, - "social_background.xml"); - - mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); + createControls(guild, showBackground); } A_DELETE_COPY(SocialGuildTab) diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h index 0ac832f6c..62d55982a 100644 --- a/src/gui/widgets/tabs/socialguildtab2.h +++ b/src/gui/widgets/tabs/socialguildtab2.h @@ -50,13 +50,7 @@ class SocialGuildTab2 final : public SocialTab, setSelectedTabColor(&getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED), &getThemeColor(Theme::GUILD_SOCIAL_TAB_SELECTED_OUTLINE)); - mList = new AvatarListBox(this, guild); - mList->postInit(); - mScroll = new ScrollArea(this, mList, showBackground, - "social_background.xml"); - - mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); + createControls(guild, showBackground); } A_DELETE_COPY(SocialGuildTab2) diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h index 70c92790c..1d0fbfa33 100644 --- a/src/gui/widgets/tabs/socialnavigationtab.h +++ b/src/gui/widgets/tabs/socialnavigationtab.h @@ -36,13 +36,7 @@ class SocialNavigationTab final : public SocialTab 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); + createControls(mBeings, showBackground); // TRANSLATORS: Navigation tab name in social window. // TRANSLATORS: Should be small diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h index 79209ac06..dc86fb958 100644 --- a/src/gui/widgets/tabs/socialpartytab.h +++ b/src/gui/widgets/tabs/socialpartytab.h @@ -54,13 +54,7 @@ class SocialPartyTab final : public SocialTab, setSelectedTabColor(&getThemeColor(Theme::PARTY_SOCIAL_TAB_SELECTED), &getThemeColor(Theme::PARTY_SOCIAL_TAB_SELECTED_OUTLINE)); - mList = new AvatarListBox(this, party); - mList->postInit(); - mScroll = new ScrollArea(this, mList, showBackground, - "social_background.xml"); - - mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); - mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); + createControls(party, showBackground); } A_DELETE_COPY(SocialPartyTab) diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h index 28a83ed0b..ddf9924b1 100644 --- a/src/gui/widgets/tabs/socialpickuptab.h +++ b/src/gui/widgets/tabs/socialpickuptab.h @@ -36,13 +36,7 @@ class SocialPickupTab final : public SocialTab 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); + createControls(mBeings, showBackground); // TRANSLATORS: Pickup filter tab name in social window. Should be small setCaption(_("Pik")); diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h index 5e625b06e..2026a6346 100644 --- a/src/gui/widgets/tabs/socialplayerstab.h +++ b/src/gui/widgets/tabs/socialplayerstab.h @@ -34,13 +34,7 @@ class SocialPlayersTab final : public SocialTab 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); + createControls(mBeings, showBackground); getPlayersAvatars(); setCaption(name); diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h index 433655c9d..5ba8e9884 100644 --- a/src/gui/widgets/tabs/socialtab.h +++ b/src/gui/widgets/tabs/socialtab.h @@ -24,10 +24,17 @@ #include "gui/windows/socialwindow.h" +#include "gui/widgets/avatarlistbox.h" +#include "gui/widgets/scrollarea.h" + #include "gui/widgets/tabs/tab.h" #include "localconsts.h" +class AvatarListModel; +class ConfirmDialog; +class TextDialog; + class SocialTab : public Tab { public: @@ -93,6 +100,18 @@ class SocialTab : public Tab } } + void createControls(AvatarListModel *const listModel, + const bool showBackground) + { + mList = new AvatarListBox(this, listModel); + mList->postInit(); + mScroll = new ScrollArea(this, mList, showBackground, + "social_background.xml"); + + mScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_AUTO); + mScroll->setVerticalScrollPolicy(ScrollArea::SHOW_ALWAYS); + } + void setCurrent() override final { updateCounter(); -- cgit v1.2.3-60-g2f50