From ca767ac87bc5a7f45867f808f20b4d299723e3dd Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Thu, 17 Jan 2019 10:57:58 +0000 Subject: [PATCH] UI: Visual changes to improve layout. Minor changes to improve rendering of process information text. --- src/main.c | 2 +- src/process.c | 48 ++++++++++++++++++++++++------------------------ src/ui.c | 12 ++++++------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main.c b/src/main.c index 397ed06..e76964c 100644 --- a/src/main.c +++ b/src/main.c @@ -30,7 +30,7 @@ _win_add(void) icon = elm_icon_add(win); elm_icon_standard_set(icon, "evisum"); elm_win_icon_object_set(win, icon); - evas_object_resize(win, 768 * elm_config_scale_get(), 500 * elm_config_scale_get()); + evas_object_resize(win, 800 * elm_config_scale_get(), 500 * elm_config_scale_get()); elm_win_title_set(win, "System Information"); elm_win_center(win, EINA_TRUE, EINA_TRUE); evas_object_show(win); diff --git a/src/process.c b/src/process.c index 755ddfc..ce55f3a 100644 --- a/src/process.c +++ b/src/process.c @@ -43,76 +43,76 @@ _process_state_name(char state) switch (state) { case 'D': - statename = "DSLEEP"; + statename = "dsleep"; break; case 'I': - statename = "IDLE"; + statename = "idle"; break; case 'R': - statename = "RUN"; + statename = "run"; break; case 'S': - statename = "SLEEP"; + statename = "sleep"; break; case 'T': case 't': - statename = "STOP"; + statename = "stop"; break; case 'X': - statename = "DEAD"; + statename = "dead"; break; case 'Z': - statename = "ZOMB"; + statename = "zomb"; break; } #else switch (state) { case SIDL: - statename = "IDLE"; + statename = "idle"; break; - case SRUN: - statename = "RUN"; + case Srun: + statename = "run"; break; - case SSLEEP: - statename = "SLEEP"; + case Ssleep: + statename = "sleep"; break; - case SSTOP: - statename = "STOP"; + case Sstop: + statename = "stop"; break; #if !defined(__MacOS__) #if !defined(__OpenBSD__) - case SWAIT: - statename = "WAIT"; + case Swait: + statename = "wait"; break; - case SLOCK: - statename = "LOCK"; + case Slock: + statename = "lock"; break; #endif - case SZOMB: - statename = "ZOMB"; + case Szomb: + statename = "zomb"; break; #endif #if defined(__OpenBSD__) - case SDEAD: - statename = "DEAD"; + case Sdead: + statename = "dead"; break; - case SONPROC: - statename = "ONPROC"; + case Sonproc: + statename = "onproc"; break; #endif } diff --git a/src/ui.c b/src/ui.c index 380c067..dd16405 100644 --- a/src/ui.c +++ b/src/ui.c @@ -1299,7 +1299,7 @@ _ui_system_view_add(Ui *ui) elm_table_pack(table, button, 0, 0, 1, 1); ui->entry_pid = entry = elm_entry_add(parent); - elm_entry_text_style_user_push(entry, "DEFAULT='font=default:style=default size=12 align=center'"); + elm_entry_text_style_user_push(entry, "DEFAULT='align=center'"); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0); elm_entry_scrollable_set(entry, 0); @@ -1315,7 +1315,7 @@ _ui_system_view_add(Ui *ui) elm_table_pack(table, button, 1, 0, 1, 1); ui->entry_uid = entry = elm_entry_add(parent); - elm_entry_text_style_user_push(entry, "DEFAULT='font=default:style=default size=12 align=center'"); + elm_entry_text_style_user_push(entry, "DEFAULT='align=center'"); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0); elm_entry_editable_set(entry, 0); @@ -1330,7 +1330,7 @@ _ui_system_view_add(Ui *ui) elm_table_pack(table, button, 2, 0, 1, 1); ui->entry_size = entry = elm_entry_add(parent); - elm_entry_text_style_user_push(entry, "DEFAULT='font=default:style=default size=12 align=right'"); + elm_entry_text_style_user_push(entry, "DEFAULT='align=right'"); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0); elm_entry_scrollable_set(entry, 0); @@ -1346,7 +1346,7 @@ _ui_system_view_add(Ui *ui) elm_table_pack(table, button, 3, 0, 1, 1); ui->entry_rss = entry = elm_entry_add(parent); - elm_entry_text_style_user_push(entry, "DEFAULT='font=default:style=default size=12 align=right'"); + elm_entry_text_style_user_push(entry, "DEFAULT='align=right'"); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0); elm_entry_scrollable_set(entry, 0); @@ -1377,7 +1377,7 @@ _ui_system_view_add(Ui *ui) elm_table_pack(table, button, 5, 0, 1, 1); ui->entry_state = entry = elm_entry_add(parent); - elm_entry_text_style_user_push(entry, "DEFAULT='font=default:style=default size=12 align=center'"); + elm_entry_text_style_user_push(entry, "DEFAULT='align=center'"); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0); elm_entry_single_line_set(entry, 1); @@ -1395,7 +1395,7 @@ _ui_system_view_add(Ui *ui) elm_table_pack(table, button, 6, 0, 1, 1); ui->entry_cpu_usage = entry = elm_entry_add(parent); - elm_entry_text_style_user_push(entry, "DEFAULT='font=default:style=default size=12 align=center'"); + elm_entry_text_style_user_push(entry, "DEFAULT='align=center'"); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0); elm_entry_single_line_set(entry, 1);