From: Kairong Yin Date: Tue, 4 Sep 2012 07:38:29 +0000 (-0700) Subject: Adjust the margin of Help text in Setting X-Git-Tag: 2.0_alpha~42^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b2811449687ca27292fc62198c6c5ecf6a025f6;p=apps%2Fhome%2Fsettings.git Adjust the margin of Help text in Setting Change-Id: Ia232050bac7367b5444ef646407f8a42e51e6d42 --- diff --git a/setting-connectivity/src/setting-connectivity-usb.c b/setting-connectivity/src/setting-connectivity-usb.c index 7940598..e6478cb 100755 --- a/setting-connectivity/src/setting-connectivity-usb.c +++ b/setting-connectivity/src/setting-connectivity-usb.c @@ -631,6 +631,8 @@ static int setting_connectivity_usb_create(void *cb) ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, SETTING_USB_DEBUGGING_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); #endif @@ -655,11 +657,12 @@ static int setting_connectivity_usb_create(void *cb) } // [UI] help text - setting_create_Gendial_field_def(scroller, &(ad->itc_help_style), NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, - NULL, NULL, 0, _("IDS_ST_BODY_SCREEN_OVERLAY_SHOWING_CURRENT_CPU_USAGE_ABB"), NULL, - NULL); - + setting_create_Gendial_field_def(scroller, &(ad->itc_help_style), NULL, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, + NULL, NULL, 0, _("IDS_ST_BODY_SCREEN_OVERLAY_SHOWING_CURRENT_CPU_USAGE_ABB"), NULL, + NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); // Get GPU Rendering state //SETTING_TRACE(" config_engine_get : %s", elm_config_engine_get()); @@ -698,11 +701,13 @@ static int setting_connectivity_usb_create(void *cb) return SETTING_RETURN_FAIL; } - // [UI] help text - setting_create_Gendial_field_def(scroller, &(ad->itc_help_style), NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, - NULL, NULL, 0, _("IDS_ST_BODY_USE_2D_HARDWARE_ACCELERATION_IN_APPLICATIONS_ABB"), NULL, - NULL); + // [UI] help text + setting_create_Gendial_field_def(scroller, &(ad->itc_help_style), NULL, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, + NULL, NULL, 0, _("IDS_ST_BODY_USE_2D_HARDWARE_ACCELERATION_IN_APPLICATIONS_ABB"), NULL, + NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); // NEWCODE: setting_enable_expandable_genlist(scroller, ad, __setting_devoptions_main_exp_cb, NULL); diff --git a/setting-display/src/setting-display-main.c b/setting-display/src/setting-display-main.c index 6e3857c..357e2fa 100755 --- a/setting-display/src/setting-display-main.c +++ b/setting-display/src/setting-display-main.c @@ -233,7 +233,9 @@ static int setting_display_main_create(void *cb) setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, KeyStr_AdjustScreenTone_Dsc, NULL, NULL); - + + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* BACKLIGHTTIME */ char* pa_backlight_time = get_pa_backlight_time_str(); ad->data_back = @@ -298,6 +300,8 @@ static int setting_display_main_create(void *cb) setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, LAUNCH_BATTERY_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); #if OPENING_EFFECT /* add separator */ diff --git a/setting-display/src/setting-display-smart-screen.c b/setting-display/src/setting-display-smart-screen.c index 8a6e0be..05bf2e6 100755 --- a/setting-display/src/setting-display-smart-screen.c +++ b/setting-display/src/setting-display-smart-screen.c @@ -271,6 +271,8 @@ static int setting_display_smart_screen_create(void *cb) setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, SETTING_DISPLAY_SMART_STAY_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); ret = vconf_get_bool(VCONFKEY_SETAPPL_SMARTSCREEN_SMART_ROTATION, &value); SETTING_TRACE("value = %d", value); @@ -291,6 +293,8 @@ static int setting_display_smart_screen_create(void *cb) setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, SETTING_DISPLAY_SMART_ROTATION_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_bottom_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); setting_view_display_smart_screen.is_create = 1; return SETTING_RETURN_SUCCESS; diff --git a/setting-network/src/setting-network-main.c b/setting-network/src/setting-network-main.c index 0dfa24c..8bd8031 100755 --- a/setting-network/src/setting-network-main.c +++ b/setting-network/src/setting-network-main.c @@ -303,9 +303,11 @@ static int setting_network_main_create(void *cb) } setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, Data_packet_Desc, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* data roaming */ int value_data_roaming = 0; @@ -343,9 +345,11 @@ static int setting_network_main_create(void *cb) } setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, SETTING_NETWORK_DATA_ROMING_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* (void)setting_create_Gendial_field_titleItem(scroller, &(ad->itc_group_item), speciliztion, NULL); */ diff --git a/setting-powersaving/src/setting-powersaving-customed.c b/setting-powersaving/src/setting-powersaving-customed.c index 517edf0..67bf623 100755 --- a/setting-powersaving/src/setting-powersaving-customed.c +++ b/setting-powersaving/src/setting-powersaving-customed.c @@ -84,10 +84,12 @@ static int setting_powersaving_customed_create(void *cb) G_FREE(str_value); #endif setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, "Turn off each settings when it is not in use.", NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); int ret; int value = 1; diff --git a/setting-powersaving/src/setting-powersaving-main.c b/setting-powersaving/src/setting-powersaving-main.c index 5ade847..b3c43ce 100755 --- a/setting-powersaving/src/setting-powersaving-main.c +++ b/setting-powersaving/src/setting-powersaving-main.c @@ -169,6 +169,8 @@ static int setting_powersaving_main_create(void *cb) NULL, NULL, 0, KeyStr_CPU_PS_DSC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); //B. value = 0; ret = vconf_get_bool(VCONFKEY_SETAPPL_PWRSV_CUSTMODE_DISPLAY, &value); @@ -197,6 +199,8 @@ static int setting_powersaving_main_create(void *cb) NULL, NULL, 0, KeyStr_DISPLAY_PS_DSC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); //C. value = 0; ret = vconf_get_bool(VCONFKEY_SETAPPL_PWRSV_CUSTMODE_BG_COLOR, &value); @@ -225,6 +229,8 @@ static int setting_powersaving_main_create(void *cb) NULL, NULL, 0, KeyStr_BG_COLOR_DSC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); //D. value = 0; ret = vconf_get_bool(VCONFKEY_SETAPPL_PWRSV_CUSTMODE_SCREEN_VIB, &value); @@ -277,10 +283,12 @@ static int setting_powersaving_main_create(void *cb) #if SUPPORT_UI0_3 /****Powersaving Mode description*/ setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, KeyStr_Powersaving_Mode_DSC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /****customed Setting Mode active*/ ret = vconf_get_bool(VCONFKEY_SETAPPL_PWRSV_CUSTMODE_STATUS, &value); if (0 != ret) { diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c index f1b1c94..29b5cf8 100755 --- a/setting-profile/src/setting-profile-sound-main.c +++ b/setting-profile/src/setting-profile-sound-main.c @@ -738,8 +738,10 @@ static Evas_Object *__get_main_list(void *data) setting_create_Gendial_field_def(genlist, &(ad->itc_bg_1icon), NULL, ad, - SWALLOW_Type_LAYOUT_SPECIALIZTION, + SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, SOUND_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(genlist, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* Touch sounds */ ad->data_touch_sounds = @@ -758,8 +760,10 @@ static Evas_Object *__get_main_list(void *data) setting_create_Gendial_field_def(genlist, &(ad->itc_bg_1icon), NULL, ad, - SWALLOW_Type_LAYOUT_SPECIALIZTION, + SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, "IDS_ST_BODY_PLAY_SOUND_WHEN_MAKING_SCREEN_SELECTION", NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(genlist, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* Screen lock sound */ if (vconf_get_bool(VCONFKEY_SETAPPL_SOUND_LOCK_BOOL, &vconf_value) < 0) diff --git a/setting-reset/src/setting-reset-main.c b/setting-reset/src/setting-reset-main.c index 9c5a9ad..a0fc30b 100755 --- a/setting-reset/src/setting-reset-main.c +++ b/setting-reset/src/setting-reset-main.c @@ -91,6 +91,8 @@ static int setting_reset_main_create(void *cb) ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, RESET_ALL_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); /* Button */ Setting_GenGroupItem_Data *item_data = (Setting_GenGroupItem_Data *) calloc(1, diff --git a/setting-reset/src/setting-reset-settings.c b/setting-reset/src/setting-reset-settings.c index 670488a..b44e0a4 100755 --- a/setting-reset/src/setting-reset-settings.c +++ b/setting-reset/src/setting-reset-settings.c @@ -427,10 +427,12 @@ static void __reset_an_item(Setting_Done_List_Data *list_data, item_data = setting_create_Gendial_field_def(genlist, &(ad->itc_1text), NULL, ad, - SWALLOW_Type_LAYOUT_SPECIALIZTION, + SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, (char *)item_name, (char *)result_str, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(genlist, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); } else { @@ -465,10 +467,12 @@ static void __reset_an_item(Setting_Done_List_Data *list_data, item_data = setting_create_Gendial_field_def(genlist, &(ad->itc_1text), NULL, ad, - SWALLOW_Type_LAYOUT_SPECIALIZTION, + SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, (char *)item_name, (char *)result_str, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(genlist, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); } if (item_data) diff --git a/setting-security/src/setting-security-main.c b/setting-security/src/setting-security-main.c index 9e1b4d5..94609d9 100755 --- a/setting-security/src/setting-security-main.c +++ b/setting-security/src/setting-security-main.c @@ -237,6 +237,8 @@ static int setting_security_main_create(void *cb) NULL, ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, DEVICE_ENCRYPTION_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); #if DISABLED_CODE /* mmc encryption */ ad->data_mmc_enc = setting_create_Gendial_field_def(scroller, &(ad->itc_1text_1icon), @@ -548,7 +550,7 @@ setting_security_main_mouse_up_Gendial_list_cb(void *data, Evas_Object *obj, } #endif else if(!safeStrCmp("SIM settings", list_item->keyStr)) { - setting_view_change(&setting_view_security_main, &setting_view_security_sim_settings, ad); + setting_view_change(&setting_view_security_main, &setting_view_security_sim_settings, ad); } } diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c index 2b395d2..fec3b10 100755 --- a/setting-time/src/setting-time-main.c +++ b/setting-time/src/setting-time-main.c @@ -562,9 +562,11 @@ static int setting_time_main_create(void *cb) } setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, SETTING_TIME_AUTO_UPDATE_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(scroller, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); } appcore_set_i18n("worldclock", SETTING_TIME_SHARE_LOCAL_PATH); @@ -1400,7 +1402,7 @@ static void get_gmt_offset(char *str_buf, int size) if(gmtoffset_min != 0) { gmtoffset_min = 30; } - + snprintf(str_buf, size, "%+d:%02u", gmtoffset_hour, gmtoffset_min); SETTING_TRACE("szTimezone is of a valid format: GMT: %s", str_buf); } diff --git a/src/setting-main.c b/src/setting-main.c index bb78138..cc013a6 100755 --- a/src/setting-main.c +++ b/src/setting-main.c @@ -488,8 +488,10 @@ static Setting_GenGroupItem_Data * __nfc_handler(void* data, char* keyStr, char* __BACK_POINTER_SET(ad->data_nfc); setting_create_Gendial_field_def(genlist, &itc_multiline_text, NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, SETTING_NFC_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(genlist, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); return ad->data_nfc; } @@ -511,12 +513,16 @@ static Setting_GenGroupItem_Data * __default_handler(void* data, char* keyStr, c if (!safeStrCmp(KeyStr_WiFiDirect, keyStr)) { setting_create_Gendial_field_def(genlist, &itc_multiline_text, NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, SETTING_WIFI_DIRECT_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(genlist, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); } else if (!safeStrCmp(KeyStr_KeisOverWifi, keyStr)) { setting_create_Gendial_field_def(genlist, &itc_multiline_text, NULL, - ad, SWALLOW_Type_LAYOUT_SPECIALIZTION, + ad, SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, SETTING_KIES_VIA_WIFI_DESC, NULL, NULL); + elm_genlist_item_select_mode_set(elm_genlist_item_append(genlist, &(itc_seperator), NULL, NULL,ELM_GENLIST_ITEM_NONE, NULL, NULL), + ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); } else { /* do nothing */ } @@ -581,7 +587,7 @@ void __load_connectivity_menu_list(void *data, Cfg_Item_Position inputPos, Evas_ } int idx_second_menu = 0; - + char *keyStr = NULL; char *icon_path = NULL; char *ug_args = NULL; @@ -883,7 +889,7 @@ void __load_system_menu_list(void *data, Cfg_Item_Position inputPos, Evas_Object safeStrNCat(sub_text, _(ad->more_system_menus[idx]), MAX_COMMON_BUFFER_LEN); idx++; } - + ad->data_moreSystem = setting_create_Gendial_field_groupitem(ad->main_genlist, &(ad->itc[GENDIAL_Type_2text_3]), @@ -1112,7 +1118,7 @@ static ail_cb_ret_e __download_apps_cb(ail_appinfo_h ai, void* data) /** * get 3rd party applist from AIL & searching dir/file by the defined rule * @param data ad - * if data is NULL --> just get how many items are there + * if data is NULL --> just get how many items are there * if data is NOT NULL --> draw UI code */ static int get_downloadapp_list(void* data)