apply theme spec2

Change-Id: Ie865c615f0d30f7fa4c6ada8bedcec7df12c2743

diff --git a/inc/FUiUiConfigurationTypes.h b/inc/FUiUiConfigurationTypes.h
index 53bc462..7cc377f 100755 (executable)
--- a/inc/FUiUiConfigurationTypes.h
+++ b/inc/FUiUiConfigurationTypes.h
@@ -2077,6 +2077,118 @@ struct _OSP_EXPORT_ ColorKey
                * @since  2.1
                */
                _OSP_EXPORT_ static const int DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL;
+
+               /**
+               * The property key to get the normal background color of the button item of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_BG_NORMAL;
+
+               /**
+               * The property key to get the disabled background color of the button item of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_BG_DISABLED;
+
+               /**
+               * The property key to get the pressed background color of the button item of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_BG_PRESSED;
+
+               /**
+               * The property key to get the highlighted background color of the button item of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_BG_HIGHLIGHTED;
+
+               /**
+               * The property key to get the normal background color of the button item of the translucent style of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TRANSLUCENT_BG_NORMAL;
+
+               /**
+               * The property key to get the disabled background color of the button item of the translucent style of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TRANSLUCENT_BG_DISABLED;
+
+               /**
+               * The property key to get the pressed background color of the button item of the translucent style of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TRANSLUCENT_BG_PRESSED;
+
+               /**
+               * The property key to get the highlighted background color of the button item of the translucent style of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED;
+
+               /**
+               * The property key to get the normal text color of the button item of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TEXT_NORMAL;
+
+               /**
+               * The property key to get the disabled text color of the button item of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TEXT_DISABLED;
+
+               /**
+               * The property key to get the pressed text color of the button item of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TEXT_PRESSED;
+
+               /**
+               * The property key to get the highlighted text color of the button item of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TEXT_HIGHLIGHTED;
+
+               /**
+               * The property key to get the normal text color of the button item of the translucent style of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TRANSLUCENT_TEXT_NORMAL;
+
+               /**
+               * The property key to get the disabled text color of the button item of the translucent style of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TRANSLUCENT_TEXT_DISABLED;
+
+               /**
+               * The property key to get the pressed text color of the button item of the translucent style of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TRANSLUCENT_TEXT_PRESSED;
+
+               /**
+               * The property key to get the highlighted text color of the button item of the translucent style of header
+               *
+               * @since  2.1
+               */
+               _OSP_EXPORT_ static const int BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED;
        };
 
        struct _OSP_EXPORT_ IconList

diff --git a/src/ui/FUiUiConfiguration.cpp b/src/ui/FUiUiConfiguration.cpp
index a444f7d..6722737 100644 (file)
--- a/src/ui/FUiUiConfiguration.cpp
+++ b/src/ui/FUiUiConfiguration.cpp
@@ -314,6 +314,22 @@ const int ColorKey::Header::DIVIDER_LINE_LEFT_NORMAL = _HEADER::DIVIDER_LINE_LEF
 const int ColorKey::Header::DIVIDER_LINE_RIGHT_NORMAL = _HEADER::DIVIDER_LINE_RIGHT_NORMAL_COLOR;
 const int ColorKey::Header::DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL = _HEADER::DIVIDER_LINE_LEFT_TRANSLUCENT_NORMAL_COLOR;
 const int ColorKey::Header::DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL = _HEADER::DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_BG_NORMAL = _HEADER::BUTTON_ITEM_BG_NORMAL_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_BG_DISABLED = _HEADER::BUTTON_ITEM_BG_DISABLED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_BG_PRESSED = _HEADER::BUTTON_ITEM_BG_PRESSED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_BG_HIGHLIGHTED = _HEADER::BUTTON_ITEM_BG_HIGHLIGHTED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TRANSLUCENT_BG_NORMAL = _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_NORMAL_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TRANSLUCENT_BG_DISABLED = _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_DISABLED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TRANSLUCENT_BG_PRESSED = _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_PRESSED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED = _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TEXT_NORMAL = _HEADER::BUTTON_ITEM_TEXT_NORMAL_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TEXT_DISABLED = _HEADER::BUTTON_ITEM_TEXT_DISABLED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TEXT_PRESSED = _HEADER::BUTTON_ITEM_TEXT_PRESSED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TEXT_HIGHLIGHTED = _HEADER::BUTTON_ITEM_TEXT_HIGHLIGHTED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TRANSLUCENT_TEXT_NORMAL = _HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_NORMAL_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TRANSLUCENT_TEXT_DISABLED = _HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_DISABLED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TRANSLUCENT_TEXT_PRESSED = _HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_PRESSED_COLOR;
