Added Slider specific resources in slider config.

Signed-off-by: Syed Khaja Moinuddin <moinuddin.s@samsung.com>
Change-Id: I9a7888b1389bf69103e862bf70f9ead13fa262e4

diff --git a/src/ui/controls/FUiCtrl_SliderPresenter.cpp b/src/ui/controls/FUiCtrl_SliderPresenter.cpp
index edcdad5..248955a 100644 (file)
--- a/src/ui/controls/FUiCtrl_SliderPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_SliderPresenter.cpp
@@ -424,42 +424,42 @@ _SliderPresenter::LoadBitmap(void)
        SysTryReturn(NID_UI_CTRL, r == E_SUCCESS, r, r, "[%s] Propagating.", GetErrorMessage(r));
 
        // for GROUP_STYLE_TOP
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgTopBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgTopBitmap);
        SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, "Propagating.");
 
        __pBgTopBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pResourceBgTopBitmap,Color::GetColor(COLOR_ID_MAGENTA), __currentBgColor);
        r = GetLastResult();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgTopEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgTopEffectBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
 
        // for GROUP_STYLE_MIDDLE
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgMiddleBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgMiddleBitmap);
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pBgMiddleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pResourceBgMiddleBitmap,Color::GetColor(COLOR_ID_MAGENTA), __currentBgColor);
        r = GetLastResult();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgMiddleEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_MIDDLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgMiddleEffectBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
 
        // for GROUP_STYLE_BOTTOM
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgBottomBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgBottomBitmap);
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pBgBottomBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pResourceBgBottomBitmap,Color::GetColor(COLOR_ID_MAGENTA), __currentBgColor);
        r = GetLastResult();
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgBottomEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_BOTTOM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgBottomEffectBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
        // for GROUP_STYLE_SINGLE and GROUP_STYLE_NONE
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgSingleBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pResourceBgSingleBitmap);
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
        __pBgSingleBitmap = _BitmapImpl::GetColorReplacedBitmapN(*__pResourceBgSingleBitmap, Color::GetColor(COLOR_ID_MAGENTA), __currentBgColor);
@@ -471,7 +471,7 @@ _SliderPresenter::LoadBitmap(void)
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
 
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgSingleEffectBitmap);
+       r = GET_BITMAP_CONFIG_N(SLIDER::GROUPED_SINGLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBgSingleEffectBitmap);
        SysTryCatch(NID_UI_CTRL, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
        opacity = __currentBgColor.GetAlpha();

diff --git a/src/ui/inc/FUi_ResourceSliderConfig.h b/src/ui/inc/FUi_ResourceSliderConfig.h
index 712cb73..319ab5e 100644 (file)
--- a/src/ui/inc/FUi_ResourceSliderConfig.h
+++ b/src/ui/inc/FUi_ResourceSliderConfig.h
@@ -51,6 +51,14 @@ DECLARE_UI_CONFIG(SLIDER);
        DECLARE_IMAGE_CONFIG(HANDLE_BG_EFFECT_HIGHLIGHTED, 12);
        DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, 13);
        DECLARE_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, 14);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, 15);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, 16);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, 17);
+       DECLARE_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, 18);
+       DECLARE_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, 19);
+       DECLARE_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, 20);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, 21);
+       DECLARE_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, 22);
        DECLARE_SHAPE_CONFIG(HANDLE_WIDTH, 1);
        DECLARE_SHAPE_CONFIG(HANDLE_HEIGHT, 2);
        DECLARE_SHAPE_CONFIG(HANDLE_OFFSET, 3);

diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp
index a57deb4..6c9fb2d 100644 (file)
--- a/src/ui/resource/FUi_ResourceConfigParser.cpp
+++ b/src/ui/resource/FUi_ResourceConfigParser.cpp
@@ -1836,6 +1836,22 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _SLIDER::UPWARD_OVERLAY_BG_NORMAL_IMAGE);
                }
                {
+                       const char* key ="SLIDER::GROUPED_TOP_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_TOP_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="SLIDER::GROUPED_MIDDLE_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_MIDDLE_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="SLIDER::GROUPED_BOTTOM_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_BOTTOM_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="SLIDER::GROUPED_SINGLE_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _SLIDER::GROUPED_SINGLE_BG_NORMAL_IMAGE);
+               }
+               {
                        const char* key ="SPLITPANEL::DIVIDER_BG_NORMAL";
                        __pImageKeyTable->Add(ResourceKey(key), _SPLITPANEL::DIVIDER_BG_NORMAL_IMAGE);
                }

diff --git a/src/ui/resource/FUi_ResourceSliderConfig.cpp b/src/ui/resource/FUi_ResourceSliderConfig.cpp
index 3b30432..f46fb61 100644 (file)
--- a/src/ui/resource/FUi_ResourceSliderConfig.cpp
+++ b/src/ui/resource/FUi_ResourceSliderConfig.cpp
@@ -60,6 +60,15 @@ START_UI_CONFIG(SLIDER);
        ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_NORMAL, #00_slider_popup_bg.#.png);
        ADD_IMAGE_CONFIG(UPWARD_OVERLAY_BG_EFFECT, #00_slider_popup_bg_ef.#.png);
 
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_NORMAL, #00_list_group_bg_top.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_NORMAL, #00_list_group_bg_center.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_NORMAL, #00_list_group_bg_bottom.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_TOP_BG_EFFECT_NORMAL, #00_list_group_bg_top_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_MIDDLE_BG_EFFECT_NORMAL, #00_list_group_bg_center_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_BOTTOM_BG_EFFECT_NORMAL, #00_list_group_bg_bottom_ef.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_NORMAL, #00_list_group_bg.#.png);
+       ADD_IMAGE_CONFIG(GROUPED_SINGLE_BG_EFFECT_NORMAL, #00_list_group_bg_ef.#.png);
+
        START_UI_CONFIG_MODE(720x1280);
        {
                ADD_SHAPE_CONFIG(HANDLE_WIDTH, 72);