Improve ui icons

.gitignore

@@ -9,6 +9,9 @@ doc/latex
 tools/doxygen/html
 tools/doxygen/latex
 
+# UI Icons cache
+tools/assets/icons/ui/*.png
+
 # Ignore Caches
 *#*#
 *#*

src/binres/binres.cpp

@@ -1,4 +1,5 @@
 #include "binres.hpp"
+#include <unordered_map>
 
 // Embedded binary data (e.g: PGNs icons):
 #include "binary_data.hpp"
@@ -10,23 +11,21 @@ wxBitmap LoadPNG(std::string icon, wxSize size) {
 }
 
 wxBitmap LoadPNG(std::string icon) {
-  if (icon == "swap") {
+  std::unordered_map<std::string, wxBitmap> u = {
-    return (wxBITMAP_PNG_FROM_DATA(swap));
+    {"ui_zoom_in", wxBITMAP_PNG_FROM_DATA(ui_zoom_in)},
-  } else if (icon == "zoomin") {
+    {"ui_zoom_out", wxBITMAP_PNG_FROM_DATA(ui_zoom_out)},
-    return (wxBITMAP_PNG_FROM_DATA(zoomin));
+    {"ui_coins_swap", wxBITMAP_PNG_FROM_DATA(ui_coins_swap)},
-  } else if (icon == "zoomout") {
+    {"ui_eye_close", wxBITMAP_PNG_FROM_DATA(ui_eye_close)},
-    return (wxBITMAP_PNG_FROM_DATA(zoomout));
+    {"mat", wxBITMAP_PNG_FROM_DATA(mat)},
-  } else if (icon == "cburnett") {
+    {"ochess", wxBITMAP_PNG_FROM_DATA(ochess)},
-    return (wxBITMAP_PNG_FROM_DATA(cburnett));
+    {"cburnett", wxBITMAP_PNG_FROM_DATA(cburnett)},
-  } else if (icon == "chesscom_8bits") {
+    {"chesscom_8bits", wxBITMAP_PNG_FROM_DATA(chesscom_8bits)}
-    return (wxBITMAP_PNG_FROM_DATA(chesscom_8bits));
+  };
-  } else if (icon == "hide") {
+  // Return png if exists
-    return (wxBITMAP_PNG_FROM_DATA(hide));
+  if(u.count(icon)){
-  } else if (icon == "mat") {
+    return u[icon];
-    return (wxBITMAP_PNG_FROM_DATA(mat));
-  } else if (icon == "ochess") {
-    return (wxBITMAP_PNG_FROM_DATA(ochess));
   }
+  // Otherwise null bitmap
   return (wxNullBitmap);
 }
 

src/binres/binres.hpp

@@ -26,7 +26,7 @@ wxBitmap LoadPNG(std::string icon, wxSize size);
  * @brief Load an icon from embedded binary resources
  * 
  * @param icon 
- * @return wxBitmap 
+ * @return wxBitmap the image or wxNullBitmap if not found
  */
 wxBitmap LoadPNG(std::string icon);
 

src/game_tab/left_panel/GameTabLeftPanel.cpp

@@ -15,9 +15,9 @@ GameTabLeftPanel::GameTabLeftPanel(wxFrame *parent, std::shared_ptr<Game> game)
   main_sizer->Insert(1, board_canvas, 1, wxEXPAND);
 
   // Configure buttons
-  swap_button->SetBitmapLabel(LoadPNG("swap"));
+  swap_button->SetBitmapLabel(LoadPNG("ui_coins_swap"));
-  zoomin_button->SetBitmapLabel(LoadPNG("zoomin"));
+  zoomin_button->SetBitmapLabel(LoadPNG("ui_zoom_in"));
-  zoomout_button->SetBitmapLabel(LoadPNG("zoomout"));
+  zoomout_button->SetBitmapLabel(LoadPNG("ui_zoom_out"));
 
   // Configure FEN field
   fen_text_field->SetFont(wxFont(*wxNORMAL_FONT).Bold().Larger());

