From 9f2993aaa89a4a837455e78a4e00826a779b036c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 18 Aug 2016 22:05:19 +0300
Subject: Add baic menu into social window menu button.

Allow create/leave party or guild.
---
 src/gui/widgets/tabs/socialattacktab.h     |  1 +
 src/gui/widgets/tabs/socialfriendstab.h    |  1 +
 src/gui/widgets/tabs/socialguildtab.h      |  1 +
 src/gui/widgets/tabs/socialguildtab2.h     |  1 +
 src/gui/widgets/tabs/socialnavigationtab.h |  1 +
 src/gui/widgets/tabs/socialpartytab.h      |  1 +
 src/gui/widgets/tabs/socialpickuptab.h     |  1 +
 src/gui/widgets/tabs/socialplayerstab.h    |  1 +
 src/gui/widgets/tabs/socialtab.h           | 13 +++++++++++--
 9 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/gui/widgets/tabs')

diff --git a/src/gui/widgets/tabs/socialattacktab.h b/src/gui/widgets/tabs/socialattacktab.h
index 31cafd1ff..d83df7d14 100644
--- a/src/gui/widgets/tabs/socialattacktab.h
+++ b/src/gui/widgets/tabs/socialattacktab.h
@@ -47,6 +47,7 @@ class SocialAttackTab final : public SocialTab
             // TRANSLATORS: Attack filter tab name in social window.
             // TRANSLATORS: Should be small
             setCaption(_("Atk"));
+            mMenuAction = "attack";
         }
 
         A_DELETE_COPY(SocialAttackTab)
diff --git a/src/gui/widgets/tabs/socialfriendstab.h b/src/gui/widgets/tabs/socialfriendstab.h
index b53138e10..12ea761d3 100644
--- a/src/gui/widgets/tabs/socialfriendstab.h
+++ b/src/gui/widgets/tabs/socialfriendstab.h
@@ -52,6 +52,7 @@ class SocialFriendsTab final : public SocialTab
 
             getPlayersAvatars();
             setCaption(name);
+            mMenuAction = "friends";
         }
 
         A_DELETE_COPY(SocialFriendsTab)
diff --git a/src/gui/widgets/tabs/socialguildtab.h b/src/gui/widgets/tabs/socialguildtab.h
index 942ce9d59..3ea77d529 100644
--- a/src/gui/widgets/tabs/socialguildtab.h
+++ b/src/gui/widgets/tabs/socialguildtab.h
@@ -59,6 +59,7 @@ class SocialGuildTab final : public SocialTab,
                 ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
 
             createControls(guild, showBackground);
+            mMenuAction = "guild";
         }
 
         A_DELETE_COPY(SocialGuildTab)
diff --git a/src/gui/widgets/tabs/socialguildtab2.h b/src/gui/widgets/tabs/socialguildtab2.h
index c216c6d36..cc887cd32 100644
--- a/src/gui/widgets/tabs/socialguildtab2.h
+++ b/src/gui/widgets/tabs/socialguildtab2.h
@@ -59,6 +59,7 @@ class SocialGuildTab2 final : public SocialTab,
                 ThemeColorId::GUILD_SOCIAL_TAB_SELECTED_OUTLINE));
 
             createControls(guild, showBackground);
+            mMenuAction = "guild";
         }
 
         A_DELETE_COPY(SocialGuildTab2)
diff --git a/src/gui/widgets/tabs/socialnavigationtab.h b/src/gui/widgets/tabs/socialnavigationtab.h
index e673c689b..839e2cc3e 100644
--- a/src/gui/widgets/tabs/socialnavigationtab.h
+++ b/src/gui/widgets/tabs/socialnavigationtab.h
@@ -58,6 +58,7 @@ class SocialNavigationTab final : public SocialTab
             // TRANSLATORS: Navigation tab name in social window.
             // TRANSLATORS: Should be small
             setCaption(_("Nav"));
+            mMenuAction = "navigation";
         }
 
         A_DELETE_COPY(SocialNavigationTab)
diff --git a/src/gui/widgets/tabs/socialpartytab.h b/src/gui/widgets/tabs/socialpartytab.h
index d38328728..00a66a9b9 100644
--- a/src/gui/widgets/tabs/socialpartytab.h
+++ b/src/gui/widgets/tabs/socialpartytab.h
@@ -61,6 +61,7 @@ class SocialPartyTab final : public SocialTab,
                 ThemeColorId::PARTY_SOCIAL_TAB_SELECTED_OUTLINE));
 
             createControls(party, showBackground);
+            mMenuAction = "party";
         }
 
         A_DELETE_COPY(SocialPartyTab)
diff --git a/src/gui/widgets/tabs/socialpickuptab.h b/src/gui/widgets/tabs/socialpickuptab.h
index 7c0c6fd35..fab754ec8 100644
--- a/src/gui/widgets/tabs/socialpickuptab.h
+++ b/src/gui/widgets/tabs/socialpickuptab.h
@@ -47,6 +47,7 @@ class SocialPickupTab final : public SocialTab
             // TRANSLATORS: Pickup filter tab name in social window.
             // TRANSLATORS: Should be small
             setCaption(_("Pik"));
+            mMenuAction = "pickup";
         }
 
         A_DELETE_COPY(SocialPickupTab)
diff --git a/src/gui/widgets/tabs/socialplayerstab.h b/src/gui/widgets/tabs/socialplayerstab.h
index 50d86e33c..fcd01b6a3 100644
--- a/src/gui/widgets/tabs/socialplayerstab.h
+++ b/src/gui/widgets/tabs/socialplayerstab.h
@@ -52,6 +52,7 @@ class SocialPlayersTab final : public SocialTab
 
             getPlayersAvatars();
             setCaption(name);
+            mMenuAction = "players";
         }
 
         A_DELETE_COPY(SocialPlayersTab)
diff --git a/src/gui/widgets/tabs/socialtab.h b/src/gui/widgets/tabs/socialtab.h
index dfd6ad828..9d8469321 100644
--- a/src/gui/widgets/tabs/socialtab.h
+++ b/src/gui/widgets/tabs/socialtab.h
@@ -80,7 +80,8 @@ class SocialTab notfinal : public Tab
             mConfirmDialog(nullptr),
             mScroll(nullptr),
             mList(nullptr),
-            mCounterString()
+            mCounterString(),
+            mMenuAction("menu")
         {
         }
 
@@ -116,12 +117,19 @@ class SocialTab notfinal : public Tab
         void setCurrent() override final
         {
             updateCounter();
+            updateMenu();
         }
 
         void updateCounter() const
         {
             if (socialWindow)
-                socialWindow->setCounter(this, mCounterString);
+                socialWindow->updateCounter(this, mCounterString);
+        }
+
+        void updateMenu() const
+        {
+            if (socialWindow)
+                socialWindow->updateMenu(this, mMenuAction);
         }
 
         TextDialog *mInviteDialog;
@@ -129,6 +137,7 @@ class SocialTab notfinal : public Tab
         ScrollArea *mScroll;
         AvatarListBox *mList;
         std::string mCounterString;
+        std::string mMenuAction;
 };
 
 #endif  // GUI_WIDGETS_TABS_SOCIALTAB_H
-- 
cgit v1.2.3-60-g2f50