From 6f6a7b0e0f050ee82c41fa6f0494883f4956dffb Mon Sep 17 00:00:00 2001 From: Syed Khaja Moinuddin Date: Wed, 17 Apr 2013 00:46:07 +0900 Subject: [PATCH] Renamed the resource tags as per naming conventions and also fixed custom theme in SearchBar Signed-off-by: Syed Khaja Moinuddin Change-Id: I45e1fda23de73d221c8571c392832c4b0092bfbf Signed-off-by: Syed Khaja Moinuddin --- inc/FUiUiConfigurationTypes.h | 24 ++--- src/ui/FUiUiConfiguration.cpp | 24 ++--- src/ui/controls/FUiCtrl_SearchBarPresenter.cpp | 6 ++ src/ui/inc/FUi_ResourceDateTimePickerConfig.h | 22 ++--- src/ui/inc/FUi_ResourceEditDateConfig.h | 22 ++--- src/ui/inc/FUi_ResourceEditTimeConfig.h | 22 ++--- src/ui/inc/FUi_ResourceSearchBarConfig.h | 3 +- src/ui/resource/FUi_ResourceConfigParser.cpp | 100 +++++++++++---------- .../resource/FUi_ResourceDateTimePickerConfig.cpp | 22 ++--- src/ui/resource/FUi_ResourceEditDateConfig.cpp | 22 ++--- src/ui/resource/FUi_ResourceEditTimeConfig.cpp | 22 ++--- src/ui/resource/FUi_ResourceSearchBarConfig.cpp | 1 + 12 files changed, 151 insertions(+), 139 deletions(-) diff --git a/inc/FUiUiConfigurationTypes.h b/inc/FUiUiConfigurationTypes.h index a93feae..53bc462 100755 --- a/inc/FUiUiConfigurationTypes.h +++ b/inc/FUiUiConfigurationTypes.h @@ -555,28 +555,28 @@ struct _OSP_EXPORT_ ColorKey * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_NORMAL; + _OSP_EXPORT_ static const int CONTENT_BG_NORMAL; /** * The property key to get the pressed background color of the picker button of date time picker * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_PRESSED; + _OSP_EXPORT_ static const int CONTENT_BG_PRESSED; /** * The property key to get the disabled background color of the picker button of date time picker * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_DISABLED; + _OSP_EXPORT_ static const int CONTENT_BG_DISABLED; /** * The property key to get the highlighted background color of the picker button of date time picker * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_HIGHLIGHTED; + _OSP_EXPORT_ static const int CONTENT_BG_HIGHLIGHTED; }; struct _OSP_EXPORT_ Edit { @@ -763,28 +763,28 @@ struct _OSP_EXPORT_ ColorKey * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_NORMAL; + _OSP_EXPORT_ static const int CONTENT_BG_NORMAL; /** * The property key to get the pressed background color of the picker button of edit date * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_PRESSED; + _OSP_EXPORT_ static const int CONTENT_BG_PRESSED; /** * The property key to get the disabled background color of the picker button of edit date * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_DISABLED; + _OSP_EXPORT_ static const int CONTENT_BG_DISABLED; /** * The property key to get the highlighted background color of the picker button of edit date * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_HIGHLIGHTED; + _OSP_EXPORT_ static const int CONTENT_BG_HIGHLIGHTED; }; struct _OSP_EXPORT_ EditTime @@ -878,28 +878,28 @@ struct _OSP_EXPORT_ ColorKey * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_NORMAL; + _OSP_EXPORT_ static const int CONTENT_BG_NORMAL; /** * The property key to get the pressed background color of the picker button of edit time * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_PRESSED; + _OSP_EXPORT_ static const int CONTENT_BG_PRESSED; /** * The property key to get the disabled background color of the picker button of edit time * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_DISABLED; + _OSP_EXPORT_ static const int CONTENT_BG_DISABLED; /** * The property key to get the highlighted background color of the picker button of edit time * * @since 2.1 */ - _OSP_EXPORT_ static const int PICKER_BUTTON_BG_HIGHLIGHTED; + _OSP_EXPORT_ static const int CONTENT_BG_HIGHLIGHTED; }; struct _OSP_EXPORT_ FastScroll diff --git a/src/ui/FUiUiConfiguration.cpp b/src/ui/FUiUiConfiguration.cpp index 85d375d..2ba8bab 100644 --- a/src/ui/FUiUiConfiguration.cpp +++ b/src/ui/FUiUiConfiguration.cpp @@ -104,10 +104,10 @@ const int ColorKey::DateTimePicker::AM_PM_TEXT_HIGHLIGHTED = _DATETIMEPICKER::AM const int ColorKey::DateTimePicker::AM_PM_TEXT_DISABLED = _DATETIMEPICKER::AMPM_TEXT_DISABLED_COLOR; const int ColorKey::DateTimePicker::DIVIDER_LEFT_HALF = _DATETIMEPICKER::DIVIDER_LEFT_HALF_COLOR; const int ColorKey::DateTimePicker::DIVIDER_RIGHT_HALF = _DATETIMEPICKER::DIVIDER_RIGHT_HALF_COLOR; -const int ColorKey::DateTimePicker::PICKER_BUTTON_BG_NORMAL = _DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL_COLOR; -const int ColorKey::DateTimePicker::PICKER_BUTTON_BG_PRESSED = _DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED_COLOR; -const int ColorKey::DateTimePicker::PICKER_BUTTON_BG_DISABLED = _DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED_COLOR; -const int ColorKey::DateTimePicker::PICKER_BUTTON_BG_HIGHLIGHTED = _DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR; +const int ColorKey::DateTimePicker::CONTENT_BG_NORMAL = _DATETIMEPICKER::CONTENT_BG_NORMAL_COLOR; +const int ColorKey::DateTimePicker::CONTENT_BG_PRESSED = _DATETIMEPICKER::CONTENT_BG_PRESSED_COLOR; +const int ColorKey::DateTimePicker::CONTENT_BG_DISABLED = _DATETIMEPICKER::CONTENT_BG_DISABLED_COLOR; +const int ColorKey::DateTimePicker::CONTENT_BG_HIGHLIGHTED = _DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED_COLOR; const int ColorKey::Edit::BG_NORMAL = _EDIT::BG_NORMAL_COLOR; const int ColorKey::Edit::BG_PRESSED = _EDIT::BG_PRESSED_COLOR; const int ColorKey::Edit::BG_HIGHLIGHTED = _EDIT::BG_HIGHLIGHTED_COLOR; @@ -133,10 +133,10 @@ const int ColorKey::EditDate::TITLE_TEXT_NORMAL = _EDITDATE::TITLE_TEXT_NORMAL_C const int ColorKey::EditDate::TITLE_TEXT_DISABLED = _EDITDATE::TITLE_TEXT_DISABLED_COLOR; const int ColorKey::EditDate::DIVIDER_HALF_LEFT = _EDITDATE::DIVIDER_LEFT_HALF_COLOR; const int ColorKey::EditDate::DIVIDER_HALF_RIGHT = _EDITDATE::DIVIDER_RIGHT_HALF_COLOR; -const int ColorKey::EditDate::PICKER_BUTTON_BG_NORMAL = _EDITDATE::PICKER_BUTTON_BG_NORMAL_COLOR; -const int ColorKey::EditDate::PICKER_BUTTON_BG_PRESSED = _EDITDATE::PICKER_BUTTON_BG_PRESSED_COLOR; -const int ColorKey::EditDate::PICKER_BUTTON_BG_DISABLED = _EDITDATE::PICKER_BUTTON_BG_DISABLED_COLOR; -const int ColorKey::EditDate::PICKER_BUTTON_BG_HIGHLIGHTED = _EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR; +const int ColorKey::EditDate::CONTENT_BG_NORMAL = _EDITDATE::CONTENT_BG_NORMAL_COLOR; +const int ColorKey::EditDate::CONTENT_BG_PRESSED = _EDITDATE::CONTENT_BG_PRESSED_COLOR; +const int ColorKey::EditDate::CONTENT_BG_DISABLED = _EDITDATE::CONTENT_BG_DISABLED_COLOR; +const int ColorKey::EditDate::CONTENT_BG_HIGHLIGHTED = _EDITDATE::CONTENT_BG_HIGHLIGHTED_COLOR; const int ColorKey::EditTime::BUTTON_BG_NORMAL = _EDITTIME::BUTTON_BG_NORMAL_COLOR; const int ColorKey::EditTime::BUTTON_BG_PRESSED = _EDITTIME::BUTTON_BG_PRESSED_COLOR; @@ -150,10 +150,10 @@ const int ColorKey::EditTime::TEXT_DISABLED = _EDITTIME::TEXT_DISABLED_COLOR; const int ColorKey::EditTime::TITLE_TEXT_NORMAL = _EDITTIME::TITLE_TEXT_NORMAL_COLOR; const int ColorKey::EditTime::TITLE_TEXT_DISABLED = _EDITTIME::TITLE_TEXT_DISABLED_COLOR; const int ColorKey::EditTime::BUTTON_BG_HIGHLIGHTED = _EDITTIME::BUTTON_BG_HIGHLIGHTED_COLOR; -const int ColorKey::EditTime::PICKER_BUTTON_BG_NORMAL = _EDITTIME::PICKER_BUTTON_BG_NORMAL_COLOR; -const int ColorKey::EditTime::PICKER_BUTTON_BG_PRESSED = _EDITTIME::PICKER_BUTTON_BG_PRESSED_COLOR; -const int ColorKey::EditTime::PICKER_BUTTON_BG_DISABLED = _EDITTIME::PICKER_BUTTON_BG_DISABLED_COLOR; -const int ColorKey::EditTime::PICKER_BUTTON_BG_HIGHLIGHTED = _EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR; +const int ColorKey::EditTime::CONTENT_BG_NORMAL = _EDITTIME::CONTENT_BG_NORMAL_COLOR; +const int ColorKey::EditTime::CONTENT_BG_PRESSED = _EDITTIME::CONTENT_BG_PRESSED_COLOR; +const int ColorKey::EditTime::CONTENT_BG_DISABLED = _EDITTIME::CONTENT_BG_DISABLED_COLOR; +const int ColorKey::EditTime::CONTENT_BG_HIGHLIGHTED = _EDITTIME::CONTENT_BG_HIGHLIGHTED_COLOR; const int ColorKey::FastScroll::INDEX_BG_NORMAL = _FASTSCROLL::INDEX_BG_NORMAL_COLOR; const int ColorKey::FastScroll::INDEX_BG_PRESSED = _FASTSCROLL::INDEX_BG_PRESSED_COLOR; const int ColorKey::FastScroll::INDEX_LINE_PRESSED = _FASTSCROLL::INDEX_LINE_PRESSED_COLOR; diff --git a/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp b/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp index 852de4c..1695ca4 100755 --- a/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp +++ b/src/ui/controls/FUiCtrl_SearchBarPresenter.cpp @@ -166,6 +166,12 @@ _SearchBarPresenter::LoadSearchFieldIcon() SysTryCatch(NID_UI_CTRL, __pReplacedSearchFieldNormalBitmap != null, r = GetLastResult(), GetLastResult(),"[%s] Propagating.", GetErrorMessage(GetLastResult())); + delete pSearchFieldBitmap; + pSearchFieldBitmap = null; + + r = GET_BITMAP_CONFIG_N(SEARCHBAR::ICON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pSearchFieldBitmap); + SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r,"[%s] Propagating.", GetErrorMessage(r)); + GET_COLOR_CONFIG(SEARCHBAR::ICON_BG_DISABLED, searchFieldIconColor); __pReplacedSearchFieldDisabledBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pSearchFieldBitmap, Color::GetColor(COLOR_ID_MAGENTA), searchFieldIconColor); diff --git a/src/ui/inc/FUi_ResourceDateTimePickerConfig.h b/src/ui/inc/FUi_ResourceDateTimePickerConfig.h index 2874a84..053b512 100755 --- a/src/ui/inc/FUi_ResourceDateTimePickerConfig.h +++ b/src/ui/inc/FUi_ResourceDateTimePickerConfig.h @@ -44,10 +44,10 @@ DECLARE_UI_CONFIG(DATETIMEPICKER); DECLARE_COLOR_CONFIG(DIVIDER_RIGHT_HALF, 16) DECLARE_COLOR_CONFIG(TITLE_NORMAL, 17) DECLARE_COLOR_CONFIG(TITLE_DISABLED, 18) - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL, 19); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED, 20); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED, 21); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, 22); + DECLARE_COLOR_CONFIG(CONTENT_BG_NORMAL, 19); + DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED, 20); + DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED, 21); + DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED, 22); DECLARE_IMAGE_CONFIG(AMPM_BG_NORMAL, 1) DECLARE_IMAGE_CONFIG(AMPM_BG_PRESSED, 2) @@ -60,13 +60,13 @@ DECLARE_UI_CONFIG(DATETIMEPICKER); DECLARE_IMAGE_CONFIG(COLON_BG_NORMAL, 9) DECLARE_IMAGE_CONFIG(BG_NORMAL, 10); DECLARE_IMAGE_CONFIG(BG_EFFECT, 11); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL,12); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED,13); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED,14); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,15); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL,16); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED,17); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED,18); + DECLARE_IMAGE_CONFIG(CONTENT_BG_NORMAL,12); + DECLARE_IMAGE_CONFIG(CONTENT_BG_PRESSED,13); + DECLARE_IMAGE_CONFIG(CONTENT_BG_DISABLED,14); + DECLARE_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED,15); + DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL,16); + DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED,17); + DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED,18); DECLARE_SHAPE_CONFIG(FOOTER_HEIGHT, 1) DECLARE_SHAPE_CONFIG(INPUTPAD_HEIGHT, 2) diff --git a/src/ui/inc/FUi_ResourceEditDateConfig.h b/src/ui/inc/FUi_ResourceEditDateConfig.h index a71b165..dd51c0e 100755 --- a/src/ui/inc/FUi_ResourceEditDateConfig.h +++ b/src/ui/inc/FUi_ResourceEditDateConfig.h @@ -32,17 +32,17 @@ DECLARE_UI_CONFIG(EDITDATE); DECLARE_COLOR_CONFIG(TITLE_TEXT_DISABLED,5); DECLARE_COLOR_CONFIG(DIVIDER_LEFT_HALF,6); DECLARE_COLOR_CONFIG(DIVIDER_RIGHT_HALF,7); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL,8); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED,9); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED,10); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,11); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL,1); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED,2); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED,3); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,4); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL,5); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED,6); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED,7); + DECLARE_COLOR_CONFIG(CONTENT_BG_NORMAL,8); + DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED,9); + DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED,10); + DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED,11); + DECLARE_IMAGE_CONFIG(CONTENT_BG_NORMAL,1); + DECLARE_IMAGE_CONFIG(CONTENT_BG_PRESSED,2); + DECLARE_IMAGE_CONFIG(CONTENT_BG_DISABLED,3); + DECLARE_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED,4); + DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL,5); + DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED,6); + DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED,7); DECLARE_SHAPE_CONFIG(WIDTH,1); DECLARE_SHAPE_CONFIG(HEIGHT,2); DECLARE_SHAPE_CONFIG(DATE_HEIGHT,3); diff --git a/src/ui/inc/FUi_ResourceEditTimeConfig.h b/src/ui/inc/FUi_ResourceEditTimeConfig.h index 8304df8..056ddf3 100755 --- a/src/ui/inc/FUi_ResourceEditTimeConfig.h +++ b/src/ui/inc/FUi_ResourceEditTimeConfig.h @@ -37,10 +37,10 @@ DECLARE_UI_CONFIG(EDITTIME); DECLARE_COLOR_CONFIG(TITLE_TEXT_NORMAL,10); DECLARE_COLOR_CONFIG(TITLE_TEXT_DISABLED,11); DECLARE_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED,12); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL,13); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED,14); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED,15); - DECLARE_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,16); + DECLARE_COLOR_CONFIG(CONTENT_BG_NORMAL,13); + DECLARE_COLOR_CONFIG(CONTENT_BG_PRESSED,14); + DECLARE_COLOR_CONFIG(CONTENT_BG_DISABLED,15); + DECLARE_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED,16); DECLARE_IMAGE_CONFIG(COLON_BG_NORMAL,1); DECLARE_IMAGE_CONFIG(BUTTON_BG_NORMAL,2); DECLARE_IMAGE_CONFIG(BUTTON_BG_PRESSED,3); @@ -49,13 +49,13 @@ DECLARE_UI_CONFIG(EDITTIME); DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_DISABLED,6); DECLARE_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED,7); DECLARE_IMAGE_CONFIG(BUTTON_BG_HIGHLIGHTED,8); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL,9); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED,10); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED,11); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED,12); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL,13); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED,14); - DECLARE_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED,15); + DECLARE_IMAGE_CONFIG(CONTENT_BG_NORMAL,9); + DECLARE_IMAGE_CONFIG(CONTENT_BG_PRESSED,10); + DECLARE_IMAGE_CONFIG(CONTENT_BG_DISABLED,11); + DECLARE_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED,12); + DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL,13); + DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED,14); + DECLARE_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED,15); DECLARE_SHAPE_CONFIG(WIDTH,1); DECLARE_SHAPE_CONFIG(HEIGHT,2); DECLARE_SHAPE_CONFIG(TIME_WIDTH,3); diff --git a/src/ui/inc/FUi_ResourceSearchBarConfig.h b/src/ui/inc/FUi_ResourceSearchBarConfig.h index 8679576..1169e83 100755 --- a/src/ui/inc/FUi_ResourceSearchBarConfig.h +++ b/src/ui/inc/FUi_ResourceSearchBarConfig.h @@ -51,6 +51,7 @@ DECLARE_UI_CONFIG(SEARCHBAR); DECLARE_IMAGE_CONFIG(BG_EFFECT, 5); DECLARE_IMAGE_CONFIG(ICON_NORMAL, 6); DECLARE_IMAGE_CONFIG(ICON_EFFECT_NORMAL, 7); + DECLARE_IMAGE_CONFIG(ICON_DISABLED, 8); DECLARE_SHAPE_CONFIG(HORIZONTAL_MARGIN, 1); DECLARE_SHAPE_CONFIG(VERTICAL_MARGIN, 2); DECLARE_SHAPE_CONFIG(TEXT_HORIZONTAL_MARGIN, 3); @@ -68,4 +69,4 @@ DECLARE_UI_CONFIG(SEARCHBAR); DECLARE_SHAPE_CONFIG(BUTTON_TEXT_SIZE, 15); DECLARE_END_UI_CONFIG(SEARCHBAR); -#endif //_FUI_RESOURCE_SEARCH_BAR_CONFIG_H_ \ No newline at end of file +#endif //_FUI_RESOURCE_SEARCH_BAR_CONFIG_H_ diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp index f3135a8..897e640 100755 --- a/src/ui/resource/FUi_ResourceConfigParser.cpp +++ b/src/ui/resource/FUi_ResourceConfigParser.cpp @@ -1090,20 +1090,20 @@ ConfigParser::GetImageKeyTable(void) __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::AMPM_BG_DISABLED_IMAGE); } { - const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL"; - __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL_IMAGE); + const char* key ="DATETIMEPICKER::CONTENT_BG_NORMAL"; + __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_NORMAL_IMAGE); } { - const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED"; - __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED_IMAGE); + const char* key ="DATETIMEPICKER::CONTENT_BG_PRESSED"; + __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_PRESSED_IMAGE); } { - const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED"; - __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED_IMAGE); + const char* key ="DATETIMEPICKER::CONTENT_BG_DISABLED"; + __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_DISABLED_IMAGE); } { - const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED"; - __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED_IMAGE); + const char* key ="DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED"; + __pImageKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED_IMAGE); } { const char* key ="EDIT::BG_NORMAL"; @@ -1130,20 +1130,20 @@ ConfigParser::GetImageKeyTable(void) __pImageKeyTable->Add(ResourceKey(key), _EDIT::CLEAR_ICON_PRESSED_IMAGE); } { - const char* key ="EDITDATE::PICKER_BUTTON_BG_NORMAL"; - __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_NORMAL_IMAGE); + const char* key ="EDITDATE::CONTENT_BG_NORMAL"; + __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_NORMAL_IMAGE); } { - const char* key ="EDITDATE::PICKER_BUTTON_BG_PRESSED"; - __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_PRESSED_IMAGE); + const char* key ="EDITDATE::CONTENT_BG_PRESSED"; + __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_PRESSED_IMAGE); } { - const char* key ="EDITDATE::PICKER_BUTTON_BG_DISABLED"; - __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_DISABLED_IMAGE); + const char* key ="EDITDATE::CONTENT_BG_DISABLED"; + __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_DISABLED_IMAGE); } { - const char* key ="EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED"; - __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED_IMAGE); + const char* key ="EDITDATE::CONTENT_BG_HIGHLIGHTED"; + __pImageKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_HIGHLIGHTED_IMAGE); } { const char* key ="EDITTIME::BUTTON_BG_NORMAL"; @@ -1162,20 +1162,20 @@ ConfigParser::GetImageKeyTable(void) __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::BUTTON_BG_HIGHLIGHTED_IMAGE); } { - const char* key ="EDITTIME::PICKER_BUTTON_BG_NORMAL"; - __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_NORMAL_IMAGE); + const char* key ="EDITTIME::CONTENT_BG_NORMAL"; + __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_NORMAL_IMAGE); } { - const char* key ="EDITTIME::PICKER_BUTTON_BG_PRESSED"; - __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_PRESSED_IMAGE); + const char* key ="EDITTIME::CONTENT_BG_PRESSED"; + __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_PRESSED_IMAGE); } { - const char* key ="EDITTIME::PICKER_BUTTON_BG_DISABLED"; - __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_DISABLED_IMAGE); + const char* key ="EDITTIME::CONTENT_BG_DISABLED"; + __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_DISABLED_IMAGE); } { - const char* key ="EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED"; - __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED_IMAGE); + const char* key ="EDITTIME::CONTENT_BG_HIGHLIGHTED"; + __pImageKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_HIGHLIGHTED_IMAGE); } { const char* key ="FASTSCROLL::INDEX_BG_NORMAL"; @@ -1566,6 +1566,10 @@ ConfigParser::GetImageKeyTable(void) __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::BG_NORMAL_IMAGE); } { + const char* key ="SEARCHBAR::ICON_DISABLED"; + __pImageKeyTable->Add(ResourceKey(key), _SEARCHBAR::ICON_DISABLED_IMAGE); + } + { const char* key ="SLIDER::BAR_BG_NORMAL"; __pImageKeyTable->Add(ResourceKey(key), _SLIDER::BAR_BG_NORMAL_IMAGE); } @@ -2169,20 +2173,20 @@ ConfigParser::GetColorKeyTable(void) __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::DIVIDER_RIGHT_HALF_COLOR); } { - const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL"; - __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_NORMAL_COLOR); + const char* key ="DATETIMEPICKER::CONTENT_BG_NORMAL"; + __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_NORMAL_COLOR); } { - const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED"; - __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_PRESSED_COLOR); + const char* key ="DATETIMEPICKER::CONTENT_BG_PRESSED"; + __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_PRESSED_COLOR); } { - const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED"; - __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_DISABLED_COLOR); + const char* key ="DATETIMEPICKER::CONTENT_BG_DISABLED"; + __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_DISABLED_COLOR); } { - const char* key ="DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED"; - __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR); + const char* key ="DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED"; + __pColorKeyTable->Add(ResourceKey(key), _DATETIMEPICKER::CONTENT_BG_HIGHLIGHTED_COLOR); } { const char* key ="EDIT::BG_NORMAL"; @@ -2285,20 +2289,20 @@ ConfigParser::GetColorKeyTable(void) __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::DIVIDER_RIGHT_HALF_COLOR); } { - const char* key ="EDITDATE::PICKER_BUTTON_BG_NORMAL"; - __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_NORMAL_COLOR); + const char* key ="EDITDATE::CONTENT_BG_NORMAL"; + __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_NORMAL_COLOR); } { - const char* key ="EDITDATE::PICKER_BUTTON_BG_PRESSED"; - __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_PRESSED_COLOR); + const char* key ="EDITDATE::CONTENT_BG_PRESSED"; + __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_PRESSED_COLOR); } { - const char* key ="EDITDATE::PICKER_BUTTON_BG_DISABLED"; - __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_DISABLED_COLOR); + const char* key ="EDITDATE::CONTENT_BG_DISABLED"; + __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_DISABLED_COLOR); } { - const char* key ="EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED"; - __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR); + const char* key ="EDITDATE::CONTENT_BG_HIGHLIGHTED"; + __pColorKeyTable->Add(ResourceKey(key), _EDITDATE::CONTENT_BG_HIGHLIGHTED_COLOR); } { const char* key ="EDITTIME::BUTTON_BG_NORMAL"; @@ -2349,20 +2353,20 @@ ConfigParser::GetColorKeyTable(void) __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::BUTTON_BG_HIGHLIGHTED_COLOR); } { - const char* key ="EDITTIME::PICKER_BUTTON_BG_NORMAL"; - __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_NORMAL_COLOR); + const char* key ="EDITTIME::CONTENT_BG_NORMAL"; + __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_NORMAL_COLOR); } { - const char* key ="EDITTIME::PICKER_BUTTON_BG_PRESSED"; - __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_PRESSED_COLOR); + const char* key ="EDITTIME::CONTENT_BG_PRESSED"; + __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_PRESSED_COLOR); } { - const char* key ="EDITTIME::PICKER_BUTTON_BG_DISABLED"; - __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_DISABLED_COLOR); + const char* key ="EDITTIME::CONTENT_BG_DISABLED"; + __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_DISABLED_COLOR); } { - const char* key ="EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED"; - __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::PICKER_BUTTON_BG_HIGHLIGHTED_COLOR); + const char* key ="EDITTIME::CONTENT_BG_HIGHLIGHTED"; + __pColorKeyTable->Add(ResourceKey(key), _EDITTIME::CONTENT_BG_HIGHLIGHTED_COLOR); } { const char* key ="FASTSCROLL::INDEX_BG_NORMAL"; diff --git a/src/ui/resource/FUi_ResourceDateTimePickerConfig.cpp b/src/ui/resource/FUi_ResourceDateTimePickerConfig.cpp index 3152e5e..1ebf7c3 100755 --- a/src/ui/resource/FUi_ResourceDateTimePickerConfig.cpp +++ b/src/ui/resource/FUi_ResourceDateTimePickerConfig.cpp @@ -48,10 +48,10 @@ START_UI_CONFIG(DATETIMEPICKER); ADD_COLOR_CONFIG(TITLE_NORMAL, $B052L5); ADD_COLOR_CONFIG(TITLE_DISABLED, $B052L5); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL, $W011); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED, $B042); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED, $W011); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(CONTENT_BG_NORMAL, $W011); + ADD_COLOR_CONFIG(CONTENT_BG_PRESSED, $B042); + ADD_COLOR_CONFIG(CONTENT_BG_DISABLED, $W011); + ADD_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED, $W161); ADD_IMAGE_CONFIG(AMPM_BG_NORMAL, #00_button_01.#.png); ADD_IMAGE_CONFIG(AMPM_BG_PRESSED, #00_button_01.#.png); @@ -67,13 +67,13 @@ START_UI_CONFIG(DATETIMEPICKER); ADD_IMAGE_CONFIG(BG_NORMAL, #00_list_group_bg.#.png); ADD_IMAGE_CONFIG(BG_EFFECT, #00_list_group_bg_ef.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL, #00_picker_button.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED, #00_picker_button.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED, #00_picker_button.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, #00_picker_button_focus.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_NORMAL, #00_picker_button.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_PRESSED, #00_picker_button.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_DISABLED, #00_picker_button.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED, #00_picker_button_focus.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png); START_UI_CONFIG_MODE(720x1280); { diff --git a/src/ui/resource/FUi_ResourceEditDateConfig.cpp b/src/ui/resource/FUi_ResourceEditDateConfig.cpp index 1442374..5c3be95 100755 --- a/src/ui/resource/FUi_ResourceEditDateConfig.cpp +++ b/src/ui/resource/FUi_ResourceEditDateConfig.cpp @@ -31,18 +31,18 @@ START_UI_CONFIG(EDITDATE); ADD_COLOR_CONFIG(TITLE_TEXT_DISABLED, $B052L5); ADD_COLOR_CONFIG(DIVIDER_LEFT_HALF, $B0224); ADD_COLOR_CONFIG(DIVIDER_RIGHT_HALF, $B0222); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL, $W011); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED, $B042); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED, $W011); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(CONTENT_BG_NORMAL, $W011); + ADD_COLOR_CONFIG(CONTENT_BG_PRESSED, $B042); + ADD_COLOR_CONFIG(CONTENT_BG_DISABLED, $W011); + ADD_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED, $W161); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL, #00_picker_button.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED, #00_picker_button.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED, #00_picker_button.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, #00_picker_button_focus.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_NORMAL, #00_picker_button.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_PRESSED, #00_picker_button.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_DISABLED, #00_picker_button.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED, #00_picker_button_focus.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png); START_UI_CONFIG_MODE(720x1280); { diff --git a/src/ui/resource/FUi_ResourceEditTimeConfig.cpp b/src/ui/resource/FUi_ResourceEditTimeConfig.cpp index 14d4179..8b1c228 100755 --- a/src/ui/resource/FUi_ResourceEditTimeConfig.cpp +++ b/src/ui/resource/FUi_ResourceEditTimeConfig.cpp @@ -28,10 +28,10 @@ START_UI_CONFIG(EDITTIME); ADD_COLOR_CONFIG(BUTTON_BG_PRESSED, $B042); ADD_COLOR_CONFIG(BUTTON_BG_DISABLED, $W011); ADD_COLOR_CONFIG(BUTTON_BG_HIGHLIGHTED, $W161); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_NORMAL, $W011); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_PRESSED, $B042); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_DISABLED, $W011); - ADD_COLOR_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, $W161); + ADD_COLOR_CONFIG(CONTENT_BG_NORMAL, $W011); + ADD_COLOR_CONFIG(CONTENT_BG_PRESSED, $B042); + ADD_COLOR_CONFIG(CONTENT_BG_DISABLED, $W011); + ADD_COLOR_CONFIG(CONTENT_BG_HIGHLIGHTED, $W161); ADD_COLOR_CONFIG(BUTTON_TEXT_NORMAL, $F031L1); ADD_COLOR_CONFIG(BUTTON_TEXT_PRESSED, $F031L1P); ADD_COLOR_CONFIG(BUTTON_TEXT_DISABLED, $F031L1D); @@ -49,13 +49,13 @@ START_UI_CONFIG(EDITTIME); ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_NORMAL, #00_button_01_ef.#.png); ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_DISABLED, #00_button_01_ef_dim.#.png); ADD_IMAGE_CONFIG(BUTTON_BG_EFFECT_PRESSED, #00_button_01_ef_press.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_NORMAL, #00_picker_button.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_PRESSED, #00_picker_button.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_DISABLED, #00_picker_button.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_HIGHLIGHTED, #00_picker_button_focus.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png); - ADD_IMAGE_CONFIG(PICKER_BUTTON_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_NORMAL, #00_picker_button.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_PRESSED, #00_picker_button.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_DISABLED, #00_picker_button.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_HIGHLIGHTED, #00_picker_button_focus.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_NORMAL, #00_picker_button_ef.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_DISABLED, #00_picker_button_dim_ef.#.png); + ADD_IMAGE_CONFIG(CONTENT_BG_EFFECT_PRESSED, #00_picker_button_press_ef.#.png); START_UI_CONFIG_MODE(720x1280); { diff --git a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp index b23357d..a84ed03 100755 --- a/src/ui/resource/FUi_ResourceSearchBarConfig.cpp +++ b/src/ui/resource/FUi_ResourceSearchBarConfig.cpp @@ -52,6 +52,7 @@ START_UI_CONFIG(SEARCHBAR); ADD_IMAGE_CONFIG(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); ADD_IMAGE_CONFIG(ICON_EFFECT_NORMAL, #00_search_icon_ef.png); -- 2.7.4