From 65d62b98a0a7460e20df258e17a8b30a6c274192 Mon Sep 17 00:00:00 2001
From: Jeffrey Oliver <jeffrey.oliver@panasonic.aero>
Date: Sun, 15 Feb 2015 10:55:56 -0800
Subject: [PATCH] Add full and short name for card color filters.

---
 cockatrice/src/filtertree.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/cockatrice/src/filtertree.cpp b/cockatrice/src/filtertree.cpp
index c33e94be..5028c3ba 100644
--- a/cockatrice/src/filtertree.cpp
+++ b/cockatrice/src/filtertree.cpp
@@ -161,11 +161,30 @@ bool FilterItem::acceptType(const CardInfo *info) const
 bool FilterItem::acceptColor(const CardInfo *info) const
 {
     QStringList::const_iterator i;
+    QString converted_term;
     bool status;
 
     status = false;
+    if (term.contains("green", Qt::CaseInsensitive) || term.contains("grn", Qt::CaseInsensitive)) {
+        converted_term = 'g';
+    }
+    else if (term.contains("blue", Qt::CaseInsensitive) || term.contains("blu", Qt::CaseInsensitive)) {
+        converted_term = 'u';
+    }
+    else if (term.contains("black", Qt::CaseInsensitive) || term.contains("blk", Qt::CaseInsensitive)) {
+        converted_term = 'b';
+    }
+    else if (term.contains("red", Qt::CaseInsensitive)) {
+        converted_term = 'r';
+    }
+    else if (term.contains("white", Qt::CaseInsensitive) || term.contains("wht", Qt::CaseInsensitive)) {
+        converted_term = 'w';
+    }
+    else {
+        converted_term = term;
+    }
     for (i = info->getColors().constBegin(); i != info->getColors().constEnd(); i++)
-        if ((*i).contains(term, Qt::CaseInsensitive)) {
+        if ((*i).contains(converted_term, Qt::CaseInsensitive)) {
             status = true;
             break;
         }