Modified code for resources of tableview

Change-Id: I50833e1b21aa8f4790d1a9c988d486215aab4e52
Signed-off-by: youseong.ji <youseong.ji@samsung.com>

diff --git a/src/ui/controls/FUiCtrl_TableViewItem.cpp b/src/ui/controls/FUiCtrl_TableViewItem.cpp
index 3ea5e02..685860f 100644 (file)
--- a/src/ui/controls/FUiCtrl_TableViewItem.cpp
+++ b/src/ui/controls/FUiCtrl_TableViewItem.cpp
@@ -2566,7 +2566,7 @@ _TableViewItem::DrawOnOffButton(void)
        }
        else
        {
-               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER_DIM, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
+               r = GET_BITMAP_CONFIG_N(TABLEVIEW::ONOFFBUTTON_HANDLER_DISABLED, BITMAP_PIXEL_FORMAT_ARGB8888, pOnOffButtonHandler);
        }
        SysTryCatch(NID_UI_CTRL, (r == E_SUCCESS) && (pOnOffButtonHandler != null), , E_SYSTEM, "[E_SYSTEM] OnOffHandlerButton button image load failed");
 

diff --git a/src/ui/inc/FUi_ResourceTableViewConfig.h b/src/ui/inc/FUi_ResourceTableViewConfig.h
index 29c591e..6853e89 100755 (executable)
--- a/src/ui/inc/FUi_ResourceTableViewConfig.h
+++ b/src/ui/inc/FUi_ResourceTableViewConfig.h
@@ -84,7 +84,7 @@ DECLARE_UI_CONFIG(TABLEVIEW);
        DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_NORMAL, 22);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_NORMAL, 23);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_PRESSED, 24);
-       DECLARE_IMAGE_CONFIG(RADIOBUTTON_NORMAL_DISABLED, 25);
+       DECLARE_IMAGE_CONFIG(RADIOBUTTON_SELECTED, 25);
        DECLARE_IMAGE_CONFIG(ONOFFBUTTON_ON, 26);
        DECLARE_IMAGE_CONFIG(ONOFFBUTTON_OFF, 27);
        DECLARE_IMAGE_CONFIG(ONOFFBUTTON_HANDLER, 28);
@@ -98,19 +98,16 @@ DECLARE_UI_CONFIG(TABLEVIEW);
        DECLARE_IMAGE_CONFIG(BUTTON_EXPAND_OPENED_EFFECT, 36);
        DECLARE_IMAGE_CONFIG(CHECKBOX_BG_DISABLED, 37);
        DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DISABLED, 38);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_ON_DISABLED, 39);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_OFF_DISABLED, 40);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_HANDLER_DISABLED, 41);
-       DECLARE_IMAGE_CONFIG(CIRCLE_BUTTON_BG_EFFECT_DISABLED, 42);
-       DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_PRESSED, 43);
-       DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DIM, 44);
+       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(CIRCLE_BUTTON_BG_EFFECT_DISABLED, 44);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_NORMAL, 45);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DISABLED, 46);
        DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_PRESSED, 47);
-       DECLARE_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DIM, 48);
-       DECLARE_IMAGE_CONFIG(RADIOBUTTON_SELECTED, 49);
-       DECLARE_IMAGE_CONFIG(RADIOBUTTON_SELECTED_DISABLED, 50);
-       DECLARE_IMAGE_CONFIG(ONOFFBUTTON_HANDLER_DIM, 51);
+       DECLARE_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_PRESSED, 48);
 
        DECLARE_DIMENSION_CONFIG(MIN_SIZE, 1);
        DECLARE_SHAPE_CONFIG(ITEM_DEFAULT_FONT_SIZE, 1);

diff --git a/src/ui/resource/FUi_ResourceTableViewConfig.cpp b/src/ui/resource/FUi_ResourceTableViewConfig.cpp
index 94eb6a5..5e31c62 100755 (executable)
--- a/src/ui/resource/FUi_ResourceTableViewConfig.cpp
+++ b/src/ui/resource/FUi_ResourceTableViewConfig.cpp
@@ -89,7 +89,6 @@ START_UI_CONFIG(TABLEVIEW);
        ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_NORMAL, #00_button_radio_Activated.png);
        ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DISABLED, #00_button_radio_Disabled.png);
        ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_PRESSED, #00_button_radio_press.png);
-       ADD_IMAGE_CONFIG(RADIOBUTTON_BUTTON_DIM, #00_button_radio_dim.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);
@@ -106,8 +105,6 @@ START_UI_CONFIG(TABLEVIEW);
        ADD_IMAGE_CONFIG(BUTTON_EXPAND_CLOSED_EFFECT, #00_button_expand_closed_ef.png);
        ADD_IMAGE_CONFIG(BUTTON_EXPAND_OPENED_EFFECT, #00_button_expand_opened_ef.png);
        ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_PRESSED, #00_check_press.png);
-       ADD_IMAGE_CONFIG(CHECKBOX_CHECK_MARK_DIM, #00_check_dim.png);
-       ADD_IMAGE_CONFIG(ONOFFBUTTON_HANDLER_DIM, #00_button_on_off_handler_dim.png);
 
 
        START_UI_CONFIG_MODE(720x1280);