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 f6c56cf0ba8372c3d84c4e9e904aa2aff118323a
Author: Alastair Poole <m...@alastairpoole.com>
AuthorDate: Wed Mar 5 22:44:44 2025 +0000
fixes: remove things I don't like.
I don't like the menu icon colour hack and I don't like listing
all the batteries in the status bar.
They are going.
---
src/bin/background/evisum_background.c | 40 ----------------------------------
src/bin/ui/evisum_ui.h | 2 --
src/bin/ui/ui_process_list.c | 36 +-----------------------------
3 files changed, 1 insertion(+), 77 deletions(-)
diff --git a/src/bin/background/evisum_background.c b/src/bin/background/evisum_background.c
index b4eb095..1445edd 100644
--- a/src/bin/background/evisum_background.c
+++ b/src/bin/background/evisum_background.c
@@ -7,38 +7,17 @@ void
background_init(Evisum_Ui *ui)
{
meminfo_t memory;
- power_t power;
- Battery *bat;
system_memory_usage_get(&memory);
ui->mem_total = memory.total;
ui->mem_used = memory.used;
-
- system_power_state_get(&power);
- if (power.battery_count)
- {
- ui->have_power = power.have_ac;
- for (int i = 0; i < power.battery_count; i++)
- {
- if (!power.batteries[i]->present) continue;
- bat = calloc(1, sizeof(Battery));
- bat->index = i;
- snprintf(bat->model, sizeof(bat->model), "%s", power.batteries[i]->model);
- snprintf(bat->vendor, sizeof(bat->vendor), "%s", power.batteries[i]->vendor);
- bat->usage = power.batteries[i]->percent;
- ui->batteries = eina_list_append(ui->batteries, bat);
- }
- }
- system_power_state_free(&power);
}
void
background_poller_cb(void *data, Ecore_Thread *thread)
{
meminfo_t memory;
- power_t power;
int32_t poll_count = 0;
- Battery *bat;
Evisum_Ui *ui = data;
while (!ecore_thread_check(thread))
@@ -60,26 +39,7 @@ background_poller_cb(void *data, Ecore_Thread *thread)
ui->cpu_usage = percent / system_cpu_online_count_get();
- if ((!(poll_count % 4)) && (ui->batteries))
- {
- Eina_List *l;
- system_power_state_get(&power);
- ui->have_power = power.have_ac;
- for (int i = 0; i < power.battery_count; i++)
- {
- if (!power.batteries[i]->present) continue;
- l = eina_list_nth_list(ui->batteries, i);
- if (!l) continue;
- bat = eina_list_data_get(l);
- bat->usage = power.batteries[i]->percent;
- }
- system_power_state_free(&power);
- }
-
poll_count++;
}
-
- EINA_LIST_FREE(ui->batteries, bat)
- free(bat);
}
diff --git a/src/bin/ui/evisum_ui.h b/src/bin/ui/evisum_ui.h
index fa6e18e..c918ffd 100644
--- a/src/bin/ui/evisum_ui.h
+++ b/src/bin/ui/evisum_ui.h
@@ -27,8 +27,6 @@ typedef struct _Evisum_Ui
double cpu_usage;
uint64_t mem_total;
uint64_t mem_used;
- Eina_List *batteries;
- Eina_Bool have_power;
Eina_Bool kthreads_has_rss;
struct
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c
index d43e96e..6da5909 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/ui_process_list.c
@@ -976,8 +976,6 @@ _summary_update(Win_Data *wd)
{
Evisum_Ui *ui;
Eina_Strbuf *buf;
- Battery *bat;
- Eina_List *l;
ui = wd->ui;
@@ -985,8 +983,6 @@ _summary_update(Win_Data *wd)
buf = eina_strbuf_new();
-
- eina_strbuf_append_printf(buf, _("%i processes: "), wd->summary.total);
if (wd->summary.running)
eina_strbuf_append_printf(buf, _("%i running, "), wd->summary.running);
if (wd->summary.sleeping)
@@ -1014,9 +1010,6 @@ _summary_update(Win_Data *wd)
eina_strbuf_append_printf(buf, "%s / %s ", evisum_size_format(ui->mem_used, 0), evisum_size_format(ui->mem_total, 0));
elm_object_part_text_set(wd->summary.pb_mem, "elm.text.status", eina_strbuf_string_get(buf));
- EINA_LIST_FOREACH(ui->batteries, l, bat)
- elm_progressbar_value_set(bat->pb, bat->usage / 100.0);
-
eina_strbuf_free(buf);
}
@@ -1044,8 +1037,6 @@ static void
summary_add(Win_Data *wd)
{
Evisum_Ui *ui = wd->ui;
- Battery *bat;
- Eina_List *l;
Evas_Object *hbx, *ic, *pb, *bx, *lb;
if (!ui->proc.show_statusbar) return;
@@ -1082,24 +1073,6 @@ summary_add(Win_Data *wd)
evas_object_size_hint_align_set(lb, 1.0, FILL);
evas_object_show(lb);
- EINA_LIST_FOREACH(ui->batteries, l, bat)
- {
- ic = elm_icon_add(wd->win);
- elm_icon_standard_set(ic, evisum_icon_path_get("sensor"));
- evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), ELM_SCALE_SIZE(16));
- evas_object_size_hint_weight_set(ic, 0, EXPAND);
- elm_box_pack_end(hbx, ic);
- evas_object_show(ic);
-
- bat->pb = pb = elm_progressbar_add(wd->win);
- evas_object_data_set(pb, "icon", ic);
- elm_object_tooltip_text_set(pb, eina_slstr_printf("%s (%s)", bat->vendor, bat->model));
- elm_progressbar_span_size_set(pb, 120);
- elm_progressbar_value_set(pb, bat->usage / 100.0);
- elm_box_pack_end(hbx, pb);
- evas_object_show(pb);
- }
-
bx = elm_box_add(wd->win);
evas_object_size_hint_weight_set(bx, EXPAND, EXPAND);
evas_object_size_hint_align_set(bx, FILL, FILL);
@@ -1339,19 +1312,12 @@ _btn_icon_state_update(Evas_Object *btn, Eina_Bool reverse,
{
Evas_Object *ic = elm_icon_add(btn);
- if ((wd->btn_selected) && (selected))
- evas_object_color_set(wd->btn_selected, 255, 255, 255, 255);
-
if (reverse)
elm_icon_standard_set(ic, evisum_icon_path_get("go-down"));
else
elm_icon_standard_set(ic, evisum_icon_path_get("go-up"));
- if (selected)
- {
- evas_object_color_set(ic, 128, 128, 128, 255);
- wd->btn_selected = ic;
- }
+ if (selected) wd->btn_selected = ic;
elm_object_part_content_set(btn, "icon", ic);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