+const int ColorKey::Header::BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED = _HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED_COLOR;
 const int ColorKey::IconList::EMPTY_TEXT_NORMAL = _ICONLIST::EMPTY_TEXT_NORMAL_COLOR;
 const int ColorKey::IconList::TEXT_NORMAL = _ICONLIST::TEXT_NORMAL_COLOR;
 const int ColorKey::IconList::TEXT_PRESSED = _ICONLIST::TEXT_PRESSED_COLOR;

diff --git a/src/ui/controls/FUiCtrl_ButtonImpl.cpp b/src/ui/controls/FUiCtrl_ButtonImpl.cpp
index 0db9071..e3b6a0f 100644 (file)
--- a/src/ui/controls/FUiCtrl_ButtonImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ButtonImpl.cpp
@@ -710,7 +710,7 @@ protected:
                        if (pControl->GetElement(L"NormalBitmapY", elementString))
                        {
                                position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
-                               if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
+                               if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().height - ((Control*) (GetContainer()))->GetBoundsF().y))
                                {
                                        position.y = 0.0f;
                                }
@@ -741,7 +741,7 @@ protected:
                        if (pControl->GetElement(L"PressedBitmapY", elementString))
                        {
                                position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
-                               if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
+                               if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().height - ((Control*) (GetContainer()))->GetBoundsF().y))
                                {
                                        position.y = 0.0f;
                                }
@@ -771,7 +771,7 @@ protected:
                        if (pControl->GetElement(L"DisabledBitmapY", elementString))
                        {
                                position.y = _CoordinateSystemUtils::ConvertToFloat(elementString);
-                               if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().width - ((Control*) (GetContainer()))->GetBoundsF().x))
+                               if (position.y < 0.0f || (position.y > ((Control*) (GetContainer()))->GetBoundsF().height - ((Control*) (GetContainer()))->GetBoundsF().y))
                                {
                                        position.y = 0.0f;
                                }

diff --git a/src/ui/controls/FUiCtrl_CheckButton.cpp b/src/ui/controls/FUiCtrl_CheckButton.cpp
index 569fba4..c2ddb2a 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButton.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButton.cpp
@@ -809,8 +809,8 @@ _CheckButton::LoadDefaultBackgroundBitmap(void)
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
 
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundNormalEffectBitmap);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_SINGLE_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundPressedEffectBitmap);
@@ -818,8 +818,8 @@ _CheckButton::LoadDefaultBackgroundBitmap(void)
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
 
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopNormalEffectBitmap);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_TOP_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundTopPressedEffectBitmap);
@@ -827,8 +827,8 @@ _CheckButton::LoadDefaultBackgroundBitmap(void)
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
 
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddleNormalEffectBitmap);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_MIDDLE_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundMiddlePressedEffectBitmap);
@@ -836,8 +836,8 @@ _CheckButton::LoadDefaultBackgroundBitmap(void)
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
 
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomNormalEffectBitmap);
        r = GET_BITMAP_CONFIG_N(PANEL::GROUPED_BOTTOM_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pBackgroundBottomPressedEffectBitmap);
@@ -887,8 +887,8 @@ _CheckButton::LoadDefaultBackgroundBitmap(void)
        r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_NORMAL]);
        r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_DISABLED]);
        r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_PRESSED]);
-       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
-       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_HIGHLIGHTED]);
+       r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_SELECTED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleBitmap[_CHECK_BUTTON_STATUS_SELECTED]);
 
        r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_EFFECT_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, __pCircleNormalEffectBitmap);
        r = GET_BITMAP_CONFIG_N(CHECKBUTTON::DETAILED_BG_EFFECT_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, __pCirclePressedEffectBitmap);
