From 73158b3c5536a0a5d43f32a1b0a3423ebe8118d7 Mon Sep 17 00:00:00 2001
From: Yan Pujante <yan@pongasoft.com>
Date: Wed, 19 Jun 2024 08:39:05 -0700
Subject: [PATCH] Updated release notes

---
 CMakeLists.txt                  | 2 +-
 README.md                       | 4 ++++
 cmake/fetch_re-mock.cmake       | 4 ++--
 src/cpp/re/edit/AppContext.cpp  | 2 +-
 src/cpp/re/edit/Application.cpp | 7 ++++---
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b48d47..7f72f2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.24)
 
 set(re-edit_VERSION_MAJOR 1)
 set(re-edit_VERSION_MINOR 6)
-set(re-edit_VERSION_PATCH 3)
+set(re-edit_VERSION_PATCH 4)
 set(re-edit_VERSION "${re-edit_VERSION_MAJOR}.${re-edit_VERSION_MINOR}.${re-edit_VERSION_PATCH}")
 
 execute_process(COMMAND git describe --long --dirty --abbrev=10 --tags
diff --git a/README.md b/README.md
index d54b04f..c3016a8 100644
--- a/README.md
+++ b/README.md
@@ -93,6 +93,10 @@ pongasoft produces a variety of high quality and free/open source software. If y
 
 Release Notes
 -------------
+* #### 1.6.4 - 2024/06/20
+
+- Added support for `device_categories` which was added as a new requirement to Reason 13
+
 * #### 1.6.3 - 2024/02/12
 
 - Fixed issue with contrast not being saved
diff --git a/cmake/fetch_re-mock.cmake b/cmake/fetch_re-mock.cmake
index 5d12ea8..839f053 100644
--- a/cmake/fetch_re-mock.cmake
+++ b/cmake/fetch_re-mock.cmake
@@ -6,9 +6,9 @@ include(cmake/REEditFetchContent.cmake)
 # Git repo/tag for re-mock
 #------------------------------------------------------------------------
 set(re-mock_GIT_REPO "https://github.com/pongasoft/re-mock" CACHE STRING "re-mock git repository url")
-set(re-mock_GIT_TAG "v1.4.3" CACHE STRING "re-mock git tag")
+set(re-mock_GIT_TAG "v1.6.0" CACHE STRING "re-mock git tag")
 set(re-mock_DOWNLOAD_URL "${re-mock_GIT_REPO}/archive/refs/tags/${re-mock_GIT_TAG}.zip" CACHE STRING "re-mock download url" FORCE)
-set(re-mock_DOWNLOAD_URL_HASH "SHA256=251340fdc1ddb4a44b55ab4b55e9dad3f3b1d4de70a46af183577523ca87e27a" CACHE STRING "re-mock download url hash" FORCE)
+set(re-mock_DOWNLOAD_URL_HASH "SHA256=6879590c88ae318c57ff01e57c322e85ec7f598543cfe4eca99b728600b4b89e" CACHE STRING "re-mock download url hash" FORCE)
 
 re_edit_fetch_content(NAME re-mock)
 
diff --git a/src/cpp/re/edit/AppContext.cpp b/src/cpp/re/edit/AppContext.cpp
index df4ea5f..bee57ed 100644
--- a/src/cpp/re/edit/AppContext.cpp
+++ b/src/cpp/re/edit/AppContext.cpp
@@ -68,7 +68,7 @@ class UpdateListener : public efsw::FileWatchListener
     auto file = fs::weakly_canonical(iFile, errorCode);
     if(errorCode)
     {
-      RE_EDIT_LOG_WARNING("Cannot convert %s to canonical form", iFile);
+      RE_EDIT_LOG_WARNING("Cannot convert %s to canonical form", iFile.u8string());
       return;
     }
 
diff --git a/src/cpp/re/edit/Application.cpp b/src/cpp/re/edit/Application.cpp
index ac1136d..0cec3cb 100644
--- a/src/cpp/re/edit/Application.cpp
+++ b/src/cpp/re/edit/Application.cpp
@@ -968,7 +968,7 @@ void Application::renderWelcome()
     {
       renderLogoBox();
 
-      ImGui::TextUnformatted("© 2023 pongasoft");
+      ImGui::TextUnformatted("© 2024 pongasoft");
 
       auto textSizeHeight = ImGui::CalcTextSize("R").y;
       auto remainingSizeY = viewport->Size.y - ImGui::GetCursorPosY();
@@ -1567,7 +1567,7 @@ std::optional<std::string> Application::readFile(fs::path const &iFile, UserErro
   catch(...)
   {
     if(oErrors)
-      oErrors->add("Error while reading file %s: %s", iFile, what(std::current_exception()));
+      oErrors->add("Error while reading file %s: %s", iFile.u8string(), what(std::current_exception()));
   }
 
   return std::nullopt;
@@ -1605,7 +1605,7 @@ void Application::saveFile(fs::path const &iFile, std::string const &iContent, U
   catch(...)
   {
     if(oErrors)
-      oErrors->add("Error while saving file %s: %s", iFile, what(std::current_exception()));
+      oErrors->add("Error while saving file %s: %s", iFile.u8string(), what(std::current_exception()));
   }
 }
 
@@ -1650,6 +1650,7 @@ void Application::about() const
     ImGui::Text("manufacturer:                    %s", info.fManufacturer.c_str());
     ImGui::Text("version_number:                  %s", info.fVersionNumber.c_str());
     ImGui::Text("device_type:                     %s", deviceTypeToString(info.fDeviceType));
+    ImGui::Text("device_categories:               %s", re::mock::stl::join_to_string(info.fDeviceCategories).c_str());
     ImGui::Text("supports_patches:                %s", boolToString(info.fSupportPatches));
     ImGui::Text("default_patch:                   %s", info.fDefaultPatch.c_str());
     ImGui::Text("accepts_notes:                   %s", boolToString(info.fAcceptNotes));