rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Linkify URLs in room topics 

closes #52
This commit is contained in:
Konstantinos Sideris 2017-08-26 15:36:10 +03:00
parent 177dd6a5b0
commit 6797cbc943
2 changed files with 105 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/TopRoomBar.h
View File

@ -32,6 +32,9 @@
#include "Menu.h"
#include "RoomSettings.h"
static const QString URL_HTML = "<a href=\"\\1\" style=\"color: #333333\">\\1</a>";
static const QRegExp URL_REGEX("((?:https?|ftp)://\\S+)");
class TopRoomBar : public QWidget
{
Q_OBJECT
@ -42,7 +45,7 @@ public:
inline void updateRoomAvatar(const QImage &avatar_image);
inline void updateRoomAvatar(const QIcon &icon);
inline void updateRoomName(const QString &name);
inline void updateRoomTopic(const QString &topic);
inline void updateRoomTopic(QString topic);
void updateRoomAvatarFromName(const QString &name);
void setRoomSettings(QSharedPointer<RoomSettings> settings);
@ -52,11 +55,11 @@ protected:
void paintEvent(QPaintEvent *event) override;
private:
QHBoxLayout *top_layout_;
QVBoxLayout *text_layout_;
QHBoxLayout *topLayout_;
QVBoxLayout *textLayout_;
QLabel *name_label_;
QLabel *topic_label_;
QLabel *nameLabel_;
QLabel *topicLabel_;
QSharedPointer<RoomSettings> roomSettings_;
@ -85,13 +88,18 @@ TopRoomBar::updateRoomAvatar(const QIcon &icon)
inline void
TopRoomBar::updateRoomName(const QString &name)
{
QString elidedText = QFontMetrics(name_label_->font()).elidedText(name, Qt::ElideRight, width() * 0.8);
name_label_->setText(elidedText);
QString elidedText =
QFontMetrics(nameLabel_->font()).elidedText(name, Qt::ElideRight, width() * 0.8);
nameLabel_->setText(elidedText);
}
inline void
TopRoomBar::updateRoomTopic(const QString &topic)
TopRoomBar::updateRoomTopic(QString topic)
{
QString elidedText = QFontMetrics(topic_label_->font()).elidedText(topic, Qt::ElideRight, width() * 0.8);
topic_label_->setText(elidedText);
topic.replace(URL_REGEX, URL_HTML);
QString elidedText =
QFontMetrics(topicLabel_->font()).elidedText(topic, Qt::ElideRight, width() * 0.6);
topicLabel_->setText(topic);
}

51
src/TopRoomBar.cc
View File

@ -28,9 +28,9 @@ TopRoomBar::TopRoomBar(QWidget *parent)
setMinimumSize(QSize(0, 65));
setStyleSheet("background-color: #f8fbfe; color: #171919;");
top_layout_ = new QHBoxLayout();
top_layout_->setSpacing(10);
top_layout_->setMargin(10);
topLayout_ = new QHBoxLayout();
topLayout_->setSpacing(10);
topLayout_->setMargin(10);
avatar_ = new Avatar(this);
avatar_->setLetter(QChar('?'));
@ -38,24 +38,27 @@ TopRoomBar::TopRoomBar(QWidget *parent)
avatar_->setTextColor(QColor("#555459"));
avatar_->setSize(35);
text_layout_ = new QVBoxLayout();
text_layout_->setSpacing(0);
text_layout_->setContentsMargins(0, 0, 0, 0);
textLayout_ = new QVBoxLayout();
textLayout_->setSpacing(0);
textLayout_->setContentsMargins(0, 0, 0, 0);
QFont roomFont("Open Sans SemiBold");
roomFont.setPixelSize(conf::topRoomBar::fonts::roomName);
name_label_ = new QLabel(this);
name_label_->setFont(roomFont);
nameLabel_ = new QLabel(this);
nameLabel_->setFont(roomFont);
QFont descriptionFont("Open Sans");
descriptionFont.setPixelSize(conf::topRoomBar::fonts::roomDescription);
topic_label_ = new QLabel(this);
topic_label_->setFont(descriptionFont);
topicLabel_ = new QLabel(this);
topicLabel_->setFont(descriptionFont);
topicLabel_->setTextFormat(Qt::RichText);
topicLabel_->setTextInteractionFlags(Qt::TextBrowserInteraction);
topicLabel_->setOpenExternalLinks(true);
text_layout_->addWidget(name_label_);
text_layout_->addWidget(topic_label_);
textLayout_->addWidget(nameLabel_);
textLayout_->addWidget(topicLabel_);
settingsBtn_ = new FlatButton(this);
settingsBtn_->setForegroundColor(QColor("#acc7dc"));
@ -63,19 +66,22 @@ TopRoomBar::TopRoomBar(QWidget *parent)
settingsBtn_->setCornerRadius(buttonSize_ / 2);
QIcon settings_icon;
settings_icon.addFile(":/icons/icons/vertical-ellipsis.png", QSize(), QIcon::Normal, QIcon::Off);
settings_icon.addFile(
":/icons/icons/vertical-ellipsis.png", QSize(), QIcon::Normal, QIcon::Off);
settingsBtn_->setIcon(settings_icon);
settingsBtn_->setIconSize(QSize(buttonSize_ / 2, buttonSize_ / 2));
top_layout_->addWidget(avatar_);
top_layout_->addLayout(text_layout_);
top_layout_->addStretch(1);
top_layout_->addWidget(settingsBtn_);
topLayout_->addWidget(avatar_);
topLayout_->addLayout(textLayout_);
topLayout_->addStretch(1);
topLayout_->addWidget(settingsBtn_);
menu_ = new Menu(this);
toggleNotifications_ = new QAction(tr("Disable notifications"), this);
connect(toggleNotifications_, &QAction::triggered, this, [=]() { roomSettings_->toggleNotifications(); });
connect(toggleNotifications_, &QAction::triggered, this, [=]() {
roomSettings_->toggleNotifications();
});
menu_->addAction(toggleNotifications_);
@ -86,10 +92,11 @@ TopRoomBar::TopRoomBar(QWidget *parent)
toggleNotifications_->setText(tr("Enable notifications"));
auto pos = mapToGlobal(settingsBtn_->pos());
menu_->popup(QPoint(pos.x() + buttonSize_ - menu_->sizeHint().width(), pos.y() + buttonSize_));
menu_->popup(
QPoint(pos.x() + buttonSize_ - menu_->sizeHint().width(), pos.y() + buttonSize_));
});
setLayout(top_layout_);
setLayout(topLayout_);
}
void
@ -106,8 +113,8 @@ TopRoomBar::updateRoomAvatarFromName(const QString &name)
void
TopRoomBar::reset()
{
name_label_->setText("");
topic_label_->setText("");
nameLabel_->setText("");
topicLabel_->setText("");
avatar_->setLetter(QChar('?'));
}