changed lock icon, added sideboard locking, issue #15 fixed

cockatrice/src/deckview.cpp

@@ -166,7 +166,6 @@ void DeckViewCardContainer::paint(QPainter *painter, const QStyleOptionGraphicsI
 			painter->setPen(QColor(255, 255, 255, 100));
 			painter->drawLine(QPointF(0, yUntilNow - paddingY / 2), QPointF(width, yUntilNow - paddingY / 2));
 		}
-		
 		qreal thisRowHeight = CARD_HEIGHT * currentRowsAndCols[i].first;
 		QRectF textRect(0, yUntilNow, totalTextWidth, thisRowHeight);
 		yUntilNow += thisRowHeight + paddingY;
@@ -268,22 +267,27 @@ void DeckViewCardContainer::setWidth(qreal _width)
 }
 
 DeckViewScene::DeckViewScene(QObject *parent)
-	: QGraphicsScene(parent), locked(false), deck(0), optimalAspectRatio(1.0)
+	: QGraphicsScene(parent), locked(true), deck(0), optimalAspectRatio(1.0)
 {
 }
 
 DeckViewScene::~DeckViewScene()
 {
+	clearContents();
+}
+
+void DeckViewScene::clearContents()
+{
+	QMapIterator<QString, DeckViewCardContainer *> i(cardContainers);
+	while (i.hasNext())
+		delete i.next().value();
+	cardContainers.clear();
 }
 
 void DeckViewScene::setDeck(DeckList *_deck)
 {
 	if (deck)
 		delete deck;
-	QMapIterator<QString, DeckViewCardContainer *> i(cardContainers);
-	while (i.hasNext())
-		delete i.next().value();
-	cardContainers.clear();
 	
 	deck = _deck;
 	rebuildTree();
@@ -293,6 +297,11 @@ void DeckViewScene::setDeck(DeckList *_deck)
 
 void DeckViewScene::rebuildTree()
 {
+	clearContents();
+	
+	if (!deck)
+		return;
+	
 	InnerDecklistNode *listRoot = deck->getRoot();
 	for (int i = 0; i < listRoot->size(); i++) {
 		InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
@@ -432,6 +441,12 @@ QList<MoveCard_ToZone> DeckViewScene::getSideboardPlan() const
 	return result;
 }
 
+void DeckViewScene::resetSideboardPlan()
+{
+	rebuildTree();
+	rearrangeItems();
+}
+
 DeckView::DeckView(QWidget *parent)
 	: QGraphicsView(parent)
 {
@@ -463,3 +478,8 @@ void DeckView::setDeck(DeckList *_deck)
 {
 	deckViewScene->setDeck(_deck);
 }
+
+void DeckView::resetSideboardPlan()
+{
+	deckViewScene->resetSideboardPlan();
+}

cockatrice/src/deckview.h

@@ -81,6 +81,7 @@ private:
 	DeckList *deck;
 	QMap<QString, DeckViewCardContainer *> cardContainers;
 	qreal optimalAspectRatio;
+	void clearContents();
 	void rebuildTree();
 	void applySideboardPlan(const QList<MoveCard_ToZone> &plan);
 public:
@@ -93,6 +94,7 @@ public:
 	void rearrangeItems();
 	void updateContents();
 	QList<MoveCard_ToZone> getSideboardPlan() const;
+	void resetSideboardPlan();
 };
 
 class DeckView : public QGraphicsView {
@@ -111,6 +113,7 @@ public:
 	void setDeck(DeckList *_deck);
 	void setLocked(bool _locked) { deckViewScene->setLocked(_locked); }
 	QList<MoveCard_ToZone> getSideboardPlan() const { return deckViewScene->getSideboardPlan(); }
+	void resetSideboardPlan();
 };
 
 #endif

cockatrice/src/messagelogwidget.cpp

@@ -98,6 +98,21 @@ void MessageLogWidget::logNotReadyStart(Player *player)
 		appendHtml(tr("%1 is not ready to start the game any more.", "male").arg(sanitizeHtml(player->getName())));
 }
 
+void MessageLogWidget::logSetSideboardLock(Player *player, bool locked)
+{
+	if (locked) {
+		if (isFemale(player))
+			appendHtml(tr("%1 has locked her sideboard.", "female").arg(sanitizeHtml(player->getName())));
+		else
+			appendHtml(tr("%1 has locked his sideboard.", "male").arg(sanitizeHtml(player->getName())));
+	} else {
+		if (isFemale(player))
+			appendHtml(tr("%1 has unlocked her sideboard.", "female").arg(sanitizeHtml(player->getName())));
+		else
+			appendHtml(tr("%1 has unlocked his sideboard.", "male").arg(sanitizeHtml(player->getName())));
+	}
+}
+
 void MessageLogWidget::logConcede(Player *player)
 {
 	if (isFemale(player))

cockatrice/src/messagelogwidget.h

@@ -50,6 +50,7 @@ public slots:
 	void logDeckSelect(Player *player, QString deckHash);
 	void logReadyStart(Player *player);
 	void logNotReadyStart(Player *player);
+	void logSetSideboardLock(Player *player, bool locked);
 	void logConcede(Player *player);
 	void logGameStart();
 	void logConnectionStateChanged(Player *player, bool connectionState);

cockatrice/src/playerlistwidget.cpp

@@ -55,6 +55,7 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, AbstractClient
 	concededIcon = QIcon(":/resources/icon_conceded.svg");
 	playerIcon = QIcon(":/resources/icon_player.svg");
 	spectatorIcon = QIcon(":/resources/icon_spectator.svg");
+	lockIcon = QIcon(":/resources/lock.svg");
 	
 	if (tabSupervisor) {
 		itemDelegate = new PlayerListItemDelegate(this);
@@ -115,6 +116,8 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties
 		player->setData(4, Qt::UserRole + 1, prop.player_id());
 	if (prop.has_deck_hash())
 		player->setText(5, QString::fromStdString(prop.deck_hash()));
+	if (prop.has_sideboard_locked())
+		player->setIcon(5, prop.sideboard_locked() ? lockIcon : QIcon());
 	if (prop.has_ping_seconds())
 		player->setIcon(0, QIcon(PingPixmapGenerator::generatePixmap(12, prop.ping_seconds(), 10)));
 }

cockatrice/src/playerlistwidget.h

@@ -31,7 +31,7 @@ private:
 	TabSupervisor *tabSupervisor;
 	AbstractClient *client;
 	TabGame *game;
-	QIcon readyIcon, notReadyIcon, concededIcon, playerIcon, spectatorIcon;
+	QIcon readyIcon, notReadyIcon, concededIcon, playerIcon, spectatorIcon, lockIcon;
 	bool gameStarted;
 signals:
 	void openMessageDialog(const QString &userName, bool focus);

cockatrice/src/tab_game.cpp

@@ -38,6 +38,7 @@
 #include "pb/command_deck_select.pb.h"
 #include "pb/command_ready_start.pb.h"
 #include "pb/command_set_sideboard_plan.pb.h"
+#include "pb/command_set_sideboard_lock.pb.h"
 #include "pb/command_leave_game.pb.h"
 #include "pb/command_game_say.pb.h"
 #include "pb/command_set_active_phase.pb.h"
@@ -61,26 +62,26 @@
 #include "pb/context_ping_changed.pb.h"
 #include "get_pb_extension.h"
 
-ReadyStartButton::ReadyStartButton(QWidget *parent)
-	: QPushButton(parent), readyStart(false)
+ToggleButton::ToggleButton(QWidget *parent)
+	: QPushButton(parent), state(false)
 {
 }
 
-void ReadyStartButton::paintEvent(QPaintEvent *event)
+void ToggleButton::paintEvent(QPaintEvent *event)
 {
 	QPushButton::paintEvent(event);
 	
 	QPainter painter(this);
-	if (readyStart)
+	if (state)
 		painter.setPen(QPen(Qt::green, 3));
 	else
 		painter.setPen(QPen(Qt::red, 3));
 	painter.drawRect(1.5, 1.5, width() - 3, height() - 3);
 }
 
-void ReadyStartButton::setReadyStart(bool _readyStart)
+void ToggleButton::setState(bool _state)
 {
-	readyStart = _readyStart;
+	state = _state;
 	update();
 }
 
@@ -89,17 +90,21 @@ DeckViewContainer::DeckViewContainer(int _playerId, TabGame *parent)
 {
 	loadLocalButton = new QPushButton;
 	loadRemoteButton = new QPushButton;
-	readyStartButton = new ReadyStartButton;
+	readyStartButton = new ToggleButton;
 	readyStartButton->setEnabled(false);
+	sideboardLockButton = new ToggleButton;
+	sideboardLockButton->setEnabled(false);
 	
 	connect(loadLocalButton, SIGNAL(clicked()), this, SLOT(loadLocalDeck()));
 	connect(loadRemoteButton, SIGNAL(clicked()), this, SLOT(loadRemoteDeck()));
 	connect(readyStartButton, SIGNAL(clicked()), this, SLOT(readyStart()));
+	connect(sideboardLockButton, SIGNAL(clicked()), this, SLOT(sideboardLockButtonClicked()));
 	
 	QHBoxLayout *buttonHBox = new QHBoxLayout;
 	buttonHBox->addWidget(loadLocalButton);
 	buttonHBox->addWidget(loadRemoteButton);
 	buttonHBox->addWidget(readyStartButton);
+	buttonHBox->addWidget(sideboardLockButton);
 	buttonHBox->addStretch();
 	deckView = new DeckView;
 	connect(deckView, SIGNAL(newCardAdded(AbstractCardItem *)), this, SIGNAL(newCardAdded(AbstractCardItem *)));
@@ -118,6 +123,7 @@ void DeckViewContainer::retranslateUi()
 	loadLocalButton->setText(tr("Load &local deck"));
 	loadRemoteButton->setText(tr("Load d&eck from server"));
 	readyStartButton->setText(tr("Ready to s&tart"));
+	updateSideboardLockButtonText();
 }
 
 void DeckViewContainer::setButtonsVisible(bool _visible)
@@ -125,6 +131,15 @@ void DeckViewContainer::setButtonsVisible(bool _visible)
 	loadLocalButton->setVisible(_visible);
 	loadRemoteButton->setVisible(_visible);
 	readyStartButton->setVisible(_visible);
+	sideboardLockButton->setVisible(_visible);
+}
+
+void DeckViewContainer::updateSideboardLockButtonText()
+{
+	if (sideboardLockButton->getState())
+		sideboardLockButton->setText(tr("S&ideboard unlocked"));
+	else
+		sideboardLockButton->setText(tr("S&ideboard locked"));
 }
 
 void DeckViewContainer::loadLocalDeck()
@@ -168,14 +183,21 @@ void DeckViewContainer::deckSelectFinished(const Response &r)
 	const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
 	DeckList *newDeck = new DeckList(QString::fromStdString(resp.deck()));
 	db->cacheCardPixmaps(newDeck->getCardList());
-	deckView->setDeck(newDeck);
-	readyStartButton->setEnabled(true);
+	setDeck(newDeck);
 }
 
 void DeckViewContainer::readyStart()
 {
 	Command_ReadyStart cmd;
-	cmd.set_ready(!readyStartButton->getReadyStart());
+	cmd.set_ready(!readyStartButton->getState());
+	static_cast<TabGame *>(parent())->sendGameCommand(cmd, playerId);
+}
+
+void DeckViewContainer::sideboardLockButtonClicked()
+{
+	Command_SetSideboardLock cmd;
+	cmd.set_locked(sideboardLockButton->getState());
+	
 	static_cast<TabGame *>(parent())->sendGameCommand(cmd, playerId);
 }
 
