1 files changed, 26 insertions, 26 deletions

diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index ee816a9..1a039b9 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -29,7 +29,7 @@
 #include "locales.hpp"
 
 
-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};
 
@@ -38,14 +38,14 @@ static billing_item* invoice_items_buffer = 0;
 void draw_contact_form_ex(contact* buffer, bool viewing_only = false, bool with_autocomplete = false);
 void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false);
 
-void ui_destroy_invoices()
+void ui::destroy_invoices()
 {
     free(invoice_items_buffer);
 }
 
-void ui_setup_invoices()
+void ui::setup_invoices()
 {
-    current_view_state = view_state::LIST;
+    current_view_state = ui::view_state::LIST_ALL;
     active_invoice = administration_invoice_create_empty();
 
     u32 invoice_items_count = MAX_BILLING_ITEMS;
@@ -251,7 +251,7 @@ static void draw_invoice_form(invoice* buffer, bool viewing_only = false)
     if (viewing_only) ImGui::EndDisabled();
 }
 
-static void ui_draw_invoices_list()
+static void draw_invoices_list()
 {
     if (!administration_can_create_invoices()) {
         ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 102, 204, 255)); // blue
@@ -261,7 +261,7 @@ static void ui_draw_invoices_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);
             }
         }
 
@@ -283,7 +283,7 @@ static void ui_draw_invoices_list()
     // Table header controls: create button 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.supplier = administration_company_info_get();
         active_invoice.is_outgoing = 1;
@@ -344,7 +344,7 @@ static void ui_draw_invoices_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();
@@ -354,7 +354,7 @@ static void ui_draw_invoices_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();
@@ -387,10 +387,10 @@ static void ui_draw_invoices_list()
 }
 
 
-static void ui_draw_invoice_update()
+static void draw_invoice_update()
 {
     if (ImGui::Button(locale::get("form.back"))) {
-        current_view_state = view_state::LIST;
+        current_view_state = ui::view_state::LIST_ALL;
     }
     
     draw_invoice_form(&active_invoice);
@@ -402,19 +402,19 @@ static void ui_draw_invoice_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_invoices();
-        ui_setup_invoices();
+        ui::destroy_invoices();
+        ui::setup_invoices();
     } 
 
     if (!can_save) ImGui::EndDisabled();
 }
 
-static void ui_draw_invoice_create()
+static void draw_invoice_create()
 {
     if (ImGui::Button(locale::get("form.back"))) {
-        current_view_state = view_state::LIST;
+        current_view_state = ui::view_state::LIST_ALL;
     }
     
     draw_invoice_form(&active_invoice);
@@ -426,31 +426,31 @@ static void ui_draw_invoice_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_invoices();
-        ui_setup_invoices();
+        ui::destroy_invoices();
+        ui::setup_invoices();
     } 
 
     if (!can_save) ImGui::EndDisabled();
 }
 
-static void ui_draw_invoice_view()
+static void draw_invoice_view()
 {
     if (ImGui::Button(locale::get("form.back"))) {
-        current_view_state = view_state::LIST;
+        current_view_state = ui::view_state::LIST_ALL;
     }
 
     draw_invoice_form(&active_invoice, true);
 }
 
-void ui_draw_invoices()
+void ui::draw_invoices()
 {
     switch(current_view_state)
     {
-        case view_state::LIST: ui_draw_invoices_list(); break;
-        case view_state::CREATE: ui_draw_invoice_create(); break;
-        case view_state::EDIT: ui_draw_invoice_update(); break;
-        case view_state::VIEW: ui_draw_invoice_view(); break;
+        case ui::view_state::LIST_ALL: draw_invoices_list(); break;
+        case ui::view_state::CREATE: draw_invoice_create(); break;
+        case ui::view_state::EDIT_EXISTING: draw_invoice_update(); break;
+        case ui::view_state::VIEW_EXISTING: draw_invoice_view(); break;
     }
 }
\ No newline at end of file