netstar pushed a commit to branch master.
http://git.enlightenment.org/apps/evisum.git/commit/?id=a33baabcc3e018b10ceecfaedecf1e1f647448ac
commit a33baabcc3e018b10ceecfaedecf1e1f647448ac
Author: Alastair Poole <nets...@gmail.com>
Date: Sat Oct 10 14:52:11 2020 +0100
ui: stuff.
---
src/bin/evisum_config.h | 1 +
src/bin/ui/ui.c | 14 ++++++++++++--
src/bin/ui/ui_cpu.c | 7 ++++---
src/bin/ui/ui_disk.c | 3 ++-
src/bin/ui/ui_memory.c | 3 ++-
src/bin/ui/ui_sensors.c | 3 ++-
src/bin/ui/ui_util.c | 13 +++++++++++++
src/bin/ui/ui_util.h | 6 ++++++
8 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/src/bin/evisum_config.h b/src/bin/evisum_config.h
index 775ca3b..2be9d20 100644
--- a/src/bin/evisum_config.h
+++ b/src/bin/evisum_config.h
@@ -14,6 +14,7 @@ typedef struct _Evisum_Config
int height;
int poll_delay;
Eina_Bool effects;
+ Eina_Bool backgrounds;
Eina_Bool show_kthreads;
} Evisum_Config;
diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index 50cfaca..63712c7 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -32,6 +32,7 @@ _config_save(Ui *ui)
_evisum_config->width = w;
_evisum_config->height = h;
_evisum_config->effects = evisum_ui_effects_enabled_get();
+ _evisum_config->backgrounds = evisum_ui_backgrounds_enabled_get();
_evisum_config->poll_delay = ui->settings.poll_delay;
_evisum_config->show_kthreads = ui->settings.show_kthreads;
@@ -53,6 +54,7 @@ _config_load(Ui *ui)
evas_object_resize(ui->win, _evisum_config->width,
_evisum_config->height);
evisum_ui_effects_enabled_set(_evisum_config->effects);
+ evisum_ui_backgrounds_enabled_set(_evisum_config->backgrounds);
ui->settings.show_kthreads = _evisum_config->show_kthreads;
proc_info_kthreads_show_set(ui->settings.show_kthreads);
@@ -1094,7 +1096,15 @@ _menu_effects_clicked_cb(void *data, Evas_Object *obj
EINA_UNUSED,
{
Ui *ui = data;
- evisum_ui_effects_enabled_set(!evisum_ui_effects_enabled_get());
+ if ((!evisum_ui_effects_enabled_get()) &&
(!evisum_ui_backgrounds_enabled_get()))
+ evisum_ui_backgrounds_enabled_set(1);
+ else if (evisum_ui_backgrounds_enabled_get() &&
(!evisum_ui_effects_enabled_get()))
+ evisum_ui_effects_enabled_set(1);
+ else
+ {
+ evisum_ui_effects_enabled_set(0);
+ evisum_ui_backgrounds_enabled_set(0);
+ }
_config_save(ui);
ecore_app_restart();
@@ -1811,7 +1821,7 @@ _ui_init(Evas_Object *parent)
_config_load(ui);
- if (evisum_ui_effects_enabled_get())
+ if (evisum_ui_effects_enabled_get() || evisum_ui_backgrounds_enabled_get())
evisum_ui_background_random_add(ui->win, 1);
_ui_content_add(parent, ui);
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c
index 12cae41..671343d 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/ui_cpu.c
@@ -154,9 +154,9 @@ _core_times_main_cb(void *data, Ecore_Thread *thread)
Core *core = &(cores_out[n]);
core->id = n;
core->percent = cores[n]->percent;
- if (ad->cpu_freq)
+ if (ad->show_cpufreq && ad->cpu_freq)
core->freq = system_cpu_n_frequency_get(n);
- if (ad->cpu_temp)
+ if (ad->show_cputemp && ad->cpu_temp)
core->temp = system_cpu_n_temperature_get(n);
free(cores[n]);
}
@@ -572,7 +572,8 @@ ui_win_cpu_add(Ui *ui)
elm_win_autodel_set(win, EINA_TRUE);
evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
evas_object_size_hint_align_set(win, FILL, FILL);
- evisum_ui_background_random_add(win, evisum_ui_effects_enabled_get());
+ evisum_ui_background_random_add(win, (evisum_ui_effects_enabled_get() ||
+ evisum_ui_backgrounds_enabled_get()));
scroller = elm_scroller_add(win);
evas_object_size_hint_weight_set(scroller, EXPAND, EXPAND);
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c
index bf744e5..a39562f 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/ui_disk.c
@@ -254,7 +254,8 @@ ui_win_disk_add(Ui *ui)
_("Storage"));
evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
evas_object_size_hint_align_set(win, FILL, FILL);
- evisum_ui_background_random_add(win, evisum_ui_effects_enabled_get());
+ evisum_ui_background_random_add(win, (evisum_ui_effects_enabled_get() ||
+ evisum_ui_backgrounds_enabled_get()));
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c
index e48bf68..aa73d1c 100644
--- a/src/bin/ui/ui_memory.c
+++ b/src/bin/ui/ui_memory.c
@@ -138,7 +138,8 @@ ui_win_memory_add(Ui *ui)
_("Memory Usage"));
evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
evas_object_size_hint_align_set(win, FILL, FILL);
- evisum_ui_background_random_add(win, evisum_ui_effects_enabled_get());
+ evisum_ui_background_random_add(win, (evisum_ui_effects_enabled_get() ||
+ evisum_ui_backgrounds_enabled_get()));
frame = elm_frame_add(win);
evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/ui_sensors.c
index 8d72629..5ce4de7 100644
--- a/src/bin/ui/ui_sensors.c
+++ b/src/bin/ui/ui_sensors.c
@@ -258,7 +258,8 @@ ui_win_sensors_add(Ui *ui)
ui->sensors.win = win = elm_win_util_standard_add("evisum", _("Sensors"));
evas_object_size_hint_weight_set(win, EXPAND, EXPAND);
evas_object_size_hint_align_set(win, FILL, FILL);
- evisum_ui_background_random_add(win, evisum_ui_effects_enabled_get());
+ evisum_ui_background_random_add(win, (evisum_ui_effects_enabled_get() ||
+ evisum_ui_backgrounds_enabled_get()));
box = elm_box_add(win);
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c
index f330b5b..ebaea82 100644
--- a/src/bin/ui/ui_util.c
+++ b/src/bin/ui/ui_util.c
@@ -6,6 +6,7 @@
#define ARRAY_SIZE(n) sizeof(n) / sizeof(n[0])
static Eina_Bool _effects_enabled = EINA_FALSE;
+static Eina_Bool _backgrounds_enabled = EINA_FALSE;
Evas_Object *
evisum_ui_tab_add(Evas_Object *parent, Evas_Object **alias, const char *text,
@@ -477,6 +478,18 @@ evisum_ui_background_add(Evas_Object *win, Eina_Bool
enabled)
return bg;
}
+Eina_Bool
+evisum_ui_backgrounds_enabled_get(void)
+{
+ return _backgrounds_enabled;
+}
+
+void
+evisum_ui_backgrounds_enabled_set(Eina_Bool enabled)
+{
+ _backgrounds_enabled = enabled;
+}
+
Eina_Bool
evisum_ui_effects_enabled_get(void)
{
diff --git a/src/bin/ui/ui_util.h b/src/bin/ui/ui_util.h
index ef8bf74..fca3798 100644
--- a/src/bin/ui/ui_util.h
+++ b/src/bin/ui/ui_util.h
@@ -41,6 +41,12 @@ evisum_ui_background_add(Evas_Object *win, Eina_Bool
enabled);
Evas_Object *
evisum_ui_background_random_add(Evas_Object *win, Eina_Bool enabled);
+void
+evisum_ui_backgrounds_enabled_set(Eina_Bool enabled);
+
+Eina_Bool
+evisum_ui_backgrounds_enabled_get(void);
+
void
evisum_ui_effects_enabled_set(Eina_Bool enabled);
--
