BlackTheme UX 4.4 for TableView, List (tizen_2.2)

Change-Id: I7d1d65a972af49a949c63a4efa9e1a1344685a82
Signed-off-by: katpaga.a <katpaga.a@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_ListBaseImpl.cpp b/src/ui/controls/FUiCtrl_ListBaseImpl.cpp
index 88b32f9..fbdb1a2 100644 (file)
--- a/src/ui/controls/FUiCtrl_ListBaseImpl.cpp
+++ b/src/ui/controls/FUiCtrl_ListBaseImpl.cpp
@@ -234,34 +234,35 @@ _ListBaseImpl::LoadDefaultBitmap(void)
        }
        else if (_annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING || _annexStyle == TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING_WITH_DIVIDER)
        {
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pHandlerBitmap);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pHandlerBitmap);
                SysTryReturnResult(NID_UI_CTRL, (r == E_SUCCESS), r, GetErrorMessage(r), "[%s] Propagating.", GetErrorMessage(r));
 
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBitmap);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_BG, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBitmap);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                _pCheckBitmaps[BITMAP_UNCHECKED] = CreateOnOffMergedBitmapN(*pNormalBitmap, *pHandlerBitmap, CHECK_BOX_UNCHECKED);
 
-               delete pNormalBitmap;
-               pNormalBitmap = null;
+               delete pHandlerBitmap;
+               pHandlerBitmap = null;
 
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON, BITMAP_PIXEL_FORMAT_ARGB8888, pNormalBitmap);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pHandlerBitmap);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
+
                _pCheckBitmaps[BITMAP_CHECKED] = CreateOnOffMergedBitmapN(*pNormalBitmap, *pHandlerBitmap, CHECK_BOX_CHECKED);
 
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledNormalBitmap);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledNormalBitmap);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledHandlerBitmap);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledHandlerBitmap);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                _pCheckBitmaps[BITMAP_CHECKED_DISABLED] = CreateOnOffMergedBitmapN(*pDisabledNormalBitmap, *pDisabledHandlerBitmap, CHECK_BOX_CHECKED);
 
-               delete pDisabledNormalBitmap;
-               pDisabledNormalBitmap = null;
+               delete pDisabledHandlerBitmap;
+               pDisabledHandlerBitmap = null;
 
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledNormalBitmap);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pDisabledHandlerBitmap);
                SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS), , r, "[%s] Propagating.", GetErrorMessage(r));
 
                _pCheckBitmaps[BITMAP_UNCHECKED_DISABLED] = CreateOnOffMergedBitmapN(*pDisabledNormalBitmap, *pDisabledHandlerBitmap, CHECK_BOX_UNCHECKED);

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index e635ed2..faab9f0 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -2735,35 +2735,35 @@ _TableViewItem::DrawOnOffButton(void)
        {
                if(__enabledState)
                {
-                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
+                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
                }
                else
                {
-                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
+                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
                }
        }
        else
        {
                if(__enabledState)
                {
-                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
+                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
                }
                else
                {
-                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
+                       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
                }
        }
-       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButton != null), , E_SYSTEM, "[E_SYSTEM] OnOffButton_On image load failed");
+       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButtonHandler != null), , E_SYSTEM, "[E_SYSTEM] OnOffButtonHandler image load failed");
 
        if(__enabledState)
        {
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_BG, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
        }
        else
        {
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_BG_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
        }
-       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButtonHandler != null), , E_SYSTEM, "[E_SYSTEM] OnOffHandlerButton button image load failed");
+       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButton != null), , E_SYSTEM, "[E_SYSTEM] OnOffButton image load failed");
 
        GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
        GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight);