@@ -1099,7 +1099,7 @@ _CheckButton::SetPropertyHighlightedTextColor(const Variant& color)
 result
 _CheckButton::SetPropertySelectedTextColor(const Variant& color)
 {
-       __highlightedTextColor = color.ToColor();
+       __selectedTextColor = color.ToColor();
        return E_SUCCESS;
 }
 
@@ -1130,7 +1130,7 @@ _CheckButton::GetPropertyHighlightedTextColor(void) const
 Variant
 _CheckButton::GetPropertySelectedTextColor(void) const
 {
-       return Variant(__highlightedTextColor);
+       return Variant(__selectedTextColor);
 }
 
 result

diff --git a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
index 6b9c6f0..3dbdeba 100644 (file)
--- a/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_CheckButtonPresenter.cpp
@@ -382,7 +382,7 @@ _CheckButtonPresenter::DrawBackground(void)
        {
                if (backgroundStyle == BACKGROUND_STYLE_NONE)
                {
-                       pCanvas->SetBackgroundColor(Color(0, 0, 0, 0));// kmj
+                       pCanvas->SetBackgroundColor(__pCheckButton->GetColor(_CHECK_BUTTON_STATUS_PRESSED));
                        pCanvas->Clear();
                }
                else
@@ -591,9 +591,6 @@ _CheckButtonPresenter::DrawCheckBitmap(void)
        Bitmap* pReplacementColorBackgroundBitmap = null;
        Bitmap* pReplacementColorTextBitmap = null;
 
-
-
-
        _CheckButtonStatus checkStatus = __pCheckButton->GetCheckButtonStatus();
        CheckButtonStyle checkStyle = __pCheckButton->GetCheckButtonStyle();
 

diff --git a/src/ui/controls/FUiCtrl_FooterImpl.cpp b/src/ui/controls/FUiCtrl_FooterImpl.cpp
index ba5c2de..8d0a5f9 100644 (file)
--- a/src/ui/controls/FUiCtrl_FooterImpl.cpp
+++ b/src/ui/controls/FUiCtrl_FooterImpl.cpp
@@ -647,7 +647,7 @@ _FooterImpl::SetBackButton(void)
        }
        if (pBackIconHighlightedEffectBitmap)
        {
-               pButton->SetEffectBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pBackIconHighlightedEffectBitmap);
+               pButton->SetEffectBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint(0.0f, 0.0f), *pBackIconHighlightedEffectBitmap);
                delete pBackIconHighlightedEffectBitmap;
        }
 
@@ -1040,9 +1040,9 @@ _FooterImpl::ConvertButtonItem(const ButtonItem& buttonItem)
                pIconBitmap->Scale(FloatDimension(iconSize, iconSize));
 
                pButton->SetBitmap(_BUTTON_STATUS_NORMAL, FloatPoint(0.0f, 0.0f), *pIconBitmap);
+               pButton->SetBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pIconBitmap);
                pButton->SetBitmap(_BUTTON_STATUS_PRESSED, FloatPoint(0.0f, 0.0f), *pIconBitmap);
                pButton->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED, FloatPoint(0.0f, 0.0f), *pIconBitmap);
-               pButton->SetBitmap(_BUTTON_STATUS_DISABLED, FloatPoint(0.0f, 0.0f), *pIconBitmap);
        }
 
        pIconBitmap = const_cast<Bitmap*>(buttonItem.__pImpl->GetIcon(BUTTON_ITEM_STATUS_PRESSED));
@@ -1073,9 +1073,16 @@ _FooterImpl::ConvertButtonItem(const ButtonItem& buttonItem)
        }
 
        Bitmap* pNormalBackgroundBitmap = null;
+       Bitmap* pDisabledBackgroundBitmap = null;
+       Bitmap* pPressedBackgroundBitmap = null;
+       Bitmap* pHighlightedBackgroundBitmap = null;
+
        Bitmap* pColorReplacedBitmap = null;
 
        GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundBitmap);
+       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundBitmap);
+       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundBitmap);
+       GET_BITMAP_CONFIG_N(FOOTER::BUTTON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
 
        if (pNormalBackgroundBitmap)
        {
@@ -1088,10 +1095,30 @@ _FooterImpl::ConvertButtonItem(const ButtonItem& buttonItem)
                }
 
                pButton->SetBackgroundBitmap(_BUTTON_STATUS_NORMAL, *pColorReplacedBitmap);
+               
                delete pColorReplacedBitmap;
+               delete pNormalBackgroundBitmap;
+       }
 