@@ -190,14 +212,25 @@ void DeckViewContainer::sideboardPlanChanged()
 
 void DeckViewContainer::setReadyStart(bool ready)
 {
-	readyStartButton->setReadyStart(ready);
-	deckView->setLocked(ready);
+	readyStartButton->setState(ready);
+	deckView->setLocked(ready || !sideboardLockButton->getState());
+}
+
+void DeckViewContainer::setSideboardLocked(bool locked)
+{
+	sideboardLockButton->setState(!locked);
+	updateSideboardLockButtonText();
+	deckView->setLocked(readyStartButton->getState() || !sideboardLockButton->getState());
+	if (locked)
+		deckView->resetSideboardPlan();
 }
 
 void DeckViewContainer::setDeck(DeckList *deck)
 {
 	deckView->setDeck(deck);
 	readyStartButton->setEnabled(true);
+	sideboardLockButton->setState(false);
+	sideboardLockButton->setEnabled(true);
 }
 
 TabGame::TabGame(GameReplay *_replay)
@@ -899,10 +932,15 @@ void TabGame::eventGameStateChanged(const Event_GameStateChanged &event, int /*e
 				playerListWidget->addPlayer(prop);
 			}
 			player->processPlayerInfo(playerInfo);
-			if (player->getLocal() && playerInfo.has_deck_list()) {
-				DeckList *newDeck = new DeckList(QString::fromStdString(playerInfo.deck_list()));
-				db->cacheCardPixmaps(newDeck->getCardList());
-				deckViewContainers.value(playerId)->setDeck(newDeck);
+			if (player->getLocal()) {
+				DeckViewContainer *deckViewContainer = deckViewContainers.value(playerId);
+				if (playerInfo.has_deck_list()) {
+					DeckList *newDeck = new DeckList(QString::fromStdString(playerInfo.deck_list()));
+					db->cacheCardPixmaps(newDeck->getCardList());
+					deckViewContainer->setDeck(newDeck);
+				}
+				deckViewContainer->setReadyStart(prop.ready_start());
+				deckViewContainer->setSideboardLocked(prop.sideboard_locked());
 			}
 		}
 	}
@@ -938,12 +976,13 @@ void TabGame::eventPlayerPropertiesChanged(const Event_PlayerPropertiesChanged &
 	Player *player = players.value(eventPlayerId, 0);
 	if (!player)
 		return;
-	playerListWidget->updatePlayerProperties(event.player_properties(), eventPlayerId);
+	const ServerInfo_PlayerProperties &prop = event.player_properties();
+	playerListWidget->updatePlayerProperties(prop, eventPlayerId);
 	
 	const GameEventContext::ContextType contextType = static_cast<const GameEventContext::ContextType>(getPbExtension(context));
 	switch (contextType) {
 		case GameEventContext::READY_START: {
-			bool ready = event.player_properties().ready_start();
+			bool ready = prop.ready_start();
 			if (player->getLocal())
 				deckViewContainers.value(player->getId())->setReadyStart(ready);
 			if (ready)
@@ -966,8 +1005,14 @@ void TabGame::eventPlayerPropertiesChanged(const Event_PlayerPropertiesChanged &
 			messageLog->logDeckSelect(player, QString::fromStdString(context.GetExtension(Context_DeckSelect::ext).deck_hash()));
 			break;
 		}
+		case GameEventContext::SET_SIDEBOARD_LOCK: {
+			if (player->getLocal())
+				deckViewContainers.value(player->getId())->setSideboardLocked(prop.sideboard_locked());
+			messageLog->logSetSideboardLock(player, prop.sideboard_locked());
+			break;
+		}
 		case GameEventContext::CONNECTION_STATE_CHANGED: {
-			messageLog->logConnectionStateChanged(player, event.player_properties().ping_seconds() != -1);
+			messageLog->logConnectionStateChanged(player, prop.ping_seconds() != -1);
 			break;
 		}
 		default: ;

cockatrice/src/tab_game.h

@@ -55,14 +55,14 @@ class GameReplay;
 class ServerInfo_User;
 class PendingCommand;
 
-class ReadyStartButton : public QPushButton {
+class ToggleButton : public QPushButton {
 	Q_OBJECT
 private:
-	bool readyStart;
+	bool state;
 public:
-	ReadyStartButton(QWidget *parent = 0);
-	bool getReadyStart() const { return readyStart; }
-	void setReadyStart(bool _readyStart);
+	ToggleButton(QWidget *parent = 0);
+	bool getState() const { return state; }
+	void setState(bool _state);
 protected:
 	void paintEvent(QPaintEvent *event);
 };
@@ -71,7 +71,7 @@ class DeckViewContainer : public QWidget {
 	Q_OBJECT
 private:
 	QPushButton *loadLocalButton, *loadRemoteButton;
-	ReadyStartButton *readyStartButton;
+	ToggleButton *readyStartButton, *sideboardLockButton;
 	DeckView *deckView;
 	int playerId;
 private slots:
@@ -80,6 +80,9 @@ private slots:
 	void readyStart();
 	void deckSelectFinished(const Response &r);
 	void sideboardPlanChanged();
+	void sideboardLockButtonClicked();
+private:
+	void updateSideboardLockButtonText();
 signals:
 	void newCardAdded(AbstractCardItem *card);
 public:
@@ -87,6 +90,7 @@ public:
 	void retranslateUi();
 	void setButtonsVisible(bool _visible);
 	void setReadyStart(bool ready);
+	void setSideboardLocked(bool locked);
 	void setDeck(DeckList *deck);
 };