From 52208d786c311a5676bf32990fad6d2afdc1df18 Mon Sep 17 00:00:00 2001 From: Radek Kintop Date: Fri, 23 Sep 2016 17:09:26 +0200 Subject: [PATCH] Some functionalities are hidden before release Change-Id: Iee88b60ad7eac9b6296403085ad3aa5fc4b45c3c Signed-off-by: Radek Kintop --- include/layout.h | 5 ++++- res/layout/system.edc | 4 ++-- src/common/menumgr.c | 3 ++- src/common/utils.c | 5 +++-- src/layout/layout_system.c | 19 ++++++++++--------- src/view/view_base.c | 22 ++++++++++++---------- 6 files changed, 33 insertions(+), 25 deletions(-) diff --git a/include/layout.h b/include/layout.h index b96cf32..f659668 100644 --- a/include/layout.h +++ b/include/layout.h @@ -22,6 +22,9 @@ /** * @brief Available layout types. */ +/*release changes:*/ +#define LAYOUT_MAX 2 + enum layout_type { LAYOUT_PICTURE = 0, LAYOUT_SOUND, @@ -31,7 +34,7 @@ enum layout_type { LAYOUT_SUPPORT, LAYOUT_INFO, LAYOUT_VOICE, - LAYOUT_MAX + }; /** diff --git a/res/layout/system.edc b/res/layout/system.edc index b425495..318f562 100644 --- a/res/layout/system.edc +++ b/res/layout/system.edc @@ -40,7 +40,7 @@ group { } rel2 { to, "area"; - relative, 0.0 0.0; + relative, 0.25 0.0; } align, 0.0 0.0; fixed, 1 1; @@ -55,7 +55,7 @@ group { min, 65 148; rel1 { to, "area"; - relative, 1.0 1.0; + relative, 0.75 1.0; } rel2 { to, "area"; diff --git a/src/common/menumgr.c b/src/common/menumgr.c index 4dbf30e..93088a9 100755 --- 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 4 +#define MAX_BTN_COL 2 #define STATUS_DEFAULT "N/A" @@ -223,6 +223,7 @@ 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 a16109e..011ad49 100644 --- a/src/common/utils.c +++ b/src/common/utils.c @@ -193,9 +193,10 @@ 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, EVAS_HINT_EXPAND, + evas_object_size_hint_weight_set(table, 0.5, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL); + //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_show(table); diff --git a/src/layout/layout_system.c b/src/layout/layout_system.c index 549fcab..ba105fb 100755 --- a/src/layout/layout_system.c +++ b/src/layout/layout_system.c @@ -81,7 +81,7 @@ static struct menumgr_info menu_info[] = { .style = STYLE_STATUS_BTN, .disabled = EINA_FALSE, .favorite = EINA_FALSE, - /*.status = _get_clock_mode,*/ + .status = _get_clock_mode, .selected = _selected, .focused = _focused, .selected_menu = _selected_menu, @@ -89,12 +89,13 @@ static struct menumgr_info menu_info[] = { .progress_evas = NULL, .update_cb = settings_clock_set_state_update_callbacks }, + /* { .id = MENU_SLEEP_TIMER, .title = STR_SLEEP_TIMER, .style = STYLE_STATUS_BTN, .disabled = EINA_FALSE, - /*.status = _get_sleep_timer,*/ + .status = _get_sleep_timer, .selected = _selected, .focused = _focused, .selected_menu = _selected_menu, @@ -107,7 +108,7 @@ static struct menumgr_info menu_info[] = { .title = STR_WAKEUP_TIMER, .style = STYLE_TEXTBLOCK_BTN, .disabled = EINA_FALSE, - /*.status = _get_wakeup_timer,*/ + .status = _get_wakeup_timer, .selected = _selected, .focused = _focused, .selected_menu = _selected_menu, @@ -126,7 +127,7 @@ static struct menumgr_info menu_info[] = { .progress_value = NULL, .progress_evas = NULL, .update_cb = NULL - }, + },*/ { .id = MENU_LANGUAGE, .title = STR_LANGUAGE, @@ -139,20 +140,20 @@ static struct menumgr_info menu_info[] = { .progress_value = NULL, .progress_evas = NULL, .update_cb = settings_language_set_state_update_callbacks - }, + }/*, { .id = MENU_SUBTITLE, .title = STR_SUBTITLE, .style = STYLE_STATUS_BTN, .disabled = EINA_FALSE, - /*.status = _get_subtitle,*/ + .status = _get_subtitle, .selected = _selected, .focused = _focused, .selected_menu = _selected_menu, .progress_value = NULL, .progress_evas = NULL, .update_cb = settings_language_set_subtitle_state_update_callbacks - }, + }*/, { .id = MENU_LOCATION, .title = STR_LOCATION, @@ -165,7 +166,7 @@ static struct menumgr_info menu_info[] = { .progress_value = NULL, .progress_evas = NULL, .update_cb = set_callback_for_system_location_change - }, + }/*, { .id = MENU_RESET, .title = STR_RESET, @@ -177,7 +178,7 @@ static struct menumgr_info menu_info[] = { .progress_value = NULL, .progress_evas = NULL, .update_cb = NULL - }, + },*/ }; static char *_get_clock_mode(void *data, int id) diff --git a/src/view/view_base.c b/src/view/view_base.c index 800ef4e..98177b8 100755 --- a/src/view/view_base.c +++ b/src/view/view_base.c @@ -29,6 +29,7 @@ #include "view/view_action_menu.h" #include "view/view_base.h" + struct _priv { Evas_Object *win; Evas_Object *base; @@ -47,7 +48,7 @@ struct _menu_data { }; static struct _menu_data _mdata[LAYOUT_MAX] = { - { +/* { .name = STR_PICTURE, .layout_id = LAYOUT_ID_PICTURE, .get_lclass = layout_picture_get_lclass, @@ -64,7 +65,7 @@ static struct _menu_data _mdata[LAYOUT_MAX] = { .layout_id = LAYOUT_ID_CHANNEL, .get_lclass = layout_channel_get_lclass, .enable = EINA_TRUE - }, + },*/ { .name = STR_NETWORK, .layout_id = LAYOUT_ID_NETWORK, @@ -76,7 +77,7 @@ static struct _menu_data _mdata[LAYOUT_MAX] = { .layout_id = LAYOUT_ID_SYSTEM, .get_lclass = layout_system_get_lclass, .enable = EINA_TRUE - }, + }/*, { .name = STR_SUPPORT, .layout_id = LAYOUT_ID_SUPPORT, @@ -94,12 +95,12 @@ static struct _menu_data _mdata[LAYOUT_MAX] = { .layout_id = LAYOUT_ID_VOICE, .get_lclass = layout_voice_get_lclass, .enable = EINA_TRUE - }, + },*/ }; static struct _menu_data *_mdata_p[LAYOUT_MAX] = { - &_mdata[0], &_mdata[1], &_mdata[2], &_mdata[3], - &_mdata[4], &_mdata[5], &_mdata[6], &_mdata[7] + &_mdata[0], &_mdata[1]/*, &_mdata[2], &_mdata[3], + &_mdata[4], &_mdata[5], &_mdata[6], &_mdata[7] */ }; static void _lock_focus_for_item(struct _priv *priv, int item, Eina_Bool lock); @@ -247,9 +248,9 @@ static void _swap_menu_items(struct _priv *priv, int item1, int item2, Eina_Bool inputmgr_add_callback(priv->menu[item1], item1, &_menu_input_handler, priv); inputmgr_add_callback(priv->menu[item2], item2, &_menu_input_handler, priv); - - settings_preferences_tab_order_set(item1, _mdata_p[item1]->layout_id); - settings_preferences_tab_order_set(item2, _mdata_p[item2]->layout_id); +/*release changes:*/ +//settings_preferences_tab_order_set(item1, _mdata_p[item1]->layout_id); +//settings_preferences_tab_order_set(item2, _mdata_p[item2]->layout_id); } static void _show_toast_message(Evas_Object *parent, char *text) @@ -473,7 +474,8 @@ static Evas_Object *_create(Evas_Object *win, void *data) return NULL; } - //_tab_order_restore(); +/*release changes:*/ +//_tab_order_restore(); priv->base = utils_add_layout(win, GRP_VIEW_BASE, EINA_TRUE); if (!priv->base) { -- 2.7.4