mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-01-02 08:10:28 -08:00
cleanup
This commit is contained in:
@@ -7,6 +7,7 @@ GameView::GameView(QGraphicsScene *scene, QWidget *parent)
|
||||
setBackgroundBrush(QBrush(QColor(0, 0, 0)));
|
||||
setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing/* | QPainter::SmoothPixmapTransform*/);
|
||||
setDragMode(RubberBandDrag);
|
||||
setFocusPolicy(Qt::NoFocus);
|
||||
setViewportUpdateMode(BoundingRectViewportUpdate);
|
||||
|
||||
connect(scene, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(updateSceneRect(const QRectF &)));
|
||||
|
||||
@@ -298,27 +298,6 @@ void MessageLogWidget::connectToPlayer(Player *player)
|
||||
connect(player, SIGNAL(logDumpZone(Player *, CardZone *, int)), this, SLOT(logDumpZone(Player *, CardZone *, int)));
|
||||
connect(player, SIGNAL(logStopDumpZone(Player *, CardZone *)), this, SLOT(logStopDumpZone(Player *, CardZone *)));
|
||||
connect(player, SIGNAL(logDrawCards(Player *, int)), this, SLOT(logDrawCards(Player *, int)));
|
||||
/*
|
||||
connect(game, SIGNAL(logJoin(Player *)), this, SLOT(logJoin(Player *)));
|
||||
connect(game, SIGNAL(logLeave(Player *)), this, SLOT(logLeave(Player *)));
|
||||
connect(game, SIGNAL(logGameClosed()), this, SLOT(logGameClosed()));
|
||||
connect(game, SIGNAL(logJoinSpectator(QString)), this, SLOT(logJoinSpectator(QString)));
|
||||
connect(game, SIGNAL(logLeaveSpectator(QString)), this, SLOT(logLeaveSpectator(QString)));
|
||||
|
||||
//Alert Test
|
||||
connect(game, SIGNAL(logSay(Player *, QString)), this, SLOT(msgAlert()));
|
||||
connect(game, SIGNAL(logJoin(Player *)), this, SLOT(msgAlert()));
|
||||
connect(game, SIGNAL(logLeave(Player *)), this, SLOT(msgAlert()));
|
||||
connect(game, SIGNAL(logSetActivePlayer(Player *)), this, SLOT(msgAlert()));
|
||||
connect(game, SIGNAL(setActivePhase(int)), this, SLOT(msgAlert()));
|
||||
connect(game, SIGNAL(logDraw(Player *, int)), this, SLOT(msgAlert()));
|
||||
connect(game, SIGNAL(logMoveCard(Player *, QString, CardZone *, int, CardZone *, int)), this, SLOT(msgAlert()));
|
||||
connect(game, SIGNAL(logGameStart()), this, SLOT(msgAlert()));
|
||||
*/}
|
||||
|
||||
void MessageLogWidget::msgAlert()
|
||||
{
|
||||
QApplication::alert(this);
|
||||
}
|
||||
|
||||
MessageLogWidget::MessageLogWidget(QWidget *parent)
|
||||
|
||||
@@ -47,7 +47,6 @@ public slots:
|
||||
void logStopDumpZone(Player *player, CardZone *zone);
|
||||
void logSetActivePlayer(Player *player);
|
||||
void logSetActivePhase(int phase);
|
||||
void msgAlert();
|
||||
public:
|
||||
void connectToPlayer(Player *player);
|
||||
MessageLogWidget(QWidget *parent = 0);
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
PhaseButton::PhaseButton(const QIcon &icon, QAction *_doubleClickAction)
|
||||
: QPushButton(icon, QString()), active(false), doubleClickAction(_doubleClickAction), activePixmap(50, 50), inactivePixmap(50, 50)
|
||||
{
|
||||
setFocusPolicy(Qt::NoFocus);
|
||||
setFixedSize(50, 50);
|
||||
|
||||
updatePixmap(activePixmap, true);
|
||||
@@ -79,6 +80,7 @@ PhasesToolbar::PhasesToolbar(QWidget *parent)
|
||||
connect(buttonList[i], SIGNAL(clicked()), this, SLOT(phaseButtonClicked()));
|
||||
|
||||
QPushButton *nextTurnButton = new QPushButton(QIcon(":/resources/icon_nextturn.svg"), QString());
|
||||
nextTurnButton->setFocusPolicy(Qt::NoFocus);
|
||||
nextTurnButton->setIconSize(QSize(40, 40));
|
||||
nextTurnButton->setFixedSize(50, 50);
|
||||
connect(nextTurnButton, SIGNAL(clicked()), this, SLOT(actNextTurn()));
|
||||
|
||||
Reference in New Issue
Block a user