ui: stuff.

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;
 

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);

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);

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);

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);

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);

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)
 {

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);