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

Merge pull request #2103 from Cockatrice/space

Browse source 
More screen space
This commit is contained in:
mlowe 2016-07-22 15:07:54 +02:00 committed by GitHub
commit f87f677cad
1 changed files with 88 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
cockatrice/src/tab_game.cpp
View file

@ -71,7 +71,7 @@
#include "get_pb_extension.h" #include "get_pb_extension.h"
ToggleButton::ToggleButton(QWidget *parent) ToggleButton::ToggleButton(QWidget *parent)
: QPushButton(parent), state(false) : QPushButton(parent), state(false)
{ {
} }
@ -96,7 +96,7 @@ void ToggleButton::setState(bool _state)
} }
DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent) DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
: QWidget(0), parentGame(parent), playerId(_playerId) : QWidget(0), parentGame(parent), playerId(_playerId)
{ {
loadLocalButton = new QPushButton; loadLocalButton = new QPushButton;
loadRemoteButton = new QPushButton; loadRemoteButton = new QPushButton;
@ -116,6 +116,7 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
buttonHBox->addWidget(loadRemoteButton); buttonHBox->addWidget(loadRemoteButton);
buttonHBox->addWidget(readyStartButton); buttonHBox->addWidget(readyStartButton);
buttonHBox->addWidget(sideboardLockButton); buttonHBox->addWidget(sideboardLockButton);
buttonHBox->setContentsMargins(0, 0, 0, 0);
buttonHBox->addStretch(); buttonHBox->addStretch();
deckView = new DeckView; deckView = new DeckView;
connect(deckView, SIGNAL(newCardAdded(AbstractCardItem *)), this, SIGNAL(newCardAdded(AbstractCardItem *))); connect(deckView, SIGNAL(newCardAdded(AbstractCardItem *)), this, SIGNAL(newCardAdded(AbstractCardItem *)));
@ -124,6 +125,7 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
QVBoxLayout *deckViewLayout = new QVBoxLayout; QVBoxLayout *deckViewLayout = new QVBoxLayout;
deckViewLayout->addLayout(buttonHBox); deckViewLayout->addLayout(buttonHBox);
deckViewLayout->addWidget(deckView); deckViewLayout->addWidget(deckView);
deckViewLayout->setContentsMargins(0, 0, 0, 0);
setLayout(deckViewLayout); setLayout(deckViewLayout);
retranslateUi(); retranslateUi();
@ -133,8 +135,8 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
void DeckViewContainer::retranslateUi() void DeckViewContainer::retranslateUi()
{ {
loadLocalButton->setText(tr("Load local deck")); loadLocalButton->setText(tr("Load deck..."));
loadRemoteButton->setText(tr("Load deck from server")); loadRemoteButton->setText(tr("Load remote deck..."));
readyStartButton->setText(tr("Ready to s&tart")); readyStartButton->setText(tr("Ready to s&tart"));
updateSideboardLockButtonText(); updateSideboardLockButtonText();
} }
@ -301,20 +303,20 @@ void DeckViewContainer::setDeck(const DeckLoader &deck)
} }
TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
: Tab(_tabSupervisor), : Tab(_tabSupervisor),
secondsElapsed(0), secondsElapsed(0),
hostId(-1), hostId(-1),
localPlayerId(-1), localPlayerId(-1),
spectator(true), spectator(true),
gameStateKnown(false), gameStateKnown(false),
resuming(false), resuming(false),
currentPhase(-1), currentPhase(-1),
activeCard(0), activeCard(0),
gameClosed(false), gameClosed(false),
replay(_replay), replay(_replay),
currentReplayStep(0), currentReplayStep(0),
sayLabel(0), sayLabel(0),
sayEdit(0) sayEdit(0)
{ {
// THIS CTOR IS USED ON REPLAY // THIS CTOR IS USED ON REPLAY
gameInfo.CopyFrom(replay->game_info()); gameInfo.CopyFrom(replay->game_info());
@ -367,20 +369,20 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay)
} }
TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, const Event_GameJoined &event, const QMap<int, QString> &_roomGameTypes) TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_clients, const Event_GameJoined &event, const QMap<int, QString> &_roomGameTypes)
: Tab(_tabSupervisor), : Tab(_tabSupervisor),
clients(_clients), clients(_clients),
gameInfo(event.game_info()), gameInfo(event.game_info()),
roomGameTypes(_roomGameTypes), roomGameTypes(_roomGameTypes),
hostId(event.host_id()), hostId(event.host_id()),
localPlayerId(event.player_id()), localPlayerId(event.player_id()),
spectator(event.spectator()), spectator(event.spectator()),
gameStateKnown(false), gameStateKnown(false),
resuming(event.resuming()), resuming(event.resuming()),
currentPhase(-1), currentPhase(-1),
activeCard(0), activeCard(0),
gameClosed(false), gameClosed(false),
replay(0), replay(0),
replayDock(0) replayDock(0)
{ {
// THIS CTOR IS USED ON GAMES // THIS CTOR IS USED ON GAMES
gameInfo.set_started(false); gameInfo.set_started(false);
@ -398,6 +400,7 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, QList<AbstractClient *> &_client
mainWidget = new QStackedWidget(this); mainWidget = new QStackedWidget(this);
mainWidget->addWidget(deckViewContainerWidget); mainWidget->addWidget(deckViewContainerWidget);
mainWidget->addWidget(gamePlayAreaWidget); mainWidget->addWidget(gamePlayAreaWidget);
mainWidget->setContentsMargins(0,0,0,0);
setCentralWidget(mainWidget); setCentralWidget(mainWidget);
createMenuItems(); createMenuItems();
@ -597,8 +600,8 @@ void TabGame::actLeaveGame()
{ {
if (!gameClosed) { if (!gameClosed) {
if (!spectator) if (!spectator)
if (QMessageBox::question(this, tr("Leave game"), tr("Are you sure you want to leave this game?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) if (QMessageBox::question(this, tr("Leave game"), tr("Are you sure you want to leave this game?"), QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes)
return; return;
if (!replay) if (!replay)
sendGameCommand(Command_LeaveGame()); sendGameCommand(Command_LeaveGame());
@ -727,8 +730,8 @@ void TabGame::processGameEventContainer(const GameEventContainer &cont, Abstract
} }
} else { } else {
if ((clients.size() > 1) && (playerId != -1)) if ((clients.size() > 1) && (playerId != -1))
if (clients.at(playerId) != client) if (clients.at(playerId) != client)
continue; continue;
switch (eventType) { switch (eventType) {
case GameEvent::GAME_STATE_CHANGED: eventGameStateChanged(event.GetExtension(Event_GameStateChanged::ext), playerId, context); break; case GameEvent::GAME_STATE_CHANGED: eventGameStateChanged(event.GetExtension(Event_GameStateChanged::ext), playerId, context); break;
@ -793,7 +796,7 @@ void TabGame::sendGameCommand(const google::protobuf::Message &command, int play
void TabGame::commandFinished(const Response &response) void TabGame::commandFinished(const Response &response)
{ {
if (response.response_code() == Response::RespChatFlood) if (response.response_code() == Response::RespChatFlood)
messageLog->appendMessage(tr("You are flooding the game. Please wait a couple of seconds.")); messageLog->appendMessage(tr("You are flooding the game. Please wait a couple of seconds."));
} }
PendingCommand *TabGame::prepareGameCommand(const ::google::protobuf::Message &cmd) PendingCommand *TabGame::prepareGameCommand(const ::google::protobuf::Message &cmd)
@ -985,8 +988,8 @@ void TabGame::eventPlayerPropertiesChanged(const Event_PlayerPropertiesChanged &
case GameEventContext::DECK_SELECT: { case GameEventContext::DECK_SELECT: {
Context_DeckSelect deckSelect = context.GetExtension(Context_DeckSelect::ext); Context_DeckSelect deckSelect = context.GetExtension(Context_DeckSelect::ext);
messageLog->logDeckSelect(player, messageLog->logDeckSelect(player,
QString::fromStdString(deckSelect.deck_hash()), QString::fromStdString(deckSelect.deck_hash()),
deckSelect.sideboard_size()); deckSelect.sideboard_size());
break; break;
} }
case GameEventContext::SET_SIDEBOARD_LOCK: { case GameEventContext::SET_SIDEBOARD_LOCK: {
@ -1185,8 +1188,8 @@ Player *TabGame::getActiveLocalPlayer() const
{ {
Player *active = players.value(activePlayer, 0); Player *active = players.value(activePlayer, 0);
if (active) if (active)
if (active->getLocal()) if (active->getLocal())
return active; return active;
QMapIterator<int, Player *> playerIterator(players); QMapIterator<int, Player *> playerIterator(players);
while (playerIterator.hasNext()) { while (playerIterator.hasNext()) {
@ -1450,6 +1453,7 @@ void TabGame::createPlayAreaWidget(bool bReplay)
gameView = new GameView(scene); gameView = new GameView(scene);
gamePlayAreaVBox = new QVBoxLayout; gamePlayAreaVBox = new QVBoxLayout;
gamePlayAreaVBox->setContentsMargins(0,0,0,0);
gamePlayAreaVBox->addWidget(gameView); gamePlayAreaVBox->addWidget(gameView);
gamePlayAreaWidget = new QWidget; gamePlayAreaWidget = new QWidget;
@ -1507,6 +1511,7 @@ void TabGame::createDeckViewContainerWidget(bool bReplay)
deckViewContainerWidget = new QWidget(); deckViewContainerWidget = new QWidget();
deckViewContainerWidget->setObjectName("deckViewContainerWidget"); deckViewContainerWidget->setObjectName("deckViewContainerWidget");
deckViewContainerLayout = new QVBoxLayout; deckViewContainerLayout = new QVBoxLayout;
deckViewContainerLayout->setContentsMargins(0,0,0,0);
deckViewContainerWidget->setLayout(deckViewContainerLayout); deckViewContainerWidget->setLayout(deckViewContainerLayout);
} }