enlightenment/evisum
enlightenment
/
evisum
7
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Changes: Improve the program. 

Some visual changes, additions and fixes.
This commit is contained in:
Alastair Poole 2019-06-08 23:39:15 +01:00
parent 56f2667451
commit cced6b35fa
8 changed files with 118 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -24,11 +24,11 @@ $ make install
or as an example: or as an example:
$ make PREFIX=/usr install $ sudo make PREFIX=/usr install
or even: or even:
$ make PREFIX=/opt install $ doas make PREFIX=/opt install
NOTES NOTES

2
VERSION
View File

@ -1 +1 @@
0.2.0 0.2.2

5
makefile
View File

@ -29,10 +29,11 @@ clean:
install: install:
$(MAKE) default $(MAKE) default
-mkdir -p $(PREFIX)/share/pixmaps -mkdir -p $(PREFIX)/share/
-mkdir -p $(PREFIX)/share/applications -mkdir -p $(PREFIX)/share/applications
-mkdir -p $(PREFIX)/bin -mkdir -p $(PREFIX)/bin
install -m 0644 data/evisum.png $(PREFIX)/share/pixmaps -mkdir -p $(PREFIX)/share/icons/hicolor/512x512/apps
install -m 0644 data/evisum.png $(PREFIX)/share/icons/hicolor/512x512/apps
install -m 0644 data/evisum.desktop $(PREFIX)/share/applications install -m 0644 data/evisum.desktop $(PREFIX)/share/applications
install -m 0755 evisum $(PREFIX)/bin install -m 0755 evisum $(PREFIX)/bin
install -m 0755 src/tingle/tingle $(PREFIX)/bin install -m 0755 src/tingle/tingle $(PREFIX)/bin

11
src/disks.c
View File

@ -257,6 +257,17 @@ disks_get(void)
if (devs) if (devs)
eina_list_free(devs); eina_list_free(devs);
devs = ecore_file_ls("/dev/mapper");
EINA_LIST_FREE(devs, name)
{
snprintf(buf, sizeof(buf), "/dev/mapper/%s", name);
list = eina_list_append(list, strdup(name));
free(name);
}
if (devs)
eina_list_free(devs);
list = eina_list_sort(list, eina_list_count(list), _cmp_cb); list = eina_list_sort(list, eina_list_count(list), _cmp_cb);
return list; return list;

2
src/main.c
View File

@ -30,7 +30,7 @@ _win_add(void)
icon = elm_icon_add(win); icon = elm_icon_add(win);
elm_icon_standard_set(icon, "evisum"); elm_icon_standard_set(icon, "evisum");
elm_win_icon_object_set(win, icon); elm_win_icon_object_set(win, icon);
evas_object_resize(win, 800 * elm_config_scale_get(), 500 * elm_config_scale_get()); evas_object_resize(win, 400 * elm_config_scale_get(), 450 * elm_config_scale_get());
elm_win_title_set(win, "System Information"); elm_win_title_set(win, "System Information");
elm_win_center(win, EINA_TRUE, EINA_TRUE); elm_win_center(win, EINA_TRUE, EINA_TRUE);
evas_object_show(win); evas_object_show(win);

16
src/tingle/tingle.c
View File

@ -22,11 +22,7 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#define VERSION "0.9.0"
/* Visit: http://haxlab.org */
/* Build : cc -lm (file) -o (output) */
/* What a shitstorm this turned into! hah! */
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -1593,10 +1589,20 @@ main(int argc, char **argv)
" This is the default behaviour with no arguments.\n" " This is the default behaviour with no arguments.\n"
" With other flags specify (in any order) which\n" " With other flags specify (in any order) which\n"
" components to display in the status bar.\n" " components to display in the status bar.\n"
" -v | -version | --version\n"
" Version information.\n"
" -h | -help | --help\n" " This help.\n"); " -h | -help | --help\n" " This help.\n");
exit(0); exit(0);
} }
if ((!strcmp(argv[i], "-v")) ||
(!strcmp(argv[i], "-version")) || (!strcmp(argv[i], "--version")))
{
printf("(c) Copyright 2017-2019. Alastair Poole (see COPYING for details)\n");
printf("Tingle version %s\n", VERSION);
exit(0);
}
if (!strcmp(argv[i], "-c")) if (!strcmp(argv[i], "-c"))
order[j] |= RESULTS_CPU; order[j] |= RESULTS_CPU;
else if (!strcmp(argv[i], "-C")) else if (!strcmp(argv[i], "-C"))

