Fixed Cancel button and Checkbox colors.

Change-Id: Ia0d5486b5e1bf18073210815882f653262768196
Signed-off-by: shivamv <shivam.v2@samsung.com>

diff --git a/res/edje/ivug-main.edc b/res/edje/ivug-main.edc
old mode 100644 (file)
new mode 100755 (executable)
index 33fb22d..7e004e8
--- a/res/edje/ivug-main.edc
+++ b/res/edje/ivug-main.edc
@@ -869,6 +869,7 @@ collections {
                                        state: "default" 0.0;
                                        rel1 { relative: 0.0 0.0; to:"padding.r";}
                                        rel2 { relative: 1.0 1.0; to:"padding.r";}
+                                       visible: 1;
                                }
                        }
                }

diff --git a/src/main/popup/ivug-popup.c b/src/main/popup/ivug-popup.c
old mode 100644 (file)
new mode 100755 (executable)
index 76e1129..8fae7f4
--- a/src/main/popup/ivug-popup.c
+++ b/src/main/popup/ivug-popup.c
@@ -224,13 +224,13 @@ ivug_deletepopup_show(Evas_Object* parent, const char* file_type,
        elm_object_domain_translatable_part_text_set(popup, "title,text", IVUG_TEXT_DOMAIN, IDS_DELETE);
 
 
-       btn_cancel = ivug_button_add(popup, "popup_button/default", gGetLanguageHandle(), IDS_CANCEL, NULL, _on_popup_response, iv_popup);
+       btn_cancel = ivug_button_add(popup, "border", gGetLanguageHandle(), IDS_CANCEL, NULL, _on_popup_response, iv_popup);
        elm_object_part_content_set(popup, "button1", btn_cancel);
        elm_object_domain_translatable_text_set(btn_cancel, IVUG_TEXT_DOMAIN, IDS_CANCEL);
        evas_object_data_set(btn_cancel, "response", (void *)POPUP_RESPONSE_CANCEL);
 
 
-       btn_delete = ivug_button_add(popup, "popup_button/default", gGetLanguageHandle(), IDS_DELETE, NULL, _on_popup_response, iv_popup);
+       btn_delete = ivug_button_add(popup, "default", gGetLanguageHandle(), IDS_DELETE, NULL, _on_popup_response, iv_popup);
        elm_object_part_content_set(popup, "button2", btn_delete);
        elm_object_domain_translatable_text_set(btn_delete, IVUG_TEXT_DOMAIN, IDS_DELETE);
        evas_object_data_set(btn_delete, "response", (void *)POPUP_RESPONSE_OK);

diff --git a/src/main/view/ivug-main-view.cpp b/src/main/view/ivug-main-view.cpp
old mode 100644 (file)
new mode 100755 (executable)
index e5b0ef5..8e1ea67
--- a/src/main/view/ivug-main-view.cpp
+++ b/src/main/view/ivug-main-view.cpp
@@ -104,11 +104,9 @@ _check_changed_cb(void *data, Evas_Object *obj, void *event_info)
 
                        pMainView->selected_path_list = eina_list_append(pMainView->selected_path_list, (void *)strdup(mdata->filepath));
                        pMainView->total_selected++;
-                       evas_object_color_set(obj, 255, 255, 255, 255);
                        elm_check_state_set(obj, EINA_TRUE);
                } else {
                        //[ToDo] Show the popup for Max count or size
-                       evas_object_color_set(obj, 128, 138, 137, 255);
                        elm_check_state_set(obj, EINA_FALSE);
                }
        } else {
@@ -125,7 +123,6 @@ _check_changed_cb(void *data, Evas_Object *obj, void *event_info)
                        }
                }
 
-               evas_object_color_set(obj, 128, 138, 137, 255);
                elm_check_state_set(obj, EINA_FALSE);
        }
        _update_check_title(pMainView);
