Merge branch 'master' into new_panels_with_context_buttons

[situare] / src / ui / userinfo.cpp

diff --git a/src/ui/userinfo.cpp b/src/ui/userinfo.cpp
index 311e7c5..d7e8f33 100644 (file)
--- a/src/ui/userinfo.cpp
+++ b/src/ui/userinfo.cpp
@@ -23,18 +23,26 @@
    USA.
 */
 
+#include <QFormLayout>
+#include <QLabel>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QSettings>
+#include <QVBoxLayout>
+
 #include "common.h"
 #include "imagebutton.h"
-#include "../user/user.h"
+#include "user/user.h"
+
 #include "userinfo.h"
 
-const int BACKGROUND_WIDTH = 240;           ///< Width for item
-const int BACKGROUND_TOP_HEIGHT = 16;       ///< Height for item top
+const int BACKGROUND_WIDTH = 368;           ///< Width for item
+const int BACKGROUND_TOP_HEIGHT = 20;       ///< Height for item top
 const int BACKGROUND_BOTTOM_HEIGHT = 15;    ///< Height for item bottom
 const int ICON_HEIGHT = 24;                 ///< Icon height
 const int ICON_WIDTH = 24;                  ///< Icon width
 const int MARGIN = 5;                       ///< Icon margin
-const int LINE_LENGTH = 17;                 ///< Line length
+const int LINE_LENGTH = 27;                 ///< Line length
 const int MOUSE_PRESS_AREA_WIDTH = 20;      ///< Area width for item height toggling
 const int MOUSE_PRESS_AREA_HEIGHT = 20;     ///< Area height for item height toggling
 
@@ -61,10 +69,6 @@ UserInfo::UserInfo(QWidget *parent)
     infoLayout->setMargin(0);
     infoLayout->setSpacing(0);
 
-    QHBoxLayout *buttonLayout = new QHBoxLayout();
-    buttonLayout->setMargin(0);
-    buttonLayout->setSpacing(0);
-
     QLabel *envelopeLabel = new QLabel();
     envelopeLabel->setPixmap(QPixmap(":/res/images/envelope.png"));
     envelopeLabel->setContentsMargins(0, 0, MARGIN, 0);
@@ -90,14 +94,6 @@ UserInfo::UserInfo(QWidget *parent)
     m_updatedLabel = new QLabel();
     m_updatedLabel->setWordWrap(true);
 
-    ImageButton *updateFriendsButton = new ImageButton(this, ":/res/images/refresh.png",
-                                                             ":/res/images/refresh_s.png");
-    ImageButton *updateStatusMessageButton = new ImageButton(this, ":/res/images/send_position.png",
-                                                                   ":/res/images/send_position_s.png");
-
-    buttonLayout->addWidget(updateFriendsButton);
-    buttonLayout->addWidget(updateStatusMessageButton);
-
     infoLayout->addRow(envelopeLabel, m_statusTextLabel);
     infoLayout->addRow(compassLabel, m_locationLabel);
     infoLayout->addRow(clockLabel, m_updatedLabel);
@@ -105,13 +101,6 @@ UserInfo::UserInfo(QWidget *parent)
     verticalLayout->addWidget(m_findButton, 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()),
             this, SLOT(findButtonClicked()));
@@ -127,9 +116,9 @@ UserInfo::UserInfo(QWidget *parent)
     namePalette.setColor(QPalette::Foreground, Qt::white);
     m_nameLabel->setPalette(namePalette);
 
-    m_backgroundTopImage.load(":/res/images/user_info_item_top.png");
-    m_backgroundMiddleImage.load(":/res/images/user_info_item_middle.png");
-    m_backgroundBottomImage.load(":/res/images/user_info_item_bottom.png");
+    m_backgroundTopImage.load(":/res/images/list_item_top.png");
+    m_backgroundMiddleImage.load(":/res/images/list_item_middle.png");
+    m_backgroundBottomImage.load(":/res/images/list_item_bottom.png");
 
     restoreUnsendMessage();
 }
@@ -140,7 +129,7 @@ UserInfo::~UserInfo()
 
     QSettings settings(DIRECTORY_NAME, FILE_NAME);
 
-    if (!m_backupMessage.isEmpty()) {        
+    if (!m_backupMessage.isEmpty()) {
         settings.setValue(USER_UNSEND_MESSAGE, m_backupMessage.toAscii());
         settings.setValue(USER_UNSEND_MESSAGE_PUBLISH, m_backupFacebookPublishPolicity);
     } else {
@@ -156,7 +145,7 @@ void UserInfo::setAddress(const QString &address)
     m_locationLabel->setText(address);
 }
 
-void UserInfo::setCoordinates(const QPointF &coordinates)
+void UserInfo::setCoordinates(const GeoCoordinate &coordinates)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -300,8 +289,10 @@ void UserInfo::paintEvent(QPaintEvent *aPaintEvent)
     QPainter painter(this);
 
     QRect topRect = QRect(0, MARGIN, BACKGROUND_WIDTH, BACKGROUND_TOP_HEIGHT);
+///< @todo Overlaps with topRect?
     QRect middleRect = QRect(0, topRect.bottom(), BACKGROUND_WIDTH,
-                             height() - BACKGROUND_TOP_HEIGHT - BACKGROUND_BOTTOM_HEIGHT);
+                             this->height() - BACKGROUND_TOP_HEIGHT - BACKGROUND_BOTTOM_HEIGHT);
+///< @todo Overlaps with middleRect
     QRect bottomRect = QRect(topRect.left(), middleRect.bottom(), BACKGROUND_WIDTH,
                              BACKGROUND_BOTTOM_HEIGHT);
 
@@ -333,7 +324,7 @@ QString UserInfo::shortenText(const QLabel *label, const QString &text, int text
             textParam.truncate(index);
             textParam.append("...");
         }
-            if (textWidth > 150)
+            if (textWidth > 250) ///< @todo magic number
                 textParam.insert(LINE_LENGTH, QString("\n"));
 
    return labelMetrics.elidedText(textParam, Qt::ElideRight, textMaxWidth);
@@ -361,5 +352,4 @@ void UserInfo::updateLocationDialogFinished(int reason)
         m_updateLocation->deleteLater();
         m_updateLocation = 0;
     }
-
 }