Merge branch 'master' into new_panels_with_context_buttons

[situare] / src / ui / userinfopanel.cpp

diff --git a/src/ui/userinfopanel.cpp b/src/ui/userinfopanel.cpp
index ac9dc4f..2c48092 100644 (file)
--- a/src/ui/userinfopanel.cpp
+++ b/src/ui/userinfopanel.cpp
@@ -1,4 +1,4 @@
- /*
+/*
     Situare - A location system for Facebook
     Copyright (C) 2010  Ixonos Plc. Authors:
 
@@ -19,22 +19,27 @@
     along with Situare; if not, write to the Free Software
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
     USA.
- */
+*/
 
-#include "userinfopanel.h"
+#include <QScrollArea>
+#include <QVBoxLayout>
 
-#include "userinfo.h"
+#include "imagebutton.h"
 #include "panelcommon.h"
+#include "userinfo.h"
+
+#include "userinfopanel.h"
 
 UserInfoPanel::UserInfoPanel(QWidget *parent)
-    : QWidget(parent)
+    : PanelBase(parent)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
     QVBoxLayout *userInfoPanelLayout = new QVBoxLayout;
     userInfoPanelLayout->setMargin(0);
     userInfoPanelLayout->setSpacing(0);
-    userInfoPanelLayout->setContentsMargins(PANEL_MARGIN_LEFT, 0, PANEL_MARGIN_RIGHT, 0);
+    userInfoPanelLayout->setContentsMargins(PANEL_MARGIN_LEFT, PANEL_MARGIN_TOP,
+                                            PANEL_MARGIN_RIGHT, PANEL_MARGIN_BOTTOM);
     setLayout(userInfoPanelLayout);
 
     m_userInfo = new UserInfo(this);
@@ -62,20 +67,36 @@ UserInfoPanel::UserInfoPanel(QWidget *parent)
     connect(m_userInfo,SIGNAL(requestReverseGeo()),
             this, SIGNAL(requestReverseGeo()));
 
-    connect(this, SIGNAL(reverseGeoReady(QString)),
-            m_userInfo, SIGNAL(reverseGeoReady(QString)));
+    connect(m_userInfo, SIGNAL(statusUpdate(QString, bool)),
+            this, SIGNAL(statusUpdate(QString, bool)));
 
-    connect(m_userInfo, SIGNAL(statusUpdate(QString,bool)),
-            this, SIGNAL(statusUpdate(QString,bool)));
+    connect(m_userInfo, SIGNAL(notificateUpdateFailing(QString, bool)),
+             this, SIGNAL(notificateUpdateFailing(QString, bool)));
 
-    connect(m_userInfo, SIGNAL(refreshUserData()),
-            this, SIGNAL(refreshUserData()));
+    connect(this, SIGNAL(reverseGeoReady(QString)),
+            m_userInfo, SIGNAL(reverseGeoReady(QString)));
 
     connect(this, SIGNAL(clearUpdateLocationDialogData()),
             m_userInfo, SLOT(clearUpdateLocationDialogData()));
 
-    connect(m_userInfo, SIGNAL(notificateUpdateFailing(QString, bool)),
-             this, SIGNAL(notificateUpdateFailing(QString, bool)));
+    connect(this, SIGNAL(collapse()),
+            m_userInfo, SLOT(collapse()));
+
+    ImageButton *updateFriendsButton = new ImageButton(":/res/images/refresh.png",
+                                                       ":/res/images/refresh_s.png",
+                                                       "", this);
+    ImageButton *updateStatusMessageButton = new ImageButton(":/res/images/send_position.png",
+                                                             ":/res/images/send_position_s.png",
+                                                             "", this);
+
+    m_contextButtonLayout->addWidget(updateFriendsButton);
+    m_contextButtonLayout->addWidget(updateStatusMessageButton);
+
+    connect(updateFriendsButton, SIGNAL(clicked()),
+            this, SIGNAL(refreshUserData()));
+
+    connect(updateStatusMessageButton, SIGNAL(clicked()),
+            m_userInfo, SLOT(messageUpdate()));
 }
 
 void UserInfoPanel::userDataReceived(User *user)