@@ -2784,12 +2784,10 @@ _TableViewItem::DrawOnOffButton(void)
        if (IsChecked() == true)
        {
                handlerBounds.x = backgroundBounds.width - handlerBounds.width - annexMargin;
-               handlerBounds.y  = backgroundBounds.y - annexMargin;
        }
        else
        {
                handlerBounds.x = backgroundBounds.x + annexMargin;
-               handlerBounds.y  = backgroundBounds.y - annexMargin;
        }
 
        DrawBitmap(*pCanvas, handlerBounds, *pOnOffButtonHandler);
@@ -2828,8 +2826,15 @@ _TableViewItem::AdjustAnnexOnOffHandlerPosition()
        GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_MARGIN, _CONTROL_ORIENTATION_PORTRAIT, annexMargin);
 
        Bitmap* pOnOffButtonHandler = null;
-       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
-       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButtonHandler != null), , E_SYSTEM, "[E_SYSTEM] OnOffHandlerButton button image load failed");
+       if (IsChecked() == true)
+       {
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
+       }
+       else
+       {
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
+       }
+       SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButtonHandler != null), E_SYSTEM, "[E_SYSTEM] OnOffHandlerButton button image load failed.");
 
        GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
        GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight);
@@ -2899,18 +2904,18 @@ _TableViewItem::DrawAnnexOnOffHandler(float touchEndPosition)
        float annexX = 0.0f;
        float nextHandlerX = 0.0f;
 
-       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
-       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButtonHandler != null), , E_SYSTEM, "[E_SYSTEM] OnOffHandlerButton button image load failed");
+       r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_BG, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
+       SysTryReturnVoidResult(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButton != null), E_SYSTEM, "[E_SYSTEM] OnOffButton image load failed.");
 
        if (IsChecked() == true)
        {
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_ON_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
        }
        else
        {
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButton);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_OFF_HANDLER, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
        }
-       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButton != null), , E_SYSTEM, "[E_SYSTEM] OnOffButton_On image load failed");
+       SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButtonHandler != null), , E_SYSTEM, "[E_SYSTEM] OnOffHandlerButton image load failed");
 
        GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_WIDTH, _CONTROL_ORIENTATION_PORTRAIT, annexWidth);
        GET_SHAPE_CONFIG(TABLEVIEW::ITEM_ANNEX_ONOFF_HEIGHT, _CONTROL_ORIENTATION_PORTRAIT, annexHeight);
@@ -2927,7 +2932,7 @@ _TableViewItem::DrawAnnexOnOffHandler(float touchEndPosition)
        DrawBitmap(*pCanvas, backgroundBounds, *pOnOffButton);
 
        handlerBounds = CalculateAnnexBitmapBounds(annexWidth, annexHeight, *pOnOffButtonHandler);
-       handlerBounds.y  = backgroundBounds.y - annexMargin;
+       handlerBounds.y  = backgroundBounds.y;
 
        if(IsChecked())
        {

diff --git a/src/ui/inc/FUi_ResourceTableViewConfig.h b/src/ui/inc/FUi_ResourceTableViewConfig.h
index c706955..ed1955d 100644 (file)
--- a/src/ui/inc/FUi_ResourceTableViewConfig.h
+++ b/src/ui/inc/FUi_ResourceTableViewConfig.h
@@ -88,9 +88,9 @@ DECLARE_UI_CONFIG(TABLEVIEW);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_NORMAL, 23);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_PRESSED, 24);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_SELECTED, 25);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_ON, 26);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_OFF, 27);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_HANDLER, 28);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_ON_HANDLER, 26);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_OFF_HANDLER, 27);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_BG, 28);
        DECLARE_IMAGE_CONFIG(CIRCLE_BUTTON_BG_NORMAL, 29);
        DECLARE_IMAGE_CONFIG(CIRCLE_BUTTON_BG_PRESSED, 30);
        DECLARE_IMAGE_CONFIG(CIRCLE_BUTTON_BG_HIGHLIGHTED, 31);
