namespace importer

1 files changed, 38 insertions, 38 deletions

diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index acb53a8..a63cd50 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -29,9 +29,9 @@
 #include "locales.hpp"
 #include "importer.hpp"
 
-static import_invoice_request* active_import_request = 0;
+static importer::invoice_request* active_import_request = 0;
 
-static view_state current_view_state = view_state::LIST;
+static ui::view_state current_view_state = ui::view_state::LIST_ALL;
 static invoice active_invoice = {0};
 static invoice selected_for_removal = {0};
 
@@ -41,18 +41,18 @@ void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false);
 void draw_contact_form_ex(contact* buffer, bool viewing_only = false, bool with_autocomplete = false);
 void draw_invoice_items_form(invoice* invoice);
 
-void ui_destroy_expenses()
+void ui::destroy_expenses()
 {
     free(invoice_items_buffer);
 }
 
-void ui_setup_expenses()
+void ui::setup_expenses()
 {
     if (active_import_request != 0) {
-        current_view_state = view_state::VIEW_IMPORT_REQUEST;
+        current_view_state = ui::view_state::VIEW_IMPORT_REQUEST;
     }
     else {
-        current_view_state = view_state::LIST;
+        current_view_state = ui::view_state::LIST_ALL;
     }
 
     active_invoice = administration_invoice_create_empty();
@@ -142,7 +142,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
     if (viewing_only) ImGui::EndDisabled();
 }
 
-static void ui_draw_expenses_list()
+static void draw_expenses_list()
 {
     if (!administration_can_create_invoices()) {
         ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 102, 204, 255)); // blue
@@ -152,7 +152,7 @@ static void ui_draw_expenses_list()
         if (ImGui::IsItemHovered()) {
             ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
             if (ImGui::IsMouseClicked(ImGuiMouseButton_Left)) {
-                ui_set_state(main_state::UI_SETTINGS);
+                ui::set_state(ui::main_state::UI_SETTINGS);
             }
         }
 
@@ -174,7 +174,7 @@ static void ui_draw_expenses_list()
     // Table header controls: create, import, and pagination.
     if (ImGui::Button(locale::get("form.create")))
     {
-        current_view_state = view_state::CREATE;
+        current_view_state = ui::view_state::CREATE;
         active_invoice = administration_invoice_create_empty(); // @leak
         active_invoice.customer = administration_company_info_get();
         active_invoice.is_outgoing = 0;
@@ -184,13 +184,13 @@ static void ui_draw_expenses_list()
     char import_file_path[MAX_LEN_PATH] = {0};
     ImGui::SameLine();
     if (ImGui::FormInvoiceFileSelector("+ Import", import_file_path)) { // @locale::get
-        current_view_state = view_state::VIEW_IMPORT_REQUEST;
+        current_view_state = ui::view_state::VIEW_IMPORT_REQUEST;
         active_invoice = administration_invoice_create_empty(); // @leak
         active_invoice.customer = administration_company_info_get();
         active_invoice.is_outgoing = 0;
         active_invoice.status = invoice_status::INVOICE_RECEIVED;
 
-        active_import_request = ai_document_to_invoice(import_file_path);
+        active_import_request = importer::ai_document_to_invoice(import_file_path);
     }
 
     if (current_page >= max_page-1) current_page = max_page-1;
@@ -247,7 +247,7 @@ static void ui_draw_expenses_list()
             snprintf(btn_name, sizeof(btn_name), "%s##%d", locale::get("form.view"), i);
             if (ImGui::Button(btn_name)) {
                 active_invoice = c;
-                current_view_state = view_state::VIEW;
+                current_view_state = ui::view_state::VIEW_EXISTING;
             }
 
             ImGui::SameLine();
@@ -255,7 +255,7 @@ static void ui_draw_expenses_list()
             snprintf(btn_name, sizeof(btn_name), "%s##%d", locale::get("form.change"), i);
             if (ImGui::Button(btn_name)) {
                 active_invoice = administration_invoice_create_copy(&c); // We create a copy because of billing item list pointers.
-                current_view_state = view_state::EDIT;
+                current_view_state = ui::view_state::EDIT_EXISTING;
             }
             
             ImGui::SameLine();
@@ -287,10 +287,10 @@ static void ui_draw_expenses_list()
 }
 
 
