aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

deck editor and picture file name fixes

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-04-18 02:00:48 +02:00
parent 0ea8375a2f
commit e6fc20114e
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/carddatabase.cpp
View file

@ -298,8 +298,8 @@ QString CardInfo::getMainCardType() const
QString CardInfo::getCorrectedName() const QString CardInfo::getCorrectedName() const
{ {
QString result = name; QString result = name;
// Fire // Ice, Circle of Protection: Red // Fire // Ice, Circle of Protection: Red, "Ach! Hans, Run!", Who/What/When/Where/Why, Question Elemental?
return result.remove(" // ").remove(":"); return result.remove(" // ").remove(':').remove('"').remove('?').replace('/', ' ');
} }
void CardInfo::addToSet(CardSet *set) void CardInfo::addToSet(CardSet *set)

10
cockatrice/src/carddatabasemodel.h
View file

@ -31,11 +31,11 @@ private:
QSet<QString> cardTypes, cardColors; QSet<QString> cardTypes, cardColors;
public: public:
CardDatabaseDisplayModel(QObject *parent = 0); CardDatabaseDisplayModel(QObject *parent = 0);
void setCardNameBeginning(const QString &_beginning) { cardNameBeginning = _beginning; invalidateFilter(); } void setCardNameBeginning(const QString &_beginning) { cardNameBeginning = _beginning; invalidate(); }
void setCardName(const QString &_cardName) { cardName = _cardName; invalidateFilter(); } void setCardName(const QString &_cardName) { cardName = _cardName; invalidate(); }
void setCardText(const QString &_cardText) { cardText = _cardText; invalidateFilter(); } void setCardText(const QString &_cardText) { cardText = _cardText; invalidate(); }
void setCardTypes(const QSet<QString> &_cardTypes) { cardTypes = _cardTypes; invalidateFilter(); } void setCardTypes(const QSet<QString> &_cardTypes) { cardTypes = _cardTypes; invalidate(); }
void setCardColors(const QSet<QString> &_cardColors) { cardColors = _cardColors; invalidateFilter(); } void setCardColors(const QSet<QString> &_cardColors) { cardColors = _cardColors; invalidate(); }
void clearSearch(); void clearSearch();
protected: protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;

1
cockatrice/src/window_deckeditor.cpp
View file

@ -68,6 +68,7 @@ WndDeckEditor::WndDeckEditor(QWidget *parent)
databaseView = new QTreeView(); databaseView = new QTreeView();
databaseView->setModel(databaseDisplayModel); databaseView->setModel(databaseDisplayModel);
databaseView->setUniformRowHeights(true); databaseView->setUniformRowHeights(true);
databaseView->setRootIsDecorated(false);
databaseView->setAlternatingRowColors(true); databaseView->setAlternatingRowColors(true);
databaseView->setSortingEnabled(true); databaseView->setSortingEnabled(true);
databaseView->sortByColumn(0, Qt::AscendingOrder); databaseView->sortByColumn(0, Qt::AscendingOrder);