[TIZEN_3.0] Removed extra feature code 17/90317/2 submit/tizen_mobile/20160929.162328 submit/tizen_mobile/20160930.120911
authorRahul Dadhich <r.dadhich@samsung.com>
Thu, 29 Sep 2016 10:52:11 +0000 (16:22 +0530)
committerRahul Dadhich <r.dadhich@samsung.com>
Thu, 29 Sep 2016 10:53:54 +0000 (16:23 +0530)
Change-Id: I4f18fdbb3985f0c9c1ad39382c2336c335e54ce4
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>
12 files changed:
.cproject
CMakeLists.txt
inc/util/gl-ui-util.h
project_def.prop
src/2dview/gl-timeline.c
src/2dview/gl-timeline.h
src/features/gl-albums.c
src/features/gl-thumbs-edit.c
src/features/gl-thumbs.c
src/util/gl-ui-util.c
src/widget/gl-popup.c
src/widget/gl-thumb.c

index c689c03cd14c7fa00076f49b4e73f0f7c8f5ebca..1acfe90218ed407cba6685e0142285be3dee2ec6 100644 (file)
--- a/.cproject
+++ b/.cproject
                                                                        <listOptionValue builtIn="false" value="_USE_DLOG_"/>
                                                                        <listOptionValue builtIn="false" value="_USE_SECURE_LOG_"/>
                                                                        <listOptionValue builtIn="false" value="_USE_OPENGL_BACKEND"/>
-                                                                       <listOptionValue builtIn="false" value="_USE_GRID_CHECK"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1171126414" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
index 4b057498536a24b6ca3a9b7ec538f4a347485702..7d719e5a26826c470c05012c982df2f16255dc61 100755 (executable)
@@ -93,7 +93,6 @@ ADD_DEFINITIONS("-DEDJDIR=\"${EDJDIR}\"")
 ADD_DEFINITIONS("-D_USE_DLOG_")
 ADD_DEFINITIONS("-D_USE_SECURE_LOG_")
 ADD_DEFINITIONS("-D_USE_OPENGL_BACKEND")
-ADD_DEFINITIONS("-D_USE_GRID_CHECK")
 
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
 SET(CMAKE_LDFLAGS "-Wl,-zdefs" )
index 203debcf60a7a4cefdc49900ac4a0f4968875960..6130f0fb5029d75abdd1b73d809c3cdbc4d13562 100755 (executable)
@@ -118,10 +118,8 @@ int _gl_ui_change_navi_title(Elm_Object_Item *nf_it, char *text, bool b_dropdown
 int _gl_ui_update_navi_title_text(Elm_Object_Item *nf_it, int sel_cnt, bool b_lang);
 int _gl_ui_add_selall_ck(Evas_Object *parent, char *part, char *part_btn,
                          Evas_Smart_Cb cb_func, void *data);
-#ifdef _USE_GRID_CHECK
 int _gl_show_grid_checks(Evas_Object *view, const char *ck_part);
 int _gl_show_grid_checks_dual(Evas_Object *view, const char *ck_part, const char *ck_part2);
-#endif
 
 #ifdef __cplusplus
 }
index d4f5c88d1af7923bfe517001e7a354c0af5c204e..0511933d14e9d5eec66268e7f2d62345177a4524 100644 (file)
@@ -19,7 +19,7 @@ USER_EDCS =
 USER_POS = res/po/es_ES.po res/po/lv.po res/po/hy.po res/po/gl.po res/po/ga.po res/po/es_US.po res/po/zh_HK.po res/po/zh_TW.po res/po/et.po res/po/de.po res/po/ru_RU.po res/po/nb.po res/po/lt.po res/po/it_IT.po res/po/el_GR.po res/po/uz.po res/po/pt_BR.po res/po/nl.po res/po/fr.po res/po/ca.po res/po/kk.po res/po/eu.po res/po/tr_TR.po res/po/pt_PT.po res/po/hr.po res/po/is.po res/po/hu.po res/po/ko_KR.po res/po/mk.po res/po/bg.po res/po/fr_CA.po res/po/en_US.po res/po/en.po res/po/da.po res/po/pl.po res/po/cs.po res/po/az.po res/po/ja_JP.po res/po/sv.po res/po/sk.po res/po/ro.po res/po/sl.po res/po/uk.po res/po/sr.po res/po/zh_CN.po res/po/ka.po res/po/ar.po res/po/fi.po res/po/en_PH.po
 
 # User Defines
-USER_DEFS = _USE_DLOG_ _USE_SECURE_LOG_ _USE_OPENGL_BACKEND _USE_GRID_CHECK
+USER_DEFS = _USE_DLOG_ _USE_SECURE_LOG_ _USE_OPENGL_BACKEND
 USER_CPP_DEFS = 
 
 # User Undefines
