Merge remote-tracking branch 'origin/master' into jo-remove-name-filters-from-settings

cmake/NSIS.template.in

@@ -16,7 +16,7 @@ InstallDir "$PROGRAMFILES\Cockatrice"
 !define MUI_HEADERIMAGE_UNBITMAP "${NSIS_SOURCE_PATH}\cmake\headerimage.bmp"
 !define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation of Cockatrice.$\r$\n$\r$\nClick Next to continue."
 !define MUI_FINISHPAGE_RUN "$INSTDIR/oracle.exe"
-!define MUI_FINISHPAGE_RUN_TEXT "Run card database downloader now"
+!define MUI_FINISHPAGE_RUN_TEXT "Run 'Oracle' now to update your card database"
 !define MUI_FINISHPAGE_RUN_PARAMETERS "-dlsets"
 
 !insertmacro MUI_PAGE_WELCOME

cockatrice/cockatrice.qrc

@@ -31,12 +31,14 @@
     <file>resources/icon_view.svg</file>
     <file>resources/hr.jpg</file>
     <file alias="resources/appicon.svg">resources/cockatrice.svg</file>
+    
     <file>resources/add_to_sideboard.svg</file>
     <file>resources/decrement.svg</file>
     <file>resources/increment.svg</file>
     <file>resources/remove_row.svg</file>
     <file>resources/arrow_left_green.svg</file>
     <file>resources/arrow_right_green.svg</file>
+    
     <file>resources/icon_ready_start.svg</file>
     <file>resources/icon_not_ready_start.svg</file>
     <file>resources/icon_conceded.svg</file>
@@ -320,8 +322,11 @@
 
     <file>resources/userlevels/normal.svg</file>
     <file>resources/userlevels/registered.svg</file>
+    <file>resources/userlevels/registered_buddy.svg</file>
     <file>resources/userlevels/moderator.svg</file>
+    <file>resources/userlevels/moderator_buddy.svg</file>
     <file>resources/userlevels/admin.svg</file>
+    <file>resources/userlevels/admin_buddy.svg</file>
 
     <file>resources/news/exclamation_mark.svg</file>
     <file>resources/news/question_mark.svg</file>

cockatrice/resources/decrement.svg

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -13,9 +14,9 @@
    height="64"
    id="svg2646"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
-   sodipodi:docname="decrement.svg"
+   sodipodi:docname="deck_editor_decrement.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs2648">
@@ -161,15 +162,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="7.625"
-     inkscape:cx="-58.636066"
+     inkscape:cx="26.34754"
-     inkscape:cy="34.091284"
+     inkscape:cy="29.107677"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
-     inkscape:window-width="1272"
+     inkscape:window-width="1445"
-     inkscape:window-height="723"
+     inkscape:window-height="893"
      inkscape:window-x="0"
-     inkscape:window-y="25" />
+     inkscape:window-y="25"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata2651">
     <rdf:RDF>
@@ -192,7 +194,7 @@
      inkscape:label="Pfeil"
      style="display:inline">
     <rect
-       style="fill:#96ff96;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       style="fill:#ff7672;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
        id="rect3548"
        width="14.386732"
        height="59.259636"

cockatrice/resources/remove_row.svg

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -13,9 +14,9 @@
    height="64"
    id="svg2646"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.5 r10040"
    version="1.0"
-   sodipodi:docname="remove_row.svg"
+   sodipodi:docname="deck_editor_remove_row.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs2648">
@@ -316,15 +317,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="7.625"
-     inkscape:cx="-50.74814"
+     inkscape:cx="-27.27273"
-     inkscape:cy="31.784541"
+     inkscape:cy="30.210771"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
      inkscape:window-width="1272"
      inkscape:window-height="723"
      inkscape:window-x="0"
-     inkscape:window-y="25" />
+     inkscape:window-y="25"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata2651">
     <rdf:RDF>
@@ -347,7 +349,7 @@
      inkscape:label="Pfeil"
      style="display:inline">
     <path
-       style="fill:#96ff96;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       style="fill:#ff7672;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
        d="M 6.433227,14.50946 L 23.923767,32 L 6.433227,49.490541 L 14.50946,57.566773 L 32,40.076233 L 49.490541,57.566773 L 57.566773,49.490541 L 40.076233,32 L 57.566773,14.50946 L 49.490541,6.433227 L 32,23.923767 L 14.50946,6.433227 L 6.433227,14.50946 z"
        id="rect3548" />
   </g>

cockatrice/resources/userlevels/admin_buddy.svg

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="admin_buddy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="21.988178"
+     inkscape:cy="51.245759"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+</svg>

cockatrice/resources/userlevels/moderator_buddy.svg

@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="registered_buddy - Copy.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <pattern
+       inkscape:stockid="Stripes 1:1 white"
+       id="Strips1_1white"
+       patternTransform="translate(0,0) scale(10,10)"
+       height="1"
+       width="2"
+       patternUnits="userSpaceOnUse"
+       inkscape:collect="always">
+      <rect
+         id="rect4484"
+         height="2"
+         width="1"
+         y="-0.5"
+         x="0"
+         style="fill:white;stroke:none" />
+    </pattern>
+    <linearGradient
+       id="linearGradient5225">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5227" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop5229" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5219"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop5221" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1028"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="51.90239"
+     inkscape:cy="51.245759"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.165891,25.072777 37.520125,24.981707 31.537924,5.1008868 c 0.05101,40.5880862 0.05344,-0.1118618 0,40.5561512 L 49.290236,59.413412 41.216824,37.764038 z"
+     id="path4-1"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+</svg>

cockatrice/resources/userlevels/registered_buddy.svg

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   enable-background="new 0 0 64 64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="100%"
+   height="100%"
+   sodipodi:docname="buddy_icon.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10">
+    <linearGradient
+       id="linearGradient3758">
+      <stop
+         id="stop3760"
+         offset="0"
+         style="stop-color:#0fbb00;stop-opacity:1;" />
+      <stop
+         id="stop3762"
+         offset="1"
+         style="stop-color:#064400;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3750">
+      <stop
+         style="stop-color:#ece400;stop-opacity:1;"
+         offset="0"
+         id="stop3752" />
+      <stop
+         style="stop-color:#ece400;stop-opacity:0;"
+         offset="1"
+         id="stop3754" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758"
+       id="linearGradient3756"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87626222,0,0,0.87626222,4.174756,4.8555263)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3758-7"
+       id="linearGradient3756-1"
+       x1="1.960216"
+       y1="31.261461"
+       x2="60.456024"
+       y2="31.261461"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3758-7">
+      <stop
+         id="stop3760-4"
+         offset="0"
+         style="stop-color:#ece400;stop-opacity:1;" />
+      <stop
+         id="stop3762-0"
+         offset="1"
+         style="stop-color:#ec8b00;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="1178"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="-14.986549"
+     inkscape:cy="23.31428"
+     inkscape:window-x="1912"
+     inkscape:window-y="227"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 61.442826,23.621762 38.532402,23.515555 31.556101,0.331013 24.578789,23.515555 1.6673502,23.621765 20.267785,38.422001 10.863888,63.668987 31.556101,47.626631 52.258426,63.668987 42.843404,38.422001 z"
+     id="path4-9"
+     style="fill:#000000;fill-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="M 57.150089,25.064396 37.504323,24.973324 31.522122,5.092503 25.539054,24.973324 5.8924192,25.064399 21.842354,37.75565 13.778482,59.405024 31.522122,45.64865 49.274434,59.405024 41.201022,37.75565 z"
+     id="path4"
+     style="fill:url(#linearGradient3756);fill-opacity:1"
+     inkscape:connector-curvature="0" />
+</svg>