@@ -103,9 +103,9 @@ DECLARE_UI_CONFIG(TABLEVIEW);
        DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DISABLED, 38);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_NORMAL_DISABLED, 39);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_SELECTED_DISABLED, 40);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_ON_DISABLED, 41);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_OFF_DISABLED, 42);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_HANDLER_DISABLED, 43);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_ON_HANDLER_DISABLED, 41);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_OFF_HANDLER_DISABLED, 42);
+       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_BG_DISABLED, 43);
        DECLARE_IMAGE_CONFIG(CIRCLE_BUTTON_BG_EFFECT_DISABLED, 44);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_NORMAL, 45);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DISABLED, 46);

diff --git a/src/ui/resource/FUi_ResourceConfigParser.cpp b/src/ui/resource/FUi_ResourceConfigParser.cpp
index a35ba57..b3def06 100644 (file)
--- a/src/ui/resource/FUi_ResourceConfigParser.cpp
+++ b/src/ui/resource/FUi_ResourceConfigParser.cpp
@@ -2128,28 +2128,28 @@ ConfigParser::GetImageKeyTable(void)
                        __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::RADIOBUTTON_SELECTED_DISABLED_IMAGE);
                }
                {
-                       const char* key ="TABLEVIEW::ONOFFBUTTON_ON";
-                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_ON_IMAGE);
+                       const char* key ="TABLEVIEW::ONOFFBUTTON_ON_HANDLER";
+                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_ON_HANDLER_IMAGE);
                }
                {
-                       const char* key ="TABLEVIEW::ONOFFBUTTON_ON_DISABLED";
-                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_ON_DISABLED_IMAGE);
+                       const char* key ="TABLEVIEW::ONOFFBUTTON_ON_HANDLER_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_ON_HANDLER_DISABLED_IMAGE);
                }
                {
-                       const char* key ="TABLEVIEW::ONOFFBUTTON_OFF";
-                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_OFF_IMAGE);
+                       const char* key ="TABLEVIEW::ONOFFBUTTON_OFF_HANDLER";
+                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_OFF_HANDLER_IMAGE);
                }
                {
-                       const char* key ="TABLEVIEW::ONOFFBUTTON_OFF_DISABLED";
-                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_OFF_DISABLED_IMAGE);
+                       const char* key ="TABLEVIEW::ONOFFBUTTON_OFF_HANDLER_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_OFF_HANDLER_DISABLED_IMAGE);
                }
                {
-                       const char* key ="TABLEVIEW::ONOFFBUTTON_HANDLER";
-                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_HANDLER_IMAGE);
+                       const char* key ="TABLEVIEW::ONOFFBUTTON_BG";
+                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_BG_IMAGE);
                }
                {
-                       const char* key ="TABLEVIEW::ONOFFBUTTON_HANDLER_DISABLED";
-                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_HANDLER_DISABLED_IMAGE);
+                       const char* key ="TABLEVIEW::ONOFFBUTTON_BG_DISABLED";
+                       __pImageKeyTable->Add(ResourceKey(key), _TABLEVIEW::ONOFFBUTTON_BG_DISABLED_IMAGE);
                }
                {
                        const char* key ="TABLEVIEW::CIRCLE_BUTTON_BG_NORMAL";

diff --git a/src/ui/resource/FUi_ResourceTableViewConfig.cpp b/src/ui/resource/FUi_ResourceTableViewConfig.cpp
index 00e8f9d..afa3f2c 100644 (file)
--- a/src/ui/resource/FUi_ResourceTableViewConfig.cpp
+++ b/src/ui/resource/FUi_ResourceTableViewConfig.cpp
@@ -81,20 +81,20 @@ START_UI_CONFIG(TABLEVIEW);
        ADD_IMAGE_CONFIG(CHECKBOX_BG_PRESSED, #00_check_press_bg.png);
        ADD_IMAGE_CONFIG(CHECKBOX_BG_HIGHLIGHTED, #00_check_press_bg.png);
        ADD_IMAGE_CONFIG(CHECKBOX_BG_DISABLED, #00_check_dim_bg.png);
-       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_NORMAL, #00_check_Activated.png);
-       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DISABLED, #00_check_Activated_dim.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_NORMAL, #00_check_activated.png);
+       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DISABLED, #00_check_activated_dim.png);
        ADD_IMAGE_CONFIG(RADIOBUTTON_NORMAL, #00_button_radio_bg.png);
        ADD_IMAGE_CONFIG(RADIOBUTTON_PRESSED, #00_button_radio_press_bg.png);
        ADD_IMAGE_CONFIG(RADIOBUTTON_NORMAL_DISABLED, #00_button_radio_dim_bg.png);
-       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_NORMAL, #00_button_radio_Activated.png);
-       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DISABLED, #00_button_radio_Activated_dim.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_NORMAL, #00_button_radio_activated.png);
+       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DISABLED, #00_button_radio_activated_dim.png);
        ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_PRESSED, #00_button_radio_press.png);
-       ADD_IMAGE_CONFIG(ONOFFBUTTON_ON, #00_button_on.png);
-       ADD_IMAGE_CONFIG(ONOFFBUTTON_ON_DISABLED, #00_button_on_dim.png);
-       ADD_IMAGE_CONFIG(ONOFFBUTTON_OFF, #00_button_off.png);
-       ADD_IMAGE_CONFIG(ONOFFBUTTON_OFF_DISABLED, #00_button_off_dim.png);
-       ADD_IMAGE_CONFIG(ONOFFBUTTON_HANDLER, #00_button_on_off_handler.png);
-       ADD_IMAGE_CONFIG(ONOFFBUTTON_HANDLER_DISABLED, #00_button_on_off_handler_dim.png);
+       ADD_IMAGE_CONFIG(ONOFFBUTTON_ON_HANDLER, #00_button_on_handler.png);
+       ADD_IMAGE_CONFIG(ONOFFBUTTON_ON_HANDLER_DISABLED, #00_button_on_handler_dim.png);
+       ADD_IMAGE_CONFIG(ONOFFBUTTON_OFF_HANDLER, #00_button_off_handler.png);
+       ADD_IMAGE_CONFIG(ONOFFBUTTON_OFF_HANDLER_DISABLED, #00_button_off_handler_dim.png);
+       ADD_IMAGE_CONFIG(ONOFFBUTTON_BG, #00_button_on_off_bg.png);
+       ADD_IMAGE_CONFIG(ONOFFBUTTON_BG_DISABLED, #00_button_on_off_bg_dim.png);
        ADD_IMAGE_CONFIG(CIRCLE_BUTTON_BG_NORMAL, #00_circle_bg.png);
        ADD_IMAGE_CONFIG(CIRCLE_BUTTON_BG_PRESSED, #00_circle_bg_ef_press.png);
        ADD_IMAGE_CONFIG(CIRCLE_BUTTON_BG_HIGHLIGHTED, #00_circle_bg_ef_press.png);
@@ -129,7 +129,7 @@ START_UI_CONFIG(TABLEVIEW);
                ADD_SHAPE_CONFIG(ITEM_ANNEX_MARGIN, 16);
                ADD_SHAPE_CONFIG(ITEM_ANNEX_ONOFF_WIDTH, 135);
                ADD_SHAPE_CONFIG(ITEM_ANNEX_ONOFF_HEIGHT, 63);
-               ADD_SHAPE_CONFIG(ITEM_ANNEX_ONOFF_MARGIN, 2);
+               ADD_SHAPE_CONFIG(ITEM_ANNEX_ONOFF_MARGIN, 1);
                ADD_SHAPE_CONFIG(ITEM_ANNEX_MORE_WIDTH, 72);
                ADD_SHAPE_CONFIG(ITEM_ANNEX_MORE_HEIGHT, 72);
                ADD_SHAPE_CONFIG(CONTEXTITEM_RIGHT_MARGIN, 0);