Replace dv_gui_opengl with libgui

dvsku · Jun 4, 2024 · 6bd13d7 · 6bd13d7
1 parent 7c46fcd
commit 6bd13d7
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 40 deletions.
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -4,16 +4,14 @@ SET(FETCHCONTENT_QUIET OFF)
 SET(FETCHCONTENT_UPDATES_DISCONNECTED ON)
 
 ###############################################################################
-## dv_gui_opengl
+## libgui
 
 FetchContent_Declare(
-    dv_gui_opengl
-    URL https://github.com/dvsku/dv_gui_opengl/archive/3d706e2009e308508ce5a04d72805464a48af518.zip
+    libgui
+    URL https://github.com/dvsku/libgui/archive/refs/heads/master.zip
 )
 
-FetchContent_MakeAvailable(dv_gui_opengl)
-
-SET(DV_GUI_INCLUDES "${dv_gui_opengl_SOURCE_DIR}/include" PARENT_SCOPE)
+FetchContent_MakeAvailable(libgui)
 
 ###############################################################################
 ## libevp

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -21,8 +21,7 @@ TARGET_LINK_OPTIONS(dvsku_toolkit PRIVATE "/SUBSYSTEM:WINDOWS")
 
 TARGET_INCLUDE_DIRECTORIES(dvsku_toolkit PRIVATE "${TOOLKIT_LIBRARIES_DIR}")
 TARGET_INCLUDE_DIRECTORIES(dvsku_toolkit PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src")
-TARGET_INCLUDE_DIRECTORIES(dvsku_toolkit PRIVATE "${DV_GUI_INCLUDES}")
 TARGET_INCLUDE_DIRECTORIES(dvsku_toolkit PRIVATE "${LIBEVP_INCLUDES}")
 
-TARGET_LINK_LIBRARIES(dvsku_toolkit PRIVATE dv_gui_opengl2)
+TARGET_LINK_LIBRARIES(dvsku_toolkit PRIVATE libgui_opengl2)
 TARGET_LINK_LIBRARIES(dvsku_toolkit PRIVATE libevp)
diff --git a/source/src/dt_app.cpp b/source/src/dt_app.cpp
@@ -9,8 +9,8 @@ using namespace dvsku;
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC
 
-dt_app::dt_app(const dvsku::dv_window_settings& settings)
-    : dv_window(settings), m_systems(*this), m_gui(*this)
+dt_app::dt_app(const dvsku::gui_window_settings& settings)
+    : gui_window(settings), m_systems(*this), m_gui(*this)
 {
     set_resizable(false);
 }

diff --git a/source/src/dt_app.hpp b/source/src/dt_app.hpp
@@ -3,16 +3,16 @@
 #include "systems/dt_system_mngr.hpp"
 #include "gui/dt_gui_mngr.hpp"
 
-#include <dv_gui_opengl/dv_gui_opengl.hpp>
+#include <libgui.hpp>
 
 namespace dvsku_toolkit {
-    class dt_app : public dvsku::dv_window {
+    class dt_app : public dvsku::gui_window {
     public:
         dt_app()              = delete;
         dt_app(const dt_app&) = delete;
         dt_app(dt_app&&)      = delete;
 
-        dt_app(const dvsku::dv_window_settings& settings);
+        dt_app(const dvsku::gui_window_settings& settings);
 
         dt_app& operator=(const dt_app&) = delete;
         dt_app& operator=(dt_app&&)      = delete;

diff --git a/source/src/dvsku_toolkit.cpp b/source/src/dvsku_toolkit.cpp
@@ -7,7 +7,7 @@ using namespace dvsku_toolkit;
 
 INT WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PSTR lpCmdLine, INT nCmdShow) {
     try {
-        dvsku::dv_window_settings settings;
+        dvsku::gui_window_settings settings;
         settings.width                 = 600U;
         settings.height                = 275U;
         settings.title                 = DT_APP_NAME;

diff --git a/source/src/gui/dt_comp_pack.cpp b/source/src/gui/dt_comp_pack.cpp
@@ -15,7 +15,7 @@ dt_comp_pack::dt_comp_pack(dt_app& app)
         m_progress                          = 0.0f;
         m_app.get_systems().core.is_working = true;
 
-        m_app.set_taskbar_status(dvsku::dv_taskbar_status::normal);
+        m_app.set_taskbar_status(dvsku::gui_taskbar_status::normal);
         m_app.set_taskbar_progress(0U);
     };
     m_context.finish_callback = [this](libevp::evp_result result) {
@@ -26,14 +26,14 @@ dt_comp_pack::dt_comp_pack(dt_app& app)
         m_app.get_systems().core.has_errors = false;
         m_app.get_systems().core.errors     = "";
 
-        m_app.set_taskbar_status(dvsku::dv_taskbar_status::no_progress);
+        m_app.set_taskbar_status(dvsku::gui_taskbar_status::no_progress);
         m_app.set_taskbar_progress(0U);
 
         if (result.status == libevp::evp_result_status::ok) {
-            dvsku::dv_util_sound::success();
+            dvsku::util_sound::success();
         }
         else if (result.status == libevp::evp_result_status::error) {
-            dvsku::dv_util_sound::warning();
+            dvsku::util_sound::warning();
 
             if (!result.message.empty()) {
                 m_app.get_systems().core.has_errors = true;
@@ -65,7 +65,7 @@ void dt_comp_pack::render() {
 
     ImGui::SameLine(0.0f, 5.0f);
     if (ImGui::Button("Select##Input", { 125.0f, 21.0f })) {
-        m_input = dvsku::dv_util_dialog::select_dir("Input dir", m_input);
+        m_input = dvsku::util_dialog::select_dir("Input dir", m_input);
     }
 
     ImGui::Indent(3.0f);
@@ -77,7 +77,7 @@ void dt_comp_pack::render() {
 
     ImGui::SameLine(0.0f, 5.0f);
     if (ImGui::Button("Select##Output", { 125.0f, 21.0f })) {
-        m_output = dvsku::dv_util_dialog::save_file("Output evp", m_output, true, { "EVP (*.evp)", "*.evp" });
+        m_output = dvsku::util_dialog::save_file("Output evp", m_output, true, { "EVP (*.evp)", "*.evp" });
     }
 
     ImGui::Dummy({ 0.0f, 3.0f });

diff --git a/source/src/gui/dt_comp_unpack.cpp b/source/src/gui/dt_comp_unpack.cpp
@@ -15,7 +15,7 @@ dt_comp_unpack::dt_comp_unpack(dt_app& app)
         m_progress                          = 0.0f;
         m_app.get_systems().core.is_working = true;
 
-        m_app.set_taskbar_status(dvsku::dv_taskbar_status::normal);
+        m_app.set_taskbar_status(dvsku::gui_taskbar_status::normal);
         m_app.set_taskbar_progress(0U);
     };
     m_context.finish_callback = [this](libevp::evp_result result) {
@@ -26,14 +26,14 @@ dt_comp_unpack::dt_comp_unpack(dt_app& app)
         m_app.get_systems().core.has_errors = false;
         m_app.get_systems().core.errors     = "";
 
-        m_app.set_taskbar_status(dvsku::dv_taskbar_status::no_progress);
+        m_app.set_taskbar_status(dvsku::gui_taskbar_status::no_progress);
         m_app.set_taskbar_progress(0U);
 
         if (result.status == libevp::evp_result_status::ok) {
-            dvsku::dv_util_sound::success();
+            dvsku::util_sound::success();
         }
         else if (result.status == libevp::evp_result_status::error) {
-            dvsku::dv_util_sound::warning();
+            dvsku::util_sound::warning();
 
             if (!result.message.empty()) {
                 m_app.get_systems().core.has_errors = true;
@@ -65,7 +65,7 @@ void dt_comp_unpack::render() {
 
     ImGui::SameLine(0.0f, 5.0f);
     if (ImGui::Button("Select##Input", { 125.0f, 21.0f })) {
-        m_input = dvsku::dv_util_dialog::open_file("Input evp", m_input, { "EVP (*.evp)", "*.evp" });
+        m_input = dvsku::util_dialog::open_file("Input evp", m_input, { "EVP (*.evp)", "*.evp" });
     }
 
     ImGui::Indent(3.0f);
@@ -77,7 +77,7 @@ void dt_comp_unpack::render() {
 
     ImGui::SameLine(0.0f, 5.0f);
     if (ImGui::Button("Select##Output", { 125.0f, 21.0f })) {
-        m_output = dvsku::dv_util_dialog::select_dir("Output dir", m_output);
+        m_output = dvsku::util_dialog::select_dir("Output dir", m_output);
     }
 
     ImGui::Dummy({ 0.0f, 10.0f });

diff --git a/source/src/gui/dt_modal_errors.cpp b/source/src/gui/dt_modal_errors.cpp
@@ -10,8 +10,8 @@ using namespace dvsku;
 dt_modal_errors::dt_modal_errors(dt_app& app)
     : dt_gui_base(app) {}
 
-dv_command_state dt_modal_errors::render() {
-    dv_command_state state = dv_command_state::repeat;
+gui_command_state dt_modal_errors::render() {
+    gui_command_state state = gui_command_state::repeat;
 
     ImGui::OpenPopup("Errors##Modal");
 

diff --git a/source/src/gui/dt_modal_errors.hpp b/source/src/gui/dt_modal_errors.hpp
@@ -2,7 +2,7 @@
 
 #include "gui/dt_gui_base.hpp"
 
-#include <dv_gui_opengl/dv_gui_opengl.hpp>
+#include <libgui.hpp>
 
 namespace dvsku_toolkit {
     class dt_modal_errors : public dt_gui_base {
@@ -17,6 +17,6 @@ namespace dvsku_toolkit {
         dt_modal_errors& operator=(dt_modal_errors&&)      = delete;
 
     public:
-        dvsku::dv_command_state render();
+        dvsku::gui_command_state render();
     };
 }
diff --git a/source/src/systems/dt_sys_command.cpp b/source/src/systems/dt_sys_command.cpp
@@ -8,7 +8,7 @@ using namespace dvsku;
 // PUBLIC
 
 void dt_sys_command::prepare() {
-    set_command(dt_commands::flag_show_error_window, dv_command([this]() {
+    set_command(dt_commands::flag_show_error_window, gui_command([this]() {
         return m_app.get_gui().modal_errors.render();
     }));
 }

diff --git a/source/src/systems/dt_sys_command.hpp b/source/src/systems/dt_sys_command.hpp
@@ -2,7 +2,7 @@
 
 #include "systems/dt_system_base.hpp"
 
-#include <dv_gui_opengl/dv_gui_opengl.hpp>
+#include <libgui/systems/gui_sys_command.hpp>
 
 namespace dvsku_toolkit {
     class dt_app;
@@ -11,7 +11,7 @@ namespace dvsku_toolkit {
         flag_show_error_window
     };
 
-    class dt_sys_command : public dt_system_base, public dvsku::dv_sys_command<dt_commands> {
+    class dt_sys_command : public dt_system_base, public dvsku::gui_sys_command<dt_commands> {
     public:
         dt_sys_command()                      = delete;
         dt_sys_command(const dt_sys_command&) = delete;
@@ -21,7 +21,7 @@ namespace dvsku_toolkit {
         dt_sys_command& operator=(dt_sys_command&&)      = delete;
 
         dt_sys_command(dt_app& app)
-            : dt_system_base(app), dv_sys_command<dt_commands>() {};
+            : dt_system_base(app), gui_sys_command<dt_commands>() {};
 
     public:
         void prepare();

diff --git a/source/src/systems/dt_sys_core.cpp b/source/src/systems/dt_sys_core.cpp
@@ -9,5 +9,5 @@ using namespace dvsku_toolkit;
 dt_sys_core::dt_sys_core(dt_app& app)
     : dt_system_base(app)
 {
-    app_version = dvsku::dv_version(DT_VERSION_MAJOR, DT_VERSION_MINOR, DT_VERSION_REV);
+    app_version = dvsku::version(DT_VERSION_MAJOR, DT_VERSION_MINOR, DT_VERSION_REV);
 };
diff --git a/source/src/systems/dt_sys_core.hpp b/source/src/systems/dt_sys_core.hpp
@@ -2,18 +2,18 @@
 
 #include "systems/dt_system_base.hpp"
 
-#include <dv_gui_opengl/dv_gui_opengl.hpp>
+#include <libgui.hpp>
 #include <mutex>
 
 namespace dvsku_toolkit {
     class dt_app;
 
     class dt_sys_core : public dt_system_base {
     public:
-        dvsku::dv_version app_version;
-        bool              is_working = false;
-        bool              has_errors = false;
-        std::string       errors     = "";
+        dvsku::version app_version;
+        bool           is_working = false;
+        bool           has_errors = false;
+        std::string    errors     = "";
 
         std::mutex mutex;