cockatrice/src/carddatabase.cpp

@@ -365,6 +365,7 @@ CardInfo::CardInfo(CardDatabase *_db,
                    const QString &_name,
                    bool _isToken,
                    const QString &_manacost,
+                   const QString &_cmc,
                    const QString &_cardtype,
                    const QString &_powtough,
                    const QString &_text,
@@ -381,6 +382,7 @@ CardInfo::CardInfo(CardDatabase *_db,
       isToken(_isToken),
       sets(_sets),
       manacost(_manacost),
+      cmc(_cmc),
       cardtype(_cardtype),
       powtough(_powtough),
       text(_text),
@@ -571,6 +573,7 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfo *info)
         xml.writeTextElement("color", colors[i]);
 
     xml.writeTextElement("manacost", info->getManaCost());
+    xml.writeTextElement("cmc", info->getCmc());
     xml.writeTextElement("type", info->getCardType());
     if (!info->getPowTough().isEmpty())
         xml.writeTextElement("pt", info->getPowTough());
@@ -731,7 +734,7 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
         if (xml.readNext() == QXmlStreamReader::EndElement)
             break;
         if (xml.name() == "card") {
-            QString name, manacost, type, pt, text;
+            QString name, manacost, cmc, type, pt, text;
             QStringList colors;
             QStringMap customPicURLs, customPicURLsHq;
             MuidMap muids;
@@ -747,6 +750,8 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
                     name = xml.readElementText();
                 else if (xml.name() == "manacost")
                     manacost = xml.readElementText();
+                else if (xml.name() == "cmc")
+                    cmc = xml.readElementText();
                 else if (xml.name() == "type")
                     type = xml.readElementText();
                 else if (xml.name() == "pt")
@@ -779,7 +784,7 @@ void CardDatabase::loadCardsFromXml(QXmlStreamReader &xml, bool tokens)
             }
 
             if (isToken == tokens) {
-                addCard(new CardInfo(this, name, isToken, manacost, type, pt, text, colors, loyalty, cipt, tableRow, sets, customPicURLs, customPicURLsHq, muids));
+                addCard(new CardInfo(this, name, isToken, manacost, cmc, type, pt, text, colors, loyalty, cipt, tableRow, sets, customPicURLs, customPicURLsHq, muids));
             }
         }
     }

cockatrice/src/carddatabase.h

@@ -111,6 +111,7 @@ private:
     bool isToken;
     SetList sets;
     QString manacost;
+    QString cmc;
     QString cardtype;
     QString powtough;
     QString text;
@@ -126,6 +127,7 @@ public:
         const QString &_name = QString(),
         bool _isToken = false,
         const QString &_manacost = QString(),
+        const QString &_cmc = QString(),
         const QString &_cardtype = QString(),
         const QString &_powtough = QString(),
         const QString &_text = QString(),
@@ -142,12 +144,14 @@ public:
     bool getIsToken() const { return isToken; }
     const SetList &getSets() const { return sets; }
     const QString &getManaCost() const { return manacost; }
+    const QString &getCmc() const { return cmc; }
     const QString &getCardType() const { return cardtype; }
     const QString &getPowTough() const { return powtough; }
     const QString &getText() const { return text; }
     const int &getLoyalty() const { return loyalty; }
     bool getCipt() const { return cipt; }
     void setManaCost(const QString &_manaCost) { manacost = _manaCost; emit cardInfoChanged(this); }
+    void setCmc(const QString &_cmc) { cmc = _cmc; emit cardInfoChanged(this); }
     void setCardType(const QString &_cardType) { cardtype = _cardType; emit cardInfoChanged(this); }
     void setPowTough(const QString &_powTough) { powtough = _powTough; emit cardInfoChanged(this); }
     void setText(const QString &_text) { text = _text; emit cardInfoChanged(this); }

cockatrice/src/cardfilter.cpp

@@ -31,6 +31,8 @@ const char *CardFilter::attrName(Attr a)
             return "set";
         case AttrManaCost:
             return "mana cost";
+        case AttrCmc:
+            return "cmc";
         default:
             return "";
     }

cockatrice/src/cardfilter.h

@@ -22,6 +22,7 @@ public:
         AttrText,
         AttrSet,
         AttrManaCost,
+        AttrCmc,
         AttrEnd
     };
 

cockatrice/src/chatview.cpp

@@ -3,6 +3,8 @@
 #include <QScrollBar>
 #include <QMouseEvent>
 #include <QDesktopServices>
+#include <QApplication>
+#include <QDebug>
 #include "chatview.h"
 #include "user_level.h"
 #include "user_context_menu.h"
@@ -11,7 +13,7 @@
 #include "main.h"
 #include "tab_userlists.h"
 
-const QColor MENTION_COLOR = QColor(190, 25, 85); // maroon
+const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47);
 const QColor OTHER_USER_COLOR = QColor(0, 65, 255); // dark blue
 
 ChatView::ChatView(const TabSupervisor *_tabSupervisor, TabGame *_game, bool _showTimestamps, QWidget *parent)
