Removed unused detail view/ edit view code 33/103433/2
authorRahul Dadhich <r.dadhich@samsung.com>
Thu, 8 Dec 2016 09:23:04 +0000 (14:53 +0530)
committerRahul Dadhich <r.dadhich@samsung.com>
Thu, 8 Dec 2016 09:24:13 +0000 (14:54 +0530)
Change-Id: I4b8cebe6b7c664c6e51b6340aa99a65832d91ec3
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>
inc/features/gl-thumbs-edit.h
inc/features/gl-thumbs.h
src/features/gl-thumbs-edit.c
src/features/gl-thumbs.c
src/widget/gl-notify.c

index 8efdfdf754f2169b842ab8c63b102542fde53c88..cd46c633c51615188978b433e210ace9d6d6f104 100644 (file)
@@ -27,7 +27,6 @@ int _gl_thumbs_edit_update_view(void *data);
 int _gl_thumbs_edit_pop_view(void *data);
 int _gl_thumbs_edit_update_lang(void *data);
 int _gl_thumbs_edit_disable_btns(void *data, bool b_disable);
-int _gl_thumbs_edit_get_path(void *data, char **files);
 
 #endif
 
index 2737a75e86a0dabbd8f2b341db16e18c2e32b7ff..e2851d1f8707fbe14f5c504ab65396561a5f09b6 100644 (file)
@@ -42,12 +42,9 @@ int _gl_thumbs_update_realized_items(void *data);
 Evas_Object *_gl_thumbs_get_content(void *data, Evas_Object *parent,
                                    gl_item *gitem, int w, int h);
 int _gl_thumbs_add_btns(void *data);
-void _gl_thumbs_mouse_down(void *data, Evas *e, Evas_Object *obj, void *ei);
-void _gl_thumbs_mouse_up(void *data, Evas *e, Evas_Object *obj, void *ei);
 Evas_Object *_gl_thumbs_add_grid(void *data, Evas_Object *parent,
                                 gl_thumb_mode mode);
 int _gl_thumbs_show_edit_view(void *data);
-int _gl_thumbs_show_view(void *data);
 Eina_Bool _gl_thumbs_show_items(void *data);
 int _gl_thumbs_set_list(void *data, Eina_List *elist);
 int _gl_thumbs_clear_and_set_list(void *data, Eina_List *elist);
@@ -61,7 +58,7 @@ int _gl_thumbs_update_edit_split_view(void *data, int nf_mode, char *title, bool
 int _gl_thumbs_update_items(void *data);
 int _gl_thumbs_update_view(void *data);
 int _gl_thumbs_destroy_view(void *data, bool b_pop);
-int _gl_thumbs_destroy_view_with_cb(void *data, void *cb);
+//int _gl_thumbs_destroy_view_with_cb(void *data, void *cb);
 bool _gl_thumbs_get_view(void *data, Evas_Object **view);
 bool _gl_thumbs_show_nocontents(void *data);
 int _gl_thumbs_set_nocontents(void *data, Evas_Object *noc);
@@ -75,10 +72,7 @@ int _gl_thumbs_update_label(Elm_Object_Item *nf_it, char *title);
 int _gl_thumbs_update_label_text(Elm_Object_Item *nf_it, int sel_cnt,
                                 bool b_lang);
 int _gl_thumbs_update_lang(void *data);
-int _gl_thumbs_disable_slideshow(void *data, bool b_disabled);
-int _gl_thumbs_disable_share(void *data, bool b_disabled);
 int _gl_thumbs_check_btns(void *data);
-int _gl_thumbs_update_sequence(void *data);
 int _gl_thumbs_set_edit_mode(void *data, int mode);
 int _gl_thumbs_get_edit_mode(void *data);
 int _gl_thumbs_rotate_view(void *data);
index 4bee0a4557194d90e853e035fc6e899b1166d5c7..17815506a64d978268538a6eb6a2d52354d679e3 100644 (file)
 #include "gl-fs.h"
 #include "gl-albums.h"
 
-int _gl_thumbs_edit_get_path(void *data, char **files)
-{
-       GL_CHECK_VAL(files, 0);
-       GL_CHECK_VAL(data, 0);
-       gl_appdata *ad = (gl_appdata *)data;
-       GL_CHECK_VAL(ad->selinfo.elist, 0);
-       int i = 0;
-       gl_item *current = NULL;
-       Eina_List *l = NULL;
-
-       EINA_LIST_FOREACH(ad->selinfo.elist, l, current) {
-               if (current == NULL || current->item == NULL ||
-                       current->item->file_url == NULL) {
-                       gl_dbgE("Invalid gitem!");
-                       continue;
-               }
-
-               files[i++] = g_strdup(current->item->file_url);
-               gl_sdbg("file_url: %s!", files[i - 1]);
-       }
-       return i;
-}
-
 static void __gl_thumbs_edit_del(void *data)
 {
        GL_CHECK(data);
index 933966bd60d5e5059b0f90e947c3db449d5079c9..0ae973f179e216a35ea24bfdc7090c2856524fe9 100644 (file)
@@ -261,31 +261,11 @@ static void __gl_thumbs_check_changed(void *data, Evas_Object *obj, void *ei)
        }
        _gl_notify_check_selall(ad, nf_it, ad->gridinfo.count, album_select_count);
        /* Update the label text */
-       //if(ad->selinfo.fav_elist!=NULL)
        gl_sdbg("sel_cnt:%d", total_sel_count);
        update_text(nf_it, total_sel_count, false);
 
 }
 