@@ -1451,7 +1448,6 @@ static void ivug_update_header(void *data, media_content_db_update_type_e update
                if (pMainView->selected_path_list && update_item == MEDIA_ITEM_FILE && update_type == MEDIA_CONTENT_DELETE) {
                        EINA_LIST_FOREACH(pMainView->selected_path_list, l, list_data) {
                                if (strcmp((char *)list_data, path) == 0) {
-                                       evas_object_color_set(pMainView->check, 128, 138, 137, 255);
                                        elm_check_state_set(pMainView->check, EINA_FALSE);
                                        pMainView->selected_path_list = eina_list_remove(pMainView->selected_path_list, (void *)list_data);
                                        free(list_data);
@@ -1917,7 +1913,6 @@ SHOW_PHOTOCAM:
                Evas_Object *check = elm_check_add(sel_bar);
                elm_check_state_set(check, EINA_FALSE);
                elm_object_style_set(check, "default");
-               evas_object_color_set(check, 128, 138, 255, 255);
                elm_layout_content_set(sel_bar, "swallow.check", check); //swallow
                pMainView->check = check;
                evas_object_smart_callback_add(check, "changed", _check_changed_cb, (void *)pMainView);
@@ -1935,7 +1930,6 @@ SHOW_PHOTOCAM:
                                        Media_Item *mitem = ivug_medialist_get_current_item(pMainView->mList);
                                        Media_Data *mdata = ivug_medialist_get_data(mitem);
                                        if (strcmp(mdata->filepath, files[i]) == 0) {
-                                               evas_object_color_set(pMainView->check, 255, 255, 255, 255);
                                                elm_check_state_set(pMainView->check, EINA_TRUE);
                                        }
                                        i++;
@@ -1957,7 +1951,6 @@ SHOW_PHOTOCAM:
                        Media_Data *pData = ivug_medialist_get_data(pMainView->cur_mitem);
                        EINA_LIST_FOREACH(pMainView->selected_path_list, l, data) {
                                if (strcmp((char *)data, pData->filepath) == 0) {
-                                       evas_object_color_set(pMainView->check, 255, 255, 255, 255);
                                        elm_check_state_set(pMainView->check, EINA_TRUE);
                                }
                        }

diff --git a/src/main/view/ivug-name-view.c b/src/main/view/ivug-name-view.c
old mode 100644 (file)
new mode 100755 (executable)
index f75c2ee..47059da
--- a/src/main/view/ivug-name-view.c
+++ b/src/main/view/ivug-name-view.c
@@ -541,13 +541,11 @@ ivug_name_view_create(Evas_Object *parent, ivug_name_mode mode)
        evas_object_show(button);
        elm_object_part_content_set(pNameView->layout, "elm.swallow.button", button);
        elm_object_content_set(pNameView->popup, pNameView->layout);
-       Evas_Object *btn_cancel = ivug_button_add(pNameView->popup, "popup_button/default",
-                                                                                         gGetLanguageHandle(), IDS_CANCEL, NULL, _ivug_name_view_cancel_cb, pNameView);
+       Evas_Object *btn_cancel = ivug_button_add(pNameView->popup, "border", gGetLanguageHandle(), IDS_CANCEL, NULL, _ivug_name_view_cancel_cb, pNameView);
        elm_object_part_content_set(pNameView->popup, "button1", btn_cancel);
        elm_object_domain_translatable_text_set(btn_cancel, IVUG_TEXT_DOMAIN, IDS_CANCEL);
 
-       Evas_Object *btn_done = ivug_button_add(pNameView->popup, "popup_button/default",
-                                                                                       gGetLanguageHandle(), IDS_RENAME_BUTTON, NULL, _ivug_name_view_save_cb, pNameView);
+       Evas_Object *btn_done = ivug_button_add(pNameView->popup, "default", gGetLanguageHandle(), IDS_RENAME_BUTTON, NULL, _ivug_name_view_save_cb, pNameView);
        elm_object_part_content_set(pNameView->popup, "button2", btn_done);
 
        elm_object_domain_translatable_text_set(btn_done, IVUG_TEXT_DOMAIN, IDS_RENAME_BUTTON);

diff --git a/src/main/view/ivug-photocam.cpp b/src/main/view/ivug-photocam.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 35fcba9..0e96369
--- a/src/main/view/ivug-photocam.cpp
+++ b/src/main/view/ivug-photocam.cpp
@@ -205,13 +205,11 @@ void update_check(Ivug_MainView *pMainView)
                EINA_LIST_FOREACH(pMainView->selected_path_list, l, data) {
                        MSG_MAIN_HIGH("file is %s", (char *)data);
                        if (strcmp(mdata->filepath, (char *)data) == 0) {
-                               evas_object_color_set(pMainView->check, 255, 255, 255, 255);
                                elm_check_state_set(pMainView->check, EINA_TRUE);
                                check = 1;
                        }
                }
                if (check == 0) {
-                       evas_object_color_set(pMainView->check, 128, 138, 137, 255);
                        elm_check_state_set(pMainView->check, EINA_FALSE);
                }
        }

diff --git a/src/slideshow/control/ivug-slideshow.cpp b/src/slideshow/control/ivug-slideshow.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 1648168..5e9d78f
--- a/src/slideshow/control/ivug-slideshow.cpp
+++ b/src/slideshow/control/ivug-slideshow.cpp
@@ -1296,9 +1296,9 @@ Evas_Object *ivug_list_popoup_show(const char *title_id, void *data)
                ob->pSlideshow = pSlideshow;
                Evas_Object *btn_cancel = NULL;
                Evas_Object *btn_ok = NULL;
-               btn_cancel = ivug_button_add(popup, "popup_button/default", gGetLanguageHandle(), IDS_CANCEL, NULL, _on_popup_response, (void *)ob);
+               btn_cancel = ivug_button_add(popup, "border", gGetLanguageHandle(), IDS_CANCEL, NULL, _on_popup_response, (void *)ob);
                elm_object_part_content_set(popup, "button1", btn_cancel);
-               btn_ok = ivug_button_add(popup, "popup_button/default", gGetLanguageHandle(), "OK", NULL, _on_popup_response_ok, (void *)ob);
+               btn_ok = ivug_button_add(popup, "default", gGetLanguageHandle(), "OK", NULL, _on_popup_response_ok, (void *)ob);
                elm_object_part_content_set(popup, "button2", btn_ok);
        } else {
                itc.item_style = "1line";
@@ -1312,7 +1312,6 @@ Evas_Object *ivug_list_popoup_show(const char *title_id, void *data)
                        if (ob) {
                                ob->index = i;
                                ob->pSlideshow = pSlideshow;
-
                                elm_genlist_item_append(genlist, &itc, (void *) ob, NULL, ELM_GENLIST_ITEM_NONE, gl_effect_radio_sel_cb, (void *) ob);
                        }
                }
@@ -1320,12 +1319,9 @@ Evas_Object *ivug_list_popoup_show(const char *title_id, void *data)
                ob->pSlideshow = pSlideshow;
                Evas_Object *btn_cancel = NULL;
                Evas_Object *btn_ok = NULL;
-               btn_cancel = ivug_button_add(popup,
-                                                               "popup_button/default",
-                                                               gGetLanguageHandle(),
-                                                               IDS_CANCEL, NULL, _on_popup_response, (void *)ob);
+               btn_cancel = ivug_button_add(popup, "border", gGetLanguageHandle(), IDS_CANCEL, NULL, _on_popup_response, (void *)ob);
                elm_object_part_content_set(popup, "button1", btn_cancel);
-               btn_ok = ivug_button_add(popup, "popup_button/default", gGetLanguageHandle(), "OK", NULL, _on_popup_response_ok_effect, (void *)ob);
+               btn_ok = ivug_button_add(popup, "default", gGetLanguageHandle(), "OK", NULL, _on_popup_response_ok_effect, (void *)ob);
                elm_object_part_content_set(popup, "button2", btn_ok);
        }
        evas_object_show(genlist);