From 5e8063e0eb392df19848f1b7cfbc163f2e36a202 Mon Sep 17 00:00:00 2001 From: Jing Yigang Date: Tue, 28 Aug 2012 17:02:10 +0800 Subject: [PATCH] [Bug] Fix N_SE-7737 : the string is automatic following its sub menus are being shown. . Change-Id: Iba338598a1db278cf12cdcb2bb3c344961b716d1 --- src/setting-main.c | 55 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/setting-main.c b/src/setting-main.c index a02c2ab..518130e 100755 --- a/src/setting-main.c +++ b/src/setting-main.c @@ -591,19 +591,6 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_ icon_path = setting_cfg_get_icon_path_idx(i, j); /* SETTING_TRACE_DEBUG("Got an item[keyStr:%s, ug_args:%s, pos:%d]", */ /* keyStr, ug_args, tmpPos); */ - - if (idx_second_menu < MAX_MORE_MENU_NUM - && Cfg_Item_Pos_Level1 == tmpPos - && SETTING_VIEW_MAIN == ad->view_load - && MAIN_PROFILE_PREFERRED == ad->profile_type) { - - ad->more_connective_menus[idx_second_menu++] = keyStr; - } - - if (Cfg_Item_Pos_Level_All == inputPos) { - } else if (inputPos != tmpPos) { /* not in the inputPos level */ - continue; - } if (is_emulator) { if (!safeStrCmp(KeyStr_FlightMode, keyStr)) { @@ -631,6 +618,19 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_ } } + if (idx_second_menu < MAX_MORE_MENU_NUM + && Cfg_Item_Pos_Level1 == tmpPos + && SETTING_VIEW_MAIN == ad->view_load + && MAIN_PROFILE_PREFERRED == ad->profile_type) { + + ad->more_connective_menus[idx_second_menu++] = keyStr; + } + + if (Cfg_Item_Pos_Level_All == inputPos) { + } else if (inputPos != tmpPos) { /* not in the inputPos level */ + continue; + } + if (!safeStrCmp(KeyStr_FlightMode, keyStr)) { /* load special radio */ // ug == NULL mainlist_table[MAINLIST_ENTRY_FLIGHT_MODE].ui_handler(ad, keyStr, icon_path, ug_args, genlist); @@ -758,21 +758,7 @@ void __load_system_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object icon_path = setting_cfg_get_icon_path_idx(i, j); ug_args = setting_cfg_get_ug_args_idx(i, j); - if (idx_second_menu < MAX_MORE_MENU_NUM - && Cfg_Item_Pos_Level1 == tmpPos - && SETTING_VIEW_MAIN == ad->view_load - && MAIN_PROFILE_PREFERRED == ad->profile_type) { - ad->more_system_menus[idx_second_menu++] = keyStr; - } - //SETTING_TRACE("KeyString : %s , tmpPos : %d , inputPos : %d ", keyStr, tmpPos, inputPos ); - if (Cfg_Item_Pos_Level_All == inputPos) { - // do nothing - //SETTING_TRACE("Cfg_Item_Pos_Level_All == inputPos ---> no draw --- WHY?? "); - } else if (inputPos != tmpPos) { /* not in the inputPos level */ - //SETTING_TRACE("inputPos == tmp Pos ---> no draw --- WHY?? "); - continue; - } if (is_emulator) { if (!safeStrCmp(KeyStr_EventsNotifications, keyStr)) { @@ -796,6 +782,21 @@ void __load_system_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object } } + if (idx_second_menu < MAX_MORE_MENU_NUM + && Cfg_Item_Pos_Level1 == tmpPos + && SETTING_VIEW_MAIN == ad->view_load + && MAIN_PROFILE_PREFERRED == ad->profile_type) { + ad->more_system_menus[idx_second_menu++] = keyStr; + } + + if (Cfg_Item_Pos_Level_All == inputPos) { + // do nothing + //SETTING_TRACE("Cfg_Item_Pos_Level_All == inputPos ---> no draw --- WHY?? "); + } else if (inputPos != tmpPos) { /* not in the inputPos level */ + //SETTING_TRACE("inputPos == tmp Pos ---> no draw --- WHY?? "); + continue; + } + if (!safeStrCmp(KeyStr_Landscape, keyStr)) { /* load special UG */ int value = 0; vconf_get_bool -- 2.7.4