@@ -25,8 +27,6 @@ ChatView::ChatView(const TabSupervisor *_tabSupervisor, TabGame *_game, bool _sh
     mention = "@" + userName.toLower();
 
     mentionFormat.setFontWeight(QFont::Bold);
-    mentionFormat.setForeground(QBrush(Qt::white));
-    mentionFormat.setBackground(QBrush(MENTION_COLOR));
 
     mentionFormatOtherUser.setFontWeight(QFont::Bold);
     mentionFormatOtherUser.setForeground(Qt::blue);
@@ -117,8 +117,8 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
     
     QTextCharFormat senderFormat;
     if (tabSupervisor && tabSupervisor->getUserInfo() && (sender == QString::fromStdString(tabSupervisor->getUserInfo()->name()))) {
+        senderFormat.setForeground(QBrush(getCustomMentionColor()));
         senderFormat.setFontWeight(QFont::Bold);
-        senderFormat.setForeground(QBrush(MENTION_COLOR));
     } else {
         senderFormat.setForeground(QBrush(OTHER_USER_COLOR));
         if (playerBold)
@@ -129,7 +129,8 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
     if (!sameSender) {
         if (!sender.isEmpty()) {
             const int pixelSize = QFontInfo(cursor.charFormat().font()).pixelSize();
-            cursor.insertImage(UserLevelPixmapGenerator::generatePixmap(pixelSize, userLevel).toImage(), QString::number(pixelSize) + "_" + QString::number((int) userLevel));
+            QMap<QString, UserListTWI *> buddyList = tabSupervisor->getUserListsTab()->getBuddyList()->getUsers();
+            cursor.insertImage(UserLevelPixmapGenerator::generatePixmap(pixelSize, userLevel, buddyList.contains(sender)).toImage());
             cursor.insertText(" ");
         }
         cursor.setCharFormat(senderFormat);
@@ -194,12 +195,15 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
                 break;
             // you have been mentioned
             if (message.toLower().startsWith(mention)) {
+                mentionFormat.setBackground(QBrush(getCustomMentionColor()));
+                mentionFormat.setForeground(settingsCache->getChatMentionForeground() ? QBrush(Qt::white):QBrush(Qt::black));
                 cursor.insertText("@" + userName, mentionFormat);
                 message = message.mid(mention.size());
+                QApplication::alert(this);
             }
             // another user has been mentioned
             else {
-                int mentionEndIndex = message.indexOf(" ");
+                int mentionEndIndex = message.indexOf(QRegExp("\\W"), 1);// from 1 as @ is non-char
                 if (mentionEndIndex == -1)
                     mentionEndIndex = message.size(); // there is no text after the mention
                 QString userMention = message.left(mentionEndIndex);
@@ -225,6 +229,12 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
         verticalScrollBar()->setValue(verticalScrollBar()->maximum());
 }
 
+QColor ChatView::getCustomMentionColor() {
+    QColor customColor;
+    customColor.setNamedColor("#" + settingsCache->getChatMentionColor());
+    return customColor.isValid() ? customColor : DEFAULT_MENTION_COLOR;
+}
+
 /**
    Returns the correct case version of the provided username, if no correct casing version
    was found then the provided name is not available and will return an empty QString.

cockatrice/src/chatview.h

@@ -37,6 +37,7 @@ private:
     void appendCardTag(QTextCursor &cursor, const QString &cardName);
     void appendUrlTag(QTextCursor &cursor, QString url);
     QString getNameFromUserList(QMap<QString, UserListTWI *> &userList, QString &userName);
+    QColor getCustomMentionColor();
 private slots:
     void openLink(const QUrl &link);
 public:

cockatrice/src/deckstats_interface.cpp

@@ -32,7 +32,7 @@ void DeckStatsInterface::queryFinished(QNetworkReply *reply)
     QString data(reply->readAll());
     reply->deleteLater();
     
-    QRegExp rx("id=\"deckstats_deck_url\" value=\"([^\"]+)\"");
+    QRegExp rx("<meta property=\"og:url\" content=\"([^\"]+)\"/>");
     if (!rx.indexIn(data)) {
         QMessageBox::critical(0, tr("Error"), tr("The reply from the server could not be parsed."));
         deleteLater();
@@ -53,11 +53,13 @@ void DeckStatsInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
 #if QT_VERSION < 0x050000
     QUrl params;
     params.addQueryItem("deck", deckWithoutTokens.writeToString_Plain());
+    params.addQueryItem("decktitle", deck->getName());
     data->append(params.encodedQuery());
 #else
     QUrl params;
     QUrlQuery urlQuery;
     urlQuery.addQueryItem("deck", deckWithoutTokens.writeToString_Plain());
+    urlQuery.addQueryItem("decktitle", deck->getName());
     params.setQuery(urlQuery);
     data->append(params.query(QUrl::EncodeReserved));
 #endif

cockatrice/src/dlg_creategame.cpp

@@ -160,7 +160,7 @@ DlgCreateGame::DlgCreateGame(const ServerInfo_Game &gameInfo, const QMap<int, QS
 void DlgCreateGame::actOK()
 {
     Command_CreateGame cmd;
-    cmd.set_description(descriptionEdit->text().toStdString());
+    cmd.set_description(descriptionEdit->text().simplified().toStdString());
     cmd.set_password(passwordEdit->text().toStdString());
     cmd.set_max_players(maxPlayersEdit->value());
     cmd.set_only_buddies(onlyBuddiesCheckBox->isChecked());

cockatrice/src/dlg_settings.cpp

@@ -50,11 +50,6 @@ GeneralSettingsPage::GeneralSettingsPage()
     pixmapCacheEdit.setSingleStep(64);
     pixmapCacheEdit.setValue(settingsCache->getPixmapCacheSize());
     pixmapCacheEdit.setSuffix(" MB");
-    pixmapCacheEdit.setMinimum(64);
-    pixmapCacheEdit.setMaximum(8192);
-    pixmapCacheEdit.setSingleStep(64);
-    pixmapCacheEdit.setValue(settingsCache->getPixmapCacheSize());
-    pixmapCacheEdit.setSuffix(" MB");
     picDownloadHqCheckBox.setChecked(settingsCache->getPicDownloadHq());
     picDownloadCheckBox.setChecked(settingsCache->getPicDownload());
 
@@ -571,16 +566,29 @@ void DeckEditorSettingsPage::radioPriceTagSourceClicked(bool checked)
 
 MessagesSettingsPage::MessagesSettingsPage()
 {
-
     chatMentionCheckBox.setChecked(settingsCache->getChatMention());
     connect(&chatMentionCheckBox, SIGNAL(stateChanged(int)), settingsCache, SLOT(setChatMention(int)));
     
     ignoreUnregUsersMainChat.setChecked(settingsCache->getIgnoreUnregisteredUsers());
+    ignoreUnregUserMessages.setChecked(settingsCache->getIgnoreUnregisteredUserMessages());
     connect(&ignoreUnregUsersMainChat, SIGNAL(stateChanged(int)), settingsCache, SLOT(setIgnoreUnregisteredUsers(int)));
+    connect(&ignoreUnregUserMessages, SIGNAL(stateChanged(int)), settingsCache, SLOT(setIgnoreUnregisteredUserMessages(int)));
+    
+    invertMentionForeground.setChecked(settingsCache->getChatMentionForeground());
+    connect(&invertMentionForeground, SIGNAL(stateChanged(int)), this, SLOT(updateTextColor(int)));
+
+    mentionColor = new QLineEdit();
+    mentionColor->setText(settingsCache->getChatMentionColor());
+    updateMentionPreview();
+    connect(mentionColor, SIGNAL(textChanged(QString)), this, SLOT(updateColor(QString)));
 
     QGridLayout *chatGrid = new QGridLayout;
     chatGrid->addWidget(&chatMentionCheckBox, 0, 0);
+    chatGrid->addWidget(&invertMentionForeground, 0, 1);
+    chatGrid->addWidget(mentionColor, 0, 2);
     chatGrid->addWidget(&ignoreUnregUsersMainChat, 1, 0);
+    chatGrid->addWidget(&hexLabel, 1, 2);
+    chatGrid->addWidget(&ignoreUnregUserMessages, 2, 0);
     chatGroupBox = new QGroupBox;
     chatGroupBox->setLayout(chatGrid);
 
@@ -618,6 +626,25 @@ MessagesSettingsPage::MessagesSettingsPage()
     retranslateUi();
 }
 
+void MessagesSettingsPage::updateColor(const QString &value) {
+    QColor colorToSet;
+    colorToSet.setNamedColor("#" + value);
+    if (colorToSet.isValid()) {
+        settingsCache->setChatMentionColor(value);
+        updateMentionPreview();
+    }
+}
+
+void MessagesSettingsPage::updateTextColor(int value) {
+    settingsCache->setChatMentionForeground(value);
+    updateMentionPreview();
+}
+
+void MessagesSettingsPage::updateMentionPreview() {
+    mentionColor->setStyleSheet("QLineEdit{background:#" + settingsCache->getChatMentionColor() + 
+        ";color: " + (settingsCache->getChatMentionForeground() ? "white" : "black") + ";}");
+}
+
 void MessagesSettingsPage::storeSettings()
 {
     QSettings settings;
@@ -650,9 +677,13 @@ void MessagesSettingsPage::retranslateUi()
     aAdd->setText(tr("&Add"));
     aRemove->setText(tr("&Remove"));
     chatGroupBox->setTitle(tr("Chat settings"));
-    chatMentionCheckBox.setText(tr("Enable chat mentions ('@yourusername' in chat log will be highlighted)"));
+    chatMentionCheckBox.setText(tr("Enable chat mentions"));
     messageShortcuts->setTitle(tr("In-game message macros"));
     ignoreUnregUsersMainChat.setText(tr("Ignore unregistered users in main chat"));
+    ignoreUnregUsersMainChat.setText(tr("Ignore chat room messages sent by unregistered users."));
+    ignoreUnregUserMessages.setText(tr("Ignore private messages sent by unregistered users."));
+    invertMentionForeground.setText(tr("Invert text color"));
+    hexLabel.setText(tr("(Color is hexadecimal)"));
 }
 
 DlgSettings::DlgSettings(QWidget *parent)

cockatrice/src/dlg_settings.h

@@ -156,16 +156,23 @@ public:
 private slots:
     void actAdd();
     void actRemove();
+    void updateColor(const QString &value);
+    void updateTextColor(int value);
 private:
     QListWidget *messageList;
     QAction *aAdd;
     QAction *aRemove;
     QCheckBox chatMentionCheckBox;
+    QCheckBox invertMentionForeground;
     QCheckBox ignoreUnregUsersMainChat;
+    QCheckBox ignoreUnregUserMessages;
     QGroupBox *chatGroupBox;
     QGroupBox *messageShortcuts;
+    QLineEdit *mentionColor;
+    QLabel hexLabel;
 
     void storeSettings();
+    void updateMentionPreview();
 };
 
 class DlgSettings : public QDialog {

cockatrice/src/filtertree.cpp

@@ -199,34 +199,31 @@ bool FilterItem::acceptManaCost(const CardInfo *info) const
     return (info->getManaCost() == term);
 }
 
+bool FilterItem::acceptCmc(const CardInfo *info) const
+{
+    return (info->getCmc() == term);
+}
+
 bool FilterItem::acceptCardAttr(const CardInfo *info, CardFilter::Attr attr) const
 {
-    bool status;
-
     switch (attr) {
         case CardFilter::AttrName:
-            status = acceptName(info);
+            return acceptName(info);
-            break;
         case CardFilter::AttrType:
-            status = acceptType(info);
+            return acceptType(info);
-            break;
         case CardFilter::AttrColor:
-            status = acceptColor(info);
+            return acceptColor(info);
-            break;
         case CardFilter::AttrText:
-            status = acceptText(info);
+            return acceptText(info);
-            break;
         case CardFilter::AttrSet:
-            status = acceptSet(info);
+            return acceptSet(info);
-            break;
         case CardFilter::AttrManaCost:
-            status = acceptManaCost(info);
+            return acceptManaCost(info);
-            break;
+        case CardFilter::AttrCmc:
+            return acceptCmc(info);
         default:
-            status = true; /* ignore this attribute */
+            return true; /* ignore this attribute */
     }
-
-    return status;
 }
 
 /* need to define these here to make QT happy, otherwise

cockatrice/src/filtertree.h

@@ -117,6 +117,7 @@ public:
     bool acceptText(const CardInfo *info) const;
     bool acceptSet(const CardInfo *info) const;
     bool acceptManaCost(const CardInfo *info) const;
+    bool acceptCmc(const CardInfo *info) const;
     bool acceptCardAttr(const CardInfo *info, CardFilter::Attr attr) const;
 };
 

cockatrice/src/gamesmodel.cpp

@@ -115,7 +115,7 @@ QVariant GamesModel::data(const QModelIndex &index, int role) const
             case Qt::DisplayRole:
                 return QString::fromStdString(g.creator_info().name());
             case Qt::DecorationRole: {
-                    QPixmap avatarPixmap = UserLevelPixmapGenerator::generatePixmap(13, (UserLevelFlags)g.creator_info().user_level());
+                    QPixmap avatarPixmap = UserLevelPixmapGenerator::generatePixmap(13, (UserLevelFlags)g.creator_info().user_level(), false);
                     return QIcon(avatarPixmap);
                 }
             default:

cockatrice/src/pixmapgenerator.cpp

@@ -134,9 +134,10 @@ QPixmap CountryPixmapGenerator::generatePixmap(int height, const QString &countr
 
 QMap<QString, QPixmap> CountryPixmapGenerator::pmCache;
 
-QPixmap UserLevelPixmapGenerator::generatePixmap(int height, UserLevelFlags userLevel)
+QPixmap UserLevelPixmapGenerator::generatePixmap(int height, UserLevelFlags userLevel, bool isBuddy)
 {
-    int key = height * 10000 + (int) userLevel;
+
+    int key = height * 10000 + (int) userLevel + (int) isBuddy;
     if (pmCache.contains(key))
         return pmCache.value(key);
 
@@ -149,6 +150,10 @@ QPixmap UserLevelPixmapGenerator::generatePixmap(int height, UserLevelFlags user
         levelString = "registered";
     else
         levelString = "normal";
+
+    if (isBuddy)
+        levelString.append("_buddy");
+
     QSvgRenderer svg(QString(":/resources/userlevels/" + levelString + ".svg"));
     int width = (int) round(height * (double) svg.defaultSize().width() / (double) svg.defaultSize().height());
     QPixmap pixmap(width, height);

cockatrice/src/pixmapgenerator.h

@@ -50,7 +50,7 @@ class UserLevelPixmapGenerator {
 private:
     static QMap<int, QPixmap> pmCache;
 public:
-    static QPixmap generatePixmap(int height, UserLevelFlags userLevel);
+    static QPixmap generatePixmap(int height, UserLevelFlags userLevel, bool isBuddy);
     static void clear() { pmCache.clear(); }
 };
 

cockatrice/src/playerlistwidget.cpp

@@ -118,7 +118,7 @@ void PlayerListWidget::updatePlayerProperties(const ServerInfo_PlayerProperties
         player->setIcon(2, gameStarted ? (prop.conceded() ? concededIcon : QIcon()) : (prop.ready_start() ? readyIcon : notReadyIcon));
     if (prop.has_user_info()) {
         player->setData(3, Qt::UserRole, prop.user_info().user_level());
-        player->setIcon(3, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(prop.user_info().user_level()))));
+        player->setIcon(3, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(prop.user_info().user_level()), false)));
         player->setText(4, QString::fromStdString(prop.user_info().name()));
         const QString country = QString::fromStdString(prop.user_info().country());
         if (!country.isEmpty())

cockatrice/src/playertarget.cpp

@@ -98,7 +98,7 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o
         
         QPixmap tempPixmap;
         if (fullPixmap.isNull())
-            tempPixmap = UserLevelPixmapGenerator::generatePixmap(translatedSize.height(), UserLevelFlags(info->user_level()));
+            tempPixmap = UserLevelPixmapGenerator::generatePixmap(translatedSize.height(), UserLevelFlags(info->user_level()), false);
         else
             tempPixmap = fullPixmap.scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         

cockatrice/src/settingscache.cpp

@@ -45,11 +45,12 @@ SettingsCache::SettingsCache()
     minPlayersForMultiColumnLayout = settings->value("interface/min_players_multicolumn", 5).toInt();
     tapAnimation = settings->value("cards/tapanimation", true).toBool();
     chatMention = settings->value("chat/mention", true).toBool();
+    chatMentionForeground = settings->value("chat/mentionforeground", true).toBool();
+    chatMentionColor = settings->value("chat/mentioncolor", "A6120D").toString();
 
     zoneViewSortByName = settings->value("zoneview/sortbyname", true).toBool();
     zoneViewSortByType = settings->value("zoneview/sortbytype", true).toBool();
     zoneViewPileView = settings->value("zoneview/pileview", true).toBool();
-    zoneViewShuffle = settings->value("zoneview/shuffle", true).toBool();
 
     soundEnabled = settings->value("sound/enabled", false).toBool();
     soundPath = settings->value("sound/path").toString();
@@ -58,6 +59,7 @@ SettingsCache::SettingsCache()
     priceTagSource = settings->value("deckeditor/pricetagsource", 0).toInt();
 
     ignoreUnregisteredUsers = settings->value("chat/ignore_unregistered", false).toBool();
+    ignoreUnregisteredUserMessages = settings->value("chat/ignore_unregistered_messages", false).toBool();
 
     attemptAutoConnect = settings->value("server/auto_connect", 0).toBool(); 
 }
@@ -244,6 +246,16 @@ void SettingsCache::setChatMention(int _chatMention) {
     settings->setValue("chat/mention", chatMention);
 }
 
+void SettingsCache::setChatMentionForeground(int _chatMentionForeground) {
+    chatMentionForeground = _chatMentionForeground;
+    settings->setValue("chat/mentionforeground", chatMentionForeground);
+}
+
+void SettingsCache::setChatMentionColor(const QString &_chatMentionColor) {
+    chatMentionColor = _chatMentionColor;
+    settings->setValue("chat/mentioncolor", chatMentionColor);
+}
+
 void SettingsCache::setZoneViewSortByName(int _zoneViewSortByName)
 {
     zoneViewSortByName = _zoneViewSortByName;
@@ -261,11 +273,6 @@ void SettingsCache::setZoneViewPileView(int _zoneViewPileView){
     settings->setValue("zoneview/pileview", zoneViewPileView);
 }
 
-void SettingsCache::setZoneViewShuffle(int _zoneViewShuffle) {
-    zoneViewShuffle = _zoneViewShuffle;
-    settings->setValue("zoneview/shuffle", zoneViewShuffle);
-}
-
 void SettingsCache::setSoundEnabled(int _soundEnabled)
 {
     soundEnabled = _soundEnabled;
@@ -299,6 +306,12 @@ void SettingsCache::setIgnoreUnregisteredUsers(int _ignoreUnregisteredUsers)
     settings->setValue("chat/ignore_unregistered", ignoreUnregisteredUsers);
 }
 
+void SettingsCache::setIgnoreUnregisteredUserMessages(int _ignoreUnregisteredUserMessages)
+{
+    ignoreUnregisteredUserMessages = _ignoreUnregisteredUserMessages;
+    settings->setValue("chat/ignore_unregistered_messages", ignoreUnregisteredUserMessages);
+}
+
 void SettingsCache::setMainWindowGeometry(const QByteArray &_mainWindowGeometry)
 {
     mainWindowGeometry = _mainWindowGeometry;

cockatrice/src/settingscache.h

@@ -36,6 +36,7 @@ signals:
     void soundPathChanged();
     void priceTagFeatureChanged(int enabled);
     void ignoreUnregisteredUsersChanged();
+    void ignoreUnregisteredUserMessagesChanged();
     void pixmapCacheSizeChanged(int newSizeInMBs);
 private:
     QSettings *settings;
@@ -57,12 +58,15 @@ private:
     int minPlayersForMultiColumnLayout;
     bool tapAnimation;
     bool chatMention;
-    bool zoneViewSortByName, zoneViewSortByType, zoneViewPileView, zoneViewShuffle;
+    QString chatMentionColor;
+    bool chatMentionForeground;
+    bool zoneViewSortByName, zoneViewSortByType, zoneViewPileView;
     bool soundEnabled;
     QString soundPath;
     bool priceTagFeature;
     int priceTagSource;
     bool ignoreUnregisteredUsers;
+    bool ignoreUnregisteredUserMessages;
     QString picUrl;
     QString picUrlHq;
     QString picUrlFallback;
@@ -83,6 +87,7 @@ public:
     QString getTableBgPath() const { return tableBgPath; }
     QString getPlayerBgPath() const { return playerBgPath; }
     QString getCardBackPicturePath() const { return cardBackPicturePath; }
+    QString getChatMentionColor() const { return chatMentionColor; }
     bool getPicDownload() const { return picDownload; }
     bool getPicDownloadHq() const { return picDownloadHq; }
     bool getNotificationsEnabled() const { return notificationsEnabled; }
@@ -96,6 +101,7 @@ public:
     int getMinPlayersForMultiColumnLayout() const { return minPlayersForMultiColumnLayout; }
     bool getTapAnimation() const { return tapAnimation; }
     bool getChatMention()  const { return chatMention; }
+    bool getChatMentionForeground() const { return chatMentionForeground; }
     bool getZoneViewSortByName() const { return zoneViewSortByName; }
     bool getZoneViewSortByType() const { return zoneViewSortByType; }
     /**
@@ -103,16 +109,12 @@ public:
        @return zoneViewPileView if the view should be sorted into pile view.
      */
     bool getZoneViewPileView() const { return zoneViewPileView; }
-    /**
-       Returns if the view should be shuffled on closing.
-       @return zoneViewShuffle if the view should be shuffled on closing.
-     */
-    bool getZoneViewShuffle() const { return zoneViewShuffle; }
     bool getSoundEnabled() const { return soundEnabled; }
     QString getSoundPath() const { return soundPath; }
     bool getPriceTagFeature() const { return priceTagFeature; }
     int getPriceTagSource() const { return priceTagSource; }
     bool getIgnoreUnregisteredUsers() const { return ignoreUnregisteredUsers; }
+    bool getIgnoreUnregisteredUserMessages() const { return ignoreUnregisteredUserMessages; }
     QString getPicUrl() const { return picUrl; }
     QString getPicUrlHq() const { return picUrlHq; }
     QString getPicUrlFallback() const { return picUrlFallback; }
@@ -133,6 +135,7 @@ public slots:
     void setTableBgPath(const QString &_tableBgPath);
     void setPlayerBgPath(const QString &_playerBgPath);
     void setCardBackPicturePath(const QString &_cardBackPicturePath);
+    void setChatMentionColor(const QString &_chatMentionColor);
     void setPicDownload(int _picDownload);
     void setPicDownloadHq(int _picDownloadHq);
     void setNotificationsEnabled(int _notificationsEnabled);
@@ -146,15 +149,16 @@ public slots:
     void setMinPlayersForMultiColumnLayout(int _minPlayersForMultiColumnLayout);
     void setTapAnimation(int _tapAnimation);
     void setChatMention(int _chatMention);
+    void setChatMentionForeground(int _chatMentionForeground);
     void setZoneViewSortByName(int _zoneViewSortByName);
     void setZoneViewSortByType(int _zoneViewSortByType);
     void setZoneViewPileView(int _zoneViewPileView);
-    void setZoneViewShuffle(int _zoneViewShuffle);
     void setSoundEnabled(int _soundEnabled);
     void setSoundPath(const QString &_soundPath);
     void setPriceTagFeature(int _priceTagFeature);
     void setPriceTagSource(int _priceTagSource);
     void setIgnoreUnregisteredUsers(int _ignoreUnregisteredUsers);
+    void setIgnoreUnregisteredUserMessages(int _ignoreUnregisteredUserMessages);
     void setPicUrl(const QString &_picUrl);
     void setPicUrlHq(const QString &_picUrlHq);
     void setPicUrlFallback(const QString &_picUrlFallback);

cockatrice/src/tab_deck_editor.cpp

@@ -276,8 +276,8 @@ TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor, QWidget *parent)
     deckEditToolBar->addAction(aAddCard);
     deckEditToolBar->addAction(aAddCardToSideboard);
     deckEditToolBar->addAction(aRemoveCard);
