From bc2bc08e47ac5bf6938fe9e32bacf67c93d52bc0 Mon Sep 17 00:00:00 2001 From: Jing Yigang Date: Thu, 13 Sep 2012 15:12:34 +0800 Subject: [PATCH] [Bug] fix some UI errors. rebase Change-Id: I6a2a0376fbd15528a4f37003a3e74ee4f75074a9 --- setting-common/src/setting-common-draw-popup.c | 2 ++ setting-connectivity/src/setting-connectivity-usb.c | 4 +--- setting-display/src/setting-display-main.c | 3 ++- setting-display/src/setting-display-screen-mode.c | 8 ++++++++ setting-powersaving/src/setting-powersaving-main.c | 6 +++--- setting-profile/src/setting-profile-sound-main.c | 8 +------- setting-reset/src/setting-reset-settings.c | 5 +++-- setting-reset/src/setting-reset.c | 1 + 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/setting-common/src/setting-common-draw-popup.c b/setting-common/src/setting-common-draw-popup.c index 250e777..4c6dc9d 100755 --- a/setting-common/src/setting-common-draw-popup.c +++ b/setting-common/src/setting-common-draw-popup.c @@ -199,6 +199,7 @@ Evas_Object *setting_create_popup_with_btn(void *data, SETTING_TRACE("Parameter #%d is: %s, btn_part_str;%s", argno, btn_str, btn_part_str[argno]); if (btn_str) { Evas_Object *btn = setting_create_button(popup, btn_str, NULL, response_cb, data); + elm_object_style_set(btn, "popup_button/default"); elm_object_part_content_set(popup, btn_part_str[argno], btn); } } @@ -284,6 +285,7 @@ int setting_create_simple_popup(void *data, if (btn_str)\ {\ Evas_Object *btn = setting_create_button(popup, btn_str, NULL, response_cb, data);\ + elm_object_style_set(btn, "popup_button/default");\ elm_object_part_content_set(popup, btn_part_str[argno], btn);\ }\ }\ diff --git a/setting-connectivity/src/setting-connectivity-usb.c b/setting-connectivity/src/setting-connectivity-usb.c index 2ddb071..8330453 100755 --- a/setting-connectivity/src/setting-connectivity-usb.c +++ b/setting-connectivity/src/setting-connectivity-usb.c @@ -517,9 +517,6 @@ 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 SETTING_TRACE("Second item of Second group is set\n"); @@ -1000,6 +997,7 @@ void load_usb_connection_popup(void* data) elm_object_text_set(popup_eo, popup_msg); Evas_Object *btn = setting_create_button(win_main, _("IDS_COM_SK_CANCEL"), NULL, usb_connection_response_cb, ad); elm_object_part_content_set(popup_eo, "button1", btn); + elm_object_style_set(btn, "popup_button/default"); evas_object_show(popup_eo); popup_msg = NULL; popup_title = NULL; diff --git a/setting-display/src/setting-display-main.c b/setting-display/src/setting-display-main.c index cfc1f35..466bd49 100755 --- a/setting-display/src/setting-display-main.c +++ b/setting-display/src/setting-display-main.c @@ -292,10 +292,11 @@ 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); + +#if OPENING_EFFECT 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 */ item = elm_genlist_item_append(scroller, &(ad->itc_seperator), NULL, NULL, diff --git a/setting-display/src/setting-display-screen-mode.c b/setting-display/src/setting-display-screen-mode.c index d20379e..055aa7f 100755 --- a/setting-display/src/setting-display-screen-mode.c +++ b/setting-display/src/setting-display-screen-mode.c @@ -92,6 +92,14 @@ static int setting_display_screen_mode_create(void *cb) elm_object_part_content_set(view_layout, "search_list", scroller); + Elm_Object_Item *item = elm_genlist_item_append(scroller, + &(itc_sep_line), + NULL, NULL, + ELM_GENLIST_ITEM_NONE, + NULL, NULL); + elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); + + //gl_sel_cb = setting_mouse_up_Gendial_list_radio_cb; gl_sel_cb = setting_display_screen_mode_mouse_up_Gendial_list_radio_cb; diff --git a/setting-powersaving/src/setting-powersaving-main.c b/setting-powersaving/src/setting-powersaving-main.c index 02cb215..b3c43ce 100755 --- a/setting-powersaving/src/setting-powersaving-main.c +++ b/setting-powersaving/src/setting-powersaving-main.c @@ -165,7 +165,7 @@ static int setting_powersaving_main_create(void *cb) setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, ad, - SWALLOW_Type_LAYOUT_SPECIALIZTION, + SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, KeyStr_CPU_PS_DSC, NULL, NULL); @@ -195,7 +195,7 @@ static int setting_powersaving_main_create(void *cb) setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, ad, - SWALLOW_Type_LAYOUT_SPECIALIZTION, + SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, KeyStr_DISPLAY_PS_DSC, NULL, NULL); @@ -225,7 +225,7 @@ static int setting_powersaving_main_create(void *cb) setting_create_Gendial_field_def(scroller, &itc_multiline_text, NULL, ad, - SWALLOW_Type_LAYOUT_SPECIALIZTION, + SWALLOW_Type_LAYOUT_SPECIALIZTION_X, NULL, NULL, 0, KeyStr_BG_COLOR_DSC, NULL, NULL); diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c index 3841f08..9852290 100755 --- a/setting-profile/src/setting-profile-sound-main.c +++ b/setting-profile/src/setting-profile-sound-main.c @@ -526,14 +526,8 @@ 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); - - item = elm_genlist_item_append(genlist, &itc_bottom_seperator, NULL, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_select_mode_set(item, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); __change_state_of_sliderbars(ad); diff --git a/setting-reset/src/setting-reset-settings.c b/setting-reset/src/setting-reset-settings.c index b83c6fc..899156b 100755 --- a/setting-reset/src/setting-reset-settings.c +++ b/setting-reset/src/setting-reset-settings.c @@ -556,9 +556,9 @@ static Eina_Bool __reset_animator_cb(void *data) if (btn) { setting_enable_evas_object(btn); - setting_dim_evas_object(btn, FALSE); + setting_undo_dim_evas_object(btn, TRUE); } - + Evas_Object *genlist = elm_object_content_get(ad->notify); if(genlist) elm_genlist_item_show(elm_genlist_first_item_get(genlist), ELM_GENLIST_ITEM_SCROLLTO_TOP); @@ -604,6 +604,7 @@ static void setting_reset_settings_check_state(Setting_Done_List_Data *list_data EVAS_HINT_EXPAND); Evas_Object *btn = setting_create_button(ad->notify, _("IDS_COM_SK_OK"), NULL, setting_reset_result_popup_resp_cb, ad); elm_object_part_content_set(ad->notify, "button1", btn); + elm_object_style_set(btn, "popup_button/default"); setting_disable_evas_object(btn); setting_dim_evas_object(btn, TRUE); diff --git a/setting-reset/src/setting-reset.c b/setting-reset/src/setting-reset.c index 7894ac1..e09c60f 100755 --- a/setting-reset/src/setting-reset.c +++ b/setting-reset/src/setting-reset.c @@ -286,6 +286,7 @@ void setting_reset_result_popup_update(void *data) if (ad->notify) { elm_object_part_text_set(ad->notify, "title,text", _(RESET_RESULT_STR)); Evas_Object *btn = elm_object_part_content_get(ad->notify, "button1"); + elm_object_style_set(btn, "popup_button/default"); if (btn) { elm_object_text_set(btn, _("IDS_COM_SK_OK")); -- 2.7.4