Merge branch 'master' into new_panels_with_context_buttons

Conflicts:
	src/ui/userinfopanel.cpp

diff --cc src/engine/engine.cpp
Simple merge

diff --cc src/ui/mainwindow.cpp
Simple merge

diff --cc src/ui/userinfo.cpp
index d7e8f33,50dd2cb..c1d1b7f
--- 1/src/ui/userinfo.cpp
--- 2/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@@ -98,11 -102,18 +88,11 @@@ UserInfo::UserInfo(QWidget *parent
      infoLayout->addRow(compassLabel, m_locationLabel);
      infoLayout->addRow(clockLabel, m_updatedLabel);
  
-     verticalLayout->addWidget(m_findButton, 0, Qt::AlignHCenter);
+     verticalLayout->addWidget(m_avatar, 0, Qt::AlignHCenter);
      verticalLayout->addWidget(m_nameLabel, 0, Qt::AlignHCenter);
      verticalLayout->addLayout(infoLayout);
 -    verticalLayout->addLayout(buttonLayout);
 -
 -    connect(updateStatusMessageButton,SIGNAL(clicked()),
 -            this,SLOT(messageUpdate()));
 -
 -    connect(updateFriendsButton,SIGNAL(clicked()),
 -            this, SIGNAL(refreshUserData()));
  
-     connect(m_findButton, SIGNAL(clicked()),
+     connect(m_avatar, SIGNAL(clicked()),
              this, SLOT(findButtonClicked()));
  
      setFixedWidth(BACKGROUND_WIDTH);

diff --cc src/ui/userinfo.h
Simple merge

diff --cc src/ui/userinfopanel.cpp
index af8670a,e4e022c..2c48092
--- 1/src/ui/userinfopanel.cpp
--- 2/src/ui/userinfopanel.cpp
+++ b/src/ui/userinfopanel.cpp
@@@ -67,33 -66,23 +67,36 @@@ UserInfoPanel::UserInfoPanel(QWidget *p
      connect(m_userInfo,SIGNAL(requestReverseGeo()),
              this, SIGNAL(requestReverseGeo()));
  
-     connect(m_userInfo, SIGNAL(statusUpdate(QString,bool)),
-             this, SIGNAL(statusUpdate(QString,bool)));
 -    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)

diff --cc src/ui/userinfopanel.h
Simple merge