Merge branch 'master' of ssh://brukie@cockatrice.git.sourceforge.net/gitroot/cockatrice

cockatrice/src/decklist.h

@@ -15,6 +15,7 @@ protected:
 	InnerDecklistNode *parent;
 public:
 	AbstractDecklistNode(InnerDecklistNode *_parent = 0);
+	virtual ~AbstractDecklistNode() { }
 	virtual QString getName() const = 0;
 	InnerDecklistNode *getParent() const { return parent; }
 	int depth() const;

cockatrice/src/decklistmodel.cpp

@@ -64,11 +64,11 @@ void DeckListModel::rebuildTree()
 			InnerDecklistNode *cardTypeNode = dynamic_cast<InnerDecklistNode *>(node->findChild(cardType));
 			if (!cardTypeNode)
 				cardTypeNode = new InnerDecklistNode(cardType, node);
-			
+
 			new DecklistModelCardNode(currentCard, cardTypeNode);
 		}
 	}
-	
+
 	reset();
 }
 
@@ -148,11 +148,11 @@ QModelIndex DeckListModel::index(int row, int column, const QModelIndex &parent)
 //	debugIndexInfo("index", parent);
 	if (!hasIndex(row, column, parent))
 		return QModelIndex();
-	
+
 	InnerDecklistNode *parentNode = getNode<InnerDecklistNode *>(parent);
 	if (row >= parentNode->size())
 		return QModelIndex();
-		
+
 	return createIndex(row, column, parentNode->at(row));
 }
 
@@ -160,7 +160,7 @@ QModelIndex DeckListModel::parent(const QModelIndex &ind) const
 {
 	if (!ind.isValid())
 		return QModelIndex();
-	
+
 	return nodeToIndex(static_cast<AbstractDecklistNode *>(ind.internalPointer())->getParent());
 }
 
@@ -170,14 +170,20 @@ Qt::ItemFlags DeckListModel::flags(const QModelIndex &index) const
 		return 0;
 
 	Qt::ItemFlags result = Qt::ItemIsEnabled;
-	if (getNode<DecklistModelCardNode *>(index)) {
+	if (getNode<DecklistModelCardNode *>(index))
 		result |= Qt::ItemIsSelectable;
-		if (index.column() == 0)
-			result |= Qt::ItemIsEditable;
-	}
+
 	return result;
 }
 
+void DeckListModel::emitRecursiveUpdates(const QModelIndex &index)
+{
+	if (!index.isValid())
+		return;
+	emit dataChanged(index, index);
+	emitRecursiveUpdates(index.parent());
+}
+
 bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
 	DecklistModelCardNode *node = getNode<DecklistModelCardNode *>(index);
@@ -189,7 +195,7 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, int
 		case 1: node->setName(value.toString()); break;
 		default: return false;
 	}
-	emit dataChanged(index, index);
+	emitRecursiveUpdates(index);
 	return true;
 }
 
@@ -210,9 +216,11 @@ bool DeckListModel::removeRows(int row, int count, const QModelIndex &parent)
 		delete toDelete;
 	}
 	endRemoveRows();
-	
+
 	if (!node->size() && (node != root))
 		removeRows(parent.row(), 1, parent.parent());
+	else
+		emitRecursiveUpdates(parent);
 
 	return true;
 }
@@ -231,23 +239,25 @@ InnerDecklistNode *DeckListModel::createNodeIfNeeded(const QString &name, InnerD
 QModelIndex DeckListModel::addCard(const QString &cardName, const QString &zoneName)
 {
 	InnerDecklistNode *zoneNode = createNodeIfNeeded(zoneName, root);
-	
+
 	CardInfo *info = db->getCard(cardName);
 	QString cardType = info->getMainCardType();
 	InnerDecklistNode *cardTypeNode = createNodeIfNeeded(cardType, zoneNode);
-	
+
 	DecklistModelCardNode *cardNode = dynamic_cast<DecklistModelCardNode *>(cardTypeNode->findChild(cardName));
 	if (!cardNode) {
 		DecklistCardNode *decklistCard = deckList->addCard(cardName, zoneName);
-		beginInsertRows(nodeToIndex(cardTypeNode), cardTypeNode->size(), cardTypeNode->size());
+		QModelIndex parentIndex = nodeToIndex(cardTypeNode);
+		beginInsertRows(parentIndex, cardTypeNode->size(), cardTypeNode->size());
 		cardNode = new DecklistModelCardNode(decklistCard, cardTypeNode);
 		endInsertRows();
 		sort(1);
+		emitRecursiveUpdates(parentIndex);
 		return nodeToIndex(cardNode);
 	} else {
 		cardNode->setNumber(cardNode->getNumber() + 1);
 		QModelIndex ind = nodeToIndex(cardNode);
-		emit dataChanged(ind, ind);
+		emitRecursiveUpdates(ind);
 		return ind;
 	}
 }

cockatrice/src/decklistmodel.h

@@ -45,9 +45,10 @@ private:
 	InnerDecklistNode *root;
 	InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent);
 	QModelIndex nodeToIndex(AbstractDecklistNode *node) const;