-    deckEditToolBar->addAction(aIncrement);
     deckEditToolBar->addAction(aDecrement);
+    deckEditToolBar->addAction(aIncrement);
     deckEditToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
     
     retranslateUi();

cockatrice/src/tab_game.cpp

@@ -885,6 +885,7 @@ void TabGame::startGame(bool resuming)
     gameInfo.set_started(true);
     static_cast<GameScene *>(gameView->scene())->rearrange();
     gameView->show();
+    sayEdit->setFocus();
 }
 
 void TabGame::stopGame()

cockatrice/src/tab_message.cpp

@@ -18,6 +18,7 @@ TabMessage::TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, c
     chatView = new ChatView(tabSupervisor, 0, true);
     connect(chatView, SIGNAL(showCardInfoPopup(QPoint, QString)), this, SLOT(showCardInfoPopup(QPoint, QString)));
     connect(chatView, SIGNAL(deleteCardInfoPopup(QString)), this, SLOT(deleteCardInfoPopup(QString)));
+    connect(chatView, SIGNAL(addMentionTag(QString)), this, SLOT(addMentionTag(QString)));
     sayEdit = new QLineEdit;
     connect(sayEdit, SIGNAL(returnPressed()), this, SLOT(sendMessage()));
     
@@ -43,6 +44,11 @@ TabMessage::~TabMessage()
     delete otherUserInfo;
 }
 
