This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository evisum.
View the commit online.
commit 030a185046629ea2c7422f04a8c014640f03c76f
Author: Alastair Poole <[email protected]>
AuthorDate: Sun Mar 29 07:16:45 2026 +0100
changes: add description and fix gettext.
Sorry translators!
---
src/bin/ui/evisum_ui_disk.c | 2 +-
src/bin/ui/evisum_ui_memory.c | 2 +-
src/bin/ui/evisum_ui_network.c | 6 +++---
src/bin/ui/evisum_ui_process_list.c | 20 ++++++++++----------
src/bin/ui/evisum_ui_process_view.c | 18 +++++++++---------
src/bin/ui/evisum_ui_sensors.c | 4 ++--
src/bin/ui/visuals/cpu_bars.c | 17 ++++++++++++++++-
src/bin/ui/visuals/cpu_basic.c | 18 +++++++++++++++++-
src/bin/ui/visuals/cpu_default.c | 19 ++++++++++++++++++-
9 files changed, 77 insertions(+), 29 deletions(-)
diff --git a/src/bin/ui/evisum_ui_disk.c b/src/bin/ui/evisum_ui_disk.c
index e8c57ae..7c3ac39 100644
--- a/src/bin/ui/evisum_ui_disk.c
+++ b/src/bin/ui/evisum_ui_disk.c
@@ -147,7 +147,7 @@ _evisum_ui_disk_history_legend_add(Evisum_Ui_Disk_View *view, Disk_History *entr
pb = elm_progressbar_add(view->legend_tb);
elm_object_text_set(pb, NULL);
elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(220));
- elm_progressbar_unit_format_set(pb, "0 B / 0 B");
+ elm_progressbar_unit_format_set(pb, _("0 B / 0 B"));
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
evas_object_show(pb);
diff --git a/src/bin/ui/evisum_ui_memory.c b/src/bin/ui/evisum_ui_memory.c
index 56804d9..0e20bfa 100644
--- a/src/bin/ui/evisum_ui_memory.c
+++ b/src/bin/ui/evisum_ui_memory.c
@@ -168,7 +168,7 @@ _evisum_ui_memory_series_legend_add(Evisum_Ui_Memory_View *view, Memory_Series *
pb = elm_progressbar_add(view->legend_tb);
elm_object_text_set(pb, NULL);
elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(220));
- elm_progressbar_unit_format_set(pb, "0 B / 0 B");
+ elm_progressbar_unit_format_set(pb, _("0 B / 0 B"));
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
evas_object_show(pb);
diff --git a/src/bin/ui/evisum_ui_network.c b/src/bin/ui/evisum_ui_network.c
index 5511496..0c54724 100644
--- a/src/bin/ui/evisum_ui_network.c
+++ b/src/bin/ui/evisum_ui_network.c
@@ -135,15 +135,15 @@ _evisum_ui_network_iface_color_apply(Network_Interface *iface) {
static char *
_evisum_ui_network_transfer_format(double rate) {
- const char *unit = "B/s";
+ const char *unit = _("B/s");
char buf[256];
if (rate > 1048576) {
rate /= 1048576;
- unit = "MB/s";
+ unit = _("MB/s");
} else if ((rate > 1024) && (rate < 1048576)) {
rate /= 1024;
- unit = "KB/s";
+ unit = _("KB/s");
}
snprintf(buf, sizeof(buf), "%.2f %s", rate, unit);
diff --git a/src/bin/ui/evisum_ui_process_list.c b/src/bin/ui/evisum_ui_process_list.c
index c2d9f29..7def133 100644
--- a/src/bin/ui/evisum_ui_process_list.c
+++ b/src/bin/ui/evisum_ui_process_list.c
@@ -190,7 +190,7 @@ _evisum_ui_process_list_field_row_def_get(Proc_Field id, Evisum_Ui_Widget_Exel_I
case PROC_FIELD_CPU_USAGE:
def->type = EVISUM_UI_WIDGET_EXEL_ITEM_CELL_PROGRESS;
def->key = "cpu_u";
- def->unit_format = "%1.1f %%";
+ def->unit_format = _("%1.1f %%");
return EINA_TRUE;
default: return EINA_FALSE;
}
@@ -352,15 +352,15 @@ _evisum_ui_process_list_run_time_set(char *buf, size_t n, int64_t secs) {
static void
_evisum_ui_process_list_net_rate_set(char *buf, size_t n, uint64_t rate) {
- const char *unit = "B/s";
+ const char *unit = _("B/s");
double value = rate;
if (value > 1048576.0) {
value /= 1048576.0;
- unit = "MB/s";
+ unit = _("MB/s");
} else if (value > 1024.0) {
value /= 1024.0;
- unit = "KB/s";
+ unit = _("KB/s");
}
snprintf(buf, n, "%.2f %s", value, unit);
@@ -478,14 +478,14 @@ _evisum_ui_process_list_content_get(void *data, Evas_Object *obj, const char *so
evisum_ui_widget_exel_item_field_text_set(view->widget_exel, row, PROC_FIELD_SHARED, "share", buf);
if ((ui->proc.has_wchan) && (proc->state[0] == 's' && proc->state[1] == 'l'))
- snprintf(buf, sizeof(buf), "%s", proc->wchan ?: "-");
- else snprintf(buf, sizeof(buf), "%s", proc->state ?: "-");
+ snprintf(buf, sizeof(buf), "%s", proc->wchan ?: _("-"));
+ else snprintf(buf, sizeof(buf), "%s", proc->state ?: _("-"));
evisum_ui_widget_exel_item_field_text_set(view->widget_exel, row, PROC_FIELD_STATE, "state", buf);
_evisum_ui_process_list_run_time_set(buf, sizeof(buf), proc->run_time);
evisum_ui_widget_exel_item_field_text_set(view->widget_exel, row, PROC_FIELD_TIME, "time", buf);
- snprintf(buf, sizeof(buf), "%1.1f %%", proc->cpu_usage);
+ snprintf(buf, sizeof(buf), _("%1.1f %%"), proc->cpu_usage);
evisum_ui_widget_exel_item_field_progress_set(view->widget_exel, row, PROC_FIELD_CPU_USAGE, "cpu_u",
proc->cpu_usage / 100.0, buf);
@@ -545,7 +545,7 @@ _evisum_ui_process_list_summary_add(Evisum_Ui_Process_List_View *view) {
evas_object_show(ic);
view->summary.pb_cpu = pb = elm_progressbar_add(hbx);
- elm_progressbar_unit_format_set(pb, "%1.2f %%");
+ elm_progressbar_unit_format_set(pb, _("%1.2f %%"));
elm_progressbar_span_size_set(pb, 120);
elm_box_pack_end(hbx, pb);
evas_object_show(pb);
@@ -1011,7 +1011,7 @@ _evisum_ui_process_list_item_menu_create(Evisum_Ui_Process_List_View *view, Proc
stopped = !(!strcmp(proc->state, "stop"));
menu_it = _evisum_ui_process_list_item_menu_add(menu, NULL, evisum_icon_cache_find(view->icon_cache, proc),
- proc->command ?: "-", NULL, NULL);
+ proc->command ?: _("-"), NULL, NULL);
menu_it2 = _evisum_ui_process_list_item_menu_add(menu, menu_it, "actions", _("Actions"), NULL, NULL);
_evisum_ui_process_list_item_menu_actions_add(menu, menu_it2, view);
@@ -1025,7 +1025,7 @@ _evisum_ui_process_list_item_menu_create(Evisum_Ui_Process_List_View *view, Proc
_evisum_ui_process_list_item_menu_stop_cb, view);
elm_object_item_disabled_set(menu_it2, !stopped);
- _evisum_ui_process_list_item_menu_add(menu, menu_it, "kill", "Kill", _evisum_ui_process_list_item_menu_kill_cb,
+ _evisum_ui_process_list_item_menu_add(menu, menu_it, "kill", _("Kill"), _evisum_ui_process_list_item_menu_kill_cb,
view);
elm_menu_item_separator_add(menu, menu_it);
diff --git a/src/bin/ui/evisum_ui_process_view.c b/src/bin/ui/evisum_ui_process_view.c
index d5bfb4d..b2f1181 100644
--- a/src/bin/ui/evisum_ui_process_view.c
+++ b/src/bin/ui/evisum_ui_process_view.c
@@ -628,16 +628,16 @@ _evisum_ui_process_view_run_time_string(int64_t secs) {
#if defined(__linux__)
static char *
_evisum_ui_process_view_net_rate_string(uint64_t rate) {
- const char *unit = "B/s";
+ const char *unit = _("B/s");
char buf[256];
double value = rate;
if (value > 1048576.0) {
value /= 1048576.0;
- unit = "MB/s";
+ unit = _("MB/s");
} else if (value > 1024.0) {
value /= 1024.0;
- unit = "KB/s";
+ unit = _("KB/s");
}
snprintf(buf, sizeof(buf), "%.2f %s", value, unit);
@@ -731,17 +731,17 @@ _evisum_ui_process_view_general_view_update(Evisum_Ui_Process_View *view, Proc_I
elm_object_text_set(view->general.entry_threads, eina_slstr_printf("%d", proc->numthreads));
elm_object_text_set(view->general.entry_files, eina_slstr_printf("%d", proc->numfiles));
if (!proc->is_kernel) elm_object_text_set(view->general.entry_virt, evisum_size_format(proc->mem_virt, 0));
- else elm_object_text_set(view->general.entry_virt, "-");
+ else elm_object_text_set(view->general.entry_virt, _("-"));
if ((!proc->is_kernel) || (view->kthreads_has_rss))
elm_object_text_set(view->general.entry_rss, evisum_size_format(proc->mem_rss, 0));
- else elm_object_text_set(view->general.entry_rss, "-");
+ else elm_object_text_set(view->general.entry_rss, _("-"));
if (!proc->is_kernel) elm_object_text_set(view->general.entry_shared, evisum_size_format(proc->mem_shared, 0));
- else elm_object_text_set(view->general.entry_shared, "-");
+ else elm_object_text_set(view->general.entry_shared, _("-"));
if (!proc->is_kernel) elm_object_text_set(view->general.entry_size, evisum_size_format(proc->mem_size, 0));
- else elm_object_text_set(view->general.entry_size, "-");
+ else elm_object_text_set(view->general.entry_size, _("-"));
s = _evisum_ui_process_view_run_time_string(proc->run_time);
if (s) {
@@ -774,8 +774,8 @@ _evisum_ui_process_view_general_view_update(Evisum_Ui_Process_View *view, Proc_I
free(s);
}
} else {
- elm_object_text_set(view->general.entry_net_in, "-");
- elm_object_text_set(view->general.entry_net_out, "-");
+ elm_object_text_set(view->general.entry_net_in, _("-"));
+ elm_object_text_set(view->general.entry_net_out, _("-"));
}
#endif
}
diff --git a/src/bin/ui/evisum_ui_sensors.c b/src/bin/ui/evisum_ui_sensors.c
index 8d34469..3be618b 100644
--- a/src/bin/ui/evisum_ui_sensors.c
+++ b/src/bin/ui/evisum_ui_sensors.c
@@ -100,7 +100,7 @@ _evisum_ui_sensors_legend_toggle_cb(void *data, Evas_Object *obj EINA_UNUSED, vo
static void
_evisum_ui_sensors_sensor_name_set(char *buf, size_t len, sensor_t *s) {
if (!s || !s->name) {
- snprintf(buf, len, "Sensor");
+ snprintf(buf, len, "%s", _("Sensor"));
return;
}
@@ -177,7 +177,7 @@ _evisum_ui_sensors_history_legend_add(Evisum_Ui_Sensors_View *view, Sensor_Histo
pb = elm_progressbar_add(view->legend_tb);
elm_object_text_set(pb, NULL);
elm_progressbar_span_size_set(pb, ELM_SCALE_SIZE(220));
- elm_progressbar_unit_format_set(pb, "%1.1f°C");
+ elm_progressbar_unit_format_set(pb, _("%1.1f°C"));
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
evas_object_show(pb);
diff --git a/src/bin/ui/visuals/cpu_bars.c b/src/bin/ui/visuals/cpu_bars.c
index 4234dc7..a1af7ce 100644
--- a/src/bin/ui/visuals/cpu_bars.c
+++ b/src/bin/ui/visuals/cpu_bars.c
@@ -130,7 +130,7 @@ _cb_free(void *data) {
Ui_Cpu_Data *
cpu_visual_bars(Evas_Object *parent_bx) {
- Evas_Object *tb, *rec, *container, *fr, *legend_tbl, *colors, *lb, *bg;
+ Evas_Object *tb, *rec, *container, *fr, *legend_tbl, *colors, *lb, *bg, *desc_fr;
Ext *ext;
uint8_t text_r, text_g, text_b;
char text_hex[7];
@@ -234,6 +234,21 @@ cpu_visual_bars(Evas_Object *parent_bx) {
elm_table_pack(legend_tbl, lb, 1, 0, 1, 1);
evas_object_show(lb);
+ desc_fr = elm_frame_add(parent_bx);
+ elm_object_text_set(desc_fr, _("Description"));
+ evas_object_size_hint_align_set(desc_fr, FILL, FILL);
+ evas_object_size_hint_weight_set(desc_fr, EXPAND, 0.0);
+ elm_box_pack_end(parent_bx, desc_fr);
+ evas_object_show(desc_fr);
+
+ lb = elm_label_add(desc_fr);
+ elm_label_line_wrap_set(lb, ELM_WRAP_WORD);
+ elm_object_text_set(lb, _("<align=left>This view shows CPU usage only.</align>"));
+ evas_object_size_hint_align_set(lb, 0.0, 0.5);
+ evas_object_size_hint_weight_set(lb, EXPAND, EXPAND);
+ elm_object_content_set(desc_fr, lb);
+ evas_object_show(lb);
+
pd->thread = ecore_thread_feedback_run(_core_times_main_cb, _core_times_feedback_cb, NULL, NULL, pd, 1);
return pd;
}
diff --git a/src/bin/ui/visuals/cpu_basic.c b/src/bin/ui/visuals/cpu_basic.c
index acf18d6..14bf883 100644
--- a/src/bin/ui/visuals/cpu_basic.c
+++ b/src/bin/ui/visuals/cpu_basic.c
@@ -149,7 +149,7 @@ _cpu_percent_colors_fill(Evas_Object *colors) {
Ui_Cpu_Data *
cpu_visual_basic(Evas_Object *parent_bx) {
- Evas_Object *container, *grid, *fr, *legend_tbl, *colors, *lb, *bg;
+ Evas_Object *container, *grid, *fr, *legend_tbl, *colors, *lb, *bg, *desc_fr;
Ext *ext;
uint8_t text_r, text_g, text_b;
char text_hex[7];
@@ -268,6 +268,22 @@ cpu_visual_basic(Evas_Object *parent_bx) {
elm_table_pack(legend_tbl, lb, 1, 0, 1, 1);
evas_object_show(lb);
+ desc_fr = elm_frame_add(parent_bx);
+ elm_object_text_set(desc_fr, _("Description"));
+ evas_object_size_hint_align_set(desc_fr, FILL, FILL);
+ evas_object_size_hint_weight_set(desc_fr, EXPAND, 0.0);
+ elm_box_pack_end(parent_bx, desc_fr);
+ evas_object_show(desc_fr);
+
+ lb = elm_label_add(desc_fr);
+ elm_label_line_wrap_set(lb, ELM_WRAP_WORD);
+ elm_object_text_set(lb, _("<align=left>Size shows activity level (frequency when available, otherwise load). "
+ "Color and the 0%-100% legend show CPU usage percentage.</align>"));
+ evas_object_size_hint_align_set(lb, 0.0, 0.5);
+ evas_object_size_hint_weight_set(lb, EXPAND, EXPAND);
+ elm_object_content_set(desc_fr, lb);
+ evas_object_show(lb);
+
pd->thread = ecore_thread_feedback_run(_core_times_main_cb, _core_times_feedback_cb, NULL, NULL, pd, 1);
return pd;
}
diff --git a/src/bin/ui/visuals/cpu_default.c b/src/bin/ui/visuals/cpu_default.c
index 142da78..40ca4c4 100644
--- a/src/bin/ui/visuals/cpu_default.c
+++ b/src/bin/ui/visuals/cpu_default.c
@@ -294,7 +294,7 @@ _colors_fill(Evas_Object *colors) {
Ui_Cpu_Data *
cpu_visual_default(Evas_Object *parent_box) {
Evas_Object *tbl, *tbl2, *box, *obj, *ic, *lb, *rec;
- Evas_Object *fr, *bx, *hbx, *colors, *check;
+ Evas_Object *fr, *bx, *hbx, *colors, *check, *desc_fr;
Ext *ext;
int *cpu_order;
int i, f;
@@ -507,6 +507,23 @@ cpu_visual_default(Evas_Object *parent_box) {
elm_box_pack_end(box, fr);
+ desc_fr = elm_frame_add(box);
+ elm_object_text_set(desc_fr, _("Description"));
+ evas_object_size_hint_align_set(desc_fr, FILL, FILL);
+ evas_object_size_hint_weight_set(desc_fr, EXPAND, 0);
+ elm_box_pack_end(box, desc_fr);
+ evas_object_show(desc_fr);
+
+ lb = elm_label_add(desc_fr);
+ elm_label_line_wrap_set(lb, ELM_WRAP_WORD);
+ elm_object_text_set(lb,
+ _("<align=left>This view shows CPU activity over time. "
+ "It can also show frequency and temperature when available.</align>"));
+ evas_object_size_hint_align_set(lb, 0.0, 0.5);
+ evas_object_size_hint_weight_set(lb, EXPAND, EXPAND);
+ elm_object_content_set(desc_fr, lb);
+ evas_object_show(lb);
+
fr = elm_frame_add(box);
elm_frame_autocollapse_set(fr, 1);
evas_object_size_hint_align_set(fr, FILL, FILL);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