index c1c4aa8b04bd0b7ab64a06783593771d99624482..feb58daf571c511ea08f48343f38b037171da9b9 100644 (file)
 
 #define GL_TIMELINE_TITLE_H 46
 #define GL_TIMELINE_PAD_H 8
-#define GL_TIMELINE_CONTENT_P_H 956
-#define GL_TIMELINE_CONTENT_L_H 429
-#define GL_TIMELINE_PAGE_SIZE 450
-
-#define GL_TL_PINCH_OUT_2_CNT 15
-#define GL_TL_PINCH_OUT_1_CNT 8
-#define GL_TL_PINCH_OUT_CNT_STEP 3
-
-/* Signals to hide/show title swallow */
-#define GL_TL_SWALLOW_TITLE_SHOW "elm,swallow_title,state,show"
-#define GL_TL_SWALLOW_TITLE_HIDE "elm,swallow_title,state,hide"
-/* Signals to transit title during updating if date(time) changed */
-#define GL_TL_TITLE2_SHOW_FINISHED "elm,action,title2,show,finished"
-#define GL_TL_TITLE_HIDE_FINISHED "elm,action,title,hide,finished"
-#define GL_TL_TITLE_FADE_OUT "elm,action,title,fade_out"
-#define GL_TL_TITLE2_FADE_IN "elm,action,title2,fade_in"
-#define GL_TL_TITLE_HIDE_DEFERRED "elm,state,title,hide,deferred"
-#define GL_TL_TITLE2_SHOW_DEFERRED "elm,state,title2,show,deferred"
-#define GL_TL_TITLE_SHOW "elm,state,title,show"
-#define GL_TL_TITLE2_CREATED "elm,state,title2,created"
 
 #define GL_TL_CONTENTS_FORMAT "contents_%d_%d"
 #define GL_TL_CHECKBOX_FORMAT "contents_%d_%d_checkbox"
 #define GL_TL_CONTENT_FORMAT "content_%d"
 
-#define GL_TL_TILE_DATA_KEY "gl_tile_data"
-#define GL_TL_DATA_KEY "gl_tl_data"
-
 #define GL_GRID_4_PER_ROW 4
 #define GL_GRID_7_PER_ROW 7
 
 #define GL_GRID_6_PER_ROW 6
 #define GL_GRID_10_PER_ROW 10
 
