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
25747a09
Commit
25747a09
authored
Feb 07, 2015
by
Zach
Browse files
Merge pull request #704 from ctrlaltca/fix_683
Fix #683 and #684
parents
1d81cde4
ae674e54
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/chatview.cpp
View file @
25747a09
...
...
@@ -23,8 +23,11 @@ ChatView::ChatView(const TabSupervisor *_tabSupervisor, TabGame *_game, bool _sh
userContextMenu
=
new
UserContextMenu
(
tabSupervisor
,
this
,
game
);
connect
(
userContextMenu
,
SIGNAL
(
openMessageDialog
(
QString
,
bool
)),
this
,
SIGNAL
(
openMessageDialog
(
QString
,
bool
)));
userName
=
QString
::
fromStdString
(
tabSupervisor
->
getUserInfo
()
->
name
());
mention
=
"@"
+
userName
.
toLower
();
if
(
tabSupervisor
->
getUserInfo
())
{
userName
=
QString
::
fromStdString
(
tabSupervisor
->
getUserInfo
()
->
name
());
mention
=
"@"
+
userName
.
toLower
();
}
mentionFormat
.
setFontWeight
(
QFont
::
Bold
);
...
...
@@ -127,7 +130,7 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
senderFormat
.
setAnchor
(
true
);
senderFormat
.
setAnchorHref
(
"user://"
+
QString
::
number
(
userLevel
)
+
"_"
+
sender
);
if
(
!
sameSender
)
{
if
(
!
sender
.
isEmpty
())
{
if
(
!
sender
.
isEmpty
()
&&
tabSupervisor
->
getUserListsTab
()
)
{
const
int
pixelSize
=
QFontInfo
(
cursor
.
charFormat
().
font
()).
pixelSize
();
QMap
<
QString
,
UserListTWI
*>
buddyList
=
tabSupervisor
->
getUserListsTab
()
->
getBuddyList
()
->
getUsers
();
cursor
.
insertImage
(
UserLevelPixmapGenerator
::
generatePixmap
(
pixelSize
,
userLevel
,
buddyList
.
contains
(
sender
)).
toImage
());
...
...
cockatrice/src/tab_game.cpp
View file @
25747a09
...
...
@@ -246,7 +246,8 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
activeCard
(
0
),
gameClosed
(
false
),
replay
(
_replay
),
currentReplayStep
(
0
)
currentReplayStep
(
0
),
sayEdit
(
0
)
{
setAttribute
(
Qt
::
WA_DeleteOnClose
);
...
...
@@ -885,7 +886,8 @@ void TabGame::startGame(bool resuming)
gameInfo
.
set_started
(
true
);
static_cast
<
GameScene
*>
(
gameView
->
scene
())
->
rearrange
();
gameView
->
show
();
sayEdit
->
setFocus
();
if
(
sayEdit
)
sayEdit
->
setFocus
();
}
void
TabGame
::
stopGame
()
...
...
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