From f80f51d08b6527304eae17e6148e9a60889b0b8f Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Fri, 27 Apr 2018 15:39:02 +0900 Subject: [PATCH] UserListModel: Indicate in the tooltip that a user is bridged; update to the latest lib --- client/models/userlistmodel.cpp | 5 ++++- lib | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client/models/userlistmodel.cpp b/client/models/userlistmodel.cpp index 498897c4d..54b7cf629 100644 --- a/client/models/userlistmodel.cpp +++ b/client/models/userlistmodel.cpp @@ -104,8 +104,11 @@ QVariant UserListModel::data(const QModelIndex& index, int role) const if (role == Qt::ToolTipRole) { - return QStringLiteral("%1
%2") + auto tooltip = QStringLiteral("%1
%2") .arg(user->name(m_currentRoom), user->id()); + if (!user->bridged().isEmpty()) + tooltip += tr("
Bridged from: %1").arg(user->bridged()); + return tooltip; } return QVariant(); diff --git a/lib b/lib index 698d41f19..f5af25428 160000 --- a/lib +++ b/lib @@ -1 +1 @@ -Subproject commit 698d41f191b9a7dd2c5c1662c5f5bd6b7c2697f6 +Subproject commit f5af25428212f139c59941bb294a184242c8b5e0