From: Ayush Date: Thu, 25 Apr 2013 12:34:56 +0000 (+0530) Subject: Resource config parameter name changes in SB X-Git-Tag: accepted/tizen_2.1/20130426.150533~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=555c9a14ff1380c5d4d52ad1dc15dee6c0857a3e;p=framework%2Fosp%2Fuifw.git Resource config parameter name changes in SB Change-Id: I2c3fbd7a39c655b93857ef55a9f6ace7492f9781 Signed-off-by: Ayush --- diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp index fe56767..0bbf971 100644 --- a/src/ui/controls/FUiCtrl_Edit.cpp +++ b/src/ui/controls/FUiCtrl_Edit.cpp @@ -2330,15 +2330,15 @@ _Edit::ReplaceDefaultBackgroundBitmapForSearchBar(void) __pDefaultBackgroundEffectBitmap = null; } - r = GET_BITMAP_CONFIG_N(SEARCHBAR::BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]); + r = GET_BITMAP_CONFIG_N(SEARCHBAR::EDIT_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_NORMAL]); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap"); - r = GET_BITMAP_CONFIG_N(SEARCHBAR::BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]); + r = GET_BITMAP_CONFIG_N(SEARCHBAR::EDIT_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_DISABLED]); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap"); - r = GET_BITMAP_CONFIG_N(SEARCHBAR::BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]); + r = GET_BITMAP_CONFIG_N(SEARCHBAR::EDIT_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_HIGHLIGHTED]); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap"); - r = GET_BITMAP_CONFIG_N(SEARCHBAR::BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]); + r = GET_BITMAP_CONFIG_N(SEARCHBAR::EDIT_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundBitmap[EDIT_STATUS_PRESSED]); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap"); - r = GET_BITMAP_CONFIG_N(SEARCHBAR::BG_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap); + r = GET_BITMAP_CONFIG_N(SEARCHBAR::EDIT_BG_EFFECT, BITMAP_PIXEL_FORMAT_ARGB8888, __pDefaultBackgroundEffectBitmap); SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "Failed to load bitmap"); _pEditPresenter->SetSearchBarFlag(true); diff --git a/src/ui/inc/FUi_ResourceSearchBarConfig.h b/src/ui/inc/FUi_ResourceSearchBarConfig.h index 127b8cc..00c8a60 100644 --- a/src/ui/inc/FUi_ResourceSearchBarConfig.h +++ b/src/ui/inc/FUi_ResourceSearchBarConfig.h @@ -44,11 +44,11 @@ DECLARE_UI_CONFIG(SEARCHBAR); DECLARE_COLOR_CONFIG(EDIT_TEXT_NORMAL, 17); DECLARE_COLOR_CONFIG(EDIT_TEXT_DISABLED, 18); DECLARE_COLOR_CONFIG(EDIT_TEXT_HIGHLIGHTED, 19); - DECLARE_IMAGE_CONFIG(BG_NORMAL, 1); - DECLARE_IMAGE_CONFIG(BG_DISABLED, 2); - DECLARE_IMAGE_CONFIG(BG_HIGHLIGHTED, 3); - DECLARE_IMAGE_CONFIG(BG_PRESSED, 4); - DECLARE_IMAGE_CONFIG(BG_EFFECT, 5); + DECLARE_IMAGE_CONFIG(EDIT_BG_NORMAL, 1); + DECLARE_IMAGE_CONFIG(EDIT_BG_DISABLED, 2); + DECLARE_IMAGE_CONFIG(EDIT_BG_HIGHLIGHTED, 3); + DECLARE_IMAGE_CONFIG(EDIT_BG_PRESSED, 4); + DECLARE_IMAGE_CONFIG(EDIT_BG_EFFECT, 5); DECLARE_IMAGE_CONFIG(ICON_NORMAL, 6); DECLARE_IMAGE_CONFIG(ICON_EFFECT_NORMAL, 7); DECLARE_IMAGE_CONFIG(ICON_DISABLED, 8); diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp index bd44373..765b21c 100644 --- a/src/ui/resource/FUi_ResourceConfigParser.cpp +++ b/src/ui/resource/FUi_ResourceConfigParser.cpp @@ -1738,28 +1738,28 @@ ConfigParser::GetImageKeyTable(void) __pImageKeyTable->Add(ResourceKey(key), _SCROLL::HANDLER_VERTICAL_IMAGE); } { - const char* key ="SEARCHBAR::BG_NORMAL"; - __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::BG_NORMAL_IMAGE); + const char* key ="SEARCHBAR::EDIT_BG_NORMAL"; + __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_NORMAL_IMAGE); } { - const char* key ="SEARCHBAR::BG_DISABLED"; - __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::BG_DISABLED_IMAGE); + const char* key ="SEARCHBAR::EDIT_BG_DISABLED"; + __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_DISABLED_IMAGE); } { - const char* key ="SEARCHBAR::BG_HIGHLIGHTED"; - __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::BG_HIGHLIGHTED_IMAGE); + const char* key ="SEARCHBAR::EDIT_BG_HIGHLIGHTED"; + __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_HIGHLIGHTED_IMAGE); } { - const char* key ="SEARCHBAR::BG_PRESSED"; - __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::BG_PRESSED_IMAGE); + const char* key ="SEARCHBAR::EDIT_BG_PRESSED"; + __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_PRESSED_IMAGE); } { const char* key ="SEARCHBAR::ICON_NORMAL"; __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::ICON_NORMAL_IMAGE); } { - const char* key ="SEARCHBAR::BG_NORMAL"; - __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::BG_NORMAL_IMAGE); + const char* key ="SEARCHBAR::EDIT_BG_NORMAL"; + __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::EDIT_BG_NORMAL_IMAGE); } { const char* key ="SEARCHBAR::ICON_DISABLED"; diff --git a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp index 74afcec..25d135c 100644 --- a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp +++ b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp @@ -45,11 +45,11 @@ START_UI_CONFIG(SEARCHBAR); ADD_COLOR_CONFIG(ICON_BG_DISABLED, $F041iD); ADD_COLOR_CONFIG(CONTENT_AREA_BG_NORMAL, $B013); - ADD_IMAGE_CONFIG(BG_NORMAL, #00_search_edit_field_bg.#.png); - ADD_IMAGE_CONFIG(BG_DISABLED, #00_search_edit_field_bg.#.png); - ADD_IMAGE_CONFIG(BG_HIGHLIGHTED, #00_search_edit_field_bg.#.png); - ADD_IMAGE_CONFIG(BG_PRESSED, #00_search_edit_field_bg.#.png); - ADD_IMAGE_CONFIG(BG_EFFECT, #00_search_edit_field_bg_ef.#.png); + ADD_IMAGE_CONFIG(EDIT_BG_NORMAL, #00_search_edit_field_bg.#.png); + ADD_IMAGE_CONFIG(EDIT_BG_DISABLED, #00_search_edit_field_bg.#.png); + ADD_IMAGE_CONFIG(EDIT_BG_HIGHLIGHTED, #00_search_edit_field_bg.#.png); + ADD_IMAGE_CONFIG(EDIT_BG_PRESSED, #00_search_edit_field_bg.#.png); + ADD_IMAGE_CONFIG(EDIT_BG_EFFECT, #00_search_edit_field_bg_ef.#.png); ADD_IMAGE_CONFIG(ICON_NORMAL, #00_search_icon.png); ADD_IMAGE_CONFIG(ICON_DISABLED, #00_search_icon.png);