+void TabMessage::addMentionTag(QString mentionTag) {
+    sayEdit->insert(mentionTag + " ");
+    sayEdit->setFocus();
+}
+
 void TabMessage::retranslateUi()
 {
     messageMenu->setTitle(tr("Personal &talk"));

cockatrice/src/tab_message.h

@@ -29,6 +29,7 @@ private slots:
     void sendMessage();
     void actLeave();
     void messageSent(const Response &response);
+    void addMentionTag(QString mentionTag);
 public:
     TabMessage(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User &_ownUserInfo, const ServerInfo_User &_otherUserInfo);
     ~TabMessage();

cockatrice/src/tab_supervisor.cpp

@@ -446,11 +446,21 @@ void TabSupervisor::processGameEventContainer(const GameEventContainer &cont)
 
 void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
 {
-    TabMessage *tab = messageTabs.value(QString::fromStdString(event.sender_name()));
+    QString senderName = QString::fromStdString(event.sender_name());
+    TabMessage *tab = messageTabs.value(senderName);
     if (!tab)
         tab = messageTabs.value(QString::fromStdString(event.receiver_name()));
-    if (!tab)
+    if (!tab) {
+        UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName);
+        if (twi) {
+            UserLevelFlags userLevel = UserLevelFlags(twi->getUserInfo().user_level());
+            if (settingsCache->getIgnoreUnregisteredUserMessages() &&
+                !userLevel.testFlag(ServerInfo_User::IsRegistered))
+                // Flags are additive, so reg/mod/admin are all IsRegistered
+                return;
+        }
         tab = addMessageTab(QString::fromStdString(event.sender_name()), false);
+    }
     if (!tab)
         return;
     tab->processUserMessageEvent(event);

cockatrice/src/userinfobox.cpp

@@ -31,6 +31,7 @@ UserInfoBox::UserInfoBox(AbstractClient *_client, bool _fullInfo, QWidget *paren
     mainLayout->addWidget(&genderLabel2, 3, 1, 1, 2);
     mainLayout->addWidget(&countryLabel1, 4, 0, 1, 1);
     mainLayout->addWidget(&countryLabel2, 4, 1, 1, 2);
+    mainLayout->addWidget(&countryLabel3, 4, 2, 1, 1);
     mainLayout->addWidget(&userLevelLabel1, 5, 0, 1, 1);
     mainLayout->addWidget(&userLevelLabel2, 5, 1, 1, 1);
     mainLayout->addWidget(&userLevelLabel3, 5, 2, 1, 1);
@@ -59,14 +60,16 @@ void UserInfoBox::updateInfo(const ServerInfo_User &user)
     QPixmap avatarPixmap;
     const std::string bmp = user.avatar_bmp();
     if (!avatarPixmap.loadFromData((const uchar *) bmp.data(), bmp.size()))
-        avatarPixmap = UserLevelPixmapGenerator::generatePixmap(64, userLevel);
+        avatarPixmap = UserLevelPixmapGenerator::generatePixmap(64, userLevel, false);
     avatarLabel.setPixmap(avatarPixmap);
     
     nameLabel.setText(QString::fromStdString(user.name()));
     realNameLabel2.setText(QString::fromStdString(user.real_name()));
     genderLabel2.setPixmap(GenderPixmapGenerator::generatePixmap(15, user.gender()));
-    countryLabel2.setPixmap(CountryPixmapGenerator::generatePixmap(15, QString::fromStdString(user.country())));
+    QString country = QString::fromStdString(user.country());
-    userLevelLabel2.setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel));
+    countryLabel2.setPixmap(CountryPixmapGenerator::generatePixmap(15, country));
+    countryLabel3.setText(QString("(%1)").arg(country.toUpper()));
+    userLevelLabel2.setPixmap(UserLevelPixmapGenerator::generatePixmap(15, userLevel, false));
     QString userLevelText;
     if (userLevel.testFlag(ServerInfo_User::IsAdmin))
         userLevelText = tr("Administrator");

