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

Revert "Changes:" 

This reverts commit d8714702fb.
This commit is contained in:
Alastair Poole 2019-08-30 20:35:46 +01:00
parent f9dd314951
commit 9b98d23f41
2 changed files with 18 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.c
View File

@ -2,23 +2,20 @@
See LICENSE file for details.
*/
#define VERSION "0.2.6"
#define VERSION "0.2.3"
#include "process.h"
#include "system.h"
#include "ui.h"
static void
_win_del_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
_win_del_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Ui *ui;
/* ui = data;
ui_shutdown(ui); */
ui = data;
/* We can call exit here */
exit(0);
ui_shutdown(ui);
}
static Evas_Object *

92
src/ui.c
View File

@ -1479,7 +1479,7 @@ static void
_ui_process_panel_add(Ui *ui)
{
Evas_Object *parent, *panel, *box, *hbox, *frame, *scroller, *table;
Evas_Object *label, *list, *entry, *button, *border;
Evas_Object *label, *list, *entry, *button;
parent = ui->content;
@ -1726,49 +1726,28 @@ _ui_process_panel_add(Ui *ui)
evas_object_show(hbox);
elm_table_pack(table, hbox, 1, 12, 1, 1);
border = elm_frame_add(parent);
evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(border, EVAS_HINT_FILL, 0.5);
elm_object_style_set(border, "pad_small");
evas_object_show(border);
button = elm_button_add(parent);
evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, 0.5);
elm_object_text_set(button, "Stop");
elm_object_text_set(button, "Stop Process");
elm_box_pack_end(hbox, button);
evas_object_show(button);
elm_object_content_set(border, button);
elm_box_pack_end(hbox, border);
evas_object_smart_callback_add(button, "clicked", _btn_stop_clicked_cb, ui);
border = elm_frame_add(parent);
evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(border, EVAS_HINT_FILL, 0.5);
elm_object_style_set(border, "pad_small");
evas_object_show(border);
button = elm_button_add(parent);
evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, 0.5);
elm_object_text_set(button, "Start");
elm_object_content_set(border, button);
evas_object_show(button);
elm_box_pack_end(hbox, border);
elm_object_text_set(button, "Start Process");
elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _btn_start_clicked_cb, ui);
border = elm_frame_add(parent);
evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(border, EVAS_HINT_FILL, 0.5);
elm_object_style_set(border, "pad_small");
evas_object_show(border);
evas_object_show(button);
button = elm_button_add(parent);
evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, 0.5);
elm_object_text_set(button, "Kill");
elm_box_pack_end(hbox, border);
elm_object_text_set(button, "Kill Process");
elm_box_pack_end(hbox, button);
evas_object_show(button);
elm_object_content_set(border, button);
evas_object_smart_callback_add(button, "clicked", _btn_kill_clicked_cb, ui);
}
@ -2109,7 +2088,6 @@ static Evas_Object *
_ui_tabs_add(Evas_Object *parent, Ui *ui)
{
Evas_Object *table, *hbox, *pad, *frame, *button;
Evas_Object *border;
ui->content = table = elm_table_add(parent);
evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -2130,12 +2108,6 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
elm_box_horizontal_set(hbox, EINA_TRUE);
evas_object_show(hbox);
border = elm_frame_add(parent);
evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_style_set(border, "pad_small");
evas_object_show(border);
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);
@ -2143,72 +2115,43 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
evas_object_size_hint_min_set(button, TAB_BTN_SIZE * elm_config_scale_get(), 0);
elm_object_text_set(button, "General");
evas_object_show(button);
elm_object_content_set(border, button);
elm_box_pack_end(hbox, border);
elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_system_activity_clicked_cb, ui);
border = elm_frame_add(parent);
evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_style_set(border, "pad_small");
evas_object_show(border);
ui->btn_cpu = button = elm_button_add(hbox);
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_min_set(button, TAB_BTN_SIZE * elm_config_scale_get(), 0);
elm_object_text_set(button, "CPU");
elm_object_content_set(border, button);
evas_object_show(button);
elm_box_pack_end(hbox, border);
elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_cpu_activity_clicked_cb, ui);
border = elm_frame_add(parent);
evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_style_set(border, "pad_small");
evas_object_show(border);
ui->btn_mem = button = elm_button_add(hbox);
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_min_set(button, TAB_BTN_SIZE * elm_config_scale_get(), 0);
elm_object_text_set(button, "Memory");
evas_object_show(button);
elm_object_content_set(border, button);
elm_box_pack_end(hbox, border);
elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_memory_activity_clicked_cb, ui);
border = elm_frame_add(parent);
evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_style_set(border, "pad_small");
evas_object_show(border);
ui->btn_storage = button = elm_button_add(hbox);
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_min_set(button, TAB_BTN_SIZE * elm_config_scale_get(), 0);
elm_object_text_set(button, "Storage");
evas_object_show(button);
elm_object_content_set(border, button);
elm_box_pack_end(hbox, border);
elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_disk_activity_clicked_cb, ui);
border = elm_frame_add(parent);
evas_object_size_hint_weight_set(border, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_style_set(border, "pad_small");
evas_object_show(border);
ui->btn_misc = button = elm_button_add(hbox);
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_min_set(button, TAB_BTN_SIZE * elm_config_scale_get(), 0);
elm_object_text_set(button, "Misc");
evas_object_show(button);
elm_object_content_set(border, button);
elm_box_pack_end(hbox, border);
elm_box_pack_end(hbox, button);
evas_object_smart_callback_add(button, "clicked", _tab_misc_clicked_cb, ui);
elm_object_content_set(frame, hbox);
@ -2227,18 +2170,11 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
evas_object_show(pad);
elm_box_pack_end(hbox, pad);
border = elm_frame_add(parent);
evas_object_size_hint_weight_set(border, 0.1, 0);
evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_style_set(border, "pad_small");
evas_object_show(border);
button = elm_button_add(parent);
evas_object_size_hint_weight_set(button, 0.1, 0);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_text_set(button, "Close");
elm_object_content_set(border, button);
elm_box_pack_end(hbox, border);
elm_box_pack_end(hbox, button);
evas_object_show(button);
evas_object_smart_callback_add(button, "clicked", _btn_quit_clicked_cb, ui);