diff --git a/cmake/headerimage.bmp b/cmake/headerimage.bmp
index 73c88d6d4..625680c37 100644
Binary files a/cmake/headerimage.bmp and b/cmake/headerimage.bmp differ
diff --git a/cmake/leftimage.bmp b/cmake/leftimage.bmp
index e89fdd95e..aea762678 100644
Binary files a/cmake/leftimage.bmp and b/cmake/leftimage.bmp differ
diff --git a/cockatrice/resources/appicon.ico b/cockatrice/resources/appicon.ico
index 9a4885f41..bff98608f 100644
Binary files a/cockatrice/resources/appicon.ico and b/cockatrice/resources/appicon.ico differ
diff --git a/cockatrice/resources/back.svg b/cockatrice/resources/back.svg
index 0377ecb23..3dd1c69c8 100644
--- a/cockatrice/resources/back.svg
+++ b/cockatrice/resources/back.svg
@@ -1,5 +1,6 @@
+
diff --git a/cockatrice/resources/cockatrice.png b/cockatrice/resources/cockatrice.png
index ed79b88a0..2dd322d5f 100644
Binary files a/cockatrice/resources/cockatrice.png and b/cockatrice/resources/cockatrice.png differ
diff --git a/cockatrice/resources/cockatrice.svg b/cockatrice/resources/cockatrice.svg
index 991a53c67..034eceb57 100644
--- a/cockatrice/resources/cockatrice.svg
+++ b/cockatrice/resources/cockatrice.svg
@@ -1,5 +1,6 @@
+
diff --git a/cockatrice/resources/hand.svg b/cockatrice/resources/hand.svg
index 8c28fd59f..7c34d7cc9 100644
--- a/cockatrice/resources/hand.svg
+++ b/cockatrice/resources/hand.svg
@@ -14,10 +14,13 @@
height="500"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.47pre4 r22446"
- sodipodi:docname="back.svg"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="hand.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
- version="1.0">
+ version="1.0"
+ inkscape:export-filename="C:\Users\Matt\Documents\GitHub\Cockatrice\cockatrice\resources\hand_new.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
-
-
-
-
-
-
-
-
-
+ id="linearGradient4766-8-0-3-31">
+
+
+
+ x1="-20.65873"
+ y1="37.909077"
+ x2="-25.41811"
+ y2="38.523342" />
+
+
+
+
+ x1="-20.65873"
+ y1="37.909077"
+ x2="-25.41811"
+ y2="38.523342" />
+
+
+
+
+ x1="-20.65873"
+ y1="37.909077"
+ x2="-25.41811"
+ y2="38.523342" />
+
+
+
+
+ x1="-20.65873"
+ y1="37.909077"
+ x2="-25.41811"
+ y2="38.523342" />
+
+
+
+
+
+
+
+
+ x1="-20.65873"
+ y1="37.909077"
+ x2="-25.41811"
+ y2="38.523342" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -377,7 +3435,7 @@
image/svg+xml
-
+
@@ -387,99 +3445,992 @@
id="layer1"
transform="translate(0,160)">
+ id="g4178-7"
+ transform="matrix(0.89531447,-0.44543462,0.44543462,0.89531447,-0.7217683,-5.4209005)">
-
-
-
-
-
+ style="display:inline"
+ id="layer1-1-4"
+ inkscape:label="boarder">
+
+
-
-
-
-
-
+ style="display:inline"
+ inkscape:label="inlay"
+ id="layer3-0">
+
+
+ inkscape:label="dots"
+ id="layer4-0">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ transform="translate(-380.13559,-22.492048)"
+ id="g3866-2-5">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index 7bdf47216..4d719f6b7 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -17,6 +17,19 @@ SET(servatrice_SOURCES
${VERSION_STRING_CPP}
)
+set(servatrice_RESOURCES servatrice.qrc)
+
+if(WIN32)
+ set(servatrice_SOURCES ${servatrice_SOURCES} servatrice.rc)
+endif(WIN32)
+
+
+if(APPLE)
+ set(MACOSX_BUNDLE_ICON_FILE appicon.icns)
+ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+ set(servatrice_SOURCES ${servatrice_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
+ENDIF(APPLE)
+
set(SERVATRICE_LIBS)
# Qt4 stuff
@@ -32,6 +45,7 @@ if(Qt4_FOUND)
# Libgcrypt is required only with Qt4 to support SHA512 hashing
FIND_PACKAGE(Libgcrypt REQUIRED)
INCLUDE_DIRECTORIES(${LIBGCRYPT_INCLUDE_DIR})
+ QT4_ADD_RESOURCES(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
endif()
# qt5 stuff
@@ -53,6 +67,8 @@ if(Qt5Widgets_FOUND)
list(APPEND SERVATRICE_LIBS Sql)
endif()
+ QT5_ADD_RESOURCES(servatrice_RESOURCES_RCC ${servatrice_RESOURCES})
+
# guess plugins and libraries directory
set(QT_PLUGINS_DIR "${Qt5Widgets_DIR}/../../../plugins")
get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
@@ -68,7 +84,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../common)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
# Build servatrice binary and link it
-ADD_EXECUTABLE(servatrice MACOSX_BUNDLE ${servatrice_SOURCES} ${servatrice_MOC_SRCS})
+ADD_EXECUTABLE(servatrice MACOSX_BUNDLE ${servatrice_SOURCES} ${servatrice_RESOURCES_RCC} ${servatrice_MOC_SRCS})
if(Qt4_FOUND)
if(MSVC)
diff --git a/servatrice/resources/appicon.icns b/servatrice/resources/appicon.icns
new file mode 100644
index 000000000..2dece9b08
Binary files /dev/null and b/servatrice/resources/appicon.icns differ
diff --git a/servatrice/resources/appicon.ico b/servatrice/resources/appicon.ico
new file mode 100644
index 000000000..356634870
Binary files /dev/null and b/servatrice/resources/appicon.ico differ
diff --git a/servatrice/resources/cockatrice.png b/servatrice/resources/cockatrice.png
new file mode 100644
index 000000000..7d701ef03
Binary files /dev/null and b/servatrice/resources/cockatrice.png differ
diff --git a/servatrice/resources/cockatrice.svg b/servatrice/resources/cockatrice.svg
new file mode 100644
index 000000000..6ae08524e
--- /dev/null
+++ b/servatrice/resources/cockatrice.svg
@@ -0,0 +1,779 @@
+
+
+
+
diff --git a/servatrice/servatrice.qrc b/servatrice/servatrice.qrc
new file mode 100644
index 000000000..e64960b7f
--- /dev/null
+++ b/servatrice/servatrice.qrc
@@ -0,0 +1,5 @@
+
+
+ resources/cockatrice.svg
+
+
diff --git a/servatrice/servatrice.rc b/servatrice/servatrice.rc
new file mode 100644
index 000000000..cf949f313
--- /dev/null
+++ b/servatrice/servatrice.rc
@@ -0,0 +1 @@
+ID1_ICON1 ICON DISCARDABLE "resources/appicon.ico"