[IMP] Add IconManager to load icons from their GO name

Author: rousseldenis

CMakeLists.txt

@@ -239,9 +239,6 @@ if(NOT WX_MATERIAL_PROVIDER_SRC_DIR)
 
 set(WX_MATERIAL_DESIGN_SRC_DIR "${WX_MATERIAL_PROVIDER_SRC_DIR}/MaterialDesign")
 
-include_directories(WX_MATERIAL_PROVIDER_SRC_DIR)
-include_directories(WX_MATERIAL_DESIGN_SRC_DIR)
-
 add_subdirectory(src/wxMaterial)
 
 add_subdirectory(src/build)

src/grandorgue/CMakeLists.txt

@@ -37,6 +37,7 @@ include_directories(${wxWidgets_INCLUDE_DIRS})
 include_directories(${JACK_INCLUDE_DIRS})
 include_directories(${YAML_CPP_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${WX_MATERIAL_DESIGN_SRC_DIR})
 
 set(grandorgue_src
 combinations/control/GOCombinationButtonSet.cpp

src/grandorgue/gui/frames/GOFrame.cpp

@@ -276,16 +276,19 @@ GOFrame::GOFrame(
 
   m_ToolBar = CreateToolBar(wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT);
   m_ToolBar->SetToolBitmapSize(wxSize(16, 16));
+  GOIconManager *m_icon = new GOIconManager();
+  std::string set = "set";
   m_ToolBar->AddTool(
     ID_AUDIO_MEMSET,
     _("&Memory Set\tShift"),
-    GetImage_set(),
+    m_icon->GetIcon(set),
     _("Memory Set"),
     wxITEM_CHECK);
+  std::string level = "level";
   m_ToolBar->AddTool(
     ID_MEMORY,
     _("&Memory Level"),
-    GetImage_memory(),
+    m_icon->GetIcon(level),
     _("Memory Level"),
     wxITEM_NORMAL);
   m_SetterPosition = new wxSpinCtrl(
@@ -299,7 +302,6 @@ GOFrame::GOFrame(
     999);
   m_ToolBar->AddControl(m_SetterPosition);
   m_SetterPosition->SetValue(0);
-  GOIconManager *m_icon = new GOIconManager();
   std::string volume = "volume";
   //   wxBitmap volume;
   //   volume = m_icon->GetIcon("volume");
@@ -323,11 +325,11 @@ GOFrame::GOFrame(
   m_VolumeControlTool = m_ToolBar->AddControl(m_VolumeControl);
   AdjustVolumeControlWithSettings();
   m_Volume->SetValue(m_config.Volume());
-
+  std::string reverb = "reverb";
   m_ToolBar->AddTool(
     ID_RELEASELENGTH,
     _("&Release tail length"),
-    GetImage_reverb(),
+    m_icon->GetIcon(reverb),
     _("Release tail length"),
     wxITEM_NORMAL);
   choices.clear();
@@ -342,11 +344,11 @@ GOFrame::GOFrame(
     choices);
   m_ToolBar->AddControl(m_ReleaseLength);
   UpdateReleaseLength(0);
-
+  std::string transpose = "transpose";
   m_ToolBar->AddTool(
     ID_TRANSPOSE,
     _("&Transpose"),
-    GetImage_transpose(),
+    m_icon->GetIcon(transpose),
     _("Transpose"),
     wxITEM_NORMAL);
   m_Transpose = new wxSpinCtrl(
@@ -360,11 +362,11 @@ GOFrame::GOFrame(
     11);
   m_ToolBar->AddControl(m_Transpose);
   m_Transpose->SetValue(m_config.Transpose());
-
+  std::string polyphony = "polyphony";
   m_ToolBar->AddTool(
     ID_POLYPHONY,
     _("&Polyphony"),
-    GetImage_polyphony(),
+    m_icon->GetIcon(polyphony),
     _("Polyphony"),
     wxITEM_NORMAL);
   m_Polyphony = new wxSpinCtrl(
@@ -381,11 +383,11 @@ GOFrame::GOFrame(
   m_SamplerUsage = new GOAudioGauge(m_ToolBar, wxID_ANY, wxDefaultPosition);
   m_ToolBar->AddControl(m_SamplerUsage);
   m_Polyphony->SetValue(m_config.PolyphonyLimit());
-
+  std::string panic = "panic";
   m_ToolBar->AddTool(
     ID_AUDIO_PANIC,
     _("&Panic\tEscape"),
-    GetImage_panic(),
+    m_icon->GetIcon(panic),
     _("Panic"),
     wxITEM_NORMAL);
 

src/grandorgue/icons/GOIconManager.h

@@ -8,9 +8,12 @@
 #define GOICONMANAGER_H
 
 #include "wx/artprov.h"
+#include "wxMaterialDesignArtProvider.hpp"
+#include "wxMaterialTwoToneArt.hpp"
 #include <string>
 #include <wx/bitmap.h>
-#include <wxMaterialFilledArt.hpp>
+#include <wx/string.h>
+
 /*
  * This is a class to manage icons through the application
  * It is agnostic from any particular library
@@ -25,9 +28,32 @@ class GOIconManager {
    * This returns the icon in char
    */
   wxBitmap GetIcon(std::string icon_name) {
-    wxArtProvider::Push(new wxMaterialDesignArtProvider);
-    wxBitmap image = wxArtProvider::GetBitmap(
-      wxART_CLIENT_MATERIAL_TWOTONE, wxART_VOLUME_UP, wxSize(10, 10));
+    wxString icon_id;
+    if (icon_name == "set") {
+      icon_id = wxART_DATA_SAVER_ON;
+    }
+    if (icon_name == "level") {
+      icon_id = wxART_SETTINGS_ETHERNET;
+    }
+    if (icon_name == "volume") {
+      icon_id = wxART_VOLUME_UP;
+    }
+    if (icon_name == "transpose") {
+      icon_id = wxART_COMPARE_ARROWS;
+    }
+    if (icon_name == "reverb") {
+      icon_id = wxART_LEAK_ADD;
+    }
+    if (icon_name == "polyphony") {
+      icon_id = wxART_PIANO;
+    }
+    if (icon_name == "panic") {
+      icon_id = wxART_WARNING_AMBER;
+    }
+
+    // wxArtProvider::Push(new wxMaterialDesignArtProvider);
+    wxBitmap image = wxMaterialDesignArtProvider::GetBitmap(
+      icon_id, wxART_CLIENT_MATERIAL_SHARP, wxSize(24, 24));
     return image;
   };
 };

src/wxMaterial/CMakeLists.txt

@@ -6,12 +6,25 @@ message(STATUS "wxMaterialDesign Art Provider configuration")
 include(UsewxWidgets)
 INCLUDE (CheckIncludeFileCXX)
 
-
+set(wxMaterial_src 
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxAwesomeBrandsArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxAwesomeRegularArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxAwesomeSolidArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxFluentuiFilledArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxMaterialFilledArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxFluentuiRegularArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxMaterialDesignArtProvider.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxMaterialOutlinedArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxMaterialRoundArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxMaterialSharpArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxMaterialTwoToneArt.cpp
+${WX_MATERIAL_DESIGN_SRC_DIR}/wxSimpleIconsArt.cpp
+)
 set(wxMaterial_Source "${WX_MATERIAL_DESIGN_SRC_DIR}/wxMaterialDesignArtProvider.cpp")
 
 include_directories(WX_MATERIAL_DESIGN_SRC_DIR)
 
-add_library(wxMaterial STATIC ${wxMaterial_Source})
+add_library(wxMaterial STATIC ${wxMaterial_src})
 target_link_libraries(wxMaterial ${wxWidgets_LIBRARIES})