cockatrice/src/userinfobox.h

@@ -15,7 +15,7 @@ private:
     AbstractClient *client;
     bool fullInfo;
     QLabel avatarLabel, nameLabel, realNameLabel1, realNameLabel2, genderLabel1, genderLabel2, countryLabel1,
-        countryLabel2, userLevelLabel1, userLevelLabel2, userLevelLabel3, accountAgeLebel1, accountAgeLabel2;
+        countryLabel2, countryLabel3, userLevelLabel1, userLevelLabel2, userLevelLabel3, accountAgeLebel1, accountAgeLabel2;
 public:
     UserInfoBox(AbstractClient *_client, bool fullInfo, QWidget *parent = 0, Qt::WindowFlags flags = 0);
     void retranslateUi();

cockatrice/src/userlist.cpp

@@ -181,7 +181,7 @@ void UserListTWI::setUserInfo(const ServerInfo_User &_userInfo)
     userInfo = _userInfo;
 
     setData(0, Qt::UserRole, userInfo.user_level());
-    setIcon(0, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(userInfo.user_level()))));
+    setIcon(0, QIcon(UserLevelPixmapGenerator::generatePixmap(12, UserLevelFlags(userInfo.user_level()), false)));
     setIcon(1, QIcon(CountryPixmapGenerator::generatePixmap(12, QString::fromStdString(userInfo.country()))));
     setData(2, Qt::UserRole, QString::fromStdString(userInfo.name()));
     setData(2, Qt::DisplayRole, QString::fromStdString(userInfo.name()));

