aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use the new card frame in game; mitigates #1144

Browse source
This commit is contained in:
Fabio Bas 2015-06-19 14:57:20 +02:00
parent 1ae79fbcaa
commit c400d6d4ec
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/tab_game.cpp
View file

@ -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 "cardinfowidget.h" #include "cardframe.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)
gameView = new GameView(scene); gameView = new GameView(scene);
gameView->hide(); gameView->hide();
cardInfo = new CardInfoWidget(CardInfoWidget::ModeGameTab); cardInfo = new CardFrame(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
gameView = new GameView(scene); gameView = new GameView(scene);
gameView->hide(); gameView->hide();
cardInfo = new CardInfoWidget(CardInfoWidget::ModeGameTab); cardInfo = new CardFrame(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)));

4
cockatrice/src/tab_game.h
View file

@ -11,7 +11,7 @@ class CardDatabase;
class GameView; class GameView;
class DeckView; class DeckView;
class GameScene; class GameScene;
class CardInfoWidget; class CardFrame;
class MessageLogWidget; class MessageLogWidget;
class QTimer; class QTimer;
class QSplitter; class QSplitter;
@ -125,7 +125,7 @@ private:
QToolButton *replayStartButton, *replayPauseButton, *replayFastForwardButton; QToolButton *replayStartButton, *replayPauseButton, *replayFastForwardButton;
QSplitter *splitter; QSplitter *splitter;
CardInfoWidget *cardInfo; CardFrame *cardInfo;
PlayerListWidget *playerListWidget; PlayerListWidget *playerListWidget;
QLabel *timeElapsedLabel; QLabel *timeElapsedLabel;
MessageLogWidget *messageLog; MessageLogWidget *messageLog;