+       if (pDisabledBackgroundBitmap)
+       {
+               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDisabledBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+                               GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED));
 
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pNormalBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+               if (GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED).GetAlpha() != 0xFF)
+               {
+                       pColorReplacedBitmap->SetAlphaConstant(GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED).GetAlpha());
+               }
+
+               pButton->SetBackgroundBitmap(_BUTTON_STATUS_DISABLED, *pColorReplacedBitmap);
+               
+               delete pColorReplacedBitmap;
+               delete pDisabledBackgroundBitmap;
+       }
+
+       if (pPressedBackgroundBitmap)
+       {
+               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pPressedBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                GetCore().GetButtonColor(_BUTTON_STATUS_PRESSED));
 
                if (GetCore().GetButtonColor(_BUTTON_STATUS_PRESSED).GetAlpha() != 0xFF)
@@ -1100,10 +1127,14 @@ _FooterImpl::ConvertButtonItem(const ButtonItem& buttonItem)
                }
 
                pButton->SetBackgroundBitmap(_BUTTON_STATUS_PRESSED, *pColorReplacedBitmap);
+               
                delete pColorReplacedBitmap;
+               delete pPressedBackgroundBitmap;
+       }
 
-
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pNormalBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+       if (pHighlightedBackgroundBitmap)
+       {
+               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pHighlightedBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                GetCore().GetButtonColor(_BUTTON_STATUS_HIGHLIGHTED));
 
                if (GetCore().GetButtonColor(_BUTTON_STATUS_HIGHLIGHTED).GetAlpha() != 0xFF)
@@ -1112,23 +1143,9 @@ _FooterImpl::ConvertButtonItem(const ButtonItem& buttonItem)
                }
 
                pButton->SetBackgroundBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pColorReplacedBitmap);
+               
                delete pColorReplacedBitmap;
-
-
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pNormalBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED));
-
-               if (GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED).GetAlpha() != 0xFF)
-               {
-                       pColorReplacedBitmap->SetAlphaConstant(GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED).GetAlpha());
-               }
-
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_DISABLED, *pColorReplacedBitmap);
-
-
-               delete pColorReplacedBitmap;
-
-               delete pNormalBackgroundBitmap;
+               delete pHighlightedBackgroundBitmap;
        }
 
        if (buttonItem.__pImpl->GetBackgroundBitmap(BUTTON_ITEM_STATUS_NORMAL) != null)

diff --git a/src/ui/controls/FUiCtrl_Form.cpp b/src/ui/controls/FUiCtrl_Form.cpp
index 9ba1e0f..b4ef4ea 100644 (file)
--- a/src/ui/controls/FUiCtrl_Form.cpp
+++ b/src/ui/controls/FUiCtrl_Form.cpp
@@ -1282,7 +1282,7 @@ _Form::UpdateSoftkey(unsigned long formStyle)
 
                                if (__pSoftkeyHighlightedIcon[_SOFTKEY_0])
                                {
-                                       __pFooter->GetButton(LEFT_BUTTON)->SetBitmap(_BUTTON_STATUS_PRESSED,
+                                       __pFooter->GetButton(LEFT_BUTTON)->SetBitmap(_BUTTON_STATUS_HIGHLIGHTED,
                                                        FloatPoint((__pFooter->GetButton(LEFT_BUTTON)->GetSizeF().width - __pSoftkeyHighlightedIcon[_SOFTKEY_0]->GetWidthF()) / 2,
                                                                        (__pFooter->GetButton(LEFT_BUTTON)->GetSizeF().height - __pSoftkeyHighlightedIcon[_SOFTKEY_0]->GetHeightF()) / 2 + softkeyIconGap), *__pSoftkeyHighlightedIcon[_SOFTKEY_0]);
                                }

diff --git a/src/ui/controls/FUiCtrl_HeaderImpl.cpp b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
index d7a4c30..bd64e37 100644 (file)
--- a/src/ui/controls/FUiCtrl_HeaderImpl.cpp
+++ b/src/ui/controls/FUiCtrl_HeaderImpl.cpp
@@ -1401,9 +1401,16 @@ _HeaderImpl::ConvertButtonItem(const ButtonItem& buttonItem)
        }
 
        Bitmap* pNormalBackgroundBitmap = null;