+	void emitRecursiveUpdates(const QModelIndex &index);
 	void debugIndexInfo(const QString &func, const QModelIndex &index) const;
 	void debugShowTree(InnerDecklistNode *node, int depth) const;
-	
+
 	template<typename T> T getNode(const QModelIndex &index) const
 	{
 		if (!index.isValid())

cockatrice/src/messagelogwidget.cpp

@@ -104,6 +104,8 @@ void MessageLogWidget::logSetCardCounters(QString playerName, QString cardName,
 
 void MessageLogWidget::logSetTapped(QString playerName, QString cardName, bool tapped)
 {
+	if (cardName == "-1")
+		cardName = tr("his permanents");
 	appendAndScroll(tr("%1 %2 %3").arg(playerName).arg(tapped ? "taps" : "untaps").arg(cardName));
 }
 

cockatrice/src/player.cpp

@@ -123,7 +123,8 @@ void Player::setCardAttrHelper(CardItem *card, const QString &aname, const QStri
 	if (aname == "tapped") {
 		bool tapped = avalue == "1";
 		if (!(!tapped && card->getDoesntUntap() && allCards)) {
-			emit logSetTapped(name, card->getName(), tapped);
+			if (!allCards)
+				emit logSetTapped(name, card->getName(), tapped);
 			card->setTapped(tapped);
 		}
 	} else if (aname == "attacking")
@@ -264,6 +265,8 @@ void Player::gameEvent(const ServerEventData &event)
 				CardList *const cards = zone->getCards();
 				for (int i = 0; i < cards->size(); i++)
 					setCardAttrHelper(cards->at(i), aname, avalue, true);
+				if (aname == "tapped")
+					emit logSetTapped(name, QString("-1"), avalue == "1");
 			} else {
 				CardItem *card = zone->getCard(cardId, "");
 				setCardAttrHelper(card, aname, avalue, false);

cockatrice/src/window_deckeditor.cpp

@@ -180,7 +180,7 @@ void WndDeckEditor::actNewDeck()
 {
 	if (!confirmClose())
 		return;
-		
+
 	deckModel->cleanList();
 	nameEdit->setText(QString());
 	commentsEdit->setText(QString());
@@ -240,9 +240,10 @@ void WndDeckEditor::addCardHelper(const QString &zoneName)
 	if (!currentIndex.isValid())
 		return;
 	const QString cardName = databaseModel->index(currentIndex.row(), 0).data().toString();
-	
+
 	QModelIndex newCardIndex = deckModel->addCard(cardName, zoneName);
 	recursiveExpand(newCardIndex);
+	deckView->setCurrentIndex(newCardIndex);
 
 	setWindowModified(true);
 }
@@ -273,6 +274,7 @@ void WndDeckEditor::actIncrement()
 		return;
 	const QModelIndex numberIndex = currentIndex.sibling(currentIndex.row(), 0);
 	const int count = deckModel->data(numberIndex, Qt::EditRole).toInt();
+	deckView->setCurrentIndex(numberIndex);
 	deckModel->setData(numberIndex, count + 1, Qt::EditRole);
 	setWindowModified(true);
 }
@@ -284,6 +286,7 @@ void WndDeckEditor::actDecrement()
 		return;
 	const QModelIndex numberIndex = currentIndex.sibling(currentIndex.row(), 0);
 	const int count = deckModel->data(numberIndex, Qt::EditRole).toInt();
+	deckView->setCurrentIndex(numberIndex);
 	if (count == 1)
 		deckModel->removeRow(currentIndex.row(), currentIndex.parent());
 	else