ui refactors

1 files changed, 9 insertions, 11 deletions

diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index e09db5b..d1121b1 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -34,8 +34,6 @@ static invoice selected_for_removal = {0};
 
 static billing_item* invoice_items_buffer = 0;
 
-void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false);
-void draw_contact_form_ex(contact* buffer, bool viewing_only, bool with_autocomplete, bool active_countries_only);
 void draw_invoice_items_form(invoice* invoice, bool outgoing = true);
 
 void ui::destroy_expenses()
@@ -91,30 +89,30 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
 
     ImGui::Separator();
 
-    if (ImGui::FormInvoiceFileSelector("Select file...", buffer->document.original_path)) { // @locale::get
+    if (ImGui::FileSelect("Select file...", buffer->document.original_path)) { // @locale::get
         buffer->document.copy_path[0] = 0;
     }
 
     ImGui::Separator();
 
     ImGui::Text(locale::get("invoice.form.billinginformation"));
-    draw_contact_form_ex(&buffer->customer, false, true, false);
+    ImGui::ContactForm(&buffer->customer, false, true, false);
 
     ImGui::Separator();
 
     ImGui::Text(locale::get("invoice.form.supplier"));
-    draw_contact_form_ex(&buffer->supplier, false, true, false);
+    ImGui::ContactForm(&buffer->supplier, false, true, false);
 
     ImGui::Checkbox(locale::get("invoice.form.triangulation"), &buffer->is_triangulation);
     if (buffer->is_triangulation) {
         ImGui::Spacing();
         ImGui::Text(locale::get("invoice.form.shippinginformation"));
-        draw_addressee_form_ex(&buffer->addressee, 0);
+        ImGui::DeliveryInfoForm(&buffer->addressee, 0);
     }
     ImGui::Separator();
 
-    ImGui::FormProjectCombo(buffer->project_id);
-    ImGui::FormCostCenterCombo(buffer->cost_center_id);
+    ImGui::ProjectDropdown(buffer->project_id);
+    ImGui::CostCenterDropdown(buffer->cost_center_id);
 
     ImGui::Separator();
 
@@ -134,7 +132,7 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
     ImGui::SameLine();
     ImGui::Text("| %s: ", locale::get("invoice.form.currency"));
     ImGui::SameLine();
-    if (ImGui::FormCurrencyCombo(buffer->currency))
+    if (ImGui::CurrencyDropdown(buffer->currency))
     {
         administration::invoice_set_currency(buffer, buffer->currency);
     }
@@ -185,7 +183,7 @@ static void draw_expenses_list()
 
     char import_file_path[MAX_LEN_PATH] = {0};
     ImGui::SameLine();
-    if (ImGui::FormInvoiceFileSelector("+ Import", import_file_path)) { // @localize
+    if (ImGui::FileSelect("+ Import", import_file_path)) { // @localize
         current_view_state = ui::view_state::VIEW_IMPORT_REQUEST;
         active_invoice = administration::invoice_create_empty(); // @leak
         active_invoice.customer = administration::company_info_get();
@@ -236,7 +234,7 @@ static void draw_expenses_list()
 
             if (administration::invoice_is_valid(&c) != A_ERR_SUCCESS)
             {
-                if (ImGui::DrawWarningIcon(8.0f)) {
+                if (ImGui::WarningIcon(8.0f)) {
                     ImGui::SetTooltip(locale::get("ui.tooltip.invalidInvoice"));
                 }
             }