+       Bitmap* pDisabledBackgroundBitmap = null;
+       Bitmap* pPressedBackgroundBitmap = null;
+       Bitmap* pHighlightedBackgroundBitmap = null;
+
        Bitmap* pColorReplacedBitmap = null;
 
        GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_NORMAL, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBackgroundBitmap);
+       GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledBackgroundBitmap);
+       GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_PRESSED, BITMAP_PIXEL_FORMAT_ARGB8888, pPressedBackgroundBitmap);
+       GET_BITMAP_CONFIG_N(HEADER::BUTTON_BG_HIGHLIGHTED, BITMAP_PIXEL_FORMAT_ARGB8888, pHighlightedBackgroundBitmap);
 
        if (pNormalBackgroundBitmap)
        {
@@ -1416,10 +1423,30 @@ _HeaderImpl::ConvertButtonItem(const ButtonItem& buttonItem)
                }
 
                pButton->SetBackgroundBitmap(_BUTTON_STATUS_NORMAL, *pColorReplacedBitmap);
+               
                delete pColorReplacedBitmap;
+               delete pNormalBackgroundBitmap;
+       }
 
+       if (pDisabledBackgroundBitmap)
+       {
+               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pDisabledBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+                               GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED));
 
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pNormalBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+               if (GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED).GetAlpha() != 0xFF)
+               {
+                       pColorReplacedBitmap->SetAlphaConstant(GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED).GetAlpha());
+               }
+
+               pButton->SetBackgroundBitmap(_BUTTON_STATUS_DISABLED, *pColorReplacedBitmap);
+               
+               delete pColorReplacedBitmap;
+               delete pDisabledBackgroundBitmap;
+       }
+
+       if (pPressedBackgroundBitmap)
+       {
+               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pPressedBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                GetCore().GetButtonColor(_BUTTON_STATUS_PRESSED));
 
                if (GetCore().GetButtonColor(_BUTTON_STATUS_PRESSED).GetAlpha() != 0xFF)
@@ -1428,10 +1455,14 @@ _HeaderImpl::ConvertButtonItem(const ButtonItem& buttonItem)
                }
 
                pButton->SetBackgroundBitmap(_BUTTON_STATUS_PRESSED, *pColorReplacedBitmap);
+               
                delete pColorReplacedBitmap;
+               delete pPressedBackgroundBitmap;
+       }
 
-
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pNormalBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
+       if (pHighlightedBackgroundBitmap)
+       {
+               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pHighlightedBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
                                GetCore().GetButtonColor(_BUTTON_STATUS_HIGHLIGHTED));
 
                if (GetCore().GetButtonColor(_BUTTON_STATUS_HIGHLIGHTED).GetAlpha() != 0xFF)
@@ -1440,22 +1471,9 @@ _HeaderImpl::ConvertButtonItem(const ButtonItem& buttonItem)
                }
 
                pButton->SetBackgroundBitmap(_BUTTON_STATUS_HIGHLIGHTED, *pColorReplacedBitmap);
+               
                delete pColorReplacedBitmap;
-
-
-               pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pNormalBackgroundBitmap, Color::GetColor(COLOR_ID_MAGENTA),
-                               GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED));
-
-               if (GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED).GetAlpha() != 0xFF)
-               {
-                       pColorReplacedBitmap->SetAlphaConstant(GetCore().GetButtonColor(_BUTTON_STATUS_DISABLED).GetAlpha());
-               }
-
-               pButton->SetBackgroundBitmap(_BUTTON_STATUS_DISABLED, *pColorReplacedBitmap);
-
-               delete pColorReplacedBitmap;
-
-               delete pNormalBackgroundBitmap;
+               delete pHighlightedBackgroundBitmap;
        }
 
        if (buttonItem.__pImpl->GetBackgroundBitmap(BUTTON_ITEM_STATUS_NORMAL) != null)