-#ifdef _USE_SHRINK_EFFECT
-
-
-static void __gl_thumbs_shrink_cb(void *data, Evas_Object *obj,
-                                  const char *emission, const char *source)
-{
-       GL_CHECK(data);
-       gl_item *gitem = (gl_item *) data;
-       GL_CHECK(gitem->ad);
-       gl_appdata *ad = (gl_appdata *)gitem->ad;
-       gl_dbg("");
-
-       _gl_thumbs_open_file(data);
-
-       edje_object_signal_callback_del(obj, "shrink,expand,done", "bg",
-                                       __gl_thumbs_shrink_cb);
-}
-#endif
-
 /* Only for local medias */
 static void __gl_thumbs_create_thumb_cb(media_content_error_e error,
                                         const char *path, void *user_data)
@@ -362,12 +342,6 @@ static Evas_Object *__gl_thumbs_get_content(void *data, Evas_Object *obj,
                                      ad->gridinfo.icon_w,
                                      ad->gridinfo.icon_h);
 
-#ifdef _USE_SHRINK_EFFECT
-               evas_object_event_callback_add(layout, EVAS_CALLBACK_MOUSE_DOWN,
-                                              _gl_thumbs_mouse_down, gitem);
-               evas_object_event_callback_add(layout, EVAS_CALLBACK_MOUSE_UP,
-                                              _gl_thumbs_mouse_up, gitem);
-#endif
                return layout;
        } else if (!g_strcmp0(part, GL_THUMB_CHECKBOX)) {
                Evas_Object *ck = NULL;
@@ -573,10 +547,6 @@ static bool __gl_thumbs_create_items(void *data, Evas_Object *parent)
        /* Restore previous position of scroller */
        _gl_ui_restore_scroller_pos(parent);
 
-#ifdef _USE_SHRINK_EFFECT
-       /* Disable grid item selection callback */
-       elm_gengrid_select_mode_set(parent, ELM_OBJECT_SELECT_MODE_NONE);
-#endif
        ad->gridinfo.count = item_cnt;
        ad->gridinfo.back_to_normal = false;
 
@@ -741,12 +711,8 @@ static int __gl_thumbs_mode_reset_btns(void *data)
 
        /* none items, disable 'edit' button */
        if (_gl_thumbs_check_zero(data)) {
-               _gl_thumbs_disable_share(ad, true);
-               _gl_thumbs_disable_slideshow(ad, true);
                _gl_ui_disable_menu(ad->gridinfo.nf_it, true);
        } else {
-               _gl_thumbs_disable_share(ad, false);
-               _gl_thumbs_disable_slideshow(ad, false);
                _gl_ui_disable_menu(ad->gridinfo.nf_it, false);
        }
        return 0;
@@ -1180,76 +1146,6 @@ int _gl_thumbs_add_btns(void *data)
        return 0;
 }
 