cockatrice/src/window_main.cpp

@@ -344,6 +344,7 @@ void MainWindow::createMenus()
     cockatriceMenu = menuBar()->addMenu(QString());
     cockatriceMenu->addAction(aConnect);
     cockatriceMenu->addAction(aDisconnect);
+    cockatriceMenu->addSeparator();
     cockatriceMenu->addAction(aSinglePlayer);
     cockatriceMenu->addAction(aWatchReplay);
     cockatriceMenu->addSeparator();

cockatrice/src/zoneviewwidget.cpp

@@ -101,7 +101,7 @@ ZoneViewWidget::ZoneViewWidget(Player *_player, CardZone *_origZone, int numberC
     }
 
     if (_origZone->getIsShufflable() && (numberCards == -1)) {
-        shuffleCheckBox.setChecked(settingsCache->getZoneViewShuffle());
+        shuffleCheckBox.setChecked(true);
         QGraphicsProxyWidget *shuffleProxy = new QGraphicsProxyWidget;
         shuffleProxy->setWidget(&shuffleCheckBox);
         vbox->addItem(shuffleProxy);
@@ -227,8 +227,6 @@ void ZoneViewWidget::closeEvent(QCloseEvent *event)
     }
     if (shuffleCheckBox.isChecked())
         player->sendGameCommand(Command_Shuffle());
-    if (canBeShuffled)
-        settingsCache->setZoneViewShuffle(shuffleCheckBox.isChecked());
     emit closePressed(this);
     deleteLater();
     event->accept();

cockatrice/src/zoneviewzone.cpp

@@ -106,9 +106,30 @@ void ZoneViewZone::reorganizeCards()
 
     int typeColumn = 0;
     int longestRow = 0;