src/game_tab/right_panel/editor/EditorCanvas.cpp

@@ -2,7 +2,7 @@
 
 EditorCanvas::EditorCanvas(wxFrame *parent, std::shared_ptr<Game> game)
     : wxPanel(parent), game(game) {
-  hide_icon = LoadPNG("hide", wxSize(CGEditor::status.MoveIconWidth,
+  hide_icon = LoadPNG("ui_eye_close", wxSize(CGEditor::status.MoveIconWidth,
                                      CGEditor::status.MoveIconWidth));
   t.ResizePieces(CGEditor::status.MoveIconWidth);
   

tools/assets/icons/ui/README.md

@@ -0,0 +1,4 @@
+UI icons sources
+=====
+
+Icons used in UI mainly come from [iconoir](https://iconoir.com/)

tools/assets/icons/ui/coins-swap.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24px" height="24px" viewBox="0 0 24 24" stroke-width="1.5" fill="none" xmlns="http://www.w3.org/2000/svg" color="#000000"><path d="M9.019 9A6.5 6.5 0 1115 14.981M8.5 22a6.5 6.5 0 110-13 6.5 6.5 0 010 13zM22 17a3 3 0 01-3 3h-2m0 0l2-2m-2 2l2 2M2 7a3 3 0 013-3h2m0 0L5 6m2-2L5 2" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg>

tools/assets/icons/ui/eye-close.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24px" height="24px" viewBox="0 0 24 24" stroke-width="1.5" fill="none" xmlns="http://www.w3.org/2000/svg" color="#000000"><path d="M19.5 16l-2.475-3.396M12 17.5V14M4.5 16l2.469-3.388M3 8c3.6 8 14.4 8 18 0" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg>

tools/assets/icons/ui/zoom-in.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24px" height="24px" viewBox="0 0 24 24" stroke-width="1.5" fill="none" xmlns="http://www.w3.org/2000/svg" color="#000000"><path d="M8 11h3m3 0h-3m0 0V8m0 3v3M17 17l4 4M3 11a8 8 0 1016 0 8 8 0 00-16 0z" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg>

tools/assets/icons/ui/zoom-out.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24px" height="24px" viewBox="0 0 24 24" stroke-width="1.5" fill="none" xmlns="http://www.w3.org/2000/svg" color="#000000"><path d="M17 17l4 4M3 11a8 8 0 1016 0 8 8 0 00-16 0zM8 11h6" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"></path></svg>

tools/embedded.sh

@@ -5,12 +5,6 @@
 ressources=$(cat <<-EndOfResources
 assets/boards/chesscom_8bits.png
 assets/pieces/cburnett.png
-assets/icons/hide.png
-assets/icons/mat.png
-assets/icons/ochess.png
-assets/icons/swap.png
-assets/icons/zoomin.png
-assets/icons/zoomout.png
 EndOfResources
 )
 ###############################
@@ -18,6 +12,7 @@ EndOfResources
 set -e
 wai=$(dirname $(readlink -f "$0")) # Current script directory
 dst="${wai}/../src/binres/binary_data.hpp"
+ui_icons_width=24
 
 # Binary to C headers
 # $1 is the resource file and $2 the variable name to use in the C code
@@ -25,9 +20,19 @@ bin2c () {
     xxd -n "$2" -i "$1"
 }
 
+# Generate ui icons png from svg
+rm -f "${wai}"/assets/icons/ui/*.png # Clear previous data
+for svg in $(find ${wai}/assets/icons/ui -name "*.svg")
+do
+    ext="${svg##*.}"
+    name="$(basename $svg .${ext})"
+    echo "Generating png for ${name}.${ext}..."
+    inkscape --export-type png --export-filename "${wai}/assets/icons/ui/ui-${name}.png" -w "${ui_icons_width}" "${svg}" 
+done
+
 # Generate headers
 echo -n > "$dst"
-for res in $ressources
+for res in $ressources $(find ${wai}/assets/icons/ -name "*.png")
 do
     ext="${res##*.}"
     name="$(basename $res .${ext})"