ui refactors

1 files changed, 9 insertions, 12 deletions

diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 4ae325f..8741965 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -32,9 +32,6 @@ static invoice selected_for_removal = {0};
 
 static billing_item* invoice_items_buffer = 0;
 
-void draw_contact_form_ex(contact* buffer, bool viewing_only, bool with_autocomplete, bool active_countries_only);
-void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false);
-
 void ui::destroy_invoices()
 {
     memops::unalloc(invoice_items_buffer);
@@ -87,7 +84,7 @@ void draw_invoice_items_form(invoice* invoice, bool outgoing)
             ImGui::InputFloat("##amount", &item.amount, 0.0f, 0.0f, "%.0f");
             ImGui::SameLine();
 
-            ImGui::FormToggleCombo(&item.amount_is_percentage, "X", "%");
+            ImGui::ToggleDropdown(&item.amount_is_percentage, "X", "%");
 
             ImGui::TableSetColumnIndex(2); 
             ImGui::PushItemWidth(-1);
@@ -103,14 +100,14 @@ void draw_invoice_items_form(invoice* invoice, bool outgoing)
             ImGui::InputFloat("##discount", &item.discount, 0.0f, 0.0f, "%.2f");
             ImGui::SameLine();
 
-            ImGui::FormToggleCombo(&item.discount_is_percentage, item.currency, "%");
+            ImGui::ToggleDropdown(&item.discount_is_percentage, item.currency, "%");
 
             ImGui::TableSetColumnIndex(5); 
             ImGui::Text("%.2f %s", item.net, item.currency);
 
             ImGui::TableSetColumnIndex(6);
             ImGui::PushItemWidth(-1);
-            ImGui::FormTaxRateCombo(item.tax_internal_code, outgoing, valid & A_ERR_MISSING_TAX_RATE);
+            ImGui::TaxRateDropdown(item.tax_internal_code, outgoing, valid & A_ERR_MISSING_TAX_RATE);
 
             ImGui::PopItemWidth();
 
@@ -203,24 +200,24 @@ static void draw_invoice_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::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::ProjectDropdown(buffer->project_id);
 
     ImGui::Spacing();
     ImGui::Spacing();
@@ -238,7 +235,7 @@ static void draw_invoice_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);
     }
@@ -328,7 +325,7 @@ static void draw_invoices_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"));
                 }
             }