[IMP] Add wxMaterialDesign library

Author: rousseldenis

.gitmodules

@@ -15,3 +15,6 @@
 [submodule "wxMaterialDesignArtProvider"]
 	path = wxMaterialDesignArtProvider
 	url = https://github.com/perazz/wxMaterialDesignArtProvider
+[submodule "submodules/wxMaterialDesignArtProvider"]
+	path = submodules/wxMaterialDesignArtProvider
+	url = https://github.com/perazz/wxMaterialDesignArtProvider

CMakeLists.txt

@@ -224,6 +224,25 @@ if (GO_BUILD_TESTING)
     message(STATUS " Coverage enabled")
     message(STATUS "============================================================================")
 endif()
+# include wxMaterialWidgets
+if(NOT WX_MATERIAL_PROVIDER_SRC_DIR)
+    set(WX_MATERIAL_PROVIDER_SRC_DIR "${CMAKE_SOURCE_DIR}/submodules/wxMaterialDesignArtProvider")
+    if(NOT EXISTS "${WX_MATERIAL_PROVIDER_SRC_DIR}/wxMaterialDesignIconsMain.h")
+      message(
+        FATAL_ERROR 
+        "${WX_MATERIAL_PROVIDER_SRC_DIR}/wxMaterialDesignIconsMain.h file does not exist."
+        "Possible the wxMaterialDesign submodule has not been updated."
+        "Try to execute 'git submodule update --init --recursive' in the source directory"
+      )
+    endif()
+  endif()
+
+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)
 add_subdirectory(src/images)

src/grandorgue/CMakeLists.txt

@@ -136,6 +136,7 @@ gui/wxcontrols/GORightVisiblePicker.cpp
 gui/wxcontrols/go_gui_utils.cpp
 help/GOHelpController.cpp
 help/GOHelpRequestor.cpp
+icons/GOIconManager.cpp
 loader/GOFileStore.cpp
 loader/GOLoaderFilename.cpp
 loader/GOLoadThread.cpp
@@ -252,10 +253,10 @@ if (USE_INTERNAL_ZITACONVOLVER)
 endif()
 
 add_library(golib STATIC ${grandorgue_src})
-set(go_libs ${wxWidgets_LIBRARIES} ${YAML_CPP_LIBRARIES} ${RT_LIBRARIES} ${PORTAUDIO_LIBRARIES} ${FFTW_LIBRARIES} ${ZITACONVOLVER_LIBRARIES} CURL::libcurl)
+set(go_libs ${wxWidgets_LIBRARIES} ${WX_MATERIAL_DESIGN_SRC_DIR} ${YAML_CPP_LIBRARIES} ${RT_LIBRARIES} ${PORTAUDIO_LIBRARIES} ${FFTW_LIBRARIES} ${ZITACONVOLVER_LIBRARIES} CURL::libcurl)
 set(go_libdir ${wxWidgets_LIBRARY_DIRS} ${RT_LIBDIR} ${PORTAUDIO_LIBDIR} ${FFTW_LIBDIR})
 target_include_directories(golib PUBLIC ${YAML_CPP_INCLUDE_DIRS})
-target_link_libraries(golib GrandOrgueImages GrandOrgueCore ${go_libs})
+target_link_libraries(golib wxMaterial GrandOrgueImages GrandOrgueCore ${go_libs})
 link_directories(${go_libdir})
 
 if (WIN32)

src/grandorgue/gui/frames/GOFrame.cpp

@@ -47,6 +47,8 @@
 #include "temperaments/GOTemperament.h"
 #include "threading/GOMutexLocker.h"
 
+#include "icons/GOIconManager.h"
+
 #include "GOApp.h"
 #include "GODocument.h"
 #include "GOEvent.h"
@@ -297,9 +299,16 @@ 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");
   m_ToolBar->AddTool(
-    ID_VOLUME, _("&Volume"), GetImage_volume(), _("Volume"), wxITEM_NORMAL);
+    ID_VOLUME,
+    _("&Volume"),
+    m_icon->GetIcon(volume),
+    _("Volume"),
+    wxITEM_NORMAL);
   m_Volume = new wxSpinCtrl(
     m_ToolBar,
     ID_METER_AUDIO_SPIN,

src/grandorgue/icons/GOIconManager.cpp

@@ -0,0 +1,11 @@
+/*
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * License GPL-2.0 or later
+ * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
+ */
+
+#include "GOIconManager.h"
+
+GOIconManager::GOIconManager(){};
+
+GOIconManager::~GOIconManager(){};

src/grandorgue/icons/GOIconManager.h

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+ * License GPL-2.0 or later
+ * (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
+ */
+
+#ifndef GOICONMANAGER_H
+#define GOICONMANAGER_H
+
+#include "wx/artprov.h"
+#include <string>
+#include <wx/bitmap.h>
+#include <wxMaterialFilledArt.hpp>
+/*
+ * This is a class to manage icons through the application
+ * It is agnostic from any particular library
+ */
+class GOIconManager {
+
+public:
+  GOIconManager();
+  ~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));
+    return image;
+  };
+};
+
+#endif /* GOMIDI_H */

src/wxMaterial/CMakeLists.txt

@@ -0,0 +1,20 @@
+# Copyright 2009-2024 GrandOrgue contributors (see AUTHORS)
+# License GPL-2.0 or later (https://www.gnu.org/licenses/old-licenses/gpl-2.0.html).
+
+message(STATUS "wxMaterialDesign Art Provider configuration")
+
+include(UsewxWidgets)
+INCLUDE (CheckIncludeFileCXX)
+
+
+set(wxMaterial_Source "${WX_MATERIAL_DESIGN_SRC_DIR}/wxMaterialDesignArtProvider.cpp")
+
+include_directories(WX_MATERIAL_DESIGN_SRC_DIR)
+
+add_library(wxMaterial STATIC ${wxMaterial_Source})
+target_link_libraries(wxMaterial ${wxWidgets_LIBRARIES})
+
+
+# find_package(wxWidgets REQUIRED wxMaterial)
+
+message(STATUS "============================================================================")