diff --git a/src/ui/controls/FUiCtrl_Toolbar.cpp b/src/ui/controls/FUiCtrl_Toolbar.cpp
index 81658b4..12b50ae 100644 (file)
--- a/src/ui/controls/FUiCtrl_Toolbar.cpp
+++ b/src/ui/controls/FUiCtrl_Toolbar.cpp
@@ -3152,10 +3152,10 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                if (__transparent == true)
                {
                        pButton->SetTextColor(_BUTTON_STATUS_NORMAL, __buttonTransTextColor[_BUTTON_STATUS_NORMAL]);
+                       pButton->SetTextColor(_BUTTON_STATUS_DISABLED, __buttonTransTextColor[_BUTTON_STATUS_DISABLED]);
                        pButton->SetTextColor(_BUTTON_STATUS_PRESSED, __buttonTransTextColor[_BUTTON_STATUS_PRESSED]);
                        pButton->SetTextColor(_BUTTON_STATUS_HIGHLIGHTED, __buttonTransTextColor[_BUTTON_STATUS_HIGHLIGHTED]);
-                       pButton->SetTextColor(_BUTTON_STATUS_DISABLED, __buttonTransTextColor[_BUTTON_STATUS_DISABLED]);
-
+                       
                        if (pNormalBackgroundBitmap)
                        {
                                pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pNormalBackgroundBitmap,
@@ -3199,10 +3199,10 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                else
                {
                        pButton->SetTextColor(_BUTTON_STATUS_NORMAL, __buttonTextColor[_BUTTON_STATUS_NORMAL]);
+                       pButton->SetTextColor(_BUTTON_STATUS_DISABLED, __buttonTextColor[_BUTTON_STATUS_DISABLED]);
                        pButton->SetTextColor(_BUTTON_STATUS_PRESSED, __buttonTextColor[_BUTTON_STATUS_PRESSED]);
                        pButton->SetTextColor(_BUTTON_STATUS_HIGHLIGHTED, __buttonTextColor[_BUTTON_STATUS_HIGHLIGHTED]);
-                       pButton->SetTextColor(_BUTTON_STATUS_DISABLED, __buttonTextColor[_BUTTON_STATUS_DISABLED]);
-
+                       
                        if (pNormalBackgroundBitmap)
                        {
                                pColorReplacedBitmap = _BitmapImpl::GetColorReplacedBitmapN(*pNormalBackgroundBitmap,
@@ -3529,9 +3529,9 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                if (__transparent == true)
                {
                        pButton->SetTextColor(_BUTTON_STATUS_NORMAL, __itemTransTextColor[_BUTTON_STATUS_NORMAL]);
+                       pButton->SetTextColor(_BUTTON_STATUS_DISABLED, __itemTransTextColor[_BUTTON_STATUS_DISABLED]);
                        pButton->SetTextColor(_BUTTON_STATUS_PRESSED, __itemTransTextColor[_BUTTON_STATUS_PRESSED]);
                        pButton->SetTextColor(_BUTTON_STATUS_HIGHLIGHTED, __itemTransTextColor[_BUTTON_STATUS_HIGHLIGHTED]);
-                       pButton->SetTextColor(_BUTTON_STATUS_DISABLED, __itemTransTextColor[_BUTTON_STATUS_DISABLED]);
                        pButton->SetTextColor(_BUTTON_STATUS_SELECTED, __itemTransTextColor[_BUTTON_STATUS_SELECTED]);
 
                        if (pNormalBackgroundBitmap)
@@ -3587,9 +3587,9 @@ _Toolbar::ApplyUserGUI(ButtonType buttonType, _Button* pButton)
                else
                {
                        pButton->SetTextColor(_BUTTON_STATUS_NORMAL, __itemTextColor[_BUTTON_STATUS_NORMAL]);
+                       pButton->SetTextColor(_BUTTON_STATUS_DISABLED, __itemTextColor[_BUTTON_STATUS_DISABLED]);
                        pButton->SetTextColor(_BUTTON_STATUS_PRESSED, __itemTextColor[_BUTTON_STATUS_PRESSED]);
                        pButton->SetTextColor(_BUTTON_STATUS_HIGHLIGHTED, __itemTextColor[_BUTTON_STATUS_HIGHLIGHTED]);
-                       pButton->SetTextColor(_BUTTON_STATUS_DISABLED, __itemTextColor[_BUTTON_STATUS_DISABLED]);
                        pButton->SetTextColor(_BUTTON_STATUS_SELECTED, __itemTextColor[_BUTTON_STATUS_SELECTED]);
 
                        if (pNormalBackgroundBitmap)

diff --git a/src/ui/inc/FUiCtrl_CheckButton.h b/src/ui/inc/FUiCtrl_CheckButton.h
index 5a6c0e8..974ffa1 100644 (file)
--- a/src/ui/inc/FUiCtrl_CheckButton.h
+++ b/src/ui/inc/FUiCtrl_CheckButton.h
@@ -68,14 +68,17 @@ class _OSP_EXPORT_ _CheckButton
                DECLARE_PROPERTY("disabledColor", GetPropertyDisabledColor, SetPropertyDisabledColor);
                DECLARE_PROPERTY("pressedColor", GetPropertyPressedColor, SetPropertyPressedColor);
                DECLARE_PROPERTY("highlightedColor", GetPropertyHighlightedColor, SetPropertyHighlightedColor);
+               DECLARE_PROPERTY("selectedColor", GetPropertySelectedColor, SetPropertySelectedColor);
                DECLARE_PROPERTY("normalTextColor", GetPropertyNormalTextColor, SetPropertyNormalTextColor);
                DECLARE_PROPERTY("disabledTextColor", GetPropertyDisabledTextColor, SetPropertyDisabledTextColor);
                DECLARE_PROPERTY("pressedTextColor", GetPropertyPressedTextColor, SetPropertyPressedTextColor);
                DECLARE_PROPERTY("highlightedTextColor", GetPropertyHighlightedTextColor, SetPropertyHighlightedTextColor);
+               DECLARE_PROPERTY("selectedTextColor", GetPropertySelectedTextColor, SetPropertySelectedTextColor);
                DECLARE_PROPERTY("normalTitleTextColor", GetPropertyNormalTitleTextColor, SetPropertyNormalTitleTextColor);
                DECLARE_PROPERTY("disabledTitleTextColor", GetPropertyDisabledTitleTextColor, SetPropertyDisabledTitleTextColor);
                DECLARE_PROPERTY("pressedTitleTextColor", GetPropertyPressedTitleTextColor, SetPropertyPressedTitleTextColor);
                DECLARE_PROPERTY("highlightedTitleTextColor", GetPropertyHighlightedTitleTextColor, SetPropertyHighlightedTitleTextColor);
+               DECLARE_PROPERTY("selectedTitleTextColor", GetPropertySelectedTitleTextColor, SetPropertySelectedTitleTextColor);
                DECLARE_PROPERTY("checkedActionId", GetPropertyCheckedActionId, SetPropertyCheckedActionId);
                DECLARE_PROPERTY("uncheckedActionId", GetPropertyUncheckedActionId, SetPropertyUncheckedActionId);
                DECLARE_PROPERTY("selectedActionId", GetPropertySelectedActionId, SetPropertySelectedActionId);

diff --git a/src/ui/inc/FUi_ResourceFooterConfig.h b/src/ui/inc/FUi_ResourceFooterConfig.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/ui/inc/FUi_ResourceHeaderConfig.h b/src/ui/inc/FUi_ResourceHeaderConfig.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp
index beb851f..8344650 100755 (executable)
--- a/src/ui/resource/FUi_ResourceConfigParser.cpp
+++ b/src/ui/resource/FUi_ResourceConfigParser.cpp
@@ -1318,6 +1318,82 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_BG_SELECTED_IMAGE);
                }
                {
+                       const char* key ="FOOTER::TAB_ITEM_TRANSLUCENT_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_TRANSLUCENT_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::TAB_ITEM_TRANSLUCENT_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_TRANSLUCENT_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::TAB_ITEM_TRANSLUCENT_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_TRANSLUCENT_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::TAB_ITEM_TRANSLUCENT_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_TRANSLUCENT_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::BUTTON_TRANSLUCENT_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::BUTTON_TRANSLUCENT_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::BUTTON_TRANSLUCENT_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::BUTTON_TRANSLUCENT_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::BUTTON_TRANSLUCENT_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::BUTTON_TRANSLUCENT_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="FOOTER::BUTTON_TRANSLUCENT_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _FOOTER::BUTTON_TRANSLUCENT_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
                        const char* key ="HEADER::BG_NORMAL";
                        __pImageKeyTable->Add(ResourceKey(key), _HEADER::BG_NORMAL_IMAGE);
                }
@@ -1354,6 +1430,134 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _HEADER::DIVIDER_LINE_TRANSLUCENT_NORMAL_IMAGE);
                }
                {
+                       const char* key ="HEADER::TAB_ITEM_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::TAB_ITEM_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::TAB_ITEM_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::TAB_ITEM_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::TAB_ITEM_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::TAB_ITEM_TRANSLUCENT_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_TRANSLUCENT_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::TAB_ITEM_TRANSLUCENT_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_TRANSLUCENT_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::TAB_ITEM_TRANSLUCENT_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_TRANSLUCENT_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::TAB_ITEM_TRANSLUCENT_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_TRANSLUCENT_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_TRANSLUCENT_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_SELECTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::SEGMENTED_ITEM_TRANSLUCENT_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_TRANSLUCENT_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_TRANSLUCENT_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_TRANSLUCENT_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_TRANSLUCENT_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_TRANSLUCENT_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_TRANSLUCENT_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_TRANSLUCENT_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_TRANSLUCENT_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_BG_NORMAL";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_NORMAL_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_DISABLED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_BG_PRESSED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_PRESSED_IMAGE);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED";
+                       __pImageKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED_IMAGE);
+               }
+               {
                        const char* key ="ICONLIST::CHECK_BG_NORMAL";
                        __pImageKeyTable->Add(ResourceKey(key), _ICONLIST::CHECK_BG_NORMAL_IMAGE);
                }
@@ -3046,24 +3250,68 @@ ConfigParser::GetColorKeyTable(void)
                        __pColorKeyTable->Add(ResourceKey(key), _HEADER::DIVIDER_LINE_RIGHT_TRANSLUCENT_NORMAL_COLOR);
                }
                {
-                       const char* key ="HEADER::TAB_ITEM_BG_NORMAL";
-                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_NORMAL_COLOR);
+                       const char* key ="HEADER::BUTTON_ITEM_BG_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_BG_NORMAL_COLOR);
                }
                {
-                       const char* key ="HEADER::TAB_ITEM_BG_DISABLED";
-                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_DISABLED_COLOR);
+                       const char* key ="HEADER::BUTTON_ITEM_BG_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_BG_DISABLED_COLOR);
                }
                {
-                       const char* key ="HEADER::TAB_ITEM_BG_PRESSED";
-                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_PRESSED_COLOR);
+                       const char* key ="HEADER::BUTTON_ITEM_BG_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_BG_PRESSED_COLOR);
                }
                {
-                       const char* key ="HEADER::TAB_ITEM_BG_HIGHLIGHTED";
-                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_HIGHLIGHTED_COLOR);
+                       const char* key ="HEADER::BUTTON_ITEM_BG_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_BG_HIGHLIGHTED_COLOR);
                }
                {
-                       const char* key ="HEADER::TAB_ITEM_BG_SELECTED";
-                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::TAB_ITEM_BG_SELECTED_COLOR);
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_BG_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_NORMAL_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_BG_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_DISABLED_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_BG_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_PRESSED_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_BG_HIGHLIGHTED_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TEXT_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TEXT_NORMAL_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TEXT_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TEXT_DISABLED_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TEXT_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TEXT_PRESSED_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TEXT_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TEXT_HIGHLIGHTED_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_NORMAL";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_NORMAL_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_DISABLED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_DISABLED_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_PRESSED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_PRESSED_COLOR);
+               }
+               {
+                       const char* key ="HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED";
+                       __pColorKeyTable->Add(ResourceKey(key), _HEADER::BUTTON_ITEM_TRANSLUCENT_TEXT_HIGHLIGHTED_COLOR);
                }
                {
                        const char* key ="ICONLIST::EMPTY_TEXT_NORMAL";

diff --git a/src/ui/resource/FUi_ResourceFooterConfig.cpp b/src/ui/resource/FUi_ResourceFooterConfig.cpp
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/ui/resource/FUi_ResourceHeaderConfig.cpp b/src/ui/resource/FUi_ResourceHeaderConfig.cpp
old mode 100755 (executable)
new mode 100644 (file)