-#define GL_GRID_H_ZOOM_03 178
-#define GL_GRID_H_ZOOM_02 267
-
-#define GL_TL_DEL_TRANSITS(tiles) \
-       do { \
-               gl_tile_s *tile = NULL; \
-               if (tiles) { \
-                       gl_dbgW("Delete transits of tiles!"); \
-                       Eina_List *l = NULL; \
-                       EINA_LIST_FOREACH(tiles, l, tile) { \
-                               if (tile) { \
-                                       GL_IF_DEL_TRANSIT(tile->trans); \
-                                       tile = NULL; \
-                               } \
-                       } \
-               } \
-       } while (0)
-
-#define GL_TL_DEL_IDLERS(idlers) \
-       do { \
-               if (idlers) { \
-                       gl_tlp_s *it_d = NULL; \
-                       EINA_LIST_FREE(idlers, it_d) { \
-                               if (it_d) { \
-                                       GL_IF_DEL_IDLER(it_d->update_idler); \
-                                       it_d = NULL; \
-                               } \
-                       } \
-                       idlers = NULL; \
-               } \
-       } while (0)
-
-/* Slider unload->free pages ==> Delete contents first before release list */
-#define GL_TL_CLEAR_PAGES(timeline_d, b_set_zop) \
-       do { \
-               GL_TL_DEL_TRANSITS(timeline_d->tiles); \
-               GL_TL_DEL_IDLERS(timeline_d->idlers); \
-               if (b_set_zop) \
-                       _gl_slider_set_zop(timeline_d->view, GL_SLIDE_ZOP_DEFAULT); \
-               _gl_slider_unload(timeline_d->view); \
-               __gl_timeline_free_pages(timeline_d); \
-       } while (0)
-
 typedef enum _gl_zoom_mode_t {
        GL_TM_ZOOM_NONE = -3,
        GL_TM_ZOOM_OUT_TWO,
@@ -132,20 +66,9 @@ typedef enum _gl_zoom_mode_t {
        GL_TM_ZOOM_MAX,
 } gl_zoom_mode_e;
 
-typedef enum _gl_trans_op_t {
-       GL_TRANS_OP_DEFAULT, /* Initial state */
-       GL_TRANS_OP_DONE, /* Transition is done, do some updating */
-       GL_TRANS_OP_START, /* Preparation is one, start to transit tiles */
-       GL_TRANS_OP_PREPARE, /* Prepare to add transition */
-       GL_TRANS_OP_SHOW, /* Tiles already created, just show them with transition */
-       GL_TRANS_OP_MAX,
-} gl_trans_op_e;
-
 typedef enum _gl_tl_view_t {
        GL_TL_VIEW_NORMAL,
        GL_TL_VIEW_EDIT,
-       GL_TL_VIEW_SHARE,
-       GL_TL_VIEW_MAX,
        GL_TL_VIEW_COPY,
 } gl_tl_view_e;
 
@@ -162,11 +85,6 @@ struct _gl_sel_data_t {
        int image_cnt;
 };
 
-typedef enum _gl_time_view_display_order {
-       TIME_ORDER_ASC = 0,
-       TIME_ORDER_DESC
-} _gl_time_view_order;
-
 struct _gl_timeline_t {
        gl_appdata *ad;
        Evas_Object *parent;
@@ -181,7 +99,6 @@ struct _gl_timeline_t {
        int h;
        bool delete_data;
        gl_mouse_s mouse;
-       Eina_List *count_list; /* List about image count of each item in default zoom level */
        gl_tl_view_e view_m; /* View mode: normal/edit/share */
        gl_zoom_mode_e zoom_level;
        Eina_List *list; /* Page data list */
@@ -189,17 +106,9 @@ struct _gl_timeline_t {
        gl_tm_s tm_s;
        gl_tm_s tm_e;
        bool b_created;
-       Ecore_Animator *animator;
        bool b_updating_title; /* Flag: updating title, it's not done if TRUE set */
-       gl_cluster *album; /* Create 'All albums' album for share/edit operation */
-       int tran_op; /* Add effect */
-       Eina_List *tiles; /* All tiles of one page */
-       Eina_List *idlers; /* For showing original file */
-       Eina_List *thumbs; /* Object list for creating thumbnails */
        Eina_List *data_list;   /* Media list */
        gl_sel_s *sel_d;
-       bool is_list_reverse;
-       _gl_time_view_order time_media_display_order; /* keep track of the media items display order */
        Elm_Object_Item *realized_item;
 };
 
@@ -212,21 +121,10 @@ struct _gl_tlp_t {
        int w;
        int h;
        Evas_Object *layout;
-       Ecore_Idler *update_idler;
        bool b_created;
        gl_timeline_s *timeline_d;
 };
 
-typedef struct _gl_tile_t gl_tile_s;
-struct _gl_tile_t {
-       Evas_Object *bg;
-       Evas_Object *parent;
-       Elm_Transit *trans;
-       int count;
-       int total;
-       gl_tlp_s *it_d;
-       gl_timeline_s *timeline_d;
-};
 
 typedef struct _gl_date_item_data_t {
        char *text;
@@ -236,8 +134,6 @@ typedef struct _gl_date_item_data_t {
 
 int _get_count_of_items_on_same_date(gl_media_s *item, Eina_List *list, char **text, int start_index);
 int _gl_time_get_number_of_items_per_row(void *data);
-static void __gl_timeline_page_deleted_cb(void *data, Evas_Object *obj,
-                       void *ei);
 static int __gl_timeline_change_mode(void *data, int mode);
 static Evas_Object *__gl_timeline_create_list_view(gl_timeline_s *timeline_d, bool update);
 
@@ -532,138 +428,6 @@ static int __gl_timeline_get_mtime_str(struct tm t1, struct tm t2, char **str1,
        return 0;
 }
 
-/* Reset title for previous animation if another animation is triggerred */
-static int __gl_timeline_reset_title(gl_timeline_s *timeline_d)
-{
-       GL_CHECK_VAL(timeline_d, -1);
-
-       Evas_Object *title = elm_object_part_content_unset(timeline_d->layout,
-                            "title2");
-       GL_CHECK_VAL(title, -1);
-       gl_dbg("Set new title: %p", title);
-       elm_object_part_content_set(timeline_d->layout, "title", title);
-
-       edje_object_signal_emit(_EDJ(timeline_d->layout), GL_TL_TITLE_SHOW,
-                               "elm");
-       edje_object_message_signal_process(_EDJ(timeline_d->layout));
-       return 0;
-}
-
-/* "elm,state,title,hide"
- */
-static void __gl_timeline_on_title_hide_finished(void *data, Evas_Object *obj,
-        const char *emission,
-        const char *source)
-{
-       GL_CHECK(data);
-       gl_timeline_s *timeline_d = (gl_timeline_s *)data;
-
-       if (!timeline_d->b_updating_title) {
-               gl_dbgW("Updating done!");
-               return;
-       }
-
-       Evas_Object *title = elm_object_part_content_unset(timeline_d->layout,
-                            "title");
-       gl_dbg("Delete old title: %p", title);
-       GL_IF_DEL_OBJ(title);
-}
-
-/* "elm,state,title2,show"
- */
-static void __gl_timeline_on_title2_show_finished(void *data, Evas_Object *obj,
-        const char *emission,
-        const char *source)
-{
-       GL_CHECK(data);
-       gl_timeline_s *timeline_d = (gl_timeline_s *)data;
-
-       if (!timeline_d->b_updating_title) {
-               gl_dbgW("Updating done!");
-               return;
-       }
-
-       gl_dbg("Update title");
-       __gl_timeline_reset_title(timeline_d);
-}
-
-static int __gl_timeline_add_title_trans_finished_cbs(gl_timeline_s *timeline_d,
-        bool b_add)
-{
-       GL_CHECK_VAL(timeline_d, -1);
-       gl_dbg("b_add: %d", b_add);
-
-       if (b_add) {
-               /* Add callback for title updating */
-               edje_object_signal_callback_add(_EDJ(timeline_d->layout),
-                                               GL_TL_TITLE2_SHOW_FINISHED, "",
-                                               __gl_timeline_on_title2_show_finished,
-                                               (void *)timeline_d);
-               edje_object_signal_callback_add(_EDJ(timeline_d->layout),
-                                               GL_TL_TITLE_HIDE_FINISHED, "",
-                                               __gl_timeline_on_title_hide_finished,
-                                               (void *)timeline_d);
-       } else {
-               /* Add callback for title updating */
-               edje_object_signal_callback_del(_EDJ(timeline_d->layout),
-                                               GL_TL_TITLE2_SHOW_FINISHED, "",
-                                               __gl_timeline_on_title2_show_finished);
-               edje_object_signal_callback_del(_EDJ(timeline_d->layout),
-                                               GL_TL_TITLE_HIDE_FINISHED, "",
-                                               __gl_timeline_on_title_hide_finished);
-       }
-       return 0;
-}
-
-/* Free data after page deleted */
-static void __gl_timeline_del_page_cb(void *data, Evas *e, Evas_Object *obj,
-                                      void *ei)
-{
-       gl_dbgW("Delete page ---");
-       GL_CHECK(data);
-       evas_object_smart_callback_del(obj, "layout,page,deleted",
-                                      __gl_timeline_page_deleted_cb);
-       gl_tlp_s *it_d = (gl_tlp_s *)data;
-       GL_IF_DEL_IDLER(it_d->update_idler);
-       it_d->b_created = false;
-       gl_dbgW("Delete page +++");
-}
-
-static void __gl_timeline_page_deleted_cb(void *data, Evas_Object *obj,
-        void *ei)
-{
-       gl_dbgW("Deleted page ------");
-       evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL,
-                                      __gl_timeline_del_page_cb);
-       GL_CHECK(data);
-       gl_tlp_s *it_d = (gl_tlp_s *)data;
-       GL_IF_DEL_IDLER(it_d->update_idler);
-       it_d->b_created = false;
-       gl_dbgW("Deleted page ++++++");
-}
-
-/* Cancel thumb creation*/
-static int __gl_timeline_cancel_thumbs(gl_timeline_s *timeline_d)
-{
-       GL_CHECK_VAL(timeline_d, -1);
-       Eina_List *l = NULL;
-       Evas_Object *bg = NULL;
-       gl_media_s *item = NULL;
-
-       EINA_LIST_FOREACH(timeline_d->thumbs, l, bg) {
-               if (bg == NULL) {
-                       continue;
-               }
-               item = (gl_media_s *)evas_object_data_get(bg,
-                       GL_TL_TILE_DATA_KEY);
-               if (item && item->b_create_thumb) {
-                       gl_dbgW("Cancel thumb creation!");
-                       _gl_data_cancel_thumb(item);
-               }
-       }
-       return 0;
-}
-
 static void __gl_timeline_resize_layout_cb(void *data, Evas *e,
         Evas_Object *obj, void *ei)
 {
@@ -1005,7 +769,7 @@ static void __gl_timeline_thumbs_sel_cb(void *data, Evas_Object *obj, void *ei)
        } else {
                if (item && item->file_url) {
                        int index = _gl_timeline_get_item_index(ad, item->file_url);
-                       _gl_ext_load_iv_timeline(ad, item->file_url, index, ad->tlinfo->time_media_display_order);
+                       _gl_ext_load_iv_timeline(ad, item->file_url, index, GL_SORT_BY_DATE_ASC);
                } else {
                        gl_dbgW("Image wasn't found!");
                }
@@ -1135,7 +899,7 @@ void _gl_timeline_open_file_select_mode(void *data)
        gl_appdata *ad = (gl_appdata *)gitem->ad;
 
        gl_dbg("Loading UG-IMAGE-VIEWER-SELECT-MODE");
-       gl_ext_load_iv_time_ug_select_mode(ad, gitem, GL_UG_IV, ad->tlinfo->time_media_display_order);
+       gl_ext_load_iv_time_ug_select_mode(ad, gitem, GL_UG_IV, GL_SORT_BY_DATE_ASC);
 }
 
 void _gl_timeline_open_image_in_select_mode(void *data, Evas_Object *obj, void *event_info)
@@ -1169,11 +933,7 @@ static Evas_Object *__gl_timeline_thumbs_get_content(void *data, Evas_Object *ob
                        ck = elm_check_add(obj);
                        GL_CHECK_NULL(ck);
 
-#ifdef _USE_GRID_CHECK
                        elm_object_style_set(ck, "grid");
-#else
-                       elm_object_style_set(ck, GL_CHECKBOX_STYLE_THUMB);
-#endif
                        evas_object_propagate_events_set(ck, EINA_FALSE);
                        elm_check_state_set(ck, gitem->check_state);
                        evas_object_data_set(ck, "data", (void *)timeline_d);
@@ -1454,11 +1214,7 @@ static Evas_Object *__gl_get_date_check(const void
                        ck = elm_check_add(pObject);
                        GL_CHECK_NULL(ck);
 
-#ifdef _USE_GRID_CHECK
                        elm_object_style_set(ck, "grid");
-#else
-                       elm_object_style_set(ck, GL_CHECKBOX_STYLE_THUMB);
-#endif
                        evas_object_propagate_events_set(ck, EINA_FALSE);
                        elm_check_state_set(ck, date_item->check_state);
                        evas_object_show(ck);
@@ -1635,13 +1391,6 @@ int _gl_timeline_create_grid_view(gl_timeline_s *timeline_d, Evas_Object *genlis
                __gl_timelne_del_nocontents(timeline_d);
                elm_naviframe_item_title_enabled_set(timeline_d->nf_it, EINA_TRUE, EINA_TRUE);
        }
-       if ((!update || !timeline_d->is_list_reverse) && timeline_d->time_media_display_order == TIME_ORDER_ASC) {
-               list = eina_list_reverse(list);
-               timeline_d->is_list_reverse = true;
-       } else if (timeline_d->is_list_reverse && timeline_d->time_media_display_order == TIME_ORDER_DESC) {
-               list = eina_list_reverse(list);
-               timeline_d->is_list_reverse = false;
-       }
 
        item_cnt = eina_list_count(list);
        timeline_d->count = item_cnt;
@@ -1861,13 +1610,6 @@ static void __gl_timeline_del_layout_cb(void *data, Evas *e, Evas_Object *obj,
        evas_object_data_del(obj, "page_h");
        if (data) {
                gl_timeline_s *timeline_d = (gl_timeline_s *)data;
-               GL_IF_DEL_ANIMATOR(timeline_d->animator);
-               GL_IF_FREE_ELIST(timeline_d->count_list);
-               GL_IF_FREE_ELIST(timeline_d->thumbs);
-               if (timeline_d->album) {
-                       _gl_data_util_free_gcluster(timeline_d->album);
-                       timeline_d->album = NULL;
-               }
                __gl_timeline_clear_sel_list(timeline_d);
                GL_GFREEIF(timeline_d->sel_d);
                _gl_time_finialize_media_data(timeline_d);
@@ -1881,8 +1623,6 @@ static int __gl_timeline_add_cbs(gl_timeline_s *timeline_d)
        GL_CHECK_VAL(timeline_d, -1);
        GL_CHECK_VAL(timeline_d->ad, -1);
 
-       /* Add callback for title updating */
-       __gl_timeline_add_title_trans_finished_cbs(timeline_d, true);
        /* Register delete callback */
        evas_object_event_callback_add(timeline_d->layout, EVAS_CALLBACK_DEL,
                                       __gl_timeline_del_layout_cb, timeline_d);
@@ -1901,43 +1641,6 @@ static int __gl_timeline_add_cbs(gl_timeline_s *timeline_d)
        return 0;
 }
 
-void __gl_timeline_desc_mode_set(void *data)
-{
-       gl_dbg("ENTRY");
-       GL_CHECK(data);
-       gl_appdata *ad = (gl_appdata *)data;
-       if (ad->tlinfo->time_media_display_order == TIME_ORDER_DESC) {
-               gl_dbg("EXIT 1");
-               return;
-       }
-       ad->tlinfo->time_media_display_order = TIME_ORDER_DESC;
-       __gl_update_timeline(ad);
-}
-
-void __gl_timeline_asc_mode_set(void *data)
-{
-       gl_dbg("ENTRY");
-       GL_CHECK(data);
-       gl_appdata *ad = (gl_appdata *)data;
-       if (ad->tlinfo->time_media_display_order == TIME_ORDER_ASC) {
-               gl_dbg("EXIT 1");
-               return;
-       }
-       ad->tlinfo->time_media_display_order = TIME_ORDER_ASC;
-       __gl_update_timeline(ad);
-}
-
-static void __gl_timeline_sort_cb(void *data, Evas_Object *obj, void *ei)
-{
-       gl_dbg("ENTRY");
-       GL_CHECK(data);
-       gl_appdata *ad = (gl_appdata *)data;
-       int state_index = -1;
-       state_index = ad->tlinfo->time_media_display_order == TIME_ORDER_ASC ? 1 : 0;
-       _gl_list_pop_create(data, obj, ei, GL_STR_SORT, GL_STR_DATE_MOST_RECENT, GL_STR_DATE_OLDEST, state_index);
-       gl_dbg("EXIT");
-}
-
 static void __gl_timeline_edit_cb(void *data, Evas_Object *obj, void *ei)
 {
        GL_CHECK(data);
@@ -2185,14 +1888,10 @@ static int __gl_timeline_ctxpopup_append(void *data, Evas_Object *parent)
                /* Delete */
                _gl_ctxpopup_append(parent, GL_STR_ID_DELETE,
                                    __gl_timeline_edit_cb, data);
-               /* Sort */
-               _gl_ctxpopup_append(parent, GL_STR_SORT,
-                                   __gl_timeline_sort_cb, data);
                /* Copy to album */
                _gl_ctxpopup_append(parent, GL_STR_ID_COPY_TO_ALBUM,
                                                        __gl_timeline_copy_cb, data);
        }
-
        return 0;
 }
 
@@ -2497,7 +2196,6 @@ static int __gl_timeline_change_mode(void *data, int mode)
                GL_GFREEIF(ad->tlinfo->sel_d);
                break;
        case GL_TL_VIEW_EDIT:
-       case GL_TL_VIEW_SHARE:
        case GL_TL_VIEW_COPY:
                GL_GFREEIF(ad->tlinfo->sel_d);
                ad->tlinfo->sel_d = g_new0(gl_sel_s, 1);
@@ -2550,8 +2248,6 @@ int _gl_timeline_create_view(void *data, Evas_Object *parent)
 
        if (ad->tlinfo) {
                gl_dbgW("Update view");
-               /*To show transition*/
-               ad->tlinfo->tran_op = GL_TRANS_OP_PREPARE;
                /*Update view*/
                ad->tlinfo->view = __gl_timeline_create_list_view(ad->tlinfo, false);
                elm_object_part_content_set(parent, "elm.swallow.view", ad->tlinfo->layout);
@@ -2582,8 +2278,6 @@ int _gl_timeline_create_view(void *data, Evas_Object *parent)
        timeline_d->parent = parent;
        timeline_d->nf_it = ad->ctrlinfo.nf_it;
        ad->tlinfo = timeline_d;
-       timeline_d->tran_op = GL_TRANS_OP_PREPARE;
-       timeline_d->time_media_display_order = TIME_ORDER_DESC;
        ad->pinchinfo.zoom_level = GL_ZOOM_IN_ONE;
 
        char *path = _gl_get_edje_path();
@@ -2604,7 +2298,6 @@ int _gl_timeline_create_view(void *data, Evas_Object *parent)
        evas_object_data_set(layout, "page_h", (void *)h);
        timeline_d->w = w;
        timeline_d->h = h;
-       timeline_d->is_list_reverse = false;
        gl_dbg("content's size(%dx%d)", w, h);
 
        view = __gl_timeline_create_list_view(timeline_d, false);
@@ -2700,11 +2393,8 @@ int _gl_timeline_hide_view(void *data)
                return -1;
        }
 
-       GL_TL_DEL_TRANSITS(ad->tlinfo->tiles);
        /* To hide slide items */
        evas_object_hide(ad->tlinfo->view);
-       /* Cancel thumb creation*/
-       __gl_timeline_cancel_thumbs(ad->tlinfo);
        /* Hide previous view */
        Evas_Object *pre_view = NULL;
        pre_view = elm_object_part_content_unset(ad->tlinfo->parent,
index 77b8d075d800bf90e14f344dfb797cb49fa4788f..45749be71c95dba9d9264132f1b91b63750f1f17 100644 (file)
@@ -27,8 +27,6 @@ int _gl_timeline_update_lang(void *data);
 int _gl_timeline_hide_view(void *data);
 int _gl_timeline_view_rotate(void *data);
 int _gl_timeline_rotate_view(void *data);
-void __gl_timeline_asc_mode_set(void *data);
-void __gl_timeline_desc_mode_set(void *data);
 bool __gl_update_timeline(void *data);
 int _gl_timeline_update_grid_size(void *data);
 void _gl_update_timeview_iv_select_mode_reply(void *data, char **select_result, int count);
index ef0565f8ac3294dc7a761dbe22e233ad23bb2678..87356cf0aa8831d6671254b7d36274a7599ff979 100644 (file)
@@ -1070,15 +1070,7 @@ int _gl_albums_change_mode(void *data, bool b_edit)
                elm_object_signal_emit(ad->ctrlinfo.ctrlbar_view_ly, "elm,selectall,state,visible,bg", "elm");
                elm_object_signal_emit(ad->ctrlinfo.ctrlbar_view_ly, "elm,selectall,state,visible", "elm");
                _gl_albums_edit_add_btns(data, ad->maininfo.naviframe);
-#ifdef _USE_GRID_CHECK
                _gl_show_grid_checks_dual(ad->albuminfo.view, GL_TILE_CHECKBOX, GL_TILE_CHECKBOX_GRID);
-#else
-               evas_object_smart_callback_del(ad->albuminfo.view, "unrealized",
-                                              __gl_albums_unrealized);
-               elm_gengrid_realized_items_update(ad->albuminfo.view);
-               evas_object_smart_callback_add(ad->albuminfo.view, "unrealized",
-                                              __gl_albums_unrealized, data);
-#endif
        } else {
                _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, GL_STR_ID_ALBUM, true);
                __gl_albums_add_btns(data);
index ce028c1321c1d3e52c7aa37274a9a1a8c765bab1..ff637880a5a5788d3103aaacb1f9b4d1446df7f1 100644 (file)
@@ -288,11 +288,7 @@ int _gl_thumbs_edit_create_view(void *data)
        _gl_thumbs_update_label(ad->gridinfo.nf_it, GL_STR_ID_SELECT_ITEM);
        /* Update realized items */
        if (_gl_thumbs_get_edit_mode(data) < GL_THUMBS_EDIT_FIRST)
-#ifdef _USE_GRID_CHECK
                _gl_show_grid_checks(ad->gridinfo.view, GL_THUMB_CHECKBOX);
-#else
-               _gl_thumbs_update_realized_items(data);
-#endif
        _gl_thumb_update_split_view(data);
        gl_dbg("Done");
        return 0;
@@ -340,11 +336,7 @@ int _gl_thumbs_edit_pop_view(void *data)
                                        GL_SIGNAL_GESTURE_DEFAULT, "elm");
 
                elm_object_signal_emit(ad->gridinfo.layout, "elm,selectall,state,default", "elm");
-#ifdef _USE_GRID_CHECK
                _gl_show_grid_checks(ad->gridinfo.view, GL_THUMB_CHECKBOX);
-#else
-               _gl_thumbs_update_realized_items(data);
-#endif
                _gl_thumbs_add_btns(data);
                ad->gridinfo.update_split_view = true;
                _gl_thumb_update_split_view(data);
index 2db1a84a58a0ce958c0b442c8f386e5f6fa6c7ff..71d20ee10808595ff8f087fe9ad78761e9be3e7f 100644 (file)
@@ -955,13 +955,8 @@ static int __gl_thumbs_ctxpopup_append(void *data, Evas_Object *parent)
        GL_CHECK_VAL(data, -1);
 
        gl_appdata *ad = (gl_appdata *)data;
-       /* 1. New album -- local album */
 
        if (ad->gridinfo.grid_type == GL_GRID_T_FAV) {
-               /* 3. Sort by */
-               if (!_gl_thumbs_check_zero(data))
-                       _gl_ctxpopup_append(parent, GL_STR_SORT,
-                                           __gl_thumbs_sortby_cb, data);
                return 0;
        }
        /* 2. Edit */
@@ -969,10 +964,6 @@ static int __gl_thumbs_ctxpopup_append(void *data, Evas_Object *parent)
        if (!_gl_thumbs_check_zero(data))
                _gl_ctxpopup_append(parent, GL_STR_ID_DELETE,
                                    __gl_thumbs_edit_cb, data);
-       /* 3. Sort by */
-       if (!_gl_thumbs_check_zero(data))
-               _gl_ctxpopup_append(parent, GL_STR_SORT,
-                                   __gl_thumbs_sortby_cb, data);
        /* 4. Copy to album*/
        if (!_gl_thumbs_check_zero(data))
                _gl_ctxpopup_append(parent, GL_STR_ID_COPY_TO_ALBUM,
index cd8355e1d9afa38cab71d1fd5b29288c45a66c74..dc74c02ec1877dfdcbf0404802325fc9da604930 100644 (file)
@@ -680,7 +680,6 @@ int _gl_ui_add_selall_ck(Evas_Object *parent, char *part, char *part_btn,
        return 0;
 }
 
-#ifdef _USE_GRID_CHECK
 int _gl_show_grid_checks(Evas_Object *view, const char *ck_part)
 {
        GL_CHECK_VAL(ck_part, -1);
@@ -738,5 +737,4 @@ int _gl_show_grid_checks_dual(Evas_Object *view, const char *ck_part, const char
        }
        return 0;
 }
-#endif
 
index 72dd66f0cfa571f13ff594f4ec7bd19d32475dc0..13f52e2140e11f273edd62a5a40f090ab7a2038f 100644 (file)
@@ -1325,62 +1325,12 @@ void _gl_album_view_selected_cb(void *data, Evas_Object *obj, void *event_info)
        gl_dbg("EXIT");
 }
 
-void _gl_asc_sort_selected_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       gl_dbg("ENTRY");
-       GL_CHECK(data);
-       gl_appdata *ad = (gl_appdata *)data;
-       if (ad->popupinfo.popup) {
-               evas_object_del(ad->popupinfo.popup);
-               ad->popupinfo.popup = NULL;
-       }
-       if (ad->maininfo.view_mode == GL_VIEW_THUMBS) {
-               if (ad->gridinfo.media_display_order == ORDER_ASC) {
-                       gl_dbg("EXIT 1");
-                       return;
-               }
-               ad->gridinfo.media_display_order = ORDER_ASC;
-               _gl_thumbs_update_items(ad);
-       } else if (ad->maininfo.view_mode == GL_VIEW_TIMELINE) {
-               __gl_timeline_asc_mode_set(ad);
-       }
-       gl_dbg("EXIT");
-}
-
-void _gl_desc_sort_selected_cb(void *data, Evas_Object *obj, void *event_info)
-{
-       gl_dbg("ENTRY");
-       GL_CHECK(data);
-       gl_appdata *ad = (gl_appdata *)data;
-       if (ad->popupinfo.popup) {
-               evas_object_del(ad->popupinfo.popup);
-               ad->popupinfo.popup = NULL;
-       }
-       if (ad->maininfo.view_mode == GL_VIEW_THUMBS) {
-               if (ad->gridinfo.media_display_order == ORDER_DESC) {
-                       gl_dbg("EXIT 1");
-                       return;
-               }
-               ad->gridinfo.media_display_order = ORDER_DESC;
-               _gl_thumbs_update_items(ad);
-       } else if (ad->maininfo.view_mode == GL_VIEW_TIMELINE) {
-               __gl_timeline_desc_mode_set(ad);
-       }
-       gl_dbg("EXIT");
-}
-
 void _gl_list_viewas_popup_cb_add(Evas_Object *btn, Evas_Object *btn1, void *ad)
 {
        evas_object_smart_callback_add(btn, "clicked", _gl_time_view_selected_cb, ad);
        evas_object_smart_callback_add(btn1, "clicked", _gl_album_view_selected_cb, ad);
 }
 
-void _gl_list_sortby_popup_cb_add(Evas_Object *btn, Evas_Object *btn1, void *ad)
-{
-       evas_object_smart_callback_add(btn, "clicked", _gl_desc_sort_selected_cb, ad);
-       evas_object_smart_callback_add(btn1, "clicked", _gl_asc_sort_selected_cb, ad);
-}
-
 void _gl_list_pop_create(void *data, Evas_Object *obj, void *ei, char *title, char *first_text, char *second_text, int state_index)
 {
        gl_dbg("ENTRY");
@@ -1431,8 +1381,6 @@ void _gl_list_pop_create(void *data, Evas_Object *obj, void *ei, char *title, ch
 
        if (strcmp(title, GL_STR_SORT)) {
                _gl_list_viewas_popup_cb_add(btn, btn1, ad);
-       } else {
-               _gl_list_sortby_popup_cb_add(btn, btn1, ad);
        }
        ad->popupinfo.popup = popup;
        elm_object_part_content_set(ly, "list", ly1);
index 846a2de97c96abfdd28b277143dcb7a6d9dbb1b9..28d11ad2a436138ac6a3ab3746c8f4d0624f10bd 100644 (file)
@@ -202,11 +202,7 @@ Evas_Object *_gl_thumb_show_checkbox(Evas_Object *obj, bool checked,
        ck = elm_check_add(obj);
        GL_CHECK_NULL(ck);
 
-#ifdef _USE_GRID_CHECK
        elm_object_style_set(ck, "grid");
-#else
-       elm_object_style_set(ck, GL_CHECKBOX_STYLE_THUMB);
-#endif
        evas_object_propagate_events_set(ck, EINA_FALSE);
 
        elm_check_state_set(ck, checked);