2 files changed, 97 insertions, 0 deletions

diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index 9ba64e9f..d57db749 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -40,13 +40,16 @@
 #include "gui/widgets/tabbedarea.h"
 
 #include "net/net.h"
+#include "net/chathandler.h"
 #include "net/guildhandler.h"
 #include "net/partyhandler.h"
 
 #include "resources/theme.h"
 
+#include "socialwindow.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
+#include "widgets/avatarlistbox.h"
 
 #include <memory>
 
@@ -231,6 +234,76 @@ private:
     Party *mParty;
 };
 
+class PlayerList : public AvatarListModel
+{
+public:
+
+    void addAvatars(const std::vector<Avatar*> &onlineUsers) {
+        mPlayers = onlineUsers;
+    }
+
+    void clearPlayerList() {
+        for (unsigned i = 0; i < mPlayers.size(); ++i)
+        {
+            delete mPlayers[i];
+        }
+        mPlayers.clear();
+    }
+
+    /**
+     * Get size of members list.
+     * @return Returns the number of members in the party.
+     */
+    int getNumberOfElements() override {
+        return mPlayers.size();
+    }
+
+    Avatar *getAvatarAt(int index) override {
+        return mPlayers[index];
+    }
+
+private:
+    std::vector<Avatar*> mPlayers;
+};
+
+class PlayerListTab : public SocialTab
+{
+public:
+    PlayerListTab() 
+    {
+        setCaption("Online Players");
+        
+        mPlayerList = new PlayerList;
+
+        mList = std::make_unique<AvatarListBox>(mPlayerList);
+        mScroll = std::make_unique<ScrollArea>(mList.get());
+
+        mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
+        mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
+
+        Net::getChatHandler()->refreshList();
+    }
+    ~PlayerListTab()
+    {
+        delete mPlayerList;
+    }
+    void clearPlayerList()
+    {
+        mPlayerList->clearPlayerList();
+    }
+    void addOnlinePlayers(const std::vector<Avatar*> &onlineUsers)
+    {
+        mPlayerList->addAvatars(onlineUsers);
+    }
+
+protected:
+    void invite() override {}
+    void leave() override {}
+
+private:
+    PlayerList *mPlayerList;
+};
+
 /*class BuddyTab : public SocialTab
 {
     // TODO?
@@ -305,17 +378,22 @@ SocialWindow::SocialWindow() :
     mCreateButton = new Button(_("Create"), "create", this);
     mInviteButton = new Button(_("Invite"), "invite", this);
     mLeaveButton = new Button(_("Leave"), "leave", this);
+    mRefreshButton = new Button(_("Refresh"), "refresh", this);
     mTabs = new TabbedArea;
 
     place(0, 0, mCreateButton);
     place(1, 0, mInviteButton);
     place(2, 0, mLeaveButton);
+    place(3, 0, mRefreshButton);
     place(0, 1, mTabs, 4, 4);
 
     widgetResized(nullptr);
 
     mCreatePopup = new CreatePopup();
 
+    mPlayerListTab = new PlayerListTab();
+    mTabs->addTab(mPlayerListTab, mPlayerListTab->mScroll.get());
+
     if (local_player->getParty())
     {
         addTab(local_player->getParty());
@@ -345,6 +423,7 @@ SocialWindow::~SocialWindow()
         mPartyInviter.clear();
     }
     delete mCreatePopup;
+    delete mPlayerListTab;
 }
 
 bool SocialWindow::addTab(Guild *guild)
@@ -462,6 +541,10 @@ void SocialWindow::action(const gcn::ActionEvent &event)
     {
         static_cast<SocialTab*>(mTabs->getSelectedTab())->leave();
     }
+    else if (event.getId() == "refresh")
+    {
+        Net::getChatHandler()->refreshList();
+    }
     else if (event.getId() == "create guild")
     {
         std::string name = mGuildCreateDialog->getText();
@@ -605,6 +688,12 @@ void SocialWindow::showPartyCreate()
     mPartyCreateDialog->addActionListener(this);
 }
 
+void SocialWindow::setPlayersOnline(const std::vector<Avatar*> &onlineUsers)
+{
+    mPlayerListTab->clearPlayerList();
+    mPlayerListTab->addOnlinePlayers(onlineUsers);
+}
+
 void SocialWindow::updateButtons()
 {
     bool hasTabs = mTabs->getNumberOfTabs() > 0;
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index 8575f3b2..0c269e26 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -28,12 +28,15 @@
 
 #include <string>
 #include <map>
+#include <vector>
 
+class Avatar;
 class Button;
 class ConfirmDialog;
 class CreatePopup;
 class Guild;
 class Party;
+class PlayerListTab;
 class SocialTab;
 class Tab;
 class TabbedArea;
@@ -74,6 +77,8 @@ public:
 
     void showPartyCreate();
 
+    void setPlayersOnline(const std::vector<Avatar*> &onlineUsers);
+
 protected:
     friend class SocialTab;
 
@@ -92,9 +97,12 @@ protected:
 
     CreatePopup *mCreatePopup;
 
+    PlayerListTab *mPlayerListTab;
+
     Button *mCreateButton;
     Button *mInviteButton;
     Button *mLeaveButton;
+    Button *mRefreshButton;
     TabbedArea *mTabs;
 };