Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
75ea8936
Commit
75ea8936
authored
May 04, 2015
by
Zach
Browse files
Merge pull request #1052 from poixen/mention_pop_fix
Can now disable desktop mentions
parents
01a85ce6
b81ed893
Changes
1
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/chatview.cpp
View file @
75ea8936
...
@@ -242,7 +242,7 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
...
@@ -242,7 +242,7 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
cursor
.
insertText
(
mention
,
mentionFormat
);
cursor
.
insertText
(
mention
,
mentionFormat
);
message
=
message
.
mid
(
mention
.
size
());
message
=
message
.
mid
(
mention
.
size
());
QApplication
::
alert
(
this
);
QApplication
::
alert
(
this
);
if
(
shouldShowSystemPopup
())
{
if
(
settingsCache
->
getShowMentionPopup
()
&&
shouldShowSystemPopup
())
{
QString
ref
=
sender
.
left
(
sender
.
length
()
-
2
);
QString
ref
=
sender
.
left
(
sender
.
length
()
-
2
);
showSystemPopup
(
ref
);
showSystemPopup
(
ref
);
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment