From b0c3fd5a7d425218d8a6edf651970970385e5925 Mon Sep 17 00:00:00 2001 From: Loren Burkholder Date: Fri, 15 Jan 2021 19:17:29 -0500 Subject: [PATCH] Remove UserItem class --- src/popups/PopupItem.cpp | 62 ---------------------------------------- src/popups/PopupItem.h | 20 ------------- 2 files changed, 82 deletions(-) diff --git a/src/popups/PopupItem.cpp b/src/popups/PopupItem.cpp index b3784843..37fe142a 100644 --- a/src/popups/PopupItem.cpp +++ b/src/popups/PopupItem.cpp @@ -37,68 +37,6 @@ PopupItem::paintEvent(QPaintEvent *) p.fillRect(rect(), hoverColor_); } -UserItem::UserItem(QWidget *parent) - : PopupItem(parent) -{ - userName_ = new QLabel("Placeholder", this); - avatar_->setLetter("P"); - topLayout_->addWidget(avatar_); - topLayout_->addWidget(userName_, 1); -} - -UserItem::UserItem(QWidget *parent, const QString &user_id) - : PopupItem(parent) - , userId_{user_id} -{ - auto displayName = cache::displayName(ChatPage::instance()->currentRoom(), userId_); - - avatar_->setLetter(utils::firstChar(displayName)); - - // If it's a matrix id we use the second letter. - if (displayName.size() > 1 && displayName.at(0) == '@') - avatar_->setLetter(QChar(displayName.at(1))); - - userName_ = new QLabel(displayName, this); - - topLayout_->addWidget(avatar_); - topLayout_->addWidget(userName_, 1); - - resolveAvatar(user_id); -} - -void -UserItem::updateItem(const QString &user_id) -{ - userId_ = user_id; - - auto displayName = cache::displayName(ChatPage::instance()->currentRoom(), userId_); - - // If it's a matrix id we use the second letter. - if (displayName.size() > 1 && displayName.at(0) == '@') - avatar_->setLetter(QChar(displayName.at(1))); - else - avatar_->setLetter(utils::firstChar(displayName)); - - userName_->setText(displayName); - resolveAvatar(user_id); -} - -void -UserItem::resolveAvatar(const QString &user_id) -{ - avatar_->setImage(ChatPage::instance()->currentRoom(), user_id); -} - -void -UserItem::mousePressEvent(QMouseEvent *event) -{ - if (event->buttons() != Qt::RightButton) - emit clicked( - cache::displayName(ChatPage::instance()->currentRoom(), selectedText())); - - QWidget::mousePressEvent(event); -} - RoomItem::RoomItem(QWidget *parent, const RoomSearchResult &res) : PopupItem(parent) , roomId_{QString::fromStdString(res.room_id)} diff --git a/src/popups/PopupItem.h b/src/popups/PopupItem.h index 17a4f6bc..499d6b33 100644 --- a/src/popups/PopupItem.h +++ b/src/popups/PopupItem.h @@ -43,26 +43,6 @@ protected: bool hovering_; }; -class UserItem : public PopupItem -{ - Q_OBJECT - -public: - UserItem(QWidget *parent); - UserItem(QWidget *parent, const QString &user_id); - QString selectedText() const { return userId_; } - void updateItem(const QString &user_id); - -protected: - void mousePressEvent(QMouseEvent *event) override; - -private: - void resolveAvatar(const QString &user_id); - - QLabel *userName_; - QString userId_; -}; - class RoomItem : public PopupItem { Q_OBJECT