netstar pushed a commit to branch master. http://git.enlightenment.org/apps/evisum.git/commit/?id=324a619a87a865e8512c2fa4344d9d41441ea7f8
commit 324a619a87a865e8512c2fa4344d9d41441ea7f8 Author: Alastair Poole <[email protected]> Date: Mon Oct 5 16:11:26 2020 +0100 sensors: diss the misc. Rename... --- src/bin/ui/meson.build | 4 ++-- src/bin/ui/ui.c | 16 +++++++------- src/bin/ui/ui.h | 2 +- src/bin/ui/{ui_misc.c => ui_sensors.c} | 38 +++++++++++++++++----------------- src/bin/ui/{ui_misc.h => ui_sensors.h} | 2 +- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/bin/ui/meson.build b/src/bin/ui/meson.build index 9db3d53..b83b812 100644 --- a/src/bin/ui/meson.build +++ b/src/bin/ui/meson.build @@ -6,8 +6,8 @@ src += files([ 'ui_util.c', 'ui_cache.c', 'ui_cache.h', - 'ui_misc.c', - 'ui_misc.h', + 'ui_sensors.c', + 'ui_sensors.h', 'ui_disk.c', 'ui_disk.h', 'ui_memory.h', diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c index 50be4a7..50cfaca 100644 --- a/src/bin/ui/ui.c +++ b/src/bin/ui/ui.c @@ -1,9 +1,9 @@ #include "config.h" #include "ui.h" -#include "ui/ui_disk.h" -#include "ui/ui_misc.h" -#include "ui/ui_memory.h" #include "ui/ui_cpu.h" +#include "ui/ui_memory.h" +#include "ui/ui_disk.h" +#include "ui/ui_sensors.h" #include "ui/ui_process_view.h" #include <stdio.h> @@ -1071,12 +1071,12 @@ _menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, } static void -_menu_misc_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, +_menu_sensors_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { Ui *ui = data; - ui_win_misc_add(ui); + ui_win_sensors_add(ui); } static void @@ -1221,7 +1221,7 @@ _main_menu_create(Ui *ui, Evas_Object *btn) elm_box_pack_end(hbox, btn); btn = _btn_create(hbox, "misc", _("Sensors"), - _menu_misc_activity_clicked_cb, ui); + _menu_sensors_activity_clicked_cb, ui); elm_box_pack_end(hbox, btn); sep = elm_separator_add(hbox); @@ -1647,8 +1647,8 @@ evisum_ui_shutdown(Ui *ui) evas_object_smart_callback_call(ui->mem.win, "delete,request", NULL); if (ui->disk.win) evas_object_smart_callback_call(ui->disk.win, "delete,request", NULL); - if (ui->misc.win) - evas_object_smart_callback_call(ui->misc.win, "delete,request", NULL); + if (ui->sensors.win) + evas_object_smart_callback_call(ui->sensors.win, "delete,request", NULL); if (ui->win_about) evas_object_smart_callback_call(ui->win_about, "delete,request", NULL); diff --git a/src/bin/ui/ui.h b/src/bin/ui/ui.h index f736c0b..f42d5f2 100644 --- a/src/bin/ui/ui.h +++ b/src/bin/ui/ui.h @@ -96,7 +96,7 @@ typedef struct Ui Evas_Object *win; Evas_Object *box; Evas_Object *timer; - } misc; + } sensors; struct { diff --git a/src/bin/ui/ui_misc.c b/src/bin/ui/ui_sensors.c similarity index 92% rename from src/bin/ui/ui_misc.c rename to src/bin/ui/ui_sensors.c index 9ef6681..4ee0764 100644 --- a/src/bin/ui/ui_misc.c +++ b/src/bin/ui/ui_sensors.c @@ -1,4 +1,4 @@ -#include "ui_misc.h" +#include "ui_sensors.h" #include "system/machine.h" static Eina_Bool @@ -157,7 +157,7 @@ _separator_add(Evas_Object *box) } static void -_misc_free(power_t *power, sensor_t **sensors, int sensor_count) +_sensors_free(power_t *power, sensor_t **sensors, int sensor_count) { for (int i = 0; i < power->battery_count; i++) { @@ -186,7 +186,7 @@ _misc_free(power_t *power, sensor_t **sensors, int sensor_count) } static Eina_Bool -_misc_update(void *data) +_sensors_update(void *data) { Ui *ui; power_t power; @@ -196,9 +196,9 @@ _misc_update(void *data) ui = data; - elm_box_clear(ui->misc.box); + elm_box_clear(ui->sensors.box); - box = elm_box_add(ui->misc.box); + box = elm_box_add(ui->sensors.box); evas_object_size_hint_align_set(box, FILL, FILL); evas_object_size_hint_weight_set(box, EXPAND, EXPAND); evas_object_show(box); @@ -216,15 +216,15 @@ _misc_update(void *data) _separator_add(box); } - _misc_free(&power, sensors, sensor_count); + _sensors_free(&power, sensors, sensor_count); - frame = elm_frame_add(ui->misc.box); + frame = elm_frame_add(ui->sensors.box); evas_object_size_hint_align_set(frame, FILL, FILL); evas_object_size_hint_weight_set(frame, EXPAND, EXPAND); elm_object_style_set(frame, "pad_huge"); evas_object_show(frame); elm_object_content_set(frame, box); - elm_box_pack_end(ui->misc.box, frame); + elm_box_pack_end(ui->sensors.box, frame); return EINA_TRUE; } @@ -235,27 +235,27 @@ _win_del_cb(void *data, Evas_Object *obj EINA_UNUSED, { Ui *ui = data; - if (ui->misc.timer) - ecore_timer_del(ui->misc.timer); - ui->misc.timer = NULL; + if (ui->sensors.timer) + ecore_timer_del(ui->sensors.timer); + ui->sensors.timer = NULL; evas_object_del(obj); - ui->misc.win = NULL; + ui->sensors.win = NULL; } void -ui_win_misc_add(Ui *ui) +ui_win_sensors_add(Ui *ui) { Evas_Object *win, *box, *hbox, *frame, *scroller; Evas_Object *table, *border, *rect; - if (ui->misc.win) + if (ui->sensors.win) { - elm_win_raise(ui->misc.win); + elm_win_raise(ui->sensors.win); return; } - ui->misc.win = win = elm_win_util_standard_add("evisum", _("Sensors")); + 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()); @@ -265,7 +265,7 @@ ui_win_misc_add(Ui *ui) evas_object_size_hint_align_set(box, FILL, FILL); evas_object_hide(box); - ui->misc.box = hbox = elm_box_add(box); + ui->sensors.box = hbox = elm_box_add(box); evas_object_size_hint_weight_set(hbox, EXPAND, EXPAND); evas_object_size_hint_align_set(hbox, FILL, FILL); evas_object_show(hbox); @@ -310,8 +310,8 @@ ui_win_misc_add(Ui *ui) evas_object_smart_callback_add(win, "delete,request", _win_del_cb, ui); evisum_child_window_show(ui->win, win); - _misc_update(ui); + _sensors_update(ui); - ui->misc.timer = ecore_timer_add(ui->settings.poll_delay, _misc_update, ui); + ui->sensors.timer = ecore_timer_add(ui->settings.poll_delay, _sensors_update, ui); } diff --git a/src/bin/ui/ui_misc.h b/src/bin/ui/ui_sensors.h similarity index 79% rename from src/bin/ui/ui_misc.h rename to src/bin/ui/ui_sensors.h index 1131415..3cfc7d7 100644 --- a/src/bin/ui/ui_misc.h +++ b/src/bin/ui/ui_sensors.h @@ -5,6 +5,6 @@ #include "../system/machine.h" void -ui_win_misc_add(Ui *ui); +ui_win_sensors_add(Ui *ui); #endif --