-void _gl_thumbs_mouse_down(void *data, Evas *e, Evas_Object *obj, void *ei)
-{
-       GL_CHECK(obj);
-       GL_CHECK(ei);
-       GL_CHECK(data);
-       gl_item *gitem = (gl_item *) data;
-       GL_CHECK(gitem->ad);
-       gl_appdata *ad = (gl_appdata *)gitem->ad;
-       Evas_Event_Mouse_Down *ev = (Evas_Event_Mouse_Down *)ei;
-
-       ad->gridinfo.mouse.x = ev->output.x;
-       ad->gridinfo.mouse.y = ev->output.y;
-
-#ifdef _USE_SHRINK_EFFECT
-       if (ad->uginfo.ug == NULL) {
-               edje_object_signal_emit(_EDJ(obj), "mouse,down,shrink", "bg");
-               ad->gridinfo.mouse.b_pressed = true;
-       }
-#endif
-}
-
-void _gl_thumbs_mouse_up(void *data, Evas *e, Evas_Object *obj, void *ei)
-{
-       GL_CHECK(data);
-       gl_item *gitem = (gl_item *)data;
-       GL_CHECK(gitem->ad);
-       gl_appdata *ad = (gl_appdata *)gitem->ad;
-
-       if (!ei || !obj) {
-               goto RET_WO_EXEC;
-       }
-
-       Evas_Event_Mouse_Up *ev = (Evas_Event_Mouse_Up *)ei;
-       if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD ||
-               ev->event_flags & EVAS_EVENT_FLAG_ON_SCROLL) {
-               goto RET_WO_EXEC;
-       }
-
-       if ((abs(ad->gridinfo.mouse.x - ev->output.x) > GL_MOUSE_RANGE) ||
-               (abs(ad->gridinfo.mouse.y - ev->output.y) > GL_MOUSE_RANGE)) {
-               goto RET_WO_EXEC;
-       }
-
-       gl_dbg("");
-
-#ifdef _USE_SHRINK_EFFECT
-       if (ad->gridinfo.mouse.b_pressed) {
-               edje_object_signal_emit(_EDJ(obj), "mouse,up,expand", "bg");
-               edje_object_signal_callback_add(_EDJ(obj), "shrink,expand,done",
-                                               "bg", __gl_thumbs_shrink_cb,
-                                               data);
-               ad->gridinfo.mouse.b_pressed = false;
-       }
-       return;
-
-RET_WO_EXEC:
-
-       if (ad->gridinfo.mouse.b_pressed) {
-               edje_object_signal_emit(_EDJ(obj), "mouse,up,expand", "bg");
-               ad->gridinfo.mouse.b_pressed = false;
-       }
-#else
-       _gl_thumbs_open_file(data);
-       return;
-
-RET_WO_EXEC:
-       return;
-#endif
-}
-
 Evas_Object *_gl_thumbs_add_grid(void *data, Evas_Object *parent,
                                  gl_thumb_mode mode)
 {
@@ -1325,31 +1221,6 @@ int _gl_thumbs_show_edit_view(void *data)
        }
 }
 
-int _gl_thumbs_show_view(void *data)
-{
-       GL_CHECK_VAL(data, -1);
-       gl_appdata *ad = (gl_appdata *)data;
-       bool b_ret = false;
-       gl_dbg("");
-
-       if (ad->gridinfo.view == NULL) {
-               gl_dbg("Error : Any gridview doesn't exist");
-               return -1;
-       }
-
-       /* Come back from edit mode, save state */
-       ad->gridinfo.back_to_normal = true;
-       b_ret = __gl_thumbs_create_items(ad, ad->gridinfo.view);
-       _gl_thumbs_set_size(ad, NULL);
-
-       if (!b_ret) {
-               gl_dbgE("Create items failed!");
-               return -1;
-       } else {
-               return 0;
-       }
-}
-
 Eina_Bool _gl_thumbs_show_items(void *data)
 {
        GL_CHECK_FALSE(data);
@@ -1750,25 +1621,6 @@ int _gl_thumbs_destroy_view(void *data, bool b_pop)
        return 0;
 }
 