-    if (pileView && sortByType) // we need sort by type enabled for the feature to work
+    if (pileView && sortByType) { // we need sort by type enabled for the feature to work
-        setPileViewPositions(cardCount, cardsToDisplay, typeColumn, longestRow);
+        int typeRow = 0;
-    else {
+        QString lastCardType;
+        for (int i = 0; i < cardCount; i++) {
+            CardItem *c = cardsToDisplay.at(i);
+            QString cardType = c->getInfo()->getMainCardType();
+
+            if (i){ // if not the first card
+                if (cardType == lastCardType)
+                    typeRow++; // add below current card
+                else { // if no match then move card to next column
+                    typeColumn++;
+                    typeRow = 0;
+                }
+            }
+
+            lastCardType = cardType;
+            qreal x = typeColumn * CARD_WIDTH;
+            qreal y = typeRow * CARD_HEIGHT / 3;
+            c->setPos(x + 5, y + 5);
+            c->setRealZValue(i);
+            longestRow = qMax(typeRow, longestRow);
+        }
+    } else {
         for (int i = 0; i < cardCount; i++) {
             CardItem *c = cardsToDisplay.at(i);
             qreal x = (i / rows) * CARD_WIDTH;
@@ -128,31 +149,6 @@ void ZoneViewZone::reorganizeCards()
     emit optimumRectChanged();
 }
 
-void ZoneViewZone::setPileViewPositions(int cardCount, CardList &cardsToDisplay, int &typeColumn, int &longestRow){
-    int typeRow = 0;
-    bool cardTypeMatch = true;
-    for (int i = 0; i < cardCount; i++) {
-        CardItem *c = cardsToDisplay.at(i);
-        QString cardType = c->getInfo()->getMainCardType();
-
-        if (i){
-            // if not the first card. Last card and this card have a matching main type?
-            cardTypeMatch = cardType.compare(cardsToDisplay.at(i-1)->getInfo()->getMainCardType()) == 0 ? true : false;
-            if (!cardTypeMatch) { // if no match then move card to next column
-                typeColumn++;
-                longestRow = qMax(typeRow, longestRow);
-                typeRow = 0;
-            } else // add below current card
-                typeRow++;
-        }
-
-        qreal x = typeColumn * CARD_WIDTH;
-        qreal y = typeRow * CARD_HEIGHT / 3;
-        c->setPos(x + 5, y + 5);
-        c->setRealZValue(i);
-    }
-}
-
 void ZoneViewZone::setSortByName(int _sortByName)
 {
     sortByName = _sortByName;

cockatrice/src/zoneviewzone.h

@@ -26,10 +26,6 @@ public:
     QRectF boundingRect() const;
     void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
     void reorganizeCards();
-
-    void setPileViewPositions(int cardCount, CardList &cardsToDisplay, int &typeColumn, int &longestRow);
-    
-
     void initializeCards(const QList<const ServerInfo_Card *> &cardList = QList<const ServerInfo_Card *>());
     void removeCard(int position);
     int getNumberCards() const { return numberCards; }

common/server_game.cpp

@@ -56,7 +56,6 @@ Server_Game::Server_Game(const ServerInfo_User &_creatorInfo, int _gameId, const
           gameStarted(false),
           gameClosed(false),
           gameId(_gameId),
-          description(_description),
           password(_password),
           maxPlayers(_maxPlayers),
           gameTypes(_gameTypes),
@@ -77,6 +76,7 @@ Server_Game::Server_Game(const ServerInfo_User &_creatorInfo, int _gameId, const
 {
     currentReplay = new GameReplay;
     currentReplay->set_replay_id(room->getServer()->getDatabaseInterface()->getNextReplayId());
+    description = _description.simplified();
 
     connect(this, SIGNAL(sigStartGameIfReady()), this, SLOT(doStartGameIfReady()), Qt::QueuedConnection);
 

oracle/src/oracleimporter.cpp

@@ -65,6 +65,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
                                   bool isToken,
                                   int cardId,
                                   QString &cardCost,
+                                  QString &cmc,
                                   const QString &cardType,
                                   const QString &cardPT,
                                   int cardLoyalty,
@@ -117,7 +118,7 @@ CardInfo *OracleImporter::addCard(const QString &setName,
         
         bool cipt = (cardText.contains(cardName + " enters the battlefield tapped."));
         
-        card = new CardInfo(this, cardName, isToken, cardCost, cardType, cardPT, fullCardText, colors, cardLoyalty, cipt);
+        card = new CardInfo(this, cardName, isToken, cardCost, cmc, cardType, cardPT, fullCardText, colors, cardLoyalty, cipt);
         int tableRow = 1;
         QString mainCardType = card->getMainCardType();
         if ((mainCardType == "Land") || mArtifact)
@@ -143,6 +144,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
     QVariantMap map;
     QString cardName;
     QString cardCost;
+    QString cmc;
     QString cardType;
     QString cardPT;
     QString cardText;
@@ -185,6 +187,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
                 // add first card's data
                 cardName = card1->contains("name") ? card1->value("name").toString() : QString("");
                 cardCost = card1->contains("manaCost") ? card1->value("manaCost").toString() : QString("");
+                cmc = card1->contains("cmc") ? card1->value("cmc").toString() : QString("");
                 cardType = card1->contains("type") ? card1->value("type").toString() : QString("");
                 cardPT = card1->contains("power") || card1->contains("toughness") ? card1->value("power").toString() + QString('/') + card1->value("toughness").toString() : QString("");
                 cardText = card1->contains("text") ? card1->value("text").toString() : QString("");
@@ -192,18 +195,22 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
                 // add second card's data
                 cardName += card2->contains("name") ? QString(" // ") + card2->value("name").toString() : QString("");
                 cardCost += card2->contains("manaCost") ? QString(" // ") + card2->value("manaCost").toString() : QString("");
+                cmc += card2->contains("cmc") ? QString(" // ") + card2->value("cmc").toString() : QString("");
                 cardType += card2->contains("type") ? QString(" // ") + card2->value("type").toString() : QString("");
                 cardPT += card2->contains("power") || card2->contains("toughness") ? QString(" // ") + card2->value("power").toString() + QString('/') + card2->value("toughness").toString() : QString("");
                 cardText += card2->contains("text") ? QString("\n\n---\n\n") + card2->value("text").toString() : QString("");
             } else {
-                // first card od a pair; enqueue for later merging
+                // first card of a pair; enqueue for later merging
-                splitCards.insert(cardId, map);
+                // Conditional on cardId because promo prints have no muid - see #640
+                if (cardId)
+                  splitCards.insert(cardId, map);
                 continue;
             }
         } else {
             // normal cards handling
             cardName = map.contains("name") ? map.value("name").toString() : QString("");
             cardCost = map.contains("manaCost") ? map.value("manaCost").toString() : QString("");
+            cmc = map.contains("cmc") ? map.value("cmc").toString() : QString("");
             cardType = map.contains("type") ? map.value("type").toString() : QString("");
             cardPT = map.contains("power") || map.contains("toughness") ? map.value("power").toString() + QString('/') + map.value("toughness").toString() : QString("");
             cardText = map.contains("text") ? map.value("text").toString() : QString("");
@@ -218,7 +225,7 @@ int OracleImporter::importTextSpoiler(CardSet *set, const QVariant &data)
         }
 
         if (!cardIsToken) {
-            CardInfo *card = addCard(set->getShortName(), cardName, cardIsToken, cardId, cardCost, cardType, cardPT, cardLoyalty, cardText.split("\n"));
+            CardInfo *card = addCard(set->getShortName(), cardName, cardIsToken, cardId, cardCost, cmc, cardType, cardPT, cardLoyalty, cardText.split("\n"));
 
             if (!set->contains(card)) {
                 card->addToSet(set);

oracle/src/oracleimporter.h

@@ -32,7 +32,7 @@ private:
     QVariantMap setsMap;
     QString dataDir;
     
-    CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, QString &cardCost, const QString &cardType, const QString &cardPT, int cardLoyalty, const QStringList &cardText);
+    CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, QString &cardCost, QString &cmc, const QString &cardType, const QString &cardPT, int cardLoyalty, const QStringList &cardText);
 signals:
     void setIndexChanged(int cardsImported, int setIndex, const QString &setName);
     void dataReadProgress(int bytesRead, int totalBytes);

travis-compile.sh

@@ -9,4 +9,4 @@ if [[ $TRAVIS_OS_NAME == "osx" && $QT4 == 0 ]]; then
   prefix="-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.4.0/"
 fi
 cmake .. -DWITH_SERVER=1 -DWITH_QT4=$QT4 $prefix
-make
+make -j2