citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Merge pull request #4516 from zhaowenlan1779/multiplayer-v4/patch-1 

multiplayer: minor UI fixes
This commit is contained in:
Pengfei Zhu 2018-12-18 22:22:49 +08:00 committed by GitHub
parent 4574bd1e5c 7a379ee03a
commit 68a223b6e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/citra_qt/multiplayer/chat_room.cpp
View File

@ -5,6 +5,7 @@
#include <array> #include <array>
#include <future> #include <future>
#include <QColor> #include <QColor>
#include <QDesktopServices>
#include <QFutureWatcher> #include <QFutureWatcher>
#include <QImage> #include <QImage>
#include <QList> #include <QList>
@ -70,7 +71,8 @@ public:
style = QString("background-color: %1").arg(ping_color); style = QString("background-color: %1").arg(ping_color);
} }
return QString("[%1] <font color='%2'>&lt;%3&gt;</font> <font style='%4'>%5</font>") return QString("[%1] <font color='%2'>&lt;%3&gt;</font> <font style='%4' "
"color='#000000'>%5</font>")
.arg(timestamp, color, name.toHtmlEscaped(), style, message.toHtmlEscaped()); .arg(timestamp, color, name.toHtmlEscaped(), style, message.toHtmlEscaped());
} }
@ -410,13 +412,24 @@ void ChatRoom::PopupContextMenu(const QPoint& menu_location) {
std::string nickname = std::string nickname =
player_list->item(item.row())->data(PlayerListItem::NicknameRole).toString().toStdString(); player_list->item(item.row())->data(PlayerListItem::NicknameRole).toString().toStdString();
if (auto room = Network::GetRoomMember().lock()) {
// You can't block, kick or ban yourself
if (nickname == room->GetNickname())
return;
}
QMenu context_menu; QMenu context_menu;
QString username = player_list->item(item.row())->data(PlayerListItem::UsernameRole).toString();
if (!username.isEmpty()) {
QAction* view_profile_action = context_menu.addAction(tr("View Profile"));
connect(view_profile_action, &QAction::triggered, [username] {
QDesktopServices::openUrl(
QString("https://community.citra-emu.org/u/%1").arg(username));
});
}
std::string cur_nickname;
if (auto room = Network::GetRoomMember().lock()) {
cur_nickname = room->GetNickname();
}
if (nickname != cur_nickname) { // You can't block yourself
QAction* block_action = context_menu.addAction(tr("Block Player")); QAction* block_action = context_menu.addAction(tr("Block Player"));
block_action->setCheckable(true); block_action->setCheckable(true);
@ -436,8 +449,9 @@ void ChatRoom::PopupContextMenu(const QPoint& menu_location) {
block_list.emplace(nickname); block_list.emplace(nickname);
} }
}); });
}
if (has_mod_perms) { if (has_mod_perms && nickname != cur_nickname) { // You can't kick or ban yourself
context_menu.addSeparator(); context_menu.addSeparator();
QAction* kick_action = context_menu.addAction(tr("Kick")); QAction* kick_action = context_menu.addAction(tr("Kick"));