-static void ui_draw_expense_update()
+static void draw_expense_update()
 {
     if (ImGui::Button(locale::get("form.back"))) {
-        current_view_state = view_state::LIST;
+        current_view_state = ui::view_state::LIST_ALL;
     }
     
     draw_expense_form(&active_invoice);
@@ -302,19 +302,19 @@ static void ui_draw_expense_update()
     if (ImGui::Button(locale::get("form.save"))) {
         administration_invoice_update(&active_invoice);
 
-        current_view_state = view_state::LIST;
+        current_view_state = ui::view_state::LIST_ALL;
 
-        ui_destroy_expenses();
-        ui_setup_expenses();
+        ui::destroy_expenses();
+        ui::setup_expenses();
     } 
 
     if (!can_save) ImGui::EndDisabled();
 }
 
-static void ui_draw_expense_create()
+static void draw_expense_create()
 {
     if (ImGui::Button(locale::get("form.back"))) {
-        current_view_state = view_state::LIST;
+        current_view_state = ui::view_state::LIST_ALL;
     }
     
     draw_expense_form(&active_invoice);
@@ -326,51 +326,51 @@ static void ui_draw_expense_create()
     if (ImGui::Button(locale::get("form.save"))) {
         administration_invoice_add(&active_invoice);
 
-        current_view_state = view_state::LIST;
+        current_view_state = ui::view_state::LIST_ALL;
 
-        ui_destroy_expenses();
-        ui_setup_expenses();
+        ui::destroy_expenses();
+        ui::setup_expenses();
     } 
 
     if (!can_save) ImGui::EndDisabled();
 }
 
-static void ui_draw_expense_view()
+static void draw_expense_view()
 {
     if (ImGui::Button(locale::get("form.back"))) {
-        current_view_state = view_state::LIST;
+        current_view_state = ui::view_state::LIST_ALL;
     }
 
     draw_expense_form(&active_invoice, true);
 }
 
-static void ui_draw_import_request()
+static void draw_import_request()
 {
     assert(active_import_request);
 
-    if (active_import_request->status == import_status::IMPORT_DONE) {
+    if (active_import_request->status == importer::status::IMPORT_DONE) {
         if (active_import_request->error == I_ERR_SUCCESS) {
             active_invoice = active_import_request->result;
-            current_view_state = view_state::CREATE;
+            current_view_state = ui::view_state::CREATE;
             active_import_request = 0;
             return;
         }
         else {
             if (ImGui::Button(locale::get("form.back"))) {
-                current_view_state = view_state::LIST;
+                current_view_state = ui::view_state::LIST_ALL;
                 active_import_request = 0;
                 return;
             }
         }
     }
 
-    ImGui::PushFont(fontBig);
+    ImGui::PushFont(ui::fontBig);
 
     ImVec2 windowSize = ImGui::GetWindowSize();
     float radius = 60.0f;
     
-    const char* text = import_status_to_str(active_import_request->status);
-    if (active_import_request->error != I_ERR_SUCCESS) text = import_error_to_str(active_import_request->error);
+    const char* text = importer::status_to_string(active_import_request->status);
+    if (active_import_request->error != I_ERR_SUCCESS) text = importer::error_to_string(active_import_request->error);
     ImVec2 textSize = ImGui::CalcTextSize(text);
     ImGui::SetCursorPos(ImVec2((windowSize.x - textSize.x) * 0.5f,
                     (windowSize.y) * 0.5f - radius - 40.0f));
@@ -388,14 +388,14 @@ static void ui_draw_import_request()
     ImGui::PopFont();
 }
 
-void ui_draw_expenses()
+void ui::draw_expenses()
 {
     switch(current_view_state)
     {
-        case view_state::LIST: ui_draw_expenses_list(); break;
-        case view_state::CREATE: ui_draw_expense_create(); break;
-        case view_state::EDIT: ui_draw_expense_update(); break;
-        case view_state::VIEW: ui_draw_expense_view(); break;
-        case view_state::VIEW_IMPORT_REQUEST: ui_draw_import_request(); break;
+        case ui::view_state::LIST_ALL: draw_expenses_list(); break;
+        case ui::view_state::CREATE: draw_expense_create(); break;
+        case ui::view_state::EDIT_EXISTING: draw_expense_update(); break;
+        case ui::view_state::VIEW_EXISTING: draw_expense_view(); break;
+        case ui::view_state::VIEW_IMPORT_REQUEST: draw_import_request(); break;
     }
 }
\ No newline at end of file