From 304f0c021f2871975d27a42d2fef9379e446b8c8 Mon Sep 17 00:00:00 2001 From: Katri Kaikkonen Date: Fri, 27 Aug 2010 16:00:51 +0300 Subject: [PATCH] =?utf8?q?Minor=20changes=20to=20userinfo.=20Remove=20word=20?= =?utf8?q?wrap=20from=20name=20label=20and=20rename=20button=20Reviewed=20by?= =?utf8?q?=20Sami=20R=C3=A4m=C3=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/ui/userinfo.cpp | 9 ++++----- src/ui/userinfo.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/ui/userinfo.cpp b/src/ui/userinfo.cpp index 244041e..50dd2cb 100644 --- a/src/ui/userinfo.cpp +++ b/src/ui/userinfo.cpp @@ -77,10 +77,9 @@ UserInfo::UserInfo(QWidget *parent) clockLabel->setContentsMargins(0, 0, MARGIN, 0); clockLabel->setFixedSize(ICON_WIDTH + MARGIN, ICON_HEIGHT); - m_findButton = new ImageButton(); + m_avatar = new ImageButton(); m_nameLabel = new QLabel(); - m_nameLabel->setWordWrap(true); m_statusTextLabel = new QLabel(); m_statusTextLabel->setWordWrap(true); @@ -103,7 +102,7 @@ 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); @@ -114,7 +113,7 @@ UserInfo::UserInfo(QWidget *parent) connect(updateFriendsButton,SIGNAL(clicked()), this, SIGNAL(refreshUserData())); - connect(m_findButton, SIGNAL(clicked()), + connect(m_avatar, SIGNAL(clicked()), this, SLOT(findButtonClicked())); setFixedWidth(BACKGROUND_WIDTH); @@ -296,7 +295,7 @@ void UserInfo::setProfileImage(const QPixmap &image) qDebug() << __PRETTY_FUNCTION__; if(!image.isNull()) - m_findButton->setButtonIcon(image); + m_avatar->setButtonIcon(image); } void UserInfo::setExpanded(bool expanded) diff --git a/src/ui/userinfo.h b/src/ui/userinfo.h index ac51ac9..14be1cf 100644 --- a/src/ui/userinfo.h +++ b/src/ui/userinfo.h @@ -266,7 +266,7 @@ private: QString m_userName; ///< User's name GeoCoordinate m_coordinates; ///< User current coordinates - ImageButton *m_findButton; ///< User find button + ImageButton *m_avatar; ///< User find button UpdateLocationDialog *m_updateLocation; ///< Update location dialog }; -- 1.7.9.5