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

ui: Small changes...

This commit is contained in:
Alastair Poole 2020-02-16 15:57:26 +00:00
parent ab629c7612
commit ac7cbd8a5b
3 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/system.c
View File

@ -900,7 +900,7 @@ _battery_state_get(power_t *power)
power->batteries[i]->charge_full = battio.bif.lfcap;
}
snprintf(name, sizeof(name), "%s (%s)", battio.bif.oeminfo, battio.bif.model);
snprintf(name, sizeof(name), "%s %s", battio.bif.oeminfo, battio.bif.model);
power->battery_names[i] = strdup(name);
battio.unit = i;
if (ioctl(fd, ACPIIO_BATT_GET_BST, &battio) != -1)
@ -990,7 +990,7 @@ _battery_state_get(power_t *power)
}
free(power->battery_names[i]);
snprintf(name, sizeof(name), "%s (%s)", vendor, model);
snprintf(name, sizeof(name), "%s %s", vendor, model);
power->battery_names[i] = strdup(name);
}

57
src/bin/ui.c
View File

@ -158,10 +158,11 @@ _tab_misc_update(Ui *ui, results_t *results)
Eina_Strbuf *buf = eina_strbuf_new();
if (buf)
{
eina_strbuf_append_printf(buf, "Battery %s ", results->power.battery_names[i]);
eina_strbuf_append_printf(buf, "Battery: %s ", results->power.battery_names[i]);
if (results->power.have_ac && i == 0)
{
eina_strbuf_append(buf, "(plugged in)");
}
elm_object_text_set(frame, eina_strbuf_string_get(buf));
eina_strbuf_free(buf);
}
@ -605,9 +606,9 @@ static void
_entry_cmd_size_set(Ui *ui)
{
static Evas_Coord winw = 0, winh = 0;
Evas_Coord w, h, ww, wh;
Evas_Coord w, h, ww, wh, ow;
evas_object_geometry_get(ui->btn_cmd, NULL, NULL, NULL, &h);
evas_object_geometry_get(ui->btn_cmd, NULL, NULL, &ow, &h);
evas_object_geometry_get(ui->entry_cmd, NULL, NULL, &w, NULL);
evas_object_geometry_get(ui->win, NULL, NULL, &ww, &wh);
@ -617,11 +618,14 @@ _entry_cmd_size_set(Ui *ui)
}
if (winw == ww && winh == wh)
{
if (ow != w)
{
evas_object_size_hint_min_set(ui->btn_cmd, w, h);
evas_object_size_hint_min_set(ui->btn_expand, w, h);
}
}
}
static void
_text_fields_append(Ui *ui, Proc_Stats *proc)
@ -1436,7 +1440,7 @@ _ui_tab_system_add(Ui *ui)
elm_entry_single_line_set(entry, EINA_TRUE);
elm_entry_scrollable_set(entry, EINA_FALSE);
elm_entry_editable_set(entry, EINA_FALSE);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
evas_object_show(entry);
elm_table_pack(table, entry, 5, 0, 1, 1);
@ -1456,7 +1460,7 @@ _ui_tab_system_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_FALSE);
elm_entry_editable_set(entry, EINA_FALSE);
elm_entry_select_allow_set(entry, EINA_FALSE);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
evas_object_show(entry);
elm_table_pack(table, entry, 6, 0, 1, 1);
@ -1550,7 +1554,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 0, 1, 1);
label = elm_label_add(parent);
@ -1565,7 +1569,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 1, 1, 1);
label = elm_label_add(parent);
@ -1580,7 +1584,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 2, 1, 1);
label = elm_label_add(parent);
@ -1595,7 +1599,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 3, 1, 1);
label = elm_label_add(parent);
@ -1614,7 +1618,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 4, 1, 1);
label = elm_label_add(parent);
@ -1629,7 +1633,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 5, 1, 1);
label = elm_label_add(parent);
@ -1644,7 +1648,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 6, 1, 1);
label = elm_label_add(parent);
@ -1659,7 +1663,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 7, 1, 1);
label = elm_label_add(parent);
@ -1674,7 +1678,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 8, 1, 1);
label = elm_label_add(parent);
@ -1689,7 +1693,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 9, 1, 1);
label = elm_label_add(parent);
@ -1704,7 +1708,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 10, 1, 1);
label = elm_label_add(parent);
@ -1719,7 +1723,7 @@ _ui_process_panel_add(Ui *ui)
elm_entry_scrollable_set(entry, EINA_TRUE);
elm_entry_editable_set(entry, EINA_FALSE);
evas_object_show(entry);
elm_entry_line_wrap_set(entry, ELM_WRAP_WORD);
elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
elm_table_pack(table, entry, 1, 11, 1, 1);
hbox = elm_box_add(parent);
@ -2339,11 +2343,9 @@ _evisum_key_down_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
ui_shutdown(ui);
}
Ui *
ui_add(Evas_Object *parent)
static Ui *
_ui_init(Evas_Object *parent)
{
eina_lock_new(&_lock);
Ui *ui = calloc(1, sizeof(Ui));
if (!ui) return NULL;
@ -2361,6 +2363,17 @@ ui_add(Evas_Object *parent)
memset(ui->cpu_times, 0, PID_MAX * sizeof(int64_t));
return ui;
}
Ui *
ui_add(Evas_Object *parent)
{
eina_lock_new(&_lock);
Ui *ui = _ui_init(parent);
if (!ui) return NULL;
/* Create the tabs, content area and the rest */
_ui_tabs_add(parent, ui);
_ui_tab_system_add(ui);

2
src/bin/ui.h
View File

@ -5,7 +5,7 @@
#include "process.h"
#define EVISUM_SIZE_WIDTH 500
#define EVISUM_SIZE_HEIGHT 560
#define EVISUM_SIZE_HEIGHT 600
typedef enum
{