From 7a7efacd5958446f1914081e108f4d29f8ffcd26 Mon Sep 17 00:00:00 2001 From: Radek Kintop Date: Thu, 17 Mar 2016 18:36:25 +0100 Subject: [PATCH] Revert "Some functionalities are hidden before prebeta release(2)" This reverts commit 877d47329042c419a3d7689b908352ae3f87d14c. Change-Id: I98a123505382074ba9b9d7d18e819e58d9ddde96 Signed-off-by: Radek Kintop --- res/layout/system.edc | 4 ++-- src/common/menumgr.c | 3 +-- src/common/utils.c | 5 ++--- src/layout/layout_system.c | 4 ++-- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/res/layout/system.edc b/res/layout/system.edc index 318f562..b425495 100644 --- a/res/layout/system.edc +++ b/res/layout/system.edc @@ -40,7 +40,7 @@ group { } rel2 { to, "area"; - relative, 0.25 0.0; + relative, 0.0 0.0; } align, 0.0 0.0; fixed, 1 1; @@ -55,7 +55,7 @@ group { min, 65 148; rel1 { to, "area"; - relative, 0.75 1.0; + relative, 1.0 1.0; } rel2 { to, "area"; diff --git a/src/common/menumgr.c b/src/common/menumgr.c index 2515342..4c1ce9e 100644 --- a/src/common/menumgr.c +++ b/src/common/menumgr.c @@ -27,7 +27,7 @@ #include "common/menumgr.h" #define MAX_BTN 8 -#define MAX_BTN_COL 2 +#define MAX_BTN_COL 4 #define STATUS_DEFAULT "N/A" @@ -222,7 +222,6 @@ struct menumgr *menumgr_create(Evas_Object *table, Evas_Object *tab_menu_btn, col = i % MAX_BTN_COL; row = i / MAX_BTN_COL; - _DBG("i %d col %d row %d", i, col, row); elm_table_pack(table, btn, col, row, 1, 1); diff --git a/src/common/utils.c b/src/common/utils.c index 36b4390..c958098 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -193,10 +193,9 @@ Evas_Object *utils_add_table(Evas_Object *parent, int padding_x, int padding_y) elm_table_homogeneous_set(table, EINA_TRUE); elm_table_padding_set(table, padding_x, padding_y); - evas_object_size_hint_weight_set(table, 0.5, + evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - //evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); - //evas_object_size_hint_align_set(table, 0.5, EVAS_HINT_FILL); + evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(table); diff --git a/src/layout/layout_system.c b/src/layout/layout_system.c index 9135cdb..49ff6c9 100644 --- a/src/layout/layout_system.c +++ b/src/layout/layout_system.c @@ -88,7 +88,7 @@ static struct menumgr_info menu_info[] = { .progress_value = NULL, .progress_evas = NULL, .update_cb = settings_clock_set_state_update_callbacks - }, + },*/ { .id = MENU_SLEEP_TIMER, .title = STR_SLEEP_TIMER, @@ -101,7 +101,7 @@ static struct menumgr_info menu_info[] = { .progress_value = NULL, .progress_evas = NULL, .update_cb = set_callback_for_sleep_timer_change - }, + },/* { .id = MENU_WAKEUP_TIMER, .title = STR_WAKEUP_TIMER, -- 2.7.4