UI: Minor improvements
This commit is contained in:
parent
c026f9d5ad
commit
203f7b96d0
7
NEWS
7
NEWS
|
@ -1,3 +1,10 @@
|
||||||
|
============
|
||||||
|
Evisum 0.2.4
|
||||||
|
============
|
||||||
|
|
||||||
|
* Fix GUI on launch and shutdown.
|
||||||
|
* Fix tingle compilation (makefile).
|
||||||
|
|
||||||
============
|
============
|
||||||
Evisum 0.2.2
|
Evisum 0.2.2
|
||||||
============
|
============
|
||||||
|
|
|
@ -30,7 +30,7 @@ _win_add(void)
|
||||||
icon = elm_icon_add(win);
|
icon = elm_icon_add(win);
|
||||||
elm_icon_standard_set(icon, "evisum");
|
elm_icon_standard_set(icon, "evisum");
|
||||||
elm_win_icon_object_set(win, icon);
|
elm_win_icon_object_set(win, icon);
|
||||||
evas_object_resize(win, 400 * elm_config_scale_get(), 450 * elm_config_scale_get());
|
evas_object_resize(win, EVISUM_SIZE_WIDTH * elm_config_scale_get(), EVISUM_SIZE_HEIGHT * elm_config_scale_get());
|
||||||
elm_win_title_set(win, "System Information");
|
elm_win_title_set(win, "System Information");
|
||||||
elm_win_center(win, EINA_TRUE, EINA_TRUE);
|
elm_win_center(win, EINA_TRUE, EINA_TRUE);
|
||||||
|
|
||||||
|
|
7
src/ui.c
7
src/ui.c
|
@ -1342,6 +1342,8 @@ _ui_system_view_add(Ui *ui)
|
||||||
evas_object_show(frame);
|
evas_object_show(frame);
|
||||||
elm_object_content_set(frame, scroller);
|
elm_object_content_set(frame, scroller);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
button = elm_button_add(parent);
|
button = elm_button_add(parent);
|
||||||
_btn_icon_state_set(button, EINA_FALSE);
|
_btn_icon_state_set(button, EINA_FALSE);
|
||||||
evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0);
|
evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0);
|
||||||
|
@ -2110,6 +2112,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
|
||||||
elm_object_disabled_set(ui->btn_general, EINA_TRUE);
|
elm_object_disabled_set(ui->btn_general, EINA_TRUE);
|
||||||
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
||||||
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
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);
|
||||||
elm_object_text_set(button, "General");
|
elm_object_text_set(button, "General");
|
||||||
evas_object_show(button);
|
evas_object_show(button);
|
||||||
elm_box_pack_end(hbox, button);
|
elm_box_pack_end(hbox, button);
|
||||||
|
@ -2118,6 +2121,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
|
||||||
ui->btn_cpu = button = elm_button_add(hbox);
|
ui->btn_cpu = button = elm_button_add(hbox);
|
||||||
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
||||||
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
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);
|
||||||
elm_object_text_set(button, "CPU");
|
elm_object_text_set(button, "CPU");
|
||||||
evas_object_show(button);
|
evas_object_show(button);
|
||||||
elm_box_pack_end(hbox, button);
|
elm_box_pack_end(hbox, button);
|
||||||
|
@ -2126,6 +2130,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
|
||||||
ui->btn_mem = button = elm_button_add(hbox);
|
ui->btn_mem = button = elm_button_add(hbox);
|
||||||
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
||||||
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
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);
|
||||||
elm_object_text_set(button, "Memory");
|
elm_object_text_set(button, "Memory");
|
||||||
evas_object_show(button);
|
evas_object_show(button);
|
||||||
elm_box_pack_end(hbox, button);
|
elm_box_pack_end(hbox, button);
|
||||||
|
@ -2134,6 +2139,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
|
||||||
ui->btn_storage = button = elm_button_add(hbox);
|
ui->btn_storage = button = elm_button_add(hbox);
|
||||||
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
||||||
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
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);
|
||||||
elm_object_text_set(button, "Storage");
|
elm_object_text_set(button, "Storage");
|
||||||
evas_object_show(button);
|
evas_object_show(button);
|
||||||
elm_box_pack_end(hbox, button);
|
elm_box_pack_end(hbox, button);
|
||||||
|
@ -2142,6 +2148,7 @@ _ui_tabs_add(Evas_Object *parent, Ui *ui)
|
||||||
ui->btn_misc = button = elm_button_add(hbox);
|
ui->btn_misc = button = elm_button_add(hbox);
|
||||||
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
evas_object_size_hint_weight_set(button, 1.0, EVAS_HINT_EXPAND);
|
||||||
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
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);
|
||||||
elm_object_text_set(button, "Misc");
|
elm_object_text_set(button, "Misc");
|
||||||
evas_object_show(button);
|
evas_object_show(button);
|
||||||
elm_box_pack_end(hbox, button);
|
elm_box_pack_end(hbox, button);
|
||||||
|
|
7
src/ui.h
7
src/ui.h
|
@ -1,8 +1,11 @@
|
||||||
#ifndef __UI_H__
|
#ifndef __UI_H__
|
||||||
#define __UI_H__
|
#define __UI_H__
|
||||||
|
|
||||||
#include <Elementary.h>
|
#include <Elementary.h>
|
||||||
|
|
||||||
|
#define EVISUM_SIZE_WIDTH 500
|
||||||
|
#define EVISUM_SIZE_HEIGHT 560
|
||||||
|
|
||||||
typedef enum
|
typedef enum
|
||||||
{
|
{
|
||||||
PROCESS_INFO_FIELD_PID,
|
PROCESS_INFO_FIELD_PID,
|
||||||
|
@ -53,7 +56,7 @@ typedef struct Ui
|
||||||
Evas_Object *panel;
|
Evas_Object *panel;
|
||||||
Evas_Object *scroller;
|
Evas_Object *scroller;
|
||||||
Evas_Object *content;
|
Evas_Object *content;
|
||||||
|
#define TAB_BTN_SIZE 75
|
||||||
Evas_Object *btn_general;
|
Evas_Object *btn_general;
|
||||||
Evas_Object *btn_cpu;
|
Evas_Object *btn_cpu;
|
||||||
Evas_Object *btn_mem;
|
Evas_Object *btn_mem;
|
||||||
|
|
Loading…
Reference in New Issue