From f7f651338ba5d76de436a61ed77f6f85973cf545 Mon Sep 17 00:00:00 2001
From: Matt Lowe <matthewneillowe@gmail.com>
Date: Tue, 3 Feb 2015 23:35:18 +0100
Subject: [PATCH] Updated deck editor buttons

---
 cockatrice/cockatrice.qrc           |  2 ++
 cockatrice/resources/decrement.svg  | 18 ++++++++++--------
 cockatrice/resources/remove_row.svg | 14 ++++++++------
 cockatrice/src/tab_deck_editor.cpp  |  2 +-
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc
index 018cf1ed..704e28cb 100644
--- a/cockatrice/cockatrice.qrc
+++ b/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>
diff --git a/cockatrice/resources/decrement.svg b/cockatrice/resources/decrement.svg
index 832e1991..0ceddf69 100644
--- a/cockatrice/resources/decrement.svg
+++ b/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:cy="34.091284"
+     inkscape:cx="26.34754"
+     inkscape:cy="29.107677"
      inkscape:document-units="px"
      inkscape:current-layer="layer2"
      showgrid="false"
-     inkscape:window-width="1272"
-     inkscape:window-height="723"
+     inkscape:window-width="1445"
+     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"
diff --git a/cockatrice/resources/remove_row.svg b/cockatrice/resources/remove_row.svg
index 25350bf7..6f133cdb 100644
--- a/cockatrice/resources/remove_row.svg
+++ b/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:cy="31.784541"
+     inkscape:cx="-27.27273"
+     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>
diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp
index 7cfbff55..fdd41967 100644
--- a/cockatrice/src/tab_deck_editor.cpp
+++ b/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();