Bugfixes and improvements

- Updated localization system from another project
- Updated original records data

Author: Andrej Redeky

.gitignore

@@ -2,6 +2,7 @@
 .xmake/
 build/
 package/
+install/
 vsxmake2015/
 vsxmake2017/
 vsxmake2019/

data/records/h2

@@ -166,7 +166,7 @@ bool ArchiveDialog::Load(const std::filesystem::path &loadPath)
   if (loadPath.empty())
     return false;
 
-  UTFGlyphRangesBuilder::Get().AddText(loadPath.native());
+  GlyphRangesBuilder::Get().AddText(loadPath.native());
 
   progressMessage = LocalizationManager::Get().Localize("ARCHIVE_DIALOG_LOAD_PROGRESS_READING_ARCHIVE");
   progressNext = 0;
@@ -197,7 +197,7 @@ bool ArchiveDialog::Load(const std::filesystem::path &loadPath)
       // TODO - this is causing a lot of synchronizations at the end of loading
       //        best would be to do this on the main thread
       for (const auto& archivePath : archivePaths)
-        UTFGlyphRangesBuilder::Get().AddText(archivePath.native());
+        GlyphRangesBuilder::Get().AddText(archivePath.native());
 
       path = loadPath;
     }
@@ -316,7 +316,7 @@ bool ArchiveDialog::Save(const std::filesystem::path &savePath, bool async)
   if (savePath.empty())
     return false;
 
-  UTFGlyphRangesBuilder::Get().AddText(savePath.native());
+  GlyphRangesBuilder::Get().AddText(savePath.native());
 
   progressMessage = LocalizationManager::Get().Localize("ARCHIVE_DIALOG_SAVE_PROGRESS_SAVING_ARCHIVE");
   progressNext = 0;
@@ -437,11 +437,11 @@ void ArchiveDialog::DrawBaseDialog(std::wstring_view dialogName, std::wstring_vi
     {
       auto progressCurrent = progressNext.load();
 
-      const auto progressSummary = LocalizationManager::Get().LocalizeFormat("ARCHIVE_DIALOG_PROGRESS_SUMMARY", progressCurrent, progressTotal);
+      const auto& progressSummary = LocalizationManager::Get().LocalizeFormat("ARCHIVE_DIALOG_PROGRESS_SUMMARY", progressCurrent, progressTotal);
       if (progressMessage.empty())
         ImGui::TextUnformatted(progressSummary.c_str());
       else
-        ImGui::TextUnformatted(std::format("{}\n{}", progressSummary, progressMessage).c_str());
+        ImGui::TextUnformatted(std::format("{}\n{}", progressSummary.native(), progressMessage.native()).c_str());
     }
     else if (!progressMessage.empty())
       ImGui::TextUnformatted(progressMessage.c_str());

data/records/h3

@@ -73,7 +73,7 @@ class ArchiveDialog
   ArchiveDirectory archiveRoot;
 
   std::recursive_mutex progressMessageMutex;
-  std::string progressMessage;
+  String8 progressMessage;
   std::atomic_uint64_t progressNext = 0;
   std::atomic_uint64_t progressNextTotal = 0;
   std::atomic_bool progressNextActive = false;

src/ArchiveDialog.cpp

@@ -15,7 +15,7 @@
 
 bool BuildFontAtlas()
 {
-  if (!UTFGlyphRangesBuilder::Get().NeedsBuild())
+  if (!GlyphRangesBuilder::Get().NeedsBuild())
     return true;
 
   std::vector<std::filesystem::path> searchPaths;
@@ -28,7 +28,7 @@ bool BuildFontAtlas()
 
   ImFontGlyphRangesBuilder builder;
 
-  const auto glyphRanges = UTFGlyphRangesBuilder::Get().Build();
+  const auto glyphRanges = GlyphRangesBuilder::Get().Build();
   for (const auto& glyphRange : glyphRanges)
   {
     uint32_t translatedGlyphRange[3]{glyphRange.first, glyphRange.second, 0};

src/ArchiveDialog.hpp

@@ -26,7 +26,7 @@ void CommonSettings::Load(const toml::table &aInputRoot)
   transcodeToOriginalFormat = commonTable["transcode_to_original_format"].value_or(transcodeToOriginalFormat);
   directImport = commonTable["direct_import"].value_or(directImport);
 
-  LocalizationManager::Get().SetLanguage(commonTable["language"].value_or(LocalizationManager::Get().GetLanguage()));
+  LocalizationManager::Get().SetLanguage(commonTable["language"].value_or(LocalizationManager::Get().GetLanguage().native()));
 }
 
 void CommonSettings::Save(toml::table &aOutputRoot) const
@@ -42,7 +42,7 @@ void CommonSettings::Save(toml::table &aOutputRoot) const
   commonTable.emplace("transcode_to_original_format", transcodeToOriginalFormat);
   commonTable.emplace("direct_import", directImport);
 
-  commonTable.emplace("language", LocalizationManager::Get().GetLanguage());
+  commonTable.emplace("language", LocalizationManager::Get().GetLanguage().native());
 
   aOutputRoot.emplace("common", std::move(commonTable));
 }
@@ -62,7 +62,7 @@ void CommonSettings::DrawDialog()
     const auto availableLanguages = LocalizationManager::Get().GetAvailableLanguages();
     for (const auto& language : availableLanguages)
     {
-      bool selected = UTFCaseInsensitiveCompare(LocalizationManager::Get().GetLanguage(), language) == 0;
+      bool selected = (LocalizationManager::Get().GetLanguage() <=> language) == std::strong_ordering::equivalent;
       if (ImGui::Selectable(language.c_str(), &selected))
         LocalizationManager::Get().SetLanguage(language);
     }

src/Localization.hpp

@@ -5,8 +5,9 @@
 
 #pragma once
 
-struct CommonSettings
+class CommonSettings
 {
+public:
   void Load(const toml::table &aInputRoot);
   void Save(toml::table &aOutputRoot) const;
   void ResetToDefaults();
@@ -25,19 +26,14 @@ struct CommonSettings
   bool directImport{false};
 };
 
-struct Options
+class Options : public Singleton<Options>
 {
+public:
   void Load();
   void Save() const;
   void ResetToDefaults();
 
   void DrawDialog();
 
-  static Options &Get()
-  {
-    static Options options;
-    return options;
-  }
-
   CommonSettings common{};
 };

src/Main.cpp

@@ -14,8 +14,6 @@ extern "C"
 #include <imgui.h>
 #include <scn/scn.h>
 #include <sndfile.hh>
-
-#define TOML_EXCEPTIONS 0
 #include <toml++/toml.h>
 
 #include <array>
@@ -31,9 +29,10 @@ extern "C"
 #include <variant>
 #include <vector>
 
-#include "Options.hpp"
-#include "Utils.hpp"
+#include "Singleton.hpp"
+#include "UTF/UTF.hpp"
 
-#include "Localization.hpp"
+using namespace UTF;
 
-using LocalizationManager = UTFLocalizationManager<char>;
+#include "Options.hpp"
+#include "Utils.hpp"