enlightenment/evisum
enlightenment
/
evisum
7
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

UI: Show percentage sign where applicable.

This commit is contained in:
Alastair Poole 2019-12-14 19:34:58 +00:00
parent f8225a6d6b
commit 539f078812
1 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/bin/ui.c
View File

@ -247,17 +247,17 @@ _ui_disk_add(Ui *ui, const char *path, const char *mount, unsigned long total, u
evas_object_size_hint_weight_set(progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_progressbar_span_size_set(progress, 1.0); elm_progressbar_span_size_set(progress, 1.0);
elm_progressbar_unit_format_set(progress,
eina_slstr_printf(
"%lu%c of %lu%c",
_disk_adjust(ui->data_unit, used), ui->data_unit,
_disk_adjust(ui->data_unit, total), ui->data_unit));
elm_object_content_set(frame, progress);
ratio = total / 100.0; ratio = total / 100.0;
value = used / ratio; value = used / ratio;
elm_progressbar_unit_format_set(progress,
eina_slstr_printf(
"%lu%c of %lu%c (%1.0f %)",
_disk_adjust(ui->data_unit, used), ui->data_unit,
_disk_adjust(ui->data_unit, total), ui->data_unit, value));
elm_object_content_set(frame, progress);
if (used == 0 && total == 0) if (used == 0 && total == 0)
elm_progressbar_value_set(progress, 1.0); elm_progressbar_value_set(progress, 1.0);
else else
@ -309,52 +309,54 @@ _tab_memory_update(Ui *ui, results_t *results)
return; return;
progress = ui->progress_mem_used; progress = ui->progress_mem_used;
elm_progressbar_unit_format_set(progress,
eina_slstr_printf(
"%lu %c / %lu %c",
_mem_adjust(ui->data_unit, results->memory.used), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.total), ui->data_unit));
ratio = results->memory.total / 100.0; ratio = results->memory.total / 100.0;
value = results->memory.used / ratio; value = results->memory.used / ratio;
elm_progressbar_unit_format_set(progress,
eina_slstr_printf(
"%lu %c / %lu %c (%1.0f %)",
_mem_adjust(ui->data_unit, results->memory.used), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.total), ui->data_unit, value));
elm_progressbar_value_set(progress, value / 100); elm_progressbar_value_set(progress, value / 100);
progress = ui->progress_mem_cached; progress = ui->progress_mem_cached;
elm_progressbar_unit_format_set(progress, eina_slstr_printf(
"%lu %c / %lu %c",
_mem_adjust(ui->data_unit, results->memory.cached), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.total), ui->data_unit));
ratio = results->memory.total / 100.0; ratio = results->memory.total / 100.0;
value = results->memory.cached / ratio; value = results->memory.cached / ratio;
elm_progressbar_unit_format_set(progress, eina_slstr_printf(
"%lu %c / %lu %c (%1.0f %)",
_mem_adjust(ui->data_unit, results->memory.cached), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.total), ui->data_unit, value));
elm_progressbar_value_set(progress, value / 100); elm_progressbar_value_set(progress, value / 100);
progress = ui->progress_mem_buffered; progress = ui->progress_mem_buffered;
elm_progressbar_unit_format_set(progress,
eina_slstr_printf(
"%lu %c / %lu %c",
_mem_adjust(ui->data_unit, results->memory.buffered), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.total), ui->data_unit));
ratio = results->memory.total / 100.0; ratio = results->memory.total / 100.0;
value = results->memory.buffered / ratio; value = results->memory.buffered / ratio;
elm_progressbar_unit_format_set(progress,
eina_slstr_printf(
"%lu %c / %lu %c (%1.0f %)",
_mem_adjust(ui->data_unit, results->memory.buffered), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.total), ui->data_unit, value));
elm_progressbar_value_set(progress, value / 100); elm_progressbar_value_set(progress, value / 100);
progress = ui->progress_mem_shared; progress = ui->progress_mem_shared;
ratio = results->memory.total / 100.0;
value = results->memory.shared / ratio;
elm_progressbar_unit_format_set(progress, elm_progressbar_unit_format_set(progress,
eina_slstr_printf( eina_slstr_printf(
"%lu %c / %lu %c", "%lu %c / %lu %c (%1.0f %)",
_mem_adjust(ui->data_unit, results->memory.shared), ui->data_unit, _mem_adjust(ui->data_unit, results->memory.shared), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.total), ui->data_unit)); _mem_adjust(ui->data_unit, results->memory.total), ui->data_unit, value));
ratio = results->memory.total / 100.0; ratio = results->memory.total / 100.0;
value = results->memory.shared / ratio; value = results->memory.shared / ratio;
elm_progressbar_value_set(progress, value / 100); elm_progressbar_value_set(progress, value / 100);
progress = ui->progress_mem_swap; progress = ui->progress_mem_swap;
elm_progressbar_unit_format_set(progress,
eina_slstr_printf(
"%lu %c / %lu %c",
_mem_adjust(ui->data_unit, results->memory.swap_used), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.swap_total), ui->data_unit));
ratio = results->memory.swap_total / 100.0; ratio = results->memory.swap_total / 100.0;
value = results->memory.swap_used / ratio; value = results->memory.swap_used / ratio;
elm_progressbar_unit_format_set(progress,
eina_slstr_printf(
"%lu %c / %lu %c (%1.0f %)",
_mem_adjust(ui->data_unit, results->memory.swap_used), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.swap_total), ui->data_unit, value));
elm_progressbar_value_set(progress, value / 100); elm_progressbar_value_set(progress, value / 100);
} }