From 66f6c4eee16b0c267164238c29b069d236bb8bdc Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Sun, 24 May 2020 13:34:26 +0100 Subject: [PATCH] style: Try to respect 80 columns. Whether it should be 80 or 120 I'm not sure. I think i'll go with the lower denominator as it's more inclusive. EVAS_ macros need simplified (this might be too simple)... --- src/bin/ui/ui.c | 270 ++++++++++++++++++++--------------- src/bin/ui/ui.h | 5 +- src/bin/ui/ui_disk.c | 45 +++--- src/bin/ui/ui_memory.c | 113 ++++++++------- src/bin/ui/ui_misc.c | 81 ++++++----- src/bin/ui/ui_process_view.c | 169 +++++++++++----------- 6 files changed, 369 insertions(+), 314 deletions(-) diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c index b833705..3ad6d60 100644 --- a/src/bin/ui/ui.c +++ b/src/bin/ui/ui.c @@ -336,8 +336,8 @@ _item_column_add(Evas_Object *table, const char *text, int col) Evas_Object *rect, *label; label = elm_label_add(table); - evas_object_size_hint_align_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_weight_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_align_set(label, EXPAND, EXPAND); + evas_object_size_hint_weight_set(label, FILL, FILL); evas_object_data_set(table, text, label); evas_object_show(label); @@ -358,8 +358,8 @@ _item_create(Evas_Object *parent) obj = parent; table = elm_table_add(obj); - evas_object_size_hint_align_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_weight_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_align_set(table, EXPAND, EXPAND); + evas_object_size_hint_weight_set(table, FILL, FILL); evas_object_show(table); _item_column_add(table, "proc_pid", 0); @@ -369,10 +369,10 @@ _item_create(Evas_Object *parent) _item_column_add(table, "proc_cmd", 4); label = _item_column_add(table, "proc_state", 5); - evas_object_size_hint_align_set(label, 0.5, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, 0.5, EXPAND); label = _item_column_add(table, "proc_cpu_usage", 6); - evas_object_size_hint_align_set(label, 0.5, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, 0.5, EXPAND); return table; } @@ -838,10 +838,13 @@ _item_menu_priority_add(Evas_Object *menu, Elm_Object_Item *menu_it, { Elm_Object_Item *it; - it = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("window"), eina_slstr_printf("%d", proc->nice), NULL, NULL); + it = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("window"), + eina_slstr_printf("%d", proc->nice), NULL, NULL); elm_menu_item_separator_add(menu, menu_it); - elm_menu_item_add(menu, menu_it, evisum_icon_path_get("increase"), _("Increase"), _item_menu_priority_increase_cb, proc); - elm_menu_item_add(menu, menu_it, evisum_icon_path_get("decrease"), _("Decrease"), _item_menu_priority_decrease_cb, proc); + elm_menu_item_add(menu, menu_it, evisum_icon_path_get("increase"), + _("Increase"), _item_menu_priority_increase_cb, proc); + elm_menu_item_add(menu, menu_it, evisum_icon_path_get("decrease"), + _("Decrease"), _item_menu_priority_decrease_cb, proc); elm_object_item_disabled_set(it, EINA_TRUE); } @@ -856,23 +859,33 @@ _item_menu_create(Ui *ui, Proc_Info *proc) ui->menu = menu = elm_menu_add(ui->win); if (!menu) return NULL; - evas_object_smart_callback_add(menu, "dismissed", _item_menu_dismissed_cb, ui); + evas_object_smart_callback_add(menu, "dismissed", + _item_menu_dismissed_cb, ui); stopped = !!strcmp(proc->state, "stop"); - menu_it = elm_menu_item_add(menu, NULL, evisum_icon_path_get("window"), proc->command, NULL, NULL); + menu_it = elm_menu_item_add(menu, NULL, evisum_icon_path_get("window"), + proc->command, NULL, NULL); - menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("window"), _("Priority"), NULL, NULL); + menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("window"), + _("Priority"), NULL, NULL); _item_menu_priority_add(menu, menu_it2, proc); elm_menu_item_separator_add(menu, menu_it); - menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("start"), _("Start"), _item_menu_start_cb, proc); + menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("start"), + _("Start"), _item_menu_start_cb, proc); + if (stopped) elm_object_item_disabled_set(menu_it2, EINA_TRUE); - menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("stop"), _("Stop"), _item_menu_stop_cb, proc); + menu_it2 = elm_menu_item_add(menu, menu_it, evisum_icon_path_get("stop"), + _("Stop"), _item_menu_stop_cb, proc); + if (!stopped) elm_object_item_disabled_set(menu_it2, EINA_TRUE); - elm_menu_item_add(menu, menu_it, evisum_icon_path_get("kill"), "Kill", _item_menu_kill_cb, proc); + elm_menu_item_add(menu, menu_it, evisum_icon_path_get("kill"), "Kill", + _item_menu_kill_cb, proc); + elm_menu_item_separator_add(menu, menu_it); - elm_menu_item_add(menu, menu_it, evisum_icon_path_get("cancel"), _("Cancel"), _item_menu_cancel_cb, ui); + elm_menu_item_add(menu, menu_it, evisum_icon_path_get("cancel"), + _("Cancel"), _item_menu_cancel_cb, ui); return menu; } @@ -932,50 +945,50 @@ _ui_tab_system_add(Ui *ui) parent = ui->content; ui->system_activity = ui->current_view = box = elm_box_add(parent); - 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_weight_set(box, EXPAND, EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); evas_object_show(box); elm_table_pack(ui->content, ui->system_activity, 0, 1, 1, 1); hbox = elm_box_add(box); - evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0); - evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, 0); + evas_object_size_hint_weight_set(hbox, EXPAND, 0); + evas_object_size_hint_align_set(hbox, FILL, 0); elm_box_horizontal_set(hbox, EINA_TRUE); evas_object_show(hbox); elm_box_pack_end(box, hbox); frame = elm_frame_add(hbox); - 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_weight_set(frame, EXPAND, EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_text_set(frame, _("System CPU")); evas_object_show(frame); elm_box_pack_end(hbox, frame); ui->progress_cpu = progress = elm_progressbar_add(parent); - 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); elm_progressbar_span_size_set(progress, 1.0); elm_progressbar_unit_format_set(progress, "%1.2f%%"); elm_object_content_set(frame, progress); evas_object_show(progress); frame = elm_frame_add(hbox); - 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_weight_set(frame, EXPAND, EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_text_set(frame, _("System Memory")); evas_object_show(frame); elm_box_pack_end(hbox, frame); ui->progress_mem = progress = elm_progressbar_add(parent); - 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); elm_progressbar_span_size_set(progress, 1.0); evas_object_show(progress); elm_object_content_set(frame, progress); table = elm_table_add(parent); - evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, 0); - evas_object_size_hint_align_set(table, EVAS_HINT_FILL, 0); + evas_object_size_hint_weight_set(table, EXPAND, 0); + evas_object_size_hint_align_set(table, FILL, 0); evas_object_show(table); ui->btn_pid = button = elm_button_add(parent); @@ -987,8 +1000,8 @@ _ui_tab_system_add(Ui *ui) else _btn_icon_state_set(button, EINA_FALSE); - evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("PID")); evas_object_show(button); elm_table_pack(table, button, 0, 0, 1, 1); @@ -1002,8 +1015,8 @@ _ui_tab_system_add(Ui *ui) else _btn_icon_state_set(button, EINA_FALSE); - evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("UID")); evas_object_show(button); elm_table_pack(table, button, 1, 0, 1, 1); @@ -1017,8 +1030,8 @@ _ui_tab_system_add(Ui *ui) else _btn_icon_state_set(button, EINA_FALSE); - evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("Size")); evas_object_show(button); elm_table_pack(table, button, 2, 0, 1, 1); @@ -1032,8 +1045,8 @@ _ui_tab_system_add(Ui *ui) else _btn_icon_state_set(button, EINA_FALSE); - evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("Res")); evas_object_show(button); elm_table_pack(table, button, 3, 0, 1, 1); @@ -1047,8 +1060,8 @@ _ui_tab_system_add(Ui *ui) else _btn_icon_state_set(button, EINA_FALSE); - evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("Command")); evas_object_show(button); elm_table_pack(table, button, 4, 0, 1, 1); @@ -1062,8 +1075,8 @@ _ui_tab_system_add(Ui *ui) else _btn_icon_state_set(button, EINA_FALSE); - evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("State")); evas_object_show(button); elm_table_pack(table, button, 5, 0, 1, 1); @@ -1077,8 +1090,8 @@ _ui_tab_system_add(Ui *ui) else _btn_icon_state_set(button, EINA_FALSE); - evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("CPU %")); evas_object_show(button); elm_table_pack(table, button, 6, 0, 1, 1); @@ -1087,24 +1100,33 @@ _ui_tab_system_add(Ui *ui) elm_scroller_gravity_set(ui->scroller, 0.0, 1.0); elm_object_focus_allow_set(plist, EINA_FALSE); elm_genlist_homogeneous_set(plist, EINA_TRUE); - evas_object_size_hint_weight_set(plist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(plist, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(plist, EXPAND, EXPAND); + evas_object_size_hint_align_set(plist, FILL, FILL); evas_object_show(plist); elm_box_pack_end(box, table); elm_box_pack_end(box, plist); - evas_object_smart_callback_add(ui->btn_pid, "clicked", _btn_pid_clicked_cb, ui); - evas_object_smart_callback_add(ui->btn_uid, "clicked", _btn_uid_clicked_cb, ui); - evas_object_smart_callback_add(ui->btn_size, "clicked", _btn_size_clicked_cb, ui); - evas_object_smart_callback_add(ui->btn_rss, "clicked", _btn_rss_clicked_cb, ui); - evas_object_smart_callback_add(ui->btn_cmd, "clicked", _btn_cmd_clicked_cb, ui); - evas_object_smart_callback_add(ui->btn_state, "clicked", _btn_state_clicked_cb, ui); - evas_object_smart_callback_add(ui->btn_cpu_usage, "clicked", _btn_cpu_usage_clicked_cb, ui); - evas_object_smart_callback_add(ui->genlist_procs, "selected", _item_pid_clicked_cb, ui); + evas_object_smart_callback_add(ui->btn_pid, "clicked", + _btn_pid_clicked_cb, ui); + evas_object_smart_callback_add(ui->btn_uid, "clicked", + _btn_uid_clicked_cb, ui); + evas_object_smart_callback_add(ui->btn_size, "clicked", + _btn_size_clicked_cb, ui); + evas_object_smart_callback_add(ui->btn_rss, "clicked", + _btn_rss_clicked_cb, ui); + evas_object_smart_callback_add(ui->btn_cmd, "clicked", + _btn_cmd_clicked_cb, ui); + evas_object_smart_callback_add(ui->btn_state, "clicked", + _btn_state_clicked_cb, ui); + evas_object_smart_callback_add(ui->btn_cpu_usage, "clicked", + _btn_cpu_usage_clicked_cb, ui); + evas_object_smart_callback_add(ui->genlist_procs, "selected", + _item_pid_clicked_cb, ui); evas_object_event_callback_add(ui->genlist_procs, EVAS_CALLBACK_MOUSE_UP, - _item_pid_secondary_clicked_cb, ui); - evas_object_smart_callback_add(ui->genlist_procs, "unrealized", _item_unrealized_cb, ui); + _item_pid_secondary_clicked_cb, ui); + evas_object_smart_callback_add(ui->genlist_procs, "unrealized", + _item_unrealized_cb, ui); } static void @@ -1258,106 +1280,110 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) Evas_Object *border; ui->content = table = elm_table_add(parent); - evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(table, EXPAND, EXPAND); + evas_object_size_hint_align_set(table, FILL, FILL); elm_object_content_set(parent, table); evas_object_show(table); frame = elm_frame_add(parent); - evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, 0); - evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(frame, EXPAND, 0); + evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_text_set(frame, _("Options")); elm_object_style_set(frame, "pad_medium"); evas_object_show(frame); hbox = elm_box_add(parent); - evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(hbox, EXPAND, EXPAND); + evas_object_size_hint_align_set(hbox, FILL, FILL); 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); + evas_object_size_hint_weight_set(border, EXPAND, EXPAND); + evas_object_size_hint_align_set(border, FILL, FILL); elm_object_style_set(border, "pad_small"); elm_box_pack_end(hbox, border); evas_object_show(border); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(border, 0, EXPAND); + evas_object_size_hint_align_set(border, FILL, 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, EVAS_HINT_EXPAND, 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); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); + evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); elm_object_text_set(button, _("General")); evas_object_show(button); elm_object_content_set(border, button); elm_box_pack_end(hbox, border); - 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); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(border, 0, EXPAND); + evas_object_size_hint_align_set(border, FILL, 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, EVAS_HINT_EXPAND, 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); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); + evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); elm_object_text_set(button, _("CPU")); elm_object_content_set(border, button); evas_object_show(button); elm_box_pack_end(hbox, border); - 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); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(border, 0, EXPAND); + evas_object_size_hint_align_set(border, FILL, 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, EVAS_HINT_EXPAND, 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); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); + evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); elm_object_text_set(button, _("Memory")); evas_object_show(button); elm_object_content_set(border, button); elm_box_pack_end(hbox, border); - 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); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(border, 0, EXPAND); + evas_object_size_hint_align_set(border, FILL, 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, EVAS_HINT_EXPAND, 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); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); + evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); elm_object_text_set(button, _("Storage")); evas_object_show(button); elm_object_content_set(border, button); elm_box_pack_end(hbox, border); - 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); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, 0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(border, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(border, 0, EXPAND); + evas_object_size_hint_align_set(border, FILL, 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, EVAS_HINT_FILL, 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); + evas_object_size_hint_weight_set(button, FILL, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); + evas_object_size_hint_min_set(button, TAB_BTN_SIZE, 0); elm_object_text_set(button, _("Misc")); evas_object_show(button); elm_object_content_set(border, button); @@ -1365,8 +1391,8 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) evas_object_smart_callback_add(button, "clicked", _tab_misc_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); + evas_object_size_hint_weight_set(border, EXPAND, EXPAND); + evas_object_size_hint_align_set(border, FILL, FILL); elm_object_style_set(border, "pad_small"); elm_box_pack_end(hbox, border); evas_object_show(border); @@ -1375,32 +1401,32 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) elm_table_pack(ui->content, frame, 0, 0, 1, 1); hbox = elm_box_add(parent); - 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_weight_set(hbox, EXPAND, 0); + evas_object_size_hint_align_set(hbox, FILL, FILL); elm_box_horizontal_set(hbox, EINA_TRUE); evas_object_show(hbox); box = elm_box_add(parent); - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, 0); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(box, EXPAND, 0); + evas_object_size_hint_align_set(box, FILL, FILL); elm_box_horizontal_set(box, EINA_TRUE); evas_object_show(box); frame = elm_frame_add(parent); - evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, 0); - evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(frame, EXPAND, 0); + evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_style_set(frame, "pad_small"); evas_object_show(frame); 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); + evas_object_size_hint_weight_set(border, EXPAND, EXPAND); + evas_object_size_hint_align_set(border, FILL, FILL); elm_object_style_set(border, "pad_small"); evas_object_show(border); ui->entry_search = entry = elm_entry_add(parent); - evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(entry, EXPAND, EXPAND); + evas_object_size_hint_align_set(entry, FILL, FILL); elm_entry_single_line_set(entry, EINA_TRUE); elm_entry_scrollable_set(entry, EINA_TRUE); elm_entry_editable_set(entry, EINA_TRUE); @@ -1410,13 +1436,13 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui) 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); + evas_object_size_hint_align_set(border, FILL, FILL); 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, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("Close")); elm_object_content_set(border, button); elm_box_pack_end(box, border); @@ -1638,8 +1664,8 @@ _sys_info_all_poll_feedback_cb(void *data, Ecore_Thread *thread, void *msg) value = sysinfo->memory.used / ratio; elm_progressbar_value_set(progress, value / 100); elm_progressbar_unit_format_set(progress, eina_slstr_printf("%s / %s", - evisum_size_format(sysinfo->memory.used << 10), - evisum_size_format(sysinfo->memory.total << 10))); + evisum_size_format(sysinfo->memory.used << 10), + evisum_size_format(sysinfo->memory.total << 10))); out: free(sysinfo->cores); free(sysinfo); @@ -1648,19 +1674,25 @@ out: static void _ui_launch(Ui *ui) { + Ecore_Thread *thr; + _process_list_update(ui); - ui->thread_system = - ecore_thread_feedback_run(_sys_info_all_poll, _sys_info_all_poll_feedback_cb, - _thread_end_cb, _thread_error_cb, ui, EINA_FALSE); + thr = ecore_thread_feedback_run(_sys_info_all_poll, + _sys_info_all_poll_feedback_cb, _thread_end_cb, + _thread_error_cb, ui, EINA_FALSE); + ui->thread_system = thr; - ui->thread_process = - ecore_thread_feedback_run(_process_list, _process_list_feedback_cb, - _thread_end_cb, _thread_error_cb, ui, EINA_FALSE); + thr = ecore_thread_feedback_run(_process_list, _process_list_feedback_cb, + _thread_end_cb, _thread_error_cb, ui, EINA_FALSE); + ui->thread_process = thr; - evas_object_event_callback_add(ui->win, EVAS_CALLBACK_RESIZE, _evisum_resize_cb, ui); - evas_object_event_callback_add(ui->content, EVAS_CALLBACK_KEY_DOWN, _evisum_key_down_cb, ui); - evas_object_event_callback_add(ui->entry_search, EVAS_CALLBACK_KEY_DOWN, _evisum_search_keypress_cb, ui); + evas_object_event_callback_add(ui->win, EVAS_CALLBACK_RESIZE, + _evisum_resize_cb, ui); + evas_object_event_callback_add(ui->content, EVAS_CALLBACK_KEY_DOWN, + _evisum_key_down_cb, ui); + evas_object_event_callback_add(ui->entry_search, EVAS_CALLBACK_KEY_DOWN, + _evisum_search_keypress_cb, ui); } static Ui * diff --git a/src/bin/ui/ui.h b/src/bin/ui/ui.h index b0c03ed..9c5c0d4 100644 --- a/src/bin/ui/ui.h +++ b/src/bin/ui/ui.h @@ -12,6 +12,9 @@ #define EVISUM_SIZE_WIDTH 600 #define EVISUM_SIZE_HEIGHT 520 +#define FILL EVAS_HINT_FILL +#define EXPAND EVAS_HINT_EXPAND + typedef enum { PROCESS_INFO_FIELD_PID, @@ -31,8 +34,6 @@ typedef enum PROCESS_INFO_FIELD_CPU_TIME, } Proc_Info_Field; -#define PROCESS_INFO_FIELDS 7 - typedef enum { DATA_UNIT_B = 'B', diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c index 83cfef7..80041c5 100644 --- a/src/bin/ui/ui_disk.c +++ b/src/bin/ui/ui_disk.c @@ -9,26 +9,27 @@ ui_tab_disk_add(Ui *ui) parent = ui->content; ui->disk_view = box = elm_box_add(parent); - 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_weight_set(box, EXPAND, EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); elm_table_pack(ui->content, ui->disk_view, 0, 1, 1, 1); evas_object_hide(box); ui->disk_activity = hbox = elm_box_add(box); - evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0.5); - evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(hbox, EXPAND, 0.5); + evas_object_size_hint_align_set(hbox, FILL, 0.5); evas_object_show(hbox); frame = elm_frame_add(box); - 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_weight_set(frame, EXPAND, EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_style_set(frame, "pad_small"); evas_object_show(frame); scroller = elm_scroller_add(parent); - evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); + evas_object_size_hint_weight_set(scroller, EXPAND, EXPAND); + evas_object_size_hint_align_set(scroller, FILL, FILL); + elm_scroller_policy_set(scroller, + ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); evas_object_show(scroller); elm_object_content_set(scroller, hbox); @@ -37,28 +38,32 @@ ui_tab_disk_add(Ui *ui) } static void -_ui_disk_add(Ui *ui, const char *path, const char *mount, unsigned long total, unsigned long used) +_ui_disk_add(Ui *ui, const char *path, const char *mount, unsigned long total, + unsigned long used) { Evas_Object *box, *frame, *progress, *label; double ratio, value; box = elm_box_add(ui->disk_activity); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); + evas_object_size_hint_weight_set(box, EXPAND, EXPAND); evas_object_show(box); label = elm_label_add(box); - evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, FILL, FILL); + evas_object_size_hint_weight_set(label, EXPAND, EXPAND); elm_object_text_set(label, - eina_slstr_printf(_("%s
mounted at %s
%s of %s"), - path, mount, evisum_size_format(used), evisum_size_format(total))); + eina_slstr_printf(_( + "%s
mounted at %s" + "
%s of %s"), + path, mount, evisum_size_format(used), + evisum_size_format(total))); evas_object_show(label); elm_box_pack_end(box, label); progress = elm_progressbar_add(box); - 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); elm_progressbar_span_size_set(progress, 1.0); evas_object_show(progress); @@ -71,8 +76,8 @@ _ui_disk_add(Ui *ui, const char *path, const char *mount, unsigned long total, u elm_progressbar_value_set(progress, value / 100.0); frame = elm_frame_add(ui->misc_activity); - evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); + evas_object_size_hint_weight_set(frame, EXPAND, EXPAND); elm_object_style_set(frame, "pad_large"); evas_object_show(frame); diff --git a/src/bin/ui/ui_memory.c b/src/bin/ui/ui_memory.c index 1033286..23640ea 100644 --- a/src/bin/ui/ui_memory.c +++ b/src/bin/ui/ui_memory.c @@ -4,8 +4,8 @@ static Evas_Object * _label_mem(Evas_Object *parent, const char *text) { Evas_Object *label = elm_label_add(parent); - evas_object_size_hint_weight_set(label, 0.1, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(label, 0.1, EXPAND); + evas_object_size_hint_align_set(label, FILL, FILL); elm_object_text_set(label, eina_slstr_printf("%s",text)); evas_object_show(label); @@ -21,68 +21,69 @@ ui_tab_memory_add(Ui *ui) parent = ui->content; ui->mem_view = box = elm_box_add(parent); - 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_weight_set(box, EXPAND, EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); elm_table_pack(ui->content, ui->mem_view, 0, 1, 1, 1); evas_object_hide(box); ui->mem_activity = hbox = elm_box_add(box); - 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_weight_set(hbox, EXPAND, 0); + evas_object_size_hint_align_set(hbox, FILL, FILL); evas_object_show(hbox); frame = elm_frame_add(box); - 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_weight_set(frame, EXPAND, EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_style_set(frame, "pad_small"); evas_object_show(frame); scroller = elm_scroller_add(parent); - evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); + evas_object_size_hint_weight_set(scroller, EXPAND, EXPAND); + evas_object_size_hint_align_set(scroller, FILL, FILL); + elm_scroller_policy_set(scroller, + ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); evas_object_show(scroller); elm_object_content_set(scroller, hbox); elm_object_content_set(frame, scroller); elm_box_pack_end(box, frame); box = elm_box_add(ui->content); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); + evas_object_size_hint_weight_set(box, EXPAND, EXPAND); evas_object_show(box); 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); + evas_object_size_hint_align_set(frame, FILL, 0); + evas_object_size_hint_weight_set(frame, EXPAND, EXPAND); evas_object_show(frame); elm_object_style_set(frame, "pad_medium"); elm_box_pack_end(box, frame); ui->title_mem = label = elm_label_add(parent); - evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(label, EXPAND, EXPAND); + evas_object_size_hint_align_set(label, FILL, FILL); elm_object_text_set(label, _("Memory")); evas_object_show(label); elm_box_pack_end(box, label); 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); + evas_object_size_hint_align_set(frame, FILL, 0); + evas_object_size_hint_weight_set(frame, EXPAND, EXPAND); evas_object_show(frame); elm_object_style_set(frame, "pad_large"); elm_box_pack_end(box, frame); table = elm_table_add(parent); - evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(table, EXPAND, EXPAND); + evas_object_size_hint_align_set(table, FILL, FILL); elm_table_padding_set(table, 0, 20 * elm_config_scale_get()); evas_object_show(table); label = _label_mem(box, _("Used")); ui->progress_mem_used = progress = elm_progressbar_add(table); - 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); elm_progressbar_span_size_set(progress, 1.0); evas_object_show(progress); @@ -92,8 +93,8 @@ ui_tab_memory_add(Ui *ui) label = _label_mem(box, _("Cached")); ui->progress_mem_cached = 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); elm_progressbar_span_size_set(progress, 1.0); evas_object_show(progress); @@ -103,8 +104,8 @@ ui_tab_memory_add(Ui *ui) label = _label_mem(box, _("Buffered")); ui->progress_mem_buffered = 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); elm_progressbar_span_size_set(progress, 1.0); evas_object_show(progress); @@ -114,8 +115,8 @@ ui_tab_memory_add(Ui *ui) label = _label_mem(box, _("Shared")); ui->progress_mem_shared = 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); evas_object_show(progress); elm_table_pack(table, label, 0, 3, 1, 1); @@ -124,16 +125,16 @@ ui_tab_memory_add(Ui *ui) label = _label_mem(box, _("Swapped")); 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); evas_object_show(progress); elm_table_pack(table, label, 0, 4, 1, 1); elm_table_pack(table, progress, 1, 4, 1, 1); frame = elm_frame_add(ui->mem_activity); - 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_weight_set(frame, EXPAND, EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_style_set(frame, "pad_large"); evas_object_show(frame); @@ -155,37 +156,41 @@ ui_tab_memory_update(Ui *ui, Sys_Info *sysinfo) ratio = sysinfo->memory.total / 100.0; value = sysinfo->memory.used / ratio; elm_progressbar_value_set(progress, value / 100); - elm_progressbar_unit_format_set(progress, eina_slstr_printf("%s / %s (%1.0f %)", - evisum_size_format(sysinfo->memory.used << 10), - evisum_size_format(sysinfo->memory.total << 10), - value)); + elm_progressbar_unit_format_set(progress, + eina_slstr_printf("%s / %s (%1.0f %)", + evisum_size_format(sysinfo->memory.used << 10), + evisum_size_format(sysinfo->memory.total << 10), + value)); progress = ui->progress_mem_cached; ratio = sysinfo->memory.total / 100.0; value = sysinfo->memory.cached / ratio; elm_progressbar_value_set(progress, value / 100); - elm_progressbar_unit_format_set(progress, eina_slstr_printf("%s / %s (%1.0f %)", - evisum_size_format(sysinfo->memory.cached << 10), - evisum_size_format(sysinfo->memory.total << 10), - value)); + elm_progressbar_unit_format_set(progress, + eina_slstr_printf("%s / %s (%1.0f %)", + evisum_size_format(sysinfo->memory.cached << 10), + evisum_size_format(sysinfo->memory.total << 10), + value)); progress = ui->progress_mem_buffered; ratio = sysinfo->memory.total / 100.0; value = sysinfo->memory.buffered / ratio; elm_progressbar_value_set(progress, value / 100); - elm_progressbar_unit_format_set(progress, eina_slstr_printf("%s / %s (%1.0f %)", - evisum_size_format(sysinfo->memory.buffered << 10), - evisum_size_format(sysinfo->memory.total << 10), - value)); + elm_progressbar_unit_format_set(progress, + eina_slstr_printf("%s / %s (%1.0f %)", + evisum_size_format(sysinfo->memory.buffered << 10), + evisum_size_format(sysinfo->memory.total << 10), + value)); progress = ui->progress_mem_shared; ratio = sysinfo->memory.total / 100.0; value = sysinfo->memory.shared / ratio; elm_progressbar_value_set(progress, value / 100); - elm_progressbar_unit_format_set(progress, eina_slstr_printf("%s / %s (%1.0f %)", - evisum_size_format(sysinfo->memory.shared << 10), - evisum_size_format(sysinfo->memory.total << 10), - value)); + elm_progressbar_unit_format_set(progress, + eina_slstr_printf("%s / %s (%1.0f %)", + evisum_size_format(sysinfo->memory.shared << 10), + evisum_size_format(sysinfo->memory.total << 10), + value)); progress = ui->progress_mem_swap; if (sysinfo->memory.swap_total) @@ -194,10 +199,12 @@ ui_tab_memory_update(Ui *ui, Sys_Info *sysinfo) value = sysinfo->memory.swap_used / ratio; } else value = 0.0; + elm_progressbar_value_set(progress, value / 100); - elm_progressbar_unit_format_set(progress, eina_slstr_printf("%s / %s (%1.0f %)", - evisum_size_format(sysinfo->memory.swap_used << 10), - evisum_size_format(sysinfo->memory.swap_total << 10), - value)); + elm_progressbar_unit_format_set(progress, + eina_slstr_printf("%s / %s (%1.0f %)", + evisum_size_format(sysinfo->memory.swap_used << 10), + evisum_size_format(sysinfo->memory.swap_total << 10), + value)); } diff --git a/src/bin/ui/ui_misc.c b/src/bin/ui/ui_misc.c index 6cc4401..38ca19d 100644 --- a/src/bin/ui/ui_misc.c +++ b/src/bin/ui/ui_misc.c @@ -11,26 +11,27 @@ _battery_usage_add(Evas_Object *box, power_t *power) continue; frame = elm_frame_add(box); - evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); + evas_object_size_hint_weight_set(frame, EXPAND, EXPAND); elm_object_style_set(frame, "pad_small"); evas_object_show(frame); vbox = elm_box_add(box); - evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(vbox, FILL, FILL); + evas_object_size_hint_weight_set(vbox, EXPAND, EXPAND); evas_object_show(vbox); label = elm_label_add(box); - evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, 1.0, FILL); + evas_object_size_hint_weight_set(label, EXPAND, EXPAND); evas_object_show(label); elm_box_pack_end(vbox, label); Eina_Strbuf *buf = eina_strbuf_new(); if (buf) { - eina_strbuf_append_printf(buf, "%s ", power->battery_names[i]); + eina_strbuf_append_printf(buf, "%s ", + power->battery_names[i]); if (power->have_ac && i == 0) { eina_strbuf_append(buf, _("(plugged in)")); @@ -41,23 +42,25 @@ _battery_usage_add(Evas_Object *box, power_t *power) } hbox = elm_box_add(box); - evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(hbox, FILL, FILL); + evas_object_size_hint_weight_set(hbox, EXPAND, EXPAND); elm_box_horizontal_set(hbox, EINA_TRUE); evas_object_show(hbox); ic = elm_image_add(box); elm_image_file_set(ic, evisum_icon_path_get("battery"), NULL); - evas_object_size_hint_min_set(ic, 32 * elm_config_scale_get(), 32 * elm_config_scale_get()); + evas_object_size_hint_min_set(ic, 32 * elm_config_scale_get(), + 32 * elm_config_scale_get()); evas_object_show(ic); elm_box_pack_end(hbox, ic); 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); elm_progressbar_span_size_set(progress, 1.0); elm_progressbar_unit_format_set(progress, "%1.0f%%"); - elm_progressbar_value_set(progress, (double) power->batteries[i]->percent / 100); + elm_progressbar_value_set(progress, + (double) power->batteries[i]->percent / 100); evas_object_show(progress); elm_box_pack_end(hbox, progress); @@ -99,8 +102,8 @@ _network_usage_add(Ui *ui, Evas_Object *box, uint64_t bytes, Eina_Bool incoming) char *tmp; vbox = elm_box_add(box); - evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(vbox, FILL, FILL); + evas_object_size_hint_weight_set(vbox, EXPAND, EXPAND); evas_object_show(vbox); label = elm_label_add(box); @@ -109,26 +112,27 @@ _network_usage_add(Ui *ui, Evas_Object *box, uint64_t bytes, Eina_Bool incoming) else elm_object_text_set(label, _("Network Outgoing")); - evas_object_size_hint_align_set(label, 1.0, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, 1.0, FILL); + evas_object_size_hint_weight_set(label, EXPAND, EXPAND); evas_object_show(label); elm_box_pack_end(vbox, label); hbox = elm_box_add(box); - evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(hbox, FILL, FILL); + evas_object_size_hint_weight_set(hbox, EXPAND, EXPAND); elm_box_horizontal_set(hbox, EINA_TRUE); evas_object_show(hbox); ic = elm_image_add(box); elm_image_file_set(ic, evisum_icon_path_get("network"), NULL); - evas_object_size_hint_min_set(ic, 32 * elm_config_scale_get(), 32 * elm_config_scale_get()); + evas_object_size_hint_min_set(ic, 32 * elm_config_scale_get(), + 32 * elm_config_scale_get()); evas_object_show(ic); elm_box_pack_end(hbox, ic); progress = elm_progressbar_add(box); - 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_size_hint_align_set(progress, FILL, FILL); + evas_object_size_hint_weight_set(progress, EXPAND, EXPAND); elm_progressbar_span_size_set(progress, 1.0); evas_object_show(progress); elm_box_pack_end(hbox, progress); @@ -147,13 +151,15 @@ _network_usage_add(Ui *ui, Evas_Object *box, uint64_t bytes, Eina_Bool incoming) { if (ui->incoming_max < bytes) ui->incoming_max = bytes; - elm_progressbar_value_set(progress, (double) bytes / ui->incoming_max); + elm_progressbar_value_set(progress, + (double) bytes / ui->incoming_max); } else { if (ui->outgoing_max < bytes) ui->outgoing_max = bytes; - elm_progressbar_value_set(progress, (double) bytes / ui->outgoing_max); + elm_progressbar_value_set(progress, + (double) bytes / ui->outgoing_max); } } @@ -168,26 +174,27 @@ ui_tab_misc_add(Ui *ui) parent = ui->content; 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_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(box, EXPAND, EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); elm_table_pack(ui->content, ui->misc_view, 0, 1, 1, 1); evas_object_hide(box); ui->misc_activity = hbox = elm_box_add(box); - 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_weight_set(hbox, EXPAND, 0); + evas_object_size_hint_align_set(hbox, FILL, FILL); evas_object_show(hbox); frame = elm_frame_add(box); elm_object_style_set(frame, "pad_small"); - 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_weight_set(frame, EXPAND, EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); evas_object_show(frame); scroller = elm_scroller_add(parent); - evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); + evas_object_size_hint_weight_set(scroller, EXPAND, EXPAND); + evas_object_size_hint_align_set(scroller, FILL, FILL); + elm_scroller_policy_set(scroller, + ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO); evas_object_show(scroller); elm_object_content_set(scroller, hbox); @@ -206,8 +213,8 @@ ui_tab_misc_update(Ui *ui, Sys_Info *sysinfo) elm_box_clear(ui->misc_activity); box = elm_box_add(ui->content); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); + evas_object_size_hint_weight_set(box, EXPAND, EXPAND); evas_object_show(box); _battery_usage_add(box, &sysinfo->power); @@ -215,8 +222,8 @@ ui_tab_misc_update(Ui *ui, Sys_Info *sysinfo) _network_usage_add(ui, box, sysinfo->outgoing, EINA_FALSE); frame = elm_frame_add(ui->misc_activity); - evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); + evas_object_size_hint_weight_set(frame, EXPAND, EXPAND); elm_object_style_set(frame, "pad_medium"); evas_object_show(frame); elm_object_content_set(frame, box); diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c index 56682d1..8e566c1 100644 --- a/src/bin/ui/ui_process_view.c +++ b/src/bin/ui/ui_process_view.c @@ -84,8 +84,8 @@ _item_column_add(Evas_Object *table, const char *text, int col) Evas_Object *rect, *label; label = elm_label_add(table); - evas_object_size_hint_align_set(label, 0.0, EVAS_HINT_EXPAND); - evas_object_size_hint_weight_set(label, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_align_set(label, 0.0, EXPAND); + evas_object_size_hint_weight_set(label, FILL, FILL); evas_object_data_set(table, text, label); evas_object_show(label); @@ -104,19 +104,19 @@ _item_create(Evas_Object *parent) Evas_Object *table, *label; table = elm_table_add(parent); - evas_object_size_hint_align_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_weight_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_align_set(table, EXPAND, EXPAND); + evas_object_size_hint_weight_set(table, FILL, FILL); evas_object_show(table); label = _item_column_add(table, "tid", 0); - evas_object_size_hint_align_set(label, 0.5, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, 0.5, EXPAND); _item_column_add(table, "name", 1); label = _item_column_add(table, "state", 2); - evas_object_size_hint_align_set(label, 0.5, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, 0.5, EXPAND); label = _item_column_add(table, "cpu_id", 3); - evas_object_size_hint_align_set(label, 0.5, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, 0.5, EXPAND); label = _item_column_add(table, "cpu_usage", 4); - evas_object_size_hint_align_set(label, 0.5, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(label, 0.5, EXPAND); return table; } @@ -205,7 +205,8 @@ _genlist_ensure_n_items(Evas_Object *genlist, unsigned int items) for (i = existing; i < items; i++) { - elm_genlist_item_append(genlist, itc, NULL, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); + elm_genlist_item_append(genlist, itc, NULL, NULL, + ELM_GENLIST_ITEM_NONE, NULL, NULL); } elm_genlist_item_class_free(itc); @@ -443,8 +444,8 @@ static Evas_Object * _entry_add(Evas_Object *parent) { Evas_Object *entry = elm_entry_add(parent); - evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(entry, EXPAND, EXPAND); + evas_object_size_hint_align_set(entry, FILL, FILL); elm_entry_single_line_set(entry, EINA_TRUE); elm_entry_scrollable_set(entry, EINA_TRUE); elm_entry_editable_set(entry, EINA_FALSE); @@ -473,13 +474,13 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui) frame = elm_frame_add(parent); elm_object_text_set(frame, _("General")); - 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_weight_set(frame, EXPAND, EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); evas_object_show(frame); table = elm_table_add(parent); - evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(table, EXPAND, EXPAND); + evas_object_size_hint_align_set(table, FILL, FILL); evas_object_show(table); elm_object_content_set(frame, table); @@ -563,28 +564,28 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui) elm_table_pack(table, entry, 1, i++, 1, 1); hbox = elm_box_add(parent); - evas_object_size_hint_weight_set(hbox, 0.5, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(hbox, 0.5, EXPAND); + evas_object_size_hint_align_set(hbox, FILL, FILL); elm_box_horizontal_set(hbox, EINA_TRUE); evas_object_show(hbox); elm_table_pack(table, hbox, 0, i, 2, 1); 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, 0.5); + evas_object_size_hint_weight_set(border, EXPAND, EXPAND); + evas_object_size_hint_align_set(border, FILL, 0.5); elm_object_style_set(border, "pad_small"); evas_object_show(border); elm_box_pack_end(hbox, border); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, 0.2, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(border, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(border, 0.2, EXPAND); + evas_object_size_hint_align_set(border, 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, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("Stop")); evas_object_show(button); evas_object_smart_callback_add(button, "clicked", _btn_stop_clicked_cb, ui); @@ -592,14 +593,14 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui) elm_box_pack_end(hbox, border); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, 0.2, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(border, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(border, 0.2, EXPAND); + evas_object_size_hint_align_set(border, 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, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("Start")); elm_object_content_set(border, button); evas_object_show(button); @@ -607,14 +608,14 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui) evas_object_smart_callback_add(button, "clicked", _btn_start_clicked_cb, ui); border = elm_frame_add(parent); - evas_object_size_hint_weight_set(border, 0.2, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(border, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(border, 0.2, EXPAND); + evas_object_size_hint_align_set(border, 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, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(button, EXPAND, EXPAND); + evas_object_size_hint_align_set(button, FILL, FILL); elm_object_text_set(button, _("Kill")); elm_box_pack_end(hbox, border); evas_object_show(button); @@ -711,26 +712,26 @@ _threads_tab_add(Evas_Object *parent, Ui_Process *ui) Evas_Object *frame, *box, *hbox, *btn, *genlist; frame = elm_frame_add(parent); - 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_weight_set(frame, EXPAND, EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_text_set(frame, _("Threads")); box = elm_box_add(parent); - 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_weight_set(box, EXPAND, EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); evas_object_show(box); elm_object_content_set(frame, box); hbox = elm_box_add(box); - 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_weight_set(hbox, EXPAND, 0); + evas_object_size_hint_align_set(hbox, FILL, FILL); elm_box_horizontal_set(hbox, EINA_TRUE); elm_box_homogeneous_set(hbox, EINA_TRUE); evas_object_show(hbox); ui->btn_thread_id = btn = elm_button_add(hbox); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); + evas_object_size_hint_align_set(btn, FILL, FILL); elm_object_text_set(btn, _("ID")); _btn_icon_state_set(btn, ui->sort_reverse); evas_object_show(btn); @@ -738,8 +739,8 @@ _threads_tab_add(Evas_Object *parent, Ui_Process *ui) elm_box_pack_end(hbox, btn); ui->btn_thread_name = btn = elm_button_add(hbox); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); + evas_object_size_hint_align_set(btn, FILL, FILL); elm_object_text_set(btn, _("Name")); _btn_icon_state_set(btn, ui->sort_reverse); evas_object_show(btn); @@ -747,8 +748,8 @@ _threads_tab_add(Evas_Object *parent, Ui_Process *ui) elm_box_pack_end(hbox, btn); ui->btn_thread_state = btn = elm_button_add(hbox); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); + evas_object_size_hint_align_set(btn, FILL, FILL); elm_object_text_set(btn, _("State")); _btn_icon_state_set(btn, ui->sort_reverse); evas_object_show(btn); @@ -756,8 +757,8 @@ _threads_tab_add(Evas_Object *parent, Ui_Process *ui) elm_box_pack_end(hbox, btn); ui->btn_thread_cpu_id = btn = elm_button_add(hbox); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); + evas_object_size_hint_align_set(btn, FILL, FILL); elm_object_text_set(btn, _("CPU ID")); _btn_icon_state_set(btn, ui->sort_reverse); evas_object_show(btn); @@ -765,8 +766,8 @@ _threads_tab_add(Evas_Object *parent, Ui_Process *ui) elm_box_pack_end(hbox, btn); ui->btn_thread_cpu_usage = btn = elm_button_add(hbox); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); + evas_object_size_hint_align_set(btn, FILL, FILL); elm_object_text_set(btn, _("CPU Usage")); _btn_icon_state_set(btn, ui->sort_reverse); evas_object_show(btn); @@ -777,8 +778,8 @@ _threads_tab_add(Evas_Object *parent, Ui_Process *ui) evas_object_data_set(genlist, "ui", ui); elm_object_focus_allow_set(genlist, EINA_FALSE); elm_genlist_homogeneous_set(genlist, EINA_TRUE); - evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(genlist, EXPAND, EXPAND); + evas_object_size_hint_align_set(genlist, FILL, FILL); evas_object_show(genlist); evas_object_smart_callback_add(ui->genlist_threads, "unrealized", _item_unrealized_cb, ui); @@ -795,19 +796,19 @@ _info_tab_add(Evas_Object *parent, Ui_Process *ui) Evas_Object *frame, *box, *entry; frame = elm_frame_add(parent); - 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_weight_set(frame, EXPAND, EXPAND); + evas_object_size_hint_align_set(frame, FILL, FILL); elm_object_text_set(frame, _("Documentation")); box = elm_box_add(parent); - 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_weight_set(box, EXPAND, EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); evas_object_show(box); elm_object_content_set(frame, box); ui->entry_info = entry = elm_entry_add(box); - evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(entry, EXPAND, EXPAND); + evas_object_size_hint_align_set(entry, FILL, FILL); elm_entry_single_line_set(entry, EINA_FALSE); elm_entry_line_wrap_set(entry, ELM_WRAP_NONE); elm_entry_editable_set(entry, EINA_FALSE); @@ -871,7 +872,8 @@ _btn_info_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, if (ui->info_init) return; - Eina_List *lines = _exe_response(eina_slstr_printf("man %s | col -b", ui->selected_cmd)); + Eina_List *lines = + _exe_response(eina_slstr_printf("man %s | col -b", ui->selected_cmd)); if (lines) { buf = eina_strbuf_new(); @@ -893,8 +895,9 @@ _btn_info_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, } else { - elm_object_text_set(ui->entry_info, eina_slstr_printf(_("No documentation found for %s."), - ui->selected_cmd)); + elm_object_text_set(ui->entry_info, + eina_slstr_printf(_("No documentation found for %s."), + ui->selected_cmd)); } ui->info_init = EINA_TRUE; @@ -906,28 +909,28 @@ _tabs_add(Evas_Object *parent, Ui_Process *ui) Evas_Object *hbox, *pad, *btn; hbox = elm_box_add(parent); - evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, 0); - evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(hbox, EXPAND, 0); + evas_object_size_hint_align_set(hbox, FILL, 0.5); elm_box_horizontal_set(hbox, EINA_TRUE); evas_object_show(hbox); pad = elm_frame_add(parent); elm_object_style_set(pad, "pad_medium"); - evas_object_size_hint_weight_set(pad, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(pad, EXPAND, EXPAND); + evas_object_size_hint_align_set(pad, FILL, FILL); evas_object_show(pad); elm_box_pack_end(hbox, pad); pad = elm_frame_add(parent); elm_object_style_set(pad, "pad_small"); - evas_object_size_hint_weight_set(pad, 0.0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(pad, 0.0, EXPAND); + evas_object_size_hint_align_set(pad, FILL, FILL); evas_object_show(pad); ui->btn_main = btn = elm_button_add(parent); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_min_set(btn, TAB_BTN_SIZE * elm_config_scale_get(), 1); + evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); + evas_object_size_hint_align_set(btn, FILL, FILL); + evas_object_size_hint_min_set(btn, TAB_BTN_SIZE, 1); elm_object_text_set(btn, _("Process")); elm_object_disabled_set(btn, EINA_TRUE); evas_object_show(btn); @@ -937,14 +940,14 @@ _tabs_add(Evas_Object *parent, Ui_Process *ui) pad = elm_frame_add(parent); elm_object_style_set(pad, "pad_small"); - evas_object_size_hint_weight_set(pad, 0.0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(pad, 0.0, EXPAND); + evas_object_size_hint_align_set(pad, FILL, FILL); evas_object_show(pad); ui->btn_thread = btn = elm_button_add(parent); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_min_set(btn, TAB_BTN_SIZE * elm_config_scale_get(), 1); + evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); + evas_object_size_hint_align_set(btn, FILL, FILL); + evas_object_size_hint_min_set(btn, TAB_BTN_SIZE, 1); elm_object_text_set(btn, _("Threads")); elm_object_disabled_set(btn, EINA_FALSE); evas_object_show(btn); @@ -954,14 +957,14 @@ _tabs_add(Evas_Object *parent, Ui_Process *ui) pad = elm_frame_add(parent); elm_object_style_set(pad, "pad_small"); - evas_object_size_hint_weight_set(pad, 0.0, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(pad, 0.0, EXPAND); + evas_object_size_hint_align_set(pad, FILL, FILL); evas_object_show(pad); ui->btn_info = btn = elm_button_add(parent); - evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_min_set(btn, TAB_BTN_SIZE * elm_config_scale_get(), 1); + evas_object_size_hint_weight_set(btn, EXPAND, EXPAND); + evas_object_size_hint_align_set(btn, FILL, FILL); + evas_object_size_hint_min_set(btn, TAB_BTN_SIZE, 1); elm_object_text_set(btn, _("Information")); elm_object_disabled_set(btn, EINA_FALSE); evas_object_show(btn); @@ -971,8 +974,8 @@ _tabs_add(Evas_Object *parent, Ui_Process *ui) pad = elm_frame_add(parent); elm_object_style_set(pad, "pad_medium"); - evas_object_size_hint_weight_set(pad, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(pad, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(pad, EXPAND, EXPAND); + evas_object_size_hint_align_set(pad, FILL, FILL); evas_object_show(pad); elm_box_pack_end(hbox, pad); @@ -1032,14 +1035,14 @@ ui_process_win_add(int pid, const char *cmd) tabs = _tabs_add(win, ui); box = elm_box_add(win); - 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_weight_set(box, EXPAND, EXPAND); + evas_object_size_hint_align_set(box, FILL, FILL); evas_object_show(box); elm_box_pack_end(box, tabs); ui->content = elm_table_add(box); - evas_object_size_hint_weight_set(ui->content, 0.5, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(ui->content, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_size_hint_weight_set(ui->content, 0.5, EXPAND); + evas_object_size_hint_align_set(ui->content, FILL, FILL); evas_object_show(ui->content); ui->main_view = _process_tab_add(win, ui);