From 79fc24769a366b9779c2be4ca2b969a19600636f Mon Sep 17 00:00:00 2001
From: Zach H <Zoosorbs@gmail.com>
Date: Tue, 21 Jun 2016 00:48:03 -0400
Subject: [PATCH] Colors to list

---
 cockatrice/src/carddatabasemodel.cpp | 4 +++-
 cockatrice/src/carddatabasemodel.h   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cockatrice/src/carddatabasemodel.cpp b/cockatrice/src/carddatabasemodel.cpp
index 7753af81..ced3443a 100644
--- a/cockatrice/src/carddatabasemodel.cpp
+++ b/cockatrice/src/carddatabasemodel.cpp
@@ -1,7 +1,7 @@
 #include "carddatabasemodel.h"
 #include "filtertree.h"
 
-#define CARDDBMODEL_COLUMNS 5
+#define CARDDBMODEL_COLUMNS 6
 
 CardDatabaseModel::CardDatabaseModel(CardDatabase *_db, QObject *parent)
     : QAbstractListModel(parent), db(_db)
@@ -44,6 +44,7 @@ QVariant CardDatabaseModel::data(const QModelIndex &index, int role) const
             card->getManaCost();
         case CardTypeColumn: return card->getCardType();
         case PTColumn: return card->getPowTough();
+        case ColorColumn: return card->getColors().join("");
         default: return QVariant();
     }
 }
@@ -60,6 +61,7 @@ QVariant CardDatabaseModel::headerData(int section, Qt::Orientation orientation,
         case ManaCostColumn: return QString(tr("Mana cost"));
         case CardTypeColumn: return QString(tr("Card type"));
         case PTColumn: return QString(tr("P/T"));
+        case ColorColumn: return QString(tr("Color(s)"));
         default: return QVariant();
     }
 }
diff --git a/cockatrice/src/carddatabasemodel.h b/cockatrice/src/carddatabasemodel.h
index 7d1dadb6..5acc5904 100644
--- a/cockatrice/src/carddatabasemodel.h
+++ b/cockatrice/src/carddatabasemodel.h
@@ -12,7 +12,7 @@ class FilterTree;
 class CardDatabaseModel : public QAbstractListModel {
     Q_OBJECT
 public:
-    enum Columns { NameColumn, SetListColumn, ManaCostColumn, PTColumn, CardTypeColumn, CMCColumn };
+    enum Columns { NameColumn, SetListColumn, ManaCostColumn, PTColumn, CardTypeColumn, ColorColumn };
     enum Role { SortRole=Qt::UserRole };
     CardDatabaseModel(CardDatabase *_db, QObject *parent = 0);
     ~CardDatabaseModel();