From 5531d83994b5d59f771cc37c60f60d9abd4311a8 Mon Sep 17 00:00:00 2001 From: chris bell Date: Fri, 7 Aug 2026 09:12:22 -0500 Subject: [PATCH] Added a confirmation dialog --- assets/local.db | Bin 40960 -> 40960 bytes assets/main.rml | 26 +++++++++++----------- assets/styles/main.rcss | 19 +++++++++++++++- src/ui.cpp | 48 ++++++++++++++++++++++++++++++++-------- src/ui.hpp | 3 +++ 5 files changed, 73 insertions(+), 23 deletions(-) diff --git a/assets/local.db b/assets/local.db index ec0156daef2e1f234faebdb98b1729571b86bca2..29da0b47c11a969170a551376f6adf6c76f9866e 100644 GIT binary patch delta 102 zcmZoTz|?SnX@WGP)I=F)MyZVn3;lWd-!d@q?`GiN&3}vk)@Htd8T=C`h)&)eZ=}e; qz#z{{error_message}}

- + - + - + - + - + - +
- +
-
+

Confirmation

-

{{confirmation_dialog_text}}

- - +

{{confirmation_dialog_text}}

- - + +
+ + \ No newline at end of file diff --git a/assets/styles/main.rcss b/assets/styles/main.rcss index 35087c1..b5412ed 100644 --- a/assets/styles/main.rcss +++ b/assets/styles/main.rcss @@ -443,9 +443,26 @@ progress-value { font-weight: bold; } +.dialog-text { + font-size: 25pt; + /* font-style: italic; */ +} + .modal-buttons { margin-top: 15px; display: flex; - justify-content: space-between; + flex-direction: row; + gap: 20px; + /* justify-content: space-between; */ + align-items: center; + justify-content: center; font-size: 18pt; + width: 100%; +} + +.modal-buttons button { + width: 50%; + height: 50px; + font-size: 20pt; + line-height: 50px; } \ No newline at end of file diff --git a/src/ui.cpp b/src/ui.cpp index 25747d2..a577282 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -53,9 +53,8 @@ bool setup_data_binding(Rml::Context *context, Rml::DataModelHandle &model_handl // Confirmation dialog dmc.Bind("is_confirmation_dialog_open", &app_data.is_confirmation_dialog_open); dmc.Bind("confirmation_dialog_text", &app_data.confirmation_dialog_text); - dmc.Bind("confirmation_dialog_result", &app_data.confimation_dialog_result); - + // Submit Add Critter dmc.BindEventCallback("submit_add_critter", [&app_data, &critters, &critter_list](Rml::DataModelHandle handle, Rml::Event &, const Rml::VariantList &) { Critter temp; temp.name = app_data.new_critter_form.name; @@ -91,18 +90,49 @@ bool setup_data_binding(Rml::Context *context, Rml::DataModelHandle &model_handl } }); - dmc.BindEventCallback("delete_critter", [&app_data, &critters, &critter_list](Rml::DataModelHandle handle, Rml::Event &, const Rml::VariantList &args) { + // Request Critter Deletion + dmc.BindEventCallback("delete_critter", [&app_data, &critters, &critter_list](Rml::DataModelHandle const_handle, Rml::Event &, const Rml::VariantList &args) { if (args.empty()) return; + Rml::DataModelHandle handle = const_handle; + int target_id = args[0].Get(); - if (db_delete_critter(target_id)) { - critters.erase(target_id); - sync_map_to_list(critters, critter_list); - handle.DirtyVariable("critters"); - std::cout << "[INFO] Deleted critter with ID #" << target_id << std::endl; + app_data.confirmation_dialog_text = "Are you sure you want to delete critter '" + critters[target_id].name + "'? This action cannot be undone."; + + app_data.on_confirm_action = [&critters, &critter_list, target_id, const_handle]() { + Rml::DataModelHandle handle = const_handle; + if (db_delete_critter(target_id)) { + critters.erase(target_id); + sync_map_to_list(critters, critter_list); + handle.DirtyVariable("critters"); + std::cout << "[INFO] Deleted critter with ID #" << target_id << std::endl; + } + }; + + app_data.is_confirmation_dialog_open = true; + handle.DirtyVariable("confirmation_dialog_text"); + handle.DirtyVariable("is_confirmation_dialog_open"); + }); + + dmc.BindEventCallback("confirm_dialog_yes", [&app_data](Rml::DataModelHandle const_handle, Rml::Event &, const Rml::VariantList &) { + Rml::DataModelHandle handle = const_handle; + + if (app_data.on_confirm_action) { + app_data.on_confirm_action(); + app_data.on_confirm_action = nullptr; } - }); + app_data.is_confirmation_dialog_open = false; + handle.DirtyVariable("is_confirmation_dialog_open"); + }); + + dmc.BindEventCallback("confirm_dialog_no", [&app_data](Rml::DataModelHandle const_handle, Rml::Event &, const Rml::VariantList &) { + Rml::DataModelHandle handle = const_handle; + + app_data.on_confirm_action = nullptr; + app_data.is_confirmation_dialog_open = false; + handle.DirtyVariable("is_confirmation_dialog_open"); + }); model_handle = dmc.GetModelHandle(); return true; diff --git a/src/ui.hpp b/src/ui.hpp index 7921d3d..a00b55c 100644 --- a/src/ui.hpp +++ b/src/ui.hpp @@ -4,6 +4,7 @@ #include #include #include +#include #include #include @@ -33,6 +34,8 @@ struct AppData { bool confimation_dialog_result = false; Rml::String error_message; NewCritterForm new_critter_form; + + std::function on_confirm_action = nullptr; }; void sync_map_to_list(const std::map &critters, std::vector &critter_list);