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

9
cockatrice/src/tab_game.cpp
View file

@ -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();
} }
@ -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();
@ -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);
} }