ui: simplify and remove title.
These labels are awful. If you are ON the CPU "tab" WHY the hack do you need another massive text label explaining the same thing!!! Sometimes I wonder, wonder wonder...
This commit is contained in:
parent
fbd7bc4f1f
commit
b2f977ee66
|
@ -66,7 +66,6 @@ typedef struct Ui
|
||||||
Evas_Object *progress_cpu;
|
Evas_Object *progress_cpu;
|
||||||
Evas_Object *progress_mem;
|
Evas_Object *progress_mem;
|
||||||
|
|
||||||
Evas_Object *title_mem;
|
|
||||||
Evas_Object *progress_mem_used;
|
Evas_Object *progress_mem_used;
|
||||||
Evas_Object *progress_mem_cached;
|
Evas_Object *progress_mem_cached;
|
||||||
Evas_Object *progress_mem_buffered;
|
Evas_Object *progress_mem_buffered;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
void
|
void
|
||||||
ui_tab_cpu_add(Ui *ui)
|
ui_tab_cpu_add(Ui *ui)
|
||||||
{
|
{
|
||||||
Evas_Object *parent, *box, *hbox, *frame, *label, *scroller;
|
Evas_Object *parent, *box, *hbox, *frame, *scroller;
|
||||||
Evas_Object *pb;
|
Evas_Object *pb;
|
||||||
unsigned int cpu_count;
|
unsigned int cpu_count;
|
||||||
|
|
||||||
|
@ -49,13 +49,6 @@ ui_tab_cpu_add(Ui *ui)
|
||||||
elm_object_style_set(frame, "pad_large");
|
elm_object_style_set(frame, "pad_large");
|
||||||
elm_box_pack_end(box, frame);
|
elm_box_pack_end(box, frame);
|
||||||
|
|
||||||
label = elm_label_add(box);
|
|
||||||
evas_object_size_hint_align_set(label, FILL, 0);
|
|
||||||
evas_object_size_hint_weight_set(label, EXPAND, EXPAND);
|
|
||||||
elm_object_text_set(label, _("<subtitle>CPUs</subtitle>"));
|
|
||||||
evas_object_show(label);
|
|
||||||
elm_box_pack_end(box, label);
|
|
||||||
|
|
||||||
cpu_count = system_cpu_online_count_get();
|
cpu_count = system_cpu_online_count_get();
|
||||||
for (int i = 0; i < cpu_count; i++)
|
for (int i = 0; i < cpu_count; i++)
|
||||||
{
|
{
|
||||||
|
@ -63,7 +56,7 @@ ui_tab_cpu_add(Ui *ui)
|
||||||
evas_object_size_hint_align_set(frame, FILL, 0);
|
evas_object_size_hint_align_set(frame, FILL, 0);
|
||||||
evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
|
evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
|
||||||
evas_object_show(frame);
|
evas_object_show(frame);
|
||||||
elm_object_style_set(frame, "pad_large");
|
elm_object_style_set(frame, "pad_huge");
|
||||||
|
|
||||||
pb = elm_progressbar_add(frame);
|
pb = elm_progressbar_add(frame);
|
||||||
evas_object_size_hint_align_set(pb, FILL, FILL);
|
evas_object_size_hint_align_set(pb, FILL, FILL);
|
||||||
|
|
|
@ -4,7 +4,7 @@ static Evas_Object *
|
||||||
_label_mem(Evas_Object *parent, const char *text)
|
_label_mem(Evas_Object *parent, const char *text)
|
||||||
{
|
{
|
||||||
Evas_Object *label = elm_label_add(parent);
|
Evas_Object *label = elm_label_add(parent);
|
||||||
evas_object_size_hint_weight_set(label, 0.1, EXPAND);
|
evas_object_size_hint_weight_set(label, 0, EXPAND);
|
||||||
evas_object_size_hint_align_set(label, FILL, FILL);
|
evas_object_size_hint_align_set(label, FILL, FILL);
|
||||||
elm_object_text_set(label, eina_slstr_printf("<bigger>%s</bigger>",text));
|
elm_object_text_set(label, eina_slstr_printf("<bigger>%s</bigger>",text));
|
||||||
evas_object_show(label);
|
evas_object_show(label);
|
||||||
|
@ -64,27 +64,6 @@ ui_tab_memory_add(Ui *ui)
|
||||||
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
|
evas_object_size_hint_weight_set(box, EXPAND, EXPAND);
|
||||||
evas_object_show(box);
|
evas_object_show(box);
|
||||||
|
|
||||||
frame = elm_frame_add(box);
|
|
||||||
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, EXPAND, EXPAND);
|
|
||||||
evas_object_size_hint_align_set(label, FILL, FILL);
|
|
||||||
elm_object_text_set(label, _("<subtitle>Memory</subtitle>"));
|
|
||||||
evas_object_show(label);
|
|
||||||
elm_box_pack_end(box, label);
|
|
||||||
|
|
||||||
frame = elm_frame_add(box);
|
|
||||||
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);
|
table = elm_table_add(parent);
|
||||||
evas_object_size_hint_weight_set(table, EXPAND, EXPAND);
|
evas_object_size_hint_weight_set(table, EXPAND, EXPAND);
|
||||||
evas_object_size_hint_align_set(table, FILL, FILL);
|
evas_object_size_hint_align_set(table, FILL, FILL);
|
||||||
|
@ -119,7 +98,7 @@ ui_tab_memory_add(Ui *ui)
|
||||||
frame = elm_frame_add(ui->mem_activity);
|
frame = elm_frame_add(ui->mem_activity);
|
||||||
evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
|
evas_object_size_hint_weight_set(frame, EXPAND, EXPAND);
|
||||||
evas_object_size_hint_align_set(frame, FILL, FILL);
|
evas_object_size_hint_align_set(frame, FILL, FILL);
|
||||||
elm_object_style_set(frame, "pad_large");
|
elm_object_style_set(frame, "pad_huge");
|
||||||
evas_object_show(frame);
|
evas_object_show(frame);
|
||||||
|
|
||||||
elm_box_pack_end(box, table);
|
elm_box_pack_end(box, table);
|
||||||
|
|
Loading…
Reference in New Issue