proclist: padding.
This commit is contained in:
parent
ca0f3e8de9
commit
a27aba5966
|
@ -89,7 +89,8 @@ system_sensors_thermal_get(int *sensor_count)
|
||||||
size_t slen = sizeof(struct sensor);
|
size_t slen = sizeof(struct sensor);
|
||||||
size_t sdlen = sizeof(struct sensordev);
|
size_t sdlen = sizeof(struct sensordev);
|
||||||
|
|
||||||
for (devn = 0;; devn++) {
|
for (devn = 0;; devn++)
|
||||||
|
{
|
||||||
mibs[2] = devn;
|
mibs[2] = devn;
|
||||||
|
|
||||||
if (sysctl(mibs, 3, &snsrdev, &sdlen, NULL, 0) == -1)
|
if (sysctl(mibs, 3, &snsrdev, &sdlen, NULL, 0) == -1)
|
||||||
|
@ -264,6 +265,8 @@ _power_battery_count_get(power_t *power)
|
||||||
power->batteries = t;
|
power->batteries = t;
|
||||||
power->batteries[i] = calloc(1, sizeof(bat_t));
|
power->batteries[i] = calloc(1, sizeof(bat_t));
|
||||||
power->batteries[i]->name = strdup(snsrdev.xname);
|
power->batteries[i]->name = strdup(snsrdev.xname);
|
||||||
|
power->batteries[i]->model = strdup("Unknown");
|
||||||
|
power->batteries[i]->vendor = strdup("Unknown");
|
||||||
power->batteries[i]->present = true;
|
power->batteries[i]->present = true;
|
||||||
power->batteries[i]->mibs[0] = mibs[0];
|
power->batteries[i]->mibs[0] = mibs[0];
|
||||||
power->batteries[i]->mibs[1] = mibs[1];
|
power->batteries[i]->mibs[1] = mibs[1];
|
||||||
|
|
|
@ -330,17 +330,28 @@ _item_del(void *data, Evas_Object *obj EINA_UNUSED)
|
||||||
static Evas_Object *
|
static Evas_Object *
|
||||||
_item_column_add(Evas_Object *tb, const char *text, int col)
|
_item_column_add(Evas_Object *tb, const char *text, int col)
|
||||||
{
|
{
|
||||||
Evas_Object *rec, *lb;
|
Evas_Object *hbx, *rec, *lb;
|
||||||
|
|
||||||
|
hbx = elm_box_add(tb);
|
||||||
|
elm_box_horizontal_set(hbx, 1);
|
||||||
|
evas_object_size_hint_align_set(hbx, FILL, FILL);
|
||||||
|
evas_object_size_hint_weight_set(hbx, 1.0, 1.0);
|
||||||
|
evas_object_show(hbx);
|
||||||
|
|
||||||
lb = elm_label_add(tb);
|
lb = elm_label_add(tb);
|
||||||
evas_object_data_set(tb, text, lb);
|
evas_object_data_set(tb, text, lb);
|
||||||
evas_object_size_hint_align_set(lb, FILL, FILL);
|
evas_object_size_hint_align_set(lb, FILL, FILL);
|
||||||
evas_object_size_hint_weight_set(lb, EXPAND, EXPAND);
|
evas_object_size_hint_weight_set(lb, EXPAND, EXPAND);
|
||||||
|
elm_box_pack_end(hbx, lb);
|
||||||
|
|
||||||
|
rec = evas_object_rectangle_add(evas_object_evas_get(tb));
|
||||||
|
evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(2), 1);
|
||||||
|
elm_box_pack_end(hbx, rec);
|
||||||
|
|
||||||
rec = evas_object_rectangle_add(evas_object_evas_get(tb));
|
rec = evas_object_rectangle_add(evas_object_evas_get(tb));
|
||||||
evas_object_data_set(lb, "rec", rec);
|
evas_object_data_set(lb, "rec", rec);
|
||||||
|
|
||||||
elm_table_pack(tb, rec, col, 0, 1, 1);
|
elm_table_pack(tb, rec, col, 0, 1, 1);
|
||||||
elm_table_pack(tb, lb, col, 0, 1, 1);
|
elm_table_pack(tb, hbx, col, 0, 1, 1);
|
||||||
evas_object_show(lb);
|
evas_object_show(lb);
|
||||||
|
|
||||||
return lb;
|
return lb;
|
||||||
|
@ -454,14 +465,26 @@ _item_create(Evas_Object *obj)
|
||||||
}
|
}
|
||||||
if (_field_enabled(PROC_FIELD_CPU_USAGE))
|
if (_field_enabled(PROC_FIELD_CPU_USAGE))
|
||||||
{
|
{
|
||||||
|
hbx = elm_box_add(tb);
|
||||||
|
elm_box_horizontal_set(hbx, 1);
|
||||||
|
evas_object_size_hint_weight_set(hbx, 1.0, 1.0);
|
||||||
|
evas_object_size_hint_align_set(hbx, FILL, FILL);
|
||||||
|
|
||||||
rec = evas_object_rectangle_add(evas_object_evas_get(tb));
|
rec = evas_object_rectangle_add(evas_object_evas_get(tb));
|
||||||
|
evas_object_size_hint_min_set(rec, ELM_SCALE_SIZE(2), 1);
|
||||||
|
elm_box_pack_end(hbx, rec);
|
||||||
|
|
||||||
pb = elm_progressbar_add(hbx);
|
pb = elm_progressbar_add(hbx);
|
||||||
evas_object_size_hint_weight_set(pb, 0, EXPAND);
|
evas_object_size_hint_weight_set(pb, 0, EXPAND);
|
||||||
evas_object_size_hint_align_set(pb, FILL, FILL);
|
evas_object_size_hint_align_set(pb, FILL, FILL);
|
||||||
elm_progressbar_unit_format_set(pb, "%1.1f %%");
|
elm_progressbar_unit_format_set(pb, "%1.1f %%");
|
||||||
|
elm_box_pack_end(hbx, pb);
|
||||||
|
evas_object_show(hbx);
|
||||||
|
|
||||||
|
rec = evas_object_rectangle_add(evas_object_evas_get(tb));
|
||||||
evas_object_data_set(pb, "rec", rec);
|
evas_object_data_set(pb, "rec", rec);
|
||||||
elm_table_pack(tb, rec, i, 0, 1, 1);
|
elm_table_pack(tb, rec, i, 0, 1, 1);
|
||||||
elm_table_pack(tb, pb, i++, 0, 1, 1);
|
elm_table_pack(tb, hbx, i++, 0, 1, 1);
|
||||||
evas_object_data_set(tb, "cpu_u", pb);
|
evas_object_data_set(tb, "cpu_u", pb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue