Merge branch 'master' into situare_interact

[situare] / src / ui / userinfopanel.h

diff --git a/src/ui/userinfopanel.h b/src/ui/userinfopanel.h
index d631a78..a6c2a42 100644 (file)
--- a/src/ui/userinfopanel.h
+++ b/src/ui/userinfopanel.h
@@ -53,6 +53,13 @@ public:
  ******************************************************************************/
 public slots:
     /**
+    * @brief Populates popular tags list
+    *
+    * @param popularTags list of popular tags
+    */
+    void populatePopularTags(QHash<QString, QString> &popularTags);
+
+    /**
      * @brief show / hide user information
      *
      * @param show true if userinfo should be shown
@@ -66,11 +73,30 @@ public slots:
      */
     void userDataReceived(User *user);
 
+private slots:
+    /**
+    * @brief Sets user's image.
+    *
+    * @param id image ID
+    * @param image image pixmap
+    */
+    void setImage(const QString &id, const QPixmap &image);
+
+    void showTagsDialog();
+
+
 /*******************************************************************************
  * SIGNALS
  ******************************************************************************/
 signals:
     /**
+    * @brief Signal for adding tags.
+    *
+    * @param tags tags to add
+    */
+    void addTags(const QStringList &tags);
+
+    /**
      * @brief Signal for collapse user info
      */
     void collapse();
@@ -83,11 +109,33 @@ signals:
     void findUser(const GeoCoordinate &coordinates);
 
     /**
+     * @brief Signal that used to inform user that his message/location update tp Situare server
+     *        was failed.
+     *        This signal is originally sended from UserInfo
+     *
+     * @param message message for notification
+     * @param modal true if modal notification otherwice false
+     */
+    void notificateUpdateFailing(const QString &message, bool modal);
+
+    /**
      * @brief Signal for refreshing user data.
      */
     void refreshUserData();
 
     /**
+    * @brief Signal for removing tags.
+    *
+    * @param tags tags to add
+    */
+    void removeTags(const QStringList &tags);
+
+    /**
+    * @brief Signal for requesting popular tags
+    */
+    void requestPopularTags();
+
+    /**
       * @brief Notify that update location message button was clicked
       */
     void updateLocationMessageButtonClicked();