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
c400d6d4
Commit
c400d6d4
authored
Jun 19, 2015
by
Fabio Bas
Browse files
use the new card frame in game; mitigates #1144
parent
1ae79fbc
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/tab_game.cpp
View file @
c400d6d4
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#include
"dlg_creategame.h"
#include
"dlg_creategame.h"
#include
"tab_game.h"
#include
"tab_game.h"
#include
"tab_supervisor.h"
#include
"tab_supervisor.h"
#include
"card
infowidget
.h"
#include
"card
frame
.h"
#include
"playerlistwidget.h"
#include
"playerlistwidget.h"
#include
"messagelogwidget.h"
#include
"messagelogwidget.h"
#include
"phasestoolbar.h"
#include
"phasestoolbar.h"
...
@@ -280,7 +280,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
...
@@ -280,7 +280,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
gameView
=
new
GameView
(
scene
);
gameView
=
new
GameView
(
scene
);
gameView
->
hide
();
gameView
->
hide
();
cardInfo
=
new
Card
InfoWidget
(
CardInfoWidget
::
ModeGameTab
);
cardInfo
=
new
Card
Frame
(
250
,
372
);
playerListWidget
=
new
PlayerListWidget
(
0
,
0
,
this
);
playerListWidget
=
new
PlayerListWidget
(
0
,
0
,
this
);
playerListWidget
->
setFocusPolicy
(
Qt
::
NoFocus
);
playerListWidget
->
setFocusPolicy
(
Qt
::
NoFocus
);
...
@@ -391,7 +391,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
...
@@ -391,7 +391,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
gameView
=
new
GameView
(
scene
);
gameView
=
new
GameView
(
scene
);
gameView
->
hide
();
gameView
->
hide
();
cardInfo
=
new
Card
InfoWidget
(
CardInfoWidget
::
ModeGameTab
);
cardInfo
=
new
Card
Frame
(
250
,
372
);
playerListWidget
=
new
PlayerListWidget
(
tabSupervisor
,
clients
.
first
(),
this
);
playerListWidget
=
new
PlayerListWidget
(
tabSupervisor
,
clients
.
first
(),
this
);
playerListWidget
->
setFocusPolicy
(
Qt
::
NoFocus
);
playerListWidget
->
setFocusPolicy
(
Qt
::
NoFocus
);
connect
(
playerListWidget
,
SIGNAL
(
openMessageDialog
(
QString
,
bool
)),
this
,
SIGNAL
(
openMessageDialog
(
QString
,
bool
)));
connect
(
playerListWidget
,
SIGNAL
(
openMessageDialog
(
QString
,
bool
)),
this
,
SIGNAL
(
openMessageDialog
(
QString
,
bool
)));
...
...
cockatrice/src/tab_game.h
View file @
c400d6d4
...
@@ -11,7 +11,7 @@ class CardDatabase;
...
@@ -11,7 +11,7 @@ class CardDatabase;
class
GameView
;
class
GameView
;
class
DeckView
;
class
DeckView
;
class
GameScene
;
class
GameScene
;
class
Card
InfoWidget
;
class
Card
Frame
;
class
MessageLogWidget
;
class
MessageLogWidget
;
class
QTimer
;
class
QTimer
;
class
QSplitter
;
class
QSplitter
;
...
@@ -125,7 +125,7 @@ private:
...
@@ -125,7 +125,7 @@ private:
QToolButton
*
replayStartButton
,
*
replayPauseButton
,
*
replayFastForwardButton
;
QToolButton
*
replayStartButton
,
*
replayPauseButton
,
*
replayFastForwardButton
;
QSplitter
*
splitter
;
QSplitter
*
splitter
;
Card
InfoWidget
*
cardInfo
;
Card
Frame
*
cardInfo
;
PlayerListWidget
*
playerListWidget
;
PlayerListWidget
*
playerListWidget
;
QLabel
*
timeElapsedLabel
;
QLabel
*
timeElapsedLabel
;
MessageLogWidget
*
messageLog
;
MessageLogWidget
*
messageLog
;
...
...
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