summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/imgui_extensions.cpp2
-rw-r--r--src/ui/ui_earnings.cpp18
-rw-r--r--src/ui/ui_expenses.cpp1
-rw-r--r--src/ui/ui_invoices.cpp1
-rw-r--r--src/ui/ui_main.cpp2
-rw-r--r--src/ui/ui_settings.cpp4
-rw-r--r--src/ui/ui_setup.cpp4
-rw-r--r--src/ui/ui_tax.cpp6
8 files changed, 18 insertions, 20 deletions
diff --git a/src/ui/imgui_extensions.cpp b/src/ui/imgui_extensions.cpp
index b3fc748..568806a 100644
--- a/src/ui/imgui_extensions.cpp
+++ b/src/ui/imgui_extensions.cpp
@@ -702,7 +702,7 @@ namespace ImGui
return result;
}
- void ToggleDropdown(bool *buffer, char* option1, char* option2)
+ void ToggleDropdown(bool *buffer, const char* option1, const char* option2)
{
const char* items[] = { option1, option2 };
diff --git a/src/ui/ui_earnings.cpp b/src/ui/ui_earnings.cpp
index b93bd75..6bd3b98 100644
--- a/src/ui/ui_earnings.cpp
+++ b/src/ui/ui_earnings.cpp
@@ -62,7 +62,7 @@ void ui::draw_earnings()
ImGui::Spacing();
- char* currency_symbol = administration::get_currency_symbol_for_currency(administration::get_default_currency());
+ const char* currency_symbol = administration::get_currency_symbol_for_currency(administration::get_default_currency());
if (ImGui::BeginTable("QuarterlyResultsTable", 5, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Hideable))
{
@@ -104,10 +104,10 @@ void ui::draw_earnings()
if (has_uncategorized_revenue || has_uncategorized_taxes || has_uncategorized_expenses) {
ImGui::TableNextRow();
ImGui::TableSetColumnIndex(0); ImGui::Text("(%s)", locale::get("statement.uncategorized"));
- ImGui::TableSetColumnIndex(1); ImGui::Text("");
- ImGui::TableSetColumnIndex(2); ImGui::Text("");
- ImGui::TableSetColumnIndex(3); ImGui::Text("");
- ImGui::TableSetColumnIndex(4); ImGui::Text("");
+ ImGui::TableSetColumnIndex(1); ImGui::TextUnformatted("");
+ ImGui::TableSetColumnIndex(2); ImGui::TextUnformatted("");
+ ImGui::TableSetColumnIndex(3); ImGui::TextUnformatted("");
+ ImGui::TableSetColumnIndex(4); ImGui::TextUnformatted("");
}
if (has_uncategorized_revenue) {
@@ -148,10 +148,10 @@ void ui::draw_earnings()
ImGuiTreeNodeFlags_SpanFullWidth |
ImGuiTreeNodeFlags_DefaultOpen);
- ImGui::TableSetColumnIndex(1); ImGui::Text("");
- ImGui::TableSetColumnIndex(2); ImGui::Text("");
- ImGui::TableSetColumnIndex(3); ImGui::Text("");
- ImGui::TableSetColumnIndex(4); ImGui::Text("");
+ ImGui::TableSetColumnIndex(1); ImGui::TextUnformatted("");
+ ImGui::TableSetColumnIndex(2); ImGui::TextUnformatted("");
+ ImGui::TableSetColumnIndex(3); ImGui::TextUnformatted("");
+ ImGui::TableSetColumnIndex(4); ImGui::TextUnformatted("");
if (!toggled) continue;
diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index 1e74508..7c9f596 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -33,7 +33,6 @@ static importer::invoice_request* active_import_request = 0;
static ui::view_state current_view_state = ui::view_state::LIST_ALL;
static invoice active_invoice = {0};
-static invoice selected_for_removal = {0};
static const float sidepanel_width = 200.0f;
static billing_item* invoice_items_buffer = 0;
diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 06f1456..49ee697 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -33,7 +33,6 @@ static u32 activity_count;
static ui::view_state current_view_state = ui::view_state::LIST_ALL;
static invoice active_invoice = {0};
-static invoice selected_for_removal = {0};
static const float sidepanel_width = 200.0f;
static billing_item* invoice_items_buffer = 0;
diff --git a/src/ui/ui_main.cpp b/src/ui/ui_main.cpp
index 0fff65d..5d74fa6 100644
--- a/src/ui/ui_main.cpp
+++ b/src/ui/ui_main.cpp
@@ -177,7 +177,7 @@ void ui::draw_main()
ImGuiWindowFlags_NoBringToFrontOnFocus |
ImGuiWindowFlags_NoCollapse);
- char* path = administration::get_file_path();
+ const char* path = administration::get_file_path();
if (path == NULL) {
ImGui::Text("%s: %s", locale::get("ui.workingOn"), locale::get("ui.unsavedProject"));
}
diff --git a/src/ui/ui_settings.cpp b/src/ui/ui_settings.cpp
index c10ca26..854d065 100644
--- a/src/ui/ui_settings.cpp
+++ b/src/ui/ui_settings.cpp
@@ -264,7 +264,7 @@ static void draw_ai_service_ui()
if (ImGui::CollapsingHeader(locale::get("settings.services.ai_service")))
{
- char* ai_service_names[AI_PROVIDER_END];
+ const char* ai_service_names[AI_PROVIDER_END];
for (u32 i = 0; i < AI_PROVIDER_END; i++) {
ai_service_names[i] = importer::get_ai_provider_implementation((ai_provider)i).provider_name;
}
@@ -355,7 +355,7 @@ static void draw_email_service_ui()
{
if (ImGui::CollapsingHeader(locale::get("settings.services.email_service")))
{
- char* email_service_names[EMAIL_PROVIDER_END];
+ const char* email_service_names[EMAIL_PROVIDER_END];
for (u32 i = 0; i < EMAIL_PROVIDER_END; i++) {
email_service_names[i] = exporter::get_email_provider_implementation((email_provider)i).provider_name;
}
diff --git a/src/ui/ui_setup.cpp b/src/ui/ui_setup.cpp
index 069c336..6140d5a 100644
--- a/src/ui/ui_setup.cpp
+++ b/src/ui/ui_setup.cpp
@@ -84,7 +84,7 @@ void ui::draw_setup()
}
if (ImGui::Button(ICON_FA_FOLDER_PLUS " Create administration", ImVec2(area.x, 0))) { // @locale
- if (administration_reader::open_existing(NULL)) {
+ if (administration_reader::open_new()) {
ui::set_state(ui::main_state::UI_SETTINGS);
ui::recreate_window_for_main_views();
}
@@ -93,7 +93,7 @@ void ui::draw_setup()
ImGui::PopStyleVar();
char version_txt[100];
- strops::format(version_txt, sizeof(version_txt), "VERSION: %s %s", config::PROGRAM_VERSION, _DATE_);
+ strops::format(version_txt, sizeof(version_txt), "VERSION: %s %s", PROGRAM_VERSION, _DATE_);
textSize = ImGui::CalcTextSize(version_txt);
ImGui::SetCursorPos(ImVec2(5, area.y));
diff --git a/src/ui/ui_tax.cpp b/src/ui/ui_tax.cpp
index f4176a6..5280e2a 100644
--- a/src/ui/ui_tax.cpp
+++ b/src/ui/ui_tax.cpp
@@ -63,7 +63,7 @@ void ui::draw_tax_report()
ImGui::Spacing();
- char* currency_symbol = administration::get_currency_symbol_for_currency(administration::get_default_currency());
+ const char* currency_symbol = administration::get_currency_symbol_for_currency(administration::get_default_currency());
tax_report report = statement->reports[current_page];
if (ImGui::BeginTable("QuarterlyTaxTable", 4, ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Hideable))
@@ -110,7 +110,7 @@ void ui::draw_tax_report()
#else
ImGui::TableSetColumnIndex(2);
if (line.show_net) ImGui::Text("%.2f %s", line.total_net, currency_symbol);
- else ImGui::Text("");
+ else ImGui::TextUnformatted("");
ImGui::TableSetColumnIndex(3);
if (line.show_tax) {
@@ -126,7 +126,7 @@ void ui::draw_tax_report()
}
}
}
- else ImGui::Text("");
+ else ImGui::TextUnformatted("");
#endif
if (bold) ImGui::PopFont();