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 d49bf6bc06bbafca053fcd38c1f48f7623921184
Author: Alastair Poole <m...@alastairpoole.com>
AuthorDate: Sat Mar 22 13:33:53 2025 +0000
code: refactor.
vtorri inspired me. This is prettier in my humble opinion.
---
src/bin/ui/evisum_ui.c | 56 +++++++++++-----------
src/bin/ui/evisum_ui.h | 4 +-
src/bin/ui/{ui_cache.c => evisum_ui_cache.c} | 2 +-
src/bin/ui/{ui_cache.h => evisum_ui_cache.h} | 4 +-
src/bin/ui/{ui_cpu.c => evisum_ui_cpu.c} | 14 +++---
src/bin/ui/{ui_cpu.h => evisum_ui_cpu.h} | 12 ++---
src/bin/ui/{ui_disk.c => evisum_ui_disk.c} | 4 +-
src/bin/ui/evisum_ui_disk.h | 9 ++++
src/bin/ui/{ui_memory.c => evisum_ui_memory.c} | 4 +-
src/bin/ui/evisum_ui_memory.h | 10 ++++
src/bin/ui/{ui_network.c => evisum_ui_network.c} | 4 +-
src/bin/ui/evisum_ui_network.h | 10 ++++
...{ui_process_list.c => evisum_ui_process_list.c} | 16 +++----
...{ui_process_list.h => evisum_ui_process_list.h} | 6 +--
...{ui_process_view.c => evisum_ui_process_view.c} | 8 ++--
...{ui_process_view.h => evisum_ui_process_view.h} | 6 +--
src/bin/ui/{ui_sensors.c => evisum_ui_sensors.c} | 4 +-
src/bin/ui/evisum_ui_sensors.h | 10 ++++
src/bin/ui/{ui_util.c => evisum_ui_util.c} | 2 +-
src/bin/ui/{ui_util.h => evisum_ui_util.h} | 4 +-
src/bin/ui/meson.build | 36 +++++++-------
src/bin/ui/ui_disk.h | 9 ----
src/bin/ui/ui_memory.h | 10 ----
src/bin/ui/ui_network.h | 10 ----
src/bin/ui/ui_sensors.h | 10 ----
src/bin/ui/visuals/cpu_bars.h | 2 +-
src/bin/ui/visuals/cpu_basic.h | 2 +-
src/bin/ui/visuals/cpu_default.h | 2 +-
28 files changed, 135 insertions(+), 135 deletions(-)
diff --git a/src/bin/ui/evisum_ui.c b/src/bin/ui/evisum_ui.c
index 91180b1..5f37ec0 100644
--- a/src/bin/ui/evisum_ui.c
+++ b/src/bin/ui/evisum_ui.c
@@ -7,13 +7,13 @@
#include "evisum_ui.h"
#include "ui/evisum_ui_colors.h"
-#include "ui/ui_cpu.h"
-#include "ui/ui_memory.h"
-#include "ui/ui_disk.h"
-#include "ui/ui_sensors.h"
-#include "ui/ui_network.h"
-#include "ui/ui_process_view.h"
-#include "ui/ui_process_list.h"
+#include "ui/evisum_ui_cpu.h"
+#include "ui/evisum_ui_memory.h"
+#include "ui/evisum_ui_disk.h"
+#include "ui/evisum_ui_sensors.h"
+#include "ui/evisum_ui_network.h"
+#include "ui/evisum_ui_process_view.h"
+#include "ui/evisum_ui_process_list.h"
int EVISUM_EVENT_CONFIG_CHANGED;
@@ -210,7 +210,7 @@ _menu_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
{
Evisum_Ui *ui = data;
- ui_mem_win_add(ui);
+ evisum_ui_mem_win_add(ui);
}
static void
@@ -219,7 +219,7 @@ _menu_network_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
{
Evisum_Ui *ui = data;
- ui_network_win_add(ui);
+ evisum_ui_network_win_add(ui);
}
static void
@@ -228,7 +228,7 @@ _menu_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
{
Evisum_Ui *ui = data;
- ui_disk_win_add(ui);
+ evisum_ui_disk_win_add(ui);
}
static void
@@ -237,7 +237,7 @@ _menu_sensors_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
{
Evisum_Ui *ui = data;
- ui_sensors_win_add(ui);
+ evisum_ui_sensors_win_add(ui);
}
static void
@@ -246,7 +246,7 @@ _menu_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
{
Evisum_Ui *ui = data;
- ui_cpu_win_add(ui);
+ evisum_ui_cpu_win_add(ui);
}
static void
@@ -255,7 +255,7 @@ _menu_process_view_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
{
Evisum_Ui *ui = data;
- ui_process_list_win_add(ui);
+ evisum_ui_process_list_win_add(ui);
}
static void
@@ -410,7 +410,7 @@ _cpu_visual_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
if (ui->cpu.visual) free(ui->cpu.visual);
ui->cpu.visual = strdup(txt);
- ui_cpu_win_restart(ui);
+ evisum_ui_cpu_win_restart(ui);
}
Evas_Object *
@@ -551,7 +551,7 @@ evisum_ui_main_menu_create(Evisum_Ui *ui, Evas_Object *parent, Evas_Object *obj)
elm_object_content_set(fr, bx);
evas_object_show(bx);
- Eina_List *visuals = ui_cpu_visuals_get();
+ Eina_List *visuals = evisum_ui_cpu_visuals_get();
char *name;
EINA_LIST_FREE(visuals, name)
@@ -720,37 +720,37 @@ evisum_ui_activate(Evisum_Ui *ui, Evisum_Action action, int pid)
if (ui->proc.restart)
{
- ui_process_list_win_add(ui);
+ evisum_ui_process_list_win_add(ui);
restart = 1;
}
if (ui->cpu.restart)
{
- ui_cpu_win_add(ui);
+ evisum_ui_cpu_win_add(ui);
restart = 1;
}
if (ui->mem.restart)
{
- ui_mem_win_add(ui);
+ evisum_ui_mem_win_add(ui);
restart = 1;
}
if (ui->disk.restart)
{
- ui_disk_win_add(ui);
+ evisum_ui_disk_win_add(ui);
restart = 1;
}
if (ui->sensors.restart)
{
- ui_sensors_win_add(ui);
+ evisum_ui_sensors_win_add(ui);
restart = 1;
}
if (ui->network.restart)
{
- ui_network_win_add(ui);
+ evisum_ui_network_win_add(ui);
restart = 1;
}
@@ -766,25 +766,25 @@ evisum_ui_activate(Evisum_Ui *ui, Evisum_Action action, int pid)
switch (action)
{
case EVISUM_ACTION_DEFAULT:
- ui_process_list_win_add(ui);
+ evisum_ui_process_list_win_add(ui);
break;
case EVISUM_ACTION_PROCESS:
- ui_process_view_win_add(pid, PROC_VIEW_DEFAULT);
+ evisum_ui_process_view_win_add(pid, PROC_VIEW_DEFAULT);
break;
case EVISUM_ACTION_CPU:
- ui_cpu_win_add(ui);
+ evisum_ui_cpu_win_add(ui);
break;
case EVISUM_ACTION_MEM:
- ui_mem_win_add(ui);
+ evisum_ui_mem_win_add(ui);
break;
case EVISUM_ACTION_STORAGE:
- ui_disk_win_add(ui);
+ evisum_ui_disk_win_add(ui);
break;
case EVISUM_ACTION_SENSORS:
- ui_sensors_win_add(ui);
+ evisum_ui_sensors_win_add(ui);
break;
case EVISUM_ACTION_NETWORK:
- ui_network_win_add(ui);
+ evisum_ui_network_win_add(ui);
break;
}
}
diff --git a/src/bin/ui/evisum_ui.h b/src/bin/ui/evisum_ui.h
index 52ab1f4..184dae3 100644
--- a/src/bin/ui/evisum_ui.h
+++ b/src/bin/ui/evisum_ui.h
@@ -8,8 +8,8 @@
#include "system/machine.h"
#include "system/process.h"
-#include "ui/ui_util.h"
-#include "ui/ui_cache.h"
+#include "ui/evisum_ui_util.h"
+#include "ui/evisum_ui_cache.h"
#define _(STR) gettext(STR)
diff --git a/src/bin/ui/ui_cache.c b/src/bin/ui/evisum_ui_cache.c
similarity index 99%
rename from src/bin/ui/ui_cache.c
rename to src/bin/ui/evisum_ui_cache.c
index f15f6ce..12cf5c9 100644
--- a/src/bin/ui/ui_cache.c
+++ b/src/bin/ui/evisum_ui_cache.c
@@ -1,4 +1,4 @@
-#include "ui_cache.h"
+#include "evisum_ui_cache.h"
Evisum_Ui_Cache *
evisum_ui_item_cache_new(Evas_Object *parent,
diff --git a/src/bin/ui/ui_cache.h b/src/bin/ui/evisum_ui_cache.h
similarity index 94%
rename from src/bin/ui/ui_cache.h
rename to src/bin/ui/evisum_ui_cache.h
index f258d9e..14b329a 100644
--- a/src/bin/ui/ui_cache.h
+++ b/src/bin/ui/evisum_ui_cache.h
@@ -1,5 +1,5 @@
-#ifndef __UI_CACHE_H__
-#define __UI_CACHE_H__
+#ifndef __EVISUM_UI_CACHE_H__
+#define __EVISUM_UI_CACHE_H__
#include <Eina.h>
#include <Evas.h>
diff --git a/src/bin/ui/ui_cpu.c b/src/bin/ui/evisum_ui_cpu.c
similarity index 95%
rename from src/bin/ui/ui_cpu.c
rename to src/bin/ui/evisum_ui_cpu.c
index 747434e..e9984fb 100644
--- a/src/bin/ui/ui_cpu.c
+++ b/src/bin/ui/evisum_ui_cpu.c
@@ -1,4 +1,4 @@
-#include "ui_cpu.h"
+#include "evisum_ui_cpu.h"
#include "config.h"
// Templates for visualisations.
@@ -99,7 +99,7 @@ _win_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
}
Eina_List *
-ui_cpu_visuals_get(void)
+evisum_ui_cpu_visuals_get(void)
{
Eina_List *l = NULL;
@@ -112,7 +112,7 @@ ui_cpu_visuals_get(void)
}
Cpu_Visual *
-ui_cpu_visual_by_name(const char *name)
+evisum_ui_cpu_visual_by_name(const char *name)
{
for (int i = 0; (i < sizeof(visualizations) / sizeof(Cpu_Visual)); i++)
{
@@ -123,16 +123,16 @@ ui_cpu_visual_by_name(const char *name)
}
void
-ui_cpu_win_restart(Evisum_Ui *ui)
+evisum_ui_cpu_win_restart(Evisum_Ui *ui)
{
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_NONE);
evas_object_del(ui->cpu.win);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- ui_cpu_win_add(ui);
+ evisum_ui_cpu_win_add(ui);
}
void
-ui_cpu_win_add(Evisum_Ui *ui)
+evisum_ui_cpu_win_add(Evisum_Ui *ui)
{
Ui_Cpu_Data *pd;
Evas_Object *win, *box, *scr, *btn, *ic;
@@ -171,7 +171,7 @@ ui_cpu_win_add(Evisum_Ui *ui)
elm_table_pack(tb, box, 0, 0, 1, 1);
- vis = ui_cpu_visual_by_name(ui->cpu.visual);
+ vis = evisum_ui_cpu_visual_by_name(ui->cpu.visual);
if (!vis)
{
fprintf(stderr, "FATAL: unknown CPU visual (check your config)\n");
diff --git a/src/bin/ui/ui_cpu.h b/src/bin/ui/evisum_ui_cpu.h
similarity index 74%
rename from src/bin/ui/ui_cpu.h
rename to src/bin/ui/evisum_ui_cpu.h
index 9bbaf9b..d688bd9 100644
--- a/src/bin/ui/ui_cpu.h
+++ b/src/bin/ui/evisum_ui_cpu.h
@@ -1,5 +1,5 @@
-#ifndef __UI_CPU_H__
-#define __UI_CPU_H__
+#ifndef __EVISUM_UI_CPU_H__
+#define __EVISUM_UI_CPU_H__
#include "evisum_ui.h"
#include "evisum_ui_colors.h"
@@ -33,15 +33,15 @@ typedef struct {
} Cpu_Visual;
void
-ui_cpu_win_add(Evisum_Ui *ui);
+evisum_ui_cpu_win_add(Evisum_Ui *ui);
void
-ui_cpu_win_restart(Evisum_Ui *ui);
+evisum_ui_cpu_win_restart(Evisum_Ui *ui);
Eina_List *
-ui_cpu_visuals_get(void);
+evisum_ui_cpu_visuals_get(void);
Cpu_Visual *
-ui_cpu_visual_by_name(const char *name);
+evisum_ui_cpu_visual_by_name(const char *name);
#endif
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/evisum_ui_disk.c
similarity index 99%
rename from src/bin/ui/ui_disk.c
rename to src/bin/ui/evisum_ui_disk.c
index dc72b67..6f52d91 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/evisum_ui_disk.c
@@ -1,4 +1,4 @@
-#include "ui_disk.h"
+#include "evisum_ui_disk.h"
#include "../system/filesystems.h"
typedef struct
@@ -551,7 +551,7 @@ _btn_min_size(Evas_Object *parent)
}
void
-ui_disk_win_add(Evisum_Ui *ui)
+evisum_ui_disk_win_add(Evisum_Ui *ui)
{
Evas_Object *win, *tb, *scr;
Evas_Object *glist, *rec, *btn;
diff --git a/src/bin/ui/evisum_ui_disk.h b/src/bin/ui/evisum_ui_disk.h
new file mode 100644
index 0000000..516b613
--- /dev/null
+++ b/src/bin/ui/evisum_ui_disk.h
@@ -0,0 +1,9 @@
+#ifndef __EVISUM_UI_DISK_H__
+#define __EVISUM_UI_DISK_H__
+
+#include "evisum_ui.h"
+
+void
+evisum_ui_disk_win_add(Evisum_Ui *ui);
+
+#endif
diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/evisum_ui_memory.c
similarity index 99%
rename from src/bin/ui/ui_memory.c
rename to src/bin/ui/evisum_ui_memory.c
index 247def3..554d5cc 100644
--- a/src/bin/ui/ui_memory.c
+++ b/src/bin/ui/evisum_ui_memory.c
@@ -1,4 +1,4 @@
-#include "ui_memory.h"
+#include "evisum_ui_memory.h"
#include "system/filesystems.h"
#include <Elementary.h>
@@ -203,7 +203,7 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
void
-ui_mem_win_add(Evisum_Ui *ui)
+evisum_ui_mem_win_add(Evisum_Ui *ui)
{
Evas_Object *win, *lb, *bx, *tb, *pb;
Evas_Object *fr;
diff --git a/src/bin/ui/evisum_ui_memory.h b/src/bin/ui/evisum_ui_memory.h
new file mode 100644
index 0000000..df6c0d0
--- /dev/null
+++ b/src/bin/ui/evisum_ui_memory.h
@@ -0,0 +1,10 @@
+#ifndef __EVISUM_UI_MEMORY_H__
+#define __EVISUM_UI_MEMORY_H__
+
+#include "evisum_ui.h"
+#include "../system/machine.h"
+
+void
+evisum_ui_mem_win_add(Evisum_Ui *ui);
+
+#endif
diff --git a/src/bin/ui/ui_network.c b/src/bin/ui/evisum_ui_network.c
similarity index 99%
rename from src/bin/ui/ui_network.c
rename to src/bin/ui/evisum_ui_network.c
index acb325d..8909758 100644
--- a/src/bin/ui/ui_network.c
+++ b/src/bin/ui/evisum_ui_network.c
@@ -1,4 +1,4 @@
-#include "ui_network.h"
+#include "evisum_ui_network.h"
#include "system/machine.h"
typedef struct
@@ -333,7 +333,7 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
void
-ui_network_win_add(Evisum_Ui *ui)
+evisum_ui_network_win_add(Evisum_Ui *ui)
{
Evas_Object *win, *bx, *glist;;
Elm_Genlist_Item_Class *itc;
diff --git a/src/bin/ui/evisum_ui_network.h b/src/bin/ui/evisum_ui_network.h
new file mode 100644
index 0000000..4ea8ae7
--- /dev/null
+++ b/src/bin/ui/evisum_ui_network.h
@@ -0,0 +1,10 @@
+#ifndef __EVISUM_UI_NETWORK_H__
+#define __EVISUM_UI_NETWORK_H__
+
+#include "evisum_ui.h"
+#include "../system/machine.h"
+
+void
+evisum_ui_network_win_add(Evisum_Ui *ui);
+
+#endif
diff --git a/src/bin/ui/ui_process_list.c b/src/bin/ui/evisum_ui_process_list.c
similarity index 99%
rename from src/bin/ui/ui_process_list.c
rename to src/bin/ui/evisum_ui_process_list.c
index 4a4e9dc..e588363 100644
--- a/src/bin/ui/ui_process_list.c
+++ b/src/bin/ui/evisum_ui_process_list.c
@@ -2,8 +2,8 @@
#include "evisum_config.h"
#include "evisum_ui.h"
-#include "ui/ui_process_list.h"
-#include "ui/ui_process_view.h"
+#include "ui/evisum_ui_process_list.h"
+#include "ui/evisum_ui_process_view.h"
#include <stdio.h>
#define __STDC_FORMAT_MACROS
@@ -1471,7 +1471,7 @@ _item_menu_manual_cb(void *data, Evas_Object *obj EINA_UNUSED,
_item_menu_cancel_cb(wd, NULL, NULL);
- ui_process_view_win_add(wd->selected_pid, PROC_VIEW_MANUAL);
+ evisum_ui_process_view_win_add(wd->selected_pid, PROC_VIEW_MANUAL);
}
static void
@@ -1482,7 +1482,7 @@ _item_menu_threads_cb(void *data, Evas_Object *obj EINA_UNUSED,
_item_menu_cancel_cb(wd, NULL, NULL);
- ui_process_view_win_add(wd->selected_pid, PROC_VIEW_THREADS);
+ evisum_ui_process_view_win_add(wd->selected_pid, PROC_VIEW_THREADS);
}
static void
@@ -1493,7 +1493,7 @@ _item_menu_children_cb(void *data, Evas_Object *obj EINA_UNUSED,
_item_menu_cancel_cb(wd, NULL, NULL);
- ui_process_view_win_add(wd->selected_pid, PROC_VIEW_CHILDREN);
+ evisum_ui_process_view_win_add(wd->selected_pid, PROC_VIEW_CHILDREN);
}
static void
@@ -1504,7 +1504,7 @@ _item_menu_general_cb(void *data, Evas_Object *obj EINA_UNUSED,
_item_menu_cancel_cb(wd, NULL, NULL);
- ui_process_view_win_add(wd->selected_pid, PROC_VIEW_DEFAULT);
+ evisum_ui_process_view_win_add(wd->selected_pid, PROC_VIEW_DEFAULT);
}
static void
@@ -1614,7 +1614,7 @@ _item_pid_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
if (!proc) return;
wd->selected_pid = proc->pid;
- ui_process_view_win_add(proc->pid, PROC_VIEW_DEFAULT);
+ evisum_ui_process_view_win_add(proc->pid, PROC_VIEW_DEFAULT);
}
static void
@@ -2371,7 +2371,7 @@ _init(Win_Data *wd)
}
void
-ui_process_list_win_add(Evisum_Ui *ui)
+evisum_ui_process_list_win_add(Evisum_Ui *ui)
{
Evas_Object *win, *icon;
Evas_Object *tb;
diff --git a/src/bin/ui/ui_process_list.h b/src/bin/ui/evisum_ui_process_list.h
similarity index 88%
rename from src/bin/ui/ui_process_list.h
rename to src/bin/ui/evisum_ui_process_list.h
index 1ef86da..a3ef17b 100644
--- a/src/bin/ui/ui_process_list.h
+++ b/src/bin/ui/evisum_ui_process_list.h
@@ -1,5 +1,5 @@
-#ifndef __UI_PROCESS_LIST_H__
-#define __UI_PROCESS_LIST_H__
+#ifndef __EVISUM_UI_PROCESS_LIST_H__
+#define __EVISUM_UI_PROCESS_LIST_H__
#include "evisum_ui.h"
@@ -45,6 +45,6 @@ typedef enum
} Proc_Field;
void
-ui_process_list_win_add(Evisum_Ui *ui);
+evisum_ui_process_list_win_add(Evisum_Ui *ui);
#endif
diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/evisum_ui_process_view.c
similarity index 99%
rename from src/bin/ui/ui_process_view.c
rename to src/bin/ui/evisum_ui_process_view.c
index 37f78d6..441e7e1 100644
--- a/src/bin/ui/ui_process_view.c
+++ b/src/bin/ui/evisum_ui_process_view.c
@@ -1,4 +1,4 @@
-#include "ui_process_view.h"
+#include "evisum_ui_process_view.h"
#include "evisum_ui_colors.h"
#include "../system/process.h"
#include "util.c"
@@ -488,7 +488,7 @@ _btn_ppid_clicked_cb(void *data, Evas_Object *obj, void *event_info)
if (!proc) return;
- ui_process_view_win_add(proc->pid, PROC_VIEW_DEFAULT);
+ evisum_ui_process_view_win_add(proc->pid, PROC_VIEW_DEFAULT);
proc_info_free(proc);
}
@@ -506,7 +506,7 @@ _item_children_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
proc = elm_object_item_data_get(it);
if (!proc) return;
- ui_process_view_win_add(proc->pid, PROC_VIEW_DEFAULT);
+ evisum_ui_process_view_win_add(proc->pid, PROC_VIEW_DEFAULT);
}
static char *
@@ -1738,7 +1738,7 @@ _activate(Win_Data *wd, Evisum_Proc_Action action)
}
void
-ui_process_view_win_add(int pid, Evisum_Proc_Action action)
+evisum_ui_process_view_win_add(int pid, Evisum_Proc_Action action)
{
Evas_Object *win, *ic, *bx, *tabs, *tb;
Proc_Info *proc;
diff --git a/src/bin/ui/ui_process_view.h b/src/bin/ui/evisum_ui_process_view.h
similarity index 59%
rename from src/bin/ui/ui_process_view.h
rename to src/bin/ui/evisum_ui_process_view.h
index 10d4072..e4c6858 100644
--- a/src/bin/ui/ui_process_view.h
+++ b/src/bin/ui/evisum_ui_process_view.h
@@ -1,5 +1,5 @@
-#ifndef __UI_PROCESS_H__
-#define __UI_PROCESS_H__
+#ifndef __EVISUM_UI_PROCESS_H__
+#define __EVISUM_UI_PROCESS_H__
#include "evisum_ui.h"
@@ -12,6 +12,6 @@ typedef enum
} Evisum_Proc_Action;
void
-ui_process_view_win_add(int pid, Evisum_Proc_Action action);
+evisum_ui_process_view_win_add(int pid, Evisum_Proc_Action action);
#endif
diff --git a/src/bin/ui/ui_sensors.c b/src/bin/ui/evisum_ui_sensors.c
similarity index 99%
rename from src/bin/ui/ui_sensors.c
rename to src/bin/ui/evisum_ui_sensors.c
index 88758e8..945ea9d 100644
--- a/src/bin/ui/ui_sensors.c
+++ b/src/bin/ui/evisum_ui_sensors.c
@@ -1,4 +1,4 @@
-#include "ui_sensors.h"
+#include "evisum_ui_sensors.h"
#include "system/machine.h"
typedef struct
@@ -249,7 +249,7 @@ _win_resize_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
void
-ui_sensors_win_add(Evisum_Ui *ui)
+evisum_ui_sensors_win_add(Evisum_Ui *ui)
{
Evas_Object *win, *content, *tbl, *bx, *fr;
Evas_Object *glist, *pb;
diff --git a/src/bin/ui/evisum_ui_sensors.h b/src/bin/ui/evisum_ui_sensors.h
new file mode 100644
index 0000000..da83ee4
--- /dev/null
+++ b/src/bin/ui/evisum_ui_sensors.h
@@ -0,0 +1,10 @@
+#ifndef __EVISUM_UI_SENSORS_H__
+#define __EVISUM_UI_SENSORS_H__
+
+#include "evisum_ui.h"
+#include "../system/machine.h"
+
+void
+evisum_ui_sensors_win_add(Evisum_Ui *ui);
+
+#endif
diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/evisum_ui_util.c
similarity index 99%
rename from src/bin/ui/ui_util.c
rename to src/bin/ui/evisum_ui_util.c
index 39ee008..91303f2 100644
--- a/src/bin/ui/ui_util.c
+++ b/src/bin/ui/evisum_ui_util.c
@@ -1,4 +1,4 @@
-#include "ui_util.h"
+#include "evisum_ui_util.h"
#include "evisum_ui.h"
#include <Elementary.h>
#include "config.h"
diff --git a/src/bin/ui/ui_util.h b/src/bin/ui/evisum_ui_util.h
similarity index 95%
rename from src/bin/ui/ui_util.h
rename to src/bin/ui/evisum_ui_util.h
index 08e9ef2..a9a70e7 100644
--- a/src/bin/ui/ui_util.h
+++ b/src/bin/ui/evisum_ui_util.h
@@ -1,5 +1,5 @@
-#ifndef __UI_UTIL_H__
-#define __UI_UTIL_H__
+#ifndef __EVISUM_UI_UTIL_H__
+#define __EVISUM_UI_UTIL_H__
#include <Evas.h>
#include "system/process.h"
diff --git a/src/bin/ui/meson.build b/src/bin/ui/meson.build
index 7fcaada..3b500b2 100644
--- a/src/bin/ui/meson.build
+++ b/src/bin/ui/meson.build
@@ -4,28 +4,28 @@ src += files([
'evisum_ui.c',
'evisum_ui_colors.c',
'evisum_ui_colors.h',
- 'ui_util.h',
- 'ui_util.c',
- 'ui_cache.c',
- 'ui_cache.h',
- 'ui_network.c',
- 'ui_network.h',
- 'ui_sensors.c',
- 'ui_sensors.h',
- 'ui_disk.c',
- 'ui_disk.h',
- 'ui_memory.h',
- 'ui_memory.c'
+ 'evisum_ui_util.h',
+ 'evisum_ui_util.c',
+ 'evisum_ui_cache.c',
+ 'evisum_ui_cache.h',
+ 'evisum_ui_network.c',
+ 'evisum_ui_network.h',
+ 'evisum_ui_sensors.c',
+ 'evisum_ui_sensors.h',
+ 'evisum_ui_disk.c',
+ 'evisum_ui_disk.h',
+ 'evisum_ui_memory.h',
+ 'evisum_ui_memory.c'
])
# IDK, OpenBSD aarch64...
subdir('visuals')
src += files([
- 'ui_cpu.c',
- 'ui_cpu.h',
- 'ui_process_view.c',
- 'ui_process_view.h',
- 'ui_process_list.c',
- 'ui_process_list.h',
+ 'evisum_ui_cpu.c',
+ 'evisum_ui_cpu.h',
+ 'evisum_ui_process_view.c',
+ 'evisum_ui_process_view.h',
+ 'evisum_ui_process_list.c',
+ 'evisum_ui_process_list.h',
])
diff --git a/src/bin/ui/ui_disk.h b/src/bin/ui/ui_disk.h
deleted file mode 100644
index cd7acfd..0000000
--- a/src/bin/ui/ui_disk.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __UI_DISK_H__
-#define __UI_DISK_H__
-
-#include "evisum_ui.h"
-
-void
-ui_disk_win_add(Evisum_Ui *ui);
-
-#endif
diff --git a/src/bin/ui/ui_memory.h b/src/bin/ui/ui_memory.h
deleted file mode 100644
index 44f8cff..0000000
--- a/src/bin/ui/ui_memory.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __UI_MEMORY_H__
-#define __UI_MEMORY_H__
-
-#include "evisum_ui.h"
-#include "../system/machine.h"
-
-void
-ui_mem_win_add(Evisum_Ui *ui);
-
-#endif
diff --git a/src/bin/ui/ui_network.h b/src/bin/ui/ui_network.h
deleted file mode 100644
index 59eaca5..0000000
--- a/src/bin/ui/ui_network.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __UI_NETWORK_H__
-#define __UI_NETWORK_H__
-
-#include "evisum_ui.h"
-#include "../system/machine.h"
-
-void
-ui_network_win_add(Evisum_Ui *ui);
-
-#endif
diff --git a/src/bin/ui/ui_sensors.h b/src/bin/ui/ui_sensors.h
deleted file mode 100644
index 2539414..0000000
--- a/src/bin/ui/ui_sensors.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __UI_SENSORS_H__
-#define __UI_SENSORS_H__
-
-#include "evisum_ui.h"
-#include "../system/machine.h"
-
-void
-ui_sensors_win_add(Evisum_Ui *ui);
-
-#endif
diff --git a/src/bin/ui/visuals/cpu_bars.h b/src/bin/ui/visuals/cpu_bars.h
index 978296c..9033c35 100644
--- a/src/bin/ui/visuals/cpu_bars.h
+++ b/src/bin/ui/visuals/cpu_bars.h
@@ -1,7 +1,7 @@
#ifndef CPU_BARS_H
#define CPU_BARS_H
-#include "ui/ui_cpu.h"
+#include "ui/evisum_ui_cpu.h"
Ui_Cpu_Data *
cpu_visual_bars(Evas_Object *parent);
diff --git a/src/bin/ui/visuals/cpu_basic.h b/src/bin/ui/visuals/cpu_basic.h
index a586001..bee5673 100644
--- a/src/bin/ui/visuals/cpu_basic.h
+++ b/src/bin/ui/visuals/cpu_basic.h
@@ -1,7 +1,7 @@
#ifndef CPU_BASIC_H
#define CPU_BASIC_H
-#include "ui/ui_cpu.h"
+#include "ui/evisum_ui_cpu.h"
Ui_Cpu_Data *
cpu_visual_basic(Evas_Object *parent);
diff --git a/src/bin/ui/visuals/cpu_default.h b/src/bin/ui/visuals/cpu_default.h
index 347e9b1..7fdca09 100644
--- a/src/bin/ui/visuals/cpu_default.h
+++ b/src/bin/ui/visuals/cpu_default.h
@@ -1,7 +1,7 @@
#ifndef CPU_VISUAL_H
#define CPU_VISUAL_H
-#include "ui/ui_cpu.h"
+#include "ui/evisum_ui_cpu.h"
Ui_Cpu_Data *
cpu_visual_default(Evas_Object *parent);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