-int _gl_thumbs_destroy_view_with_cb(void *data, void *cb)
-{
-       GL_CHECK_VAL(data, -1);
-       gl_appdata *ad = (gl_appdata *)data;
-       gl_dbg("start");
-
-       /* Delete naviframe item dierctly, instead of poping them */
-       _gl_thumbs_destroy_view(data, false);
-       /* Delete naviframe item dierctly to launch layout_delete_cb immediately */
-       _gl_ui_del_nf_items(ad->maininfo.naviframe, ad->ctrlinfo.nf_it);
-       if (cb) {
-               int (*close_cb)(void * data);
-               close_cb = cb;
-               close_cb(data);
-       }
-       gl_dbg("done");
-       return 0;
-}
-
 /**
 * Get all/image_grid_view.
 *
@@ -2017,32 +1869,6 @@ int _gl_thumbs_update_lang(void *data)
        return 0;
 }
 
-int _gl_thumbs_disable_slideshow(void *data, bool b_disabled)
-{
-       GL_CHECK_VAL(data, -1);
-       gl_appdata *ad = (gl_appdata *)data;
-       gl_dbg("b_disable: %d", b_disabled);
-       ad->gridinfo.b_slideshow_disable = b_disabled;
-       return 0;
-}
-
-int _gl_thumbs_disable_share(void *data, bool b_disabled)
-{
-       GL_CHECK_VAL(data, -1);
-       gl_appdata *ad = (gl_appdata *)data;
-       gl_dbg("b_disable: %d", b_disabled);
-       GL_CHECK_VAL(ad->gridinfo.nf_it, -1);
-       Evas_Object *btn = NULL;
-       btn = elm_object_item_part_content_get(ad->gridinfo.nf_it,
-                                              GL_NAVIFRAME_TITLE_LEFT_BTN);
-       if (btn) {
-               elm_object_disabled_set(btn, b_disabled);
-       } else {
-               gl_dbgE("Failed to get share button!");
-       }
-       return 0;
-}
-
 /* Check buttons state when coming back from albums-select view */
 int _gl_thumbs_check_btns(void *data)
 {
@@ -2051,49 +1877,6 @@ int _gl_thumbs_check_btns(void *data)
        return 0;
 }
 
-int _gl_thumbs_update_sequence(void *data)
-{
-       GL_CHECK_VAL(data, -1);
-       gl_appdata *ad = (gl_appdata *)data;
-       gl_item *gitem = NULL;
-       Elm_Object_Item *first_it = NULL;
-       Elm_Object_Item *next_it = NULL;
-       Elm_Object_Item *last_it = NULL;
-
-       Evas_Object *view = ad->gridinfo.view;
-       if (gl_get_view_mode(data) == GL_VIEW_THUMBS_SELECT) {
-               view = ad->gridinfo.select_view;
-       }
-       GL_CHECK_VAL(view, -1);
-       first_it = elm_gengrid_first_item_get(view);
-       last_it = elm_gengrid_last_item_get(view);
-
-       int sequence = 1;
-       while (first_it) {
-               next_it = elm_gengrid_item_next_get(first_it);
-
-               if (elm_gengrid_item_item_class_get(first_it) == &(ad->gridinfo.date_gic)) {
-                       goto GL_THUMBS_NEXT;
-               }
-
-               gitem = elm_object_item_data_get(first_it);
-               if (gitem) {
-                       gitem->sequence = sequence++;
-               }
-               gitem = NULL;
-
-GL_THUMBS_NEXT:
-
-               if (last_it == first_it) {
-                       gl_dbg("done!");
-                       break;
-               } else {
-                       first_it = next_it;
-               }
-       }
-       return 0;
-}
-
 int _gl_thumbs_set_edit_mode(void *data, int mode)
 {
        GL_CHECK_VAL(data, -1);
index 13be95d5a23e92d2c08733a1e25356b7960271a3..f62872a2b3db1807fa3bc9d24dae483ba4b04d17 100644 (file)
@@ -71,7 +71,6 @@ int _gl_notify_check_selall(void *data, Elm_Object_Item *nf_it, int all_cnt,
        if (selected_cnt > 0) {
                /* Enable/Disable control bar buttons */
                _gl_ctrl_enable_btns(ad, nf_it);
-               _gl_thumbs_disable_slideshow(ad, false);
        } else if (view_mode == GL_VIEW_THUMBS_SELECT) {
                /* Disable control bar buttons */
                _gl_thumbs_sel_disable_btns(data, true);
@@ -79,7 +78,6 @@ int _gl_notify_check_selall(void *data, Elm_Object_Item *nf_it, int all_cnt,
                /* Disable control bar buttons */
                _gl_ui_disable_menu(nf_it, true);
                _gl_ctrl_disable_items(nf_it, true);
-               _gl_thumbs_disable_slideshow(ad, true);
        }
 
        return 0;