jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Smarter Clipboard Pasting/Parsing (#2706)

Browse source
This commit is contained in:
Zach H 2017-05-14 14:35:40 -04:00 • committed by GitHub
parent 405a719412
commit b53cd33eed
6 changed files with 254 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/chatview/chatview.cpp
View file

@ -93,7 +93,7 @@ void ChatView::appendCardTag(QTextCursor &cursor, const QString &cardName)
anchorFormat.setAnchor(true);
anchorFormat.setAnchorHref("card://" + cardName);
anchorFormat.setFontItalic(true);
cursor.setCharFormat(anchorFormat);
cursor.insertText(cardName);
cursor.setCharFormat(oldFormat);

12
cockatrice/src/deck_loader.cpp
View file

@ -200,9 +200,19 @@ void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out, const InnerDecklis
QString DeckLoader::getCardZoneFromName(QString cardName, QString currentZoneName)
{
CardInfo *card = db->getCard(cardName);
if(card && card->getIsToken())
if (card && card->getIsToken())
return DECK_ZONE_TOKENS;
return currentZoneName;
}
QString DeckLoader::getCompleteCardName(const QString cardName) const
{
if (db) {
CardInfo *temp = db->getCardBySimpleName(cardName);
if (temp)
return temp->getName();
}
return cardName;
}

1
cockatrice/src/deck_loader.h
View file

@ -37,6 +37,7 @@ protected:
void saveToStream_DeckZone(QTextStream &out, const InnerDecklistNode *zoneNode);
void saveToStream_DeckZoneCards(QTextStream &out, const InnerDecklistNode *zoneNode, QList <DecklistCardNode*> cards);
virtual QString getCardZoneFromName(QString cardName, QString currentZoneName);
virtual QString getCompleteCardName(const QString cardName) const;
};
#endif