110
src/ui.c
View File

@ -116,16 +116,16 @@ _network_transfer_format(double rate)
} }
static void static void
_extra_view_update(Ui *ui, results_t *results) _misc_view_update(Ui *ui, results_t *results)
{ {
Evas_Object *box, *frame, *progress; Evas_Object *box, *frame, *progress;
char *tmp; char *tmp;
int i; int i;
if (!ui->extra_visible) if (!ui->misc_visible)
return; return;
elm_box_clear(ui->extra_activity); elm_box_clear(ui->misc_activity);
box = elm_box_add(ui->content); box = elm_box_add(ui->content);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
@ -204,7 +204,7 @@ _extra_view_update(Ui *ui, results_t *results)
elm_object_content_set(frame, progress); elm_object_content_set(frame, progress);
elm_box_pack_end(box, frame); elm_box_pack_end(box, frame);
elm_box_pack_end(ui->extra_activity, box); elm_box_pack_end(ui->misc_activity, box);
} }
static unsigned long static unsigned long
@ -342,6 +342,16 @@ _memory_view_update(Ui *ui, results_t *results)
ratio = results->memory.total / 100.0; ratio = results->memory.total / 100.0;
value = results->memory.shared / ratio; value = results->memory.shared / ratio;
_progressbar_value_force_set(progress, value / 100); _progressbar_value_force_set(progress, value / 100);
progress = ui->progress_mem_swap;
elm_progressbar_unit_format_set(progress,
eina_slstr_printf(
"%lu %c / %lu %c",
_mem_adjust(ui->data_unit, results->memory.swap_total - results->memory.swap_used), ui->data_unit,
_mem_adjust(ui->data_unit, results->memory.swap_total), ui->data_unit));
ratio = results->memory.swap_total / 100.0;
value = (results->memory.swap_total - results->memory.swap_used) / ratio;
_progressbar_value_force_set(progress, value / 100);
} }
static void static void
@ -404,7 +414,7 @@ _system_stats_thread_feedback_cb(void *data, Ecore_Thread *thread, void *msg)
_cpu_view_update(ui, results); _cpu_view_update(ui, results);
_memory_view_update(ui, results); _memory_view_update(ui, results);
_disk_view_update(ui); _disk_view_update(ui);
_extra_view_update(ui, results); _misc_view_update(ui, results);
for (i = 0; i < results->cpu_count; i++) for (i = 0; i < results->cpu_count; i++)
{ {
@ -1456,6 +1466,7 @@ _ui_process_panel_add(Ui *ui)
ui->list_pid = list = elm_list_add(frame); ui->list_pid = list = elm_list_add(frame);
evas_object_size_hint_weight_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_scroller_gravity_set(list, 0.5, 0.0);
evas_object_show(list); evas_object_show(list);
elm_object_content_set(frame, list); elm_object_content_set(frame, list);
evas_object_smart_callback_add(ui->list_pid, "selected", _process_panel_list_selected_cb, ui); evas_object_smart_callback_add(ui->list_pid, "selected", _process_panel_list_selected_cb, ui);
@ -1718,7 +1729,7 @@ _ui_disk_view_add(Ui *ui)
frame = elm_frame_add(box); frame = elm_frame_add(box);
evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(frame, "Disk usage"); elm_object_text_set(frame, "Storage Overview");
evas_object_show(frame); evas_object_show(frame);
scroller = elm_scroller_add(parent); scroller = elm_scroller_add(parent);
@ -1733,19 +1744,19 @@ _ui_disk_view_add(Ui *ui)
} }
static void static void
_ui_extra_view_add(Ui *ui) _ui_misc_view_add(Ui *ui)
{ {
Evas_Object *parent, *box, *hbox, *frame, *scroller; Evas_Object *parent, *box, *hbox, *frame, *scroller;
parent = ui->content; parent = ui->content;
ui->extra_view = box = elm_box_add(parent); ui->misc_view = box = elm_box_add(parent);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_table_pack(ui->content, ui->extra_view, 0, 1, 1, 1); elm_table_pack(ui->content, ui->misc_view, 0, 1, 1, 1);
evas_object_hide(box); evas_object_hide(box);
ui->extra_activity = hbox = elm_box_add(box); ui->misc_activity = hbox = elm_box_add(box);
evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0); evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(hbox); evas_object_show(hbox);
@ -1788,7 +1799,7 @@ _ui_cpu_view_add(Ui *ui)
frame = elm_frame_add(box); frame = elm_frame_add(box);
evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(frame, "CPU"); elm_object_text_set(frame, "Processor Overview");
evas_object_show(frame); evas_object_show(frame);
scroller = elm_scroller_add(parent); scroller = elm_scroller_add(parent);
@ -1823,7 +1834,7 @@ _ui_memory_view_add(Ui *ui)
frame = elm_frame_add(box); frame = elm_frame_add(box);
evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(frame, "Memory"); elm_object_text_set(frame, "Memory Overview");
evas_object_show(frame); evas_object_show(frame);
scroller = elm_scroller_add(parent); scroller = elm_scroller_add(parent);
@ -1891,9 +1902,35 @@ _ui_memory_view_add(Ui *ui)
elm_object_content_set(frame, progress); elm_object_content_set(frame, progress);
elm_box_pack_end(box, frame); elm_box_pack_end(box, frame);
frame = elm_frame_add(box);
evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, 0);
evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_object_text_set(frame, "Memory Swapped");
evas_object_show(frame);
ui->progress_mem_swap = progress = elm_progressbar_add(frame);
evas_object_size_hint_align_set(progress, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(progress, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(progress);
elm_object_content_set(frame, progress);
elm_box_pack_end(box, frame);
elm_box_pack_end(ui->mem_activity, box); elm_box_pack_end(ui->mem_activity, box);
} }
static void
_tab_state_changed(Ui *ui, Evas_Object *btn_active)
{
elm_object_disabled_set(ui->btn_general, EINA_FALSE);
elm_object_disabled_set(ui->btn_cpu, EINA_FALSE);
elm_object_disabled_set(ui->btn_mem, EINA_FALSE);
elm_object_disabled_set(ui->btn_storage, EINA_FALSE);
elm_object_disabled_set(ui->btn_misc, EINA_FALSE);
elm_object_disabled_set(btn_active, EINA_TRUE);
}
static void static void
_tab_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) _tab_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
@ -1902,15 +1939,17 @@ _tab_memory_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *
ui = data; ui = data;
ui->mem_visible = EINA_TRUE; ui->mem_visible = EINA_TRUE;
ui->extra_visible = EINA_FALSE; ui->misc_visible = EINA_FALSE;
ui->disk_visible = EINA_FALSE; ui->disk_visible = EINA_FALSE;
ui->cpu_visible = EINA_FALSE; ui->cpu_visible = EINA_FALSE;
_tab_state_changed(ui, obj);
evas_object_show(ui->mem_view); evas_object_show(ui->mem_view);
evas_object_hide(ui->system_activity); evas_object_hide(ui->system_activity);
evas_object_hide(ui->panel); evas_object_hide(ui->panel);
evas_object_hide(ui->disk_view); evas_object_hide(ui->disk_view);
evas_object_hide(ui->extra_view); evas_object_hide(ui->misc_view);
evas_object_hide(ui->cpu_view); evas_object_hide(ui->cpu_view);
} }
@ -1921,15 +1960,17 @@ _tab_system_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *
ui = data; ui = data;
ui->extra_visible = EINA_FALSE; ui->misc_visible = EINA_FALSE;
ui->disk_visible = EINA_FALSE; ui->disk_visible = EINA_FALSE;
ui->cpu_visible = EINA_FALSE; ui->cpu_visible = EINA_FALSE;
ui->mem_visible = EINA_FALSE; ui->mem_visible = EINA_FALSE;
_tab_state_changed(ui, obj);
evas_object_show(ui->system_activity); evas_object_show(ui->system_activity);
evas_object_show(ui->panel); evas_object_show(ui->panel);
evas_object_hide(ui->disk_view); evas_object_hide(ui->disk_view);
evas_object_hide(ui->extra_view); evas_object_hide(ui->misc_view);
evas_object_hide(ui->cpu_view); evas_object_hide(ui->cpu_view);
evas_object_hide(ui->mem_view); evas_object_hide(ui->mem_view);
} }
@ -1941,32 +1982,36 @@ _tab_disk_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *ev
ui = data; ui = data;
ui->extra_visible = EINA_FALSE; ui->misc_visible = EINA_FALSE;
ui->disk_visible = EINA_TRUE; ui->disk_visible = EINA_TRUE;
ui->cpu_visible = EINA_FALSE; ui->cpu_visible = EINA_FALSE;
ui->mem_visible = EINA_FALSE; ui->mem_visible = EINA_FALSE;
_tab_state_changed(ui, obj);
evas_object_show(ui->disk_view); evas_object_show(ui->disk_view);
evas_object_hide(ui->system_activity); evas_object_hide(ui->system_activity);
evas_object_hide(ui->panel); evas_object_hide(ui->panel);
evas_object_hide(ui->extra_view); evas_object_hide(ui->misc_view);
evas_object_hide(ui->cpu_view); evas_object_hide(ui->cpu_view);
evas_object_hide(ui->mem_view); evas_object_hide(ui->mem_view);
} }
static void static void
_tab_extra_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) _tab_misc_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{ {
Ui *ui; Ui *ui;
ui = data; ui = data;
ui->extra_visible = EINA_TRUE; ui->misc_visible = EINA_TRUE;
ui->disk_visible = EINA_FALSE; ui->disk_visible = EINA_FALSE;
ui->cpu_visible = EINA_FALSE; ui->cpu_visible = EINA_FALSE;
ui->mem_visible = EINA_FALSE; ui->mem_visible = EINA_FALSE;
evas_object_show(ui->extra_view); _tab_state_changed(ui, obj);
evas_object_show(ui->misc_view);
evas_object_hide(ui->system_activity); evas_object_hide(ui->system_activity);
evas_object_hide(ui->panel); evas_object_hide(ui->panel);
evas_object_hide(ui->disk_view); evas_object_hide(ui->disk_view);
@ -1982,12 +2027,14 @@ _tab_cpu_activity_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *eve
ui = data; ui = data;
ui->mem_visible = EINA_FALSE; ui->mem_visible = EINA_FALSE;
ui->extra_visible = EINA_FALSE; ui->misc_visible = EINA_FALSE;
ui->disk_visible = EINA_FALSE; ui->disk_visible = EINA_FALSE;
ui->cpu_visible = EINA_TRUE; ui->cpu_visible = EINA_TRUE;
_tab_state_changed(ui, obj);
evas_object_show(ui->cpu_view); evas_object_show(ui->cpu_view);
evas_object_hide(ui->extra_view); evas_object_hide(ui->misc_view);
evas_object_hide(ui->system_activity); evas_object_hide(ui->system_activity);
evas_object_hide(ui->panel); evas_object_hide(ui->panel);
evas_object_hide(ui->disk_view); evas_object_hide(ui->disk_view);
@ -2018,7 +2065,8 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
elm_box_horizontal_set(hbox, EINA_TRUE); elm_box_horizontal_set(hbox, EINA_TRUE);
evas_object_show(hbox); evas_object_show(hbox);
button = elm_button_add(hbox); ui->btn_general = button = elm_button_add(hbox);
elm_object_disabled_set(ui->btn_general, EINA_TRUE);
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(button, "General"); elm_object_text_set(button, "General");
@ -2026,7 +2074,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
elm_box_pack_end(hbox, button); elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_system_activity_clicked_cb, ui); evas_object_smart_callback_add(button, "clicked", _tab_system_activity_clicked_cb, ui);
button = elm_button_add(hbox); ui->btn_cpu = button = elm_button_add(hbox);
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(button, "CPU"); elm_object_text_set(button, "CPU");
@ -2034,7 +2082,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
elm_box_pack_end(hbox, button); elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_cpu_activity_clicked_cb, ui); evas_object_smart_callback_add(button, "clicked", _tab_cpu_activity_clicked_cb, ui);
button = elm_button_add(hbox); ui->btn_mem = button = elm_button_add(hbox);
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(button, "Memory"); elm_object_text_set(button, "Memory");
@ -2042,7 +2090,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
elm_box_pack_end(hbox, button); elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_memory_activity_clicked_cb, ui); evas_object_smart_callback_add(button, "clicked", _tab_memory_activity_clicked_cb, ui);
button = elm_button_add(hbox); ui->btn_storage = button = elm_button_add(hbox);
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(button, "Storage"); elm_object_text_set(button, "Storage");
@ -2050,13 +2098,13 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
elm_box_pack_end(hbox, button); elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_disk_activity_clicked_cb, ui); evas_object_smart_callback_add(button, "clicked", _tab_disk_activity_clicked_cb, ui);
button = elm_button_add(hbox); ui->btn_misc = button = elm_button_add(hbox);
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(button, "Misc"); elm_object_text_set(button, "Misc");
evas_object_show(button); evas_object_show(button);
elm_box_pack_end(hbox, button); elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_extra_clicked_cb, ui); evas_object_smart_callback_add(button, "clicked", _tab_misc_clicked_cb, ui);
elm_object_content_set(frame, hbox); elm_object_content_set(frame, hbox);
elm_table_pack(ui->content, frame, 0, 0, 1, 1); elm_table_pack(ui->content, frame, 0, 0, 1, 1);
@ -2134,7 +2182,7 @@ ui_add(Evas_Object *parent)
ui->selected_pid = -1; ui->selected_pid = -1;
ui->program_pid = getpid(); ui->program_pid = getpid();
ui->panel_visible = EINA_TRUE; ui->panel_visible = EINA_TRUE;
ui->disk_visible = ui->cpu_visible = ui->mem_visible = ui->extra_visible = EINA_TRUE; ui->disk_visible = ui->cpu_visible = ui->mem_visible = ui->misc_visible = EINA_TRUE;
ui->data_unit = DATA_UNIT_MB; ui->data_unit = DATA_UNIT_MB;
memset(ui->cpu_times, 0, PID_MAX * sizeof(int64_t)); memset(ui->cpu_times, 0, PID_MAX * sizeof(int64_t));
@ -2156,7 +2204,7 @@ ui_add(Evas_Object *parent)
_ui_cpu_view_add(ui); _ui_cpu_view_add(ui);
_ui_memory_view_add(ui); _ui_memory_view_add(ui);
_ui_disk_view_add(ui); _ui_disk_view_add(ui);
_ui_extra_view_add(ui); _ui_misc_view_add(ui);
evas_object_event_callback_add(ui->content, EVAS_CALLBACK_KEY_DOWN, _evisum_key_down_cb, ui); evas_object_event_callback_add(ui->content, EVAS_CALLBACK_KEY_DOWN, _evisum_key_down_cb, ui);

