From d8a9d534a5a39fd3d51a6ffaf92fde39a4b4077c Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Sat, 13 Sep 2025 12:40:22 +0200 Subject: save file import: contact, project, tax brackets, cost centers, administration info --- src/ui/ui_contacts.cpp | 2 +- src/ui/ui_log.cpp | 2 +- src/ui/ui_main.cpp | 2 +- src/ui/ui_start.cpp | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/ui') diff --git a/src/ui/ui_contacts.cpp b/src/ui/ui_contacts.cpp index ed770d9..e7afd7a 100644 --- a/src/ui/ui_contacts.cpp +++ b/src/ui/ui_contacts.cpp @@ -28,7 +28,7 @@ void ui_draw_address_form(address* buffer) ImGui::SetNextItemWidth(widthAvailable*0.5f); snprintf(id, sizeof(id), "%s##%p", localize("contact.form.address2"), buffer); ImGui::InputTextWithHint(id, localize("contact.form.address2"), buffer->address2, IM_ARRAYSIZE(buffer->address2)); - ImGui::SameLine();ui_helper_draw_required_tag(); + //ImGui::SameLine();ui_helper_draw_required_tag(); ImGui::SetNextItemWidth(widthAvailable*0.5f); snprintf(id, sizeof(id), "%s##%p", localize("contact.form.city"), buffer); diff --git a/src/ui/ui_log.cpp b/src/ui/ui_log.cpp index 08a0a72..4943548 100644 --- a/src/ui/ui_log.cpp +++ b/src/ui/ui_log.cpp @@ -11,7 +11,7 @@ void ui_draw_log() for (int i = (int)l->history_length-1; i >= 0; i--) { - u32 cursor = l->write_cursor - l->history_length + i; + s32 cursor = l->write_cursor - l->history_length + i; if (cursor < 0) { cursor = (l->write_cursor + i) % MAX_LEN_LOG_HISTORY; } diff --git a/src/ui/ui_main.cpp b/src/ui/ui_main.cpp index b245d88..59c4156 100644 --- a/src/ui/ui_main.cpp +++ b/src/ui/ui_main.cpp @@ -60,7 +60,7 @@ void ui_draw_main() if (ImGui::BeginMenu("File")) { if (ImGui::MenuItem("New")) { administration_reader_open_new(); } - if (ImGui::MenuItem("Open")) { /* Handle Save */ } + if (ImGui::MenuItem("Open")) { administration_reader_open_existing(NULL); } ImGui::EndMenu(); } diff --git a/src/ui/ui_start.cpp b/src/ui/ui_start.cpp index dd7b54d..90326f5 100644 --- a/src/ui/ui_start.cpp +++ b/src/ui/ui_start.cpp @@ -22,7 +22,9 @@ void ui_draw_start() ImGui::NextColumn(); if (ImGui::Button("Load", buttonSize)) { - + if (administration_reader_open_existing(NULL)) { + ui_set_state(main_state::UI_INVOICES); + } } ImGui::Columns(1); -- cgit v1.2.3-70-g09d2