From 121bf0d699b401fa60972e2a7e65fa491b07c972 Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Fri, 15 Jan 2021 12:42:31 +0000 Subject: [PATCH] ui: Naming before some gaming. --- src/bin/ui/ui.c | 26 +++++++++++++------------- src/bin/ui/ui_cpu.c | 2 +- src/bin/ui/ui_cpu.h | 2 +- src/bin/ui/ui_disk.c | 2 +- src/bin/ui/ui_disk.h | 2 +- src/bin/ui/ui_memory.c | 2 +- src/bin/ui/ui_memory.h | 2 +- src/bin/ui/ui_process_list.c | 4 ++-- src/bin/ui/ui_process_view.c | 4 ++-- src/bin/ui/ui_process_view.h | 2 +- src/bin/ui/ui_sensors.c | 2 +- src/bin/ui/ui_sensors.h | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c index 98e1eed..4ba67d0 100644 --- a/src/bin/ui/ui.c +++ b/src/bin/ui/ui.c @@ -171,7 +171,7 @@ _menu_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, { Ui *ui = data; - ui_win_memory_add(ui); + ui_mem_win_add(ui); } static void @@ -180,7 +180,7 @@ _menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, { Ui *ui = data; - ui_win_disk_add(ui); + ui_disk_win_add(ui); } static void @@ -189,7 +189,7 @@ _menu_sensors_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, { Ui *ui = data; - ui_win_sensors_add(ui); + ui_sensors_win_add(ui); } static void @@ -198,7 +198,7 @@ _menu_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, { Ui *ui = data; - ui_win_cpu_add(ui); + ui_cpu_win_add(ui); } static void @@ -500,25 +500,25 @@ evisum_ui_activate(Ui *ui, Evisum_Action action, int pid) if (ui->cpu.restart) { - ui_win_cpu_add(ui); + ui_cpu_win_add(ui); restart = 1; } if (ui->mem.restart) { - ui_win_memory_add(ui); + ui_mem_win_add(ui); restart = 1; } if (ui->disk.restart) { - ui_win_disk_add(ui); + ui_disk_win_add(ui); restart = 1; } if (ui->sensors.restart) { - ui_win_sensors_add(ui); + ui_sensors_win_add(ui); restart = 1; } @@ -537,19 +537,19 @@ evisum_ui_activate(Ui *ui, Evisum_Action action, int pid) ui_process_list_win_add(ui); break; case EVISUM_ACTION_PROCESS: - ui_process_win_add(pid); + ui_process_view_win_add(pid); break; case EVISUM_ACTION_CPU: - ui_win_cpu_add(ui); + ui_cpu_win_add(ui); break; case EVISUM_ACTION_MEM: - ui_win_memory_add(ui); + ui_mem_win_add(ui); break; case EVISUM_ACTION_STORAGE: - ui_win_disk_add(ui); + ui_disk_win_add(ui); break; case EVISUM_ACTION_SENSORS: - ui_win_sensors_add(ui); + ui_sensors_win_add(ui); break; } } diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/ui_cpu.c index 492df06..f21a01f 100644 --- a/src/bin/ui/ui_cpu.c +++ b/src/bin/ui/ui_cpu.c @@ -777,7 +777,7 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) } void -ui_win_cpu_add(Ui *ui) +ui_cpu_win_add(Ui *ui) { Animate *ad; Evas_Object *win, *box, *scroller; diff --git a/src/bin/ui/ui_cpu.h b/src/bin/ui/ui_cpu.h index df1bb9c..8fb0423 100644 --- a/src/bin/ui/ui_cpu.h +++ b/src/bin/ui/ui_cpu.h @@ -5,6 +5,6 @@ #include "../system/machine.h" void -ui_win_cpu_add(Ui *ui); +ui_cpu_win_add(Ui *ui); #endif diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c index d6eb3f4..a5d2b0e 100644 --- a/src/bin/ui/ui_disk.c +++ b/src/bin/ui/ui_disk.c @@ -565,7 +565,7 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) } void -ui_win_disk_add(Ui *ui) +ui_disk_win_add(Ui *ui) { Evas_Object *win, *panes, *fr, *bx, *tbl, *scr; Evas_Object *genlist, *btn; diff --git a/src/bin/ui/ui_disk.h b/src/bin/ui/ui_disk.h index b2c3665..1b130dd 100644 --- a/src/bin/ui/ui_disk.h +++ b/src/bin/ui/ui_disk.h @@ -4,6 +4,6 @@ #include "ui.h" void -ui_win_disk_add(Ui *ui); +ui_disk_win_add(Ui *ui); #endif diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c index 30356b6..91a8ee9 100644 --- a/src/bin/ui/ui_memory.c +++ b/src/bin/ui/ui_memory.c @@ -204,7 +204,7 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) } void -ui_win_memory_add(Ui *ui) +ui_mem_win_add(Ui *ui) { Evas_Object *win, *lb, *bx, *tbl, *pb; Evas_Object *fr; diff --git a/src/bin/ui/ui_memory.h b/src/bin/ui/ui_memory.h index 0cbe90c..d4cbb11 100644 --- a/src/bin/ui/ui_memory.h +++ b/src/bin/ui/ui_memory.h @@ -5,7 +5,7 @@ #include "../system/machine.h" void -ui_win_memory_add(Ui *ui); +ui_mem_win_add(Ui *ui); #endif diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/ui_process_list.c index 0ef8ff2..a41ba20 100644 --- a/src/bin/ui/ui_process_list.c +++ b/src/bin/ui/ui_process_list.c @@ -1056,7 +1056,7 @@ _item_menu_properties_cb(void *data, Evas_Object *obj EINA_UNUSED, _item_menu_cancel_cb(pd, NULL, NULL); - ui_process_win_add(pd->selected_pid); + ui_process_view_win_add(pd->selected_pid); } static Evas_Object * @@ -1151,7 +1151,7 @@ _item_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) if (!proc) return; pd->selected_pid = proc->pid; - ui_process_win_add(proc->pid); + ui_process_view_win_add(proc->pid); } static void diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c index 71a8edd..3b9ccca 100644 --- a/src/bin/ui/ui_process_view.c +++ b/src/bin/ui/ui_process_view.c @@ -447,7 +447,7 @@ _item_tree_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, proc = elm_object_item_data_get(it); if (!proc) return; - ui_process_win_add(proc->pid); + ui_process_view_win_add(proc->pid); } static char * @@ -1408,7 +1408,7 @@ _win_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) } void -ui_process_win_add(int pid) +ui_process_view_win_add(int pid) { Evas_Object *win, *ic, *bx, *tabs; Proc_Info *proc; diff --git a/src/bin/ui/ui_process_view.h b/src/bin/ui/ui_process_view.h index ddd7a6e..ae2cb80 100644 --- a/src/bin/ui/ui_process_view.h +++ b/src/bin/ui/ui_process_view.h @@ -4,6 +4,6 @@ #include "ui.h" void -ui_process_win_add(int pid); +ui_process_view_win_add(int pid); #endif diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/ui_sensors.c index dbbadb5..acf2c2c 100644 --- a/src/bin/ui/ui_sensors.c +++ b/src/bin/ui/ui_sensors.c @@ -260,7 +260,7 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) } void -ui_win_sensors_add(Ui *ui) +ui_sensors_win_add(Ui *ui) { Evas_Object *win, *content, *tbl, *bx, *fr; Evas_Object *genlist, *pb; diff --git a/src/bin/ui/ui_sensors.h b/src/bin/ui/ui_sensors.h index de5634e..e15af2d 100644 --- a/src/bin/ui/ui_sensors.h +++ b/src/bin/ui/ui_sensors.h @@ -5,6 +5,6 @@ #include "../system/machine.h" void -ui_win_sensors_add(Ui *ui); +ui_sensors_win_add(Ui *ui); #endif