13
src/ui.h
View File

@ -54,18 +54,24 @@ typedef struct Ui
Evas_Object *scroller; Evas_Object *scroller;
Evas_Object *content; Evas_Object *content;
Evas_Object *btn_general;
Evas_Object *btn_cpu;
Evas_Object *btn_mem;
Evas_Object *btn_storage;
Evas_Object *btn_misc;
Evas_Object *disk_view; Evas_Object *disk_view;
Evas_Object *disk_activity; Evas_Object *disk_activity;
Evas_Object *cpu_view; Evas_Object *cpu_view;
Evas_Object *cpu_activity; Evas_Object *cpu_activity;
Evas_Object *mem_view; Evas_Object *mem_view;
Evas_Object *mem_activity; Evas_Object *mem_activity;
Evas_Object *extra_view; Evas_Object *misc_view;
Evas_Object *extra_activity; Evas_Object *misc_activity;
Evas_Object *system_activity; Evas_Object *system_activity;
Eina_Bool cpu_visible; Eina_Bool cpu_visible;
Eina_Bool extra_visible; Eina_Bool misc_visible;
Eina_Bool disk_visible; Eina_Bool disk_visible;
Eina_Bool mem_visible; Eina_Bool mem_visible;
@ -76,6 +82,7 @@ typedef struct Ui
Evas_Object *progress_mem_cached; Evas_Object *progress_mem_cached;
Evas_Object *progress_mem_buffered; Evas_Object *progress_mem_buffered;
Evas_Object *progress_mem_shared; Evas_Object *progress_mem_shared;
Evas_Object *progress_mem_swap;
Evas_Object *entry_pid; Evas_Object *entry_pid;
Evas_Object *entry_uid; Evas_Object *entry_uid;