Removed unused widget code 58/106558/1
authorRahul Dadhich <r.dadhich@samsung.com>
Thu, 8 Dec 2016 10:34:11 +0000 (16:04 +0530)
committerbhutani.92 <bhutani.92@samsung.com>
Thu, 22 Dec 2016 05:18:33 +0000 (10:48 +0530)
Change-Id: Ida0340361839072b9b6d639b8e1a269cf9142782
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>
19 files changed:
inc/widget/gl-controlbar.h
inc/widget/gl-ctxpopup.h
inc/widget/gl-editfield.h
inc/widget/gl-notify.h
inc/widget/gl-popup.h
inc/widget/gl-progressbar.h
inc/widget/gl-thumb.h
inc/widget/gl-tile.h
src/2dview/gl-timeline.c
src/features/gl-thumbs.c
src/widget/gl-controlbar.c
src/widget/gl-ctxpopup.c
src/widget/gl-editfield.c
src/widget/gl-gesture.c
src/widget/gl-notify.c
src/widget/gl-popup.c
src/widget/gl-progressbar.c
src/widget/gl-thumb.c
src/widget/gl-tile.c

index 7bc1473a443ae95f1c8b416b4ab377468db88ec6..df0ed2365a0677d617816b192262923eccf00d5a 100644 (file)
@@ -40,17 +40,8 @@ Evas_Object *_gl_ctrl_add_main_layout(Evas_Object *parent);
 int _gl_ctrl_sel_tab(void *data, int tab_mode);
 int _gl_ctrl_set_tab_mode(void *data, int mode);
 int _gl_ctrl_get_tab_mode(void *data);
-int _gl_ctrl_change_easymode(void *data);
 int _gl_ctrl_enable_btns(void *data, Elm_Object_Item *nf_it);
-Evas_Object *_gl_ctrl_add_toolbar(Evas_Object *parent);
-Elm_Object_Item *_gl_ctrl_append_item(Evas_Object *obj, const char *icon,
-                                     const char *label, Evas_Smart_Cb func,
-                                     const void *data);
 int _gl_ctrl_disable_items(Elm_Object_Item *nf_it, bool b_disabled);
-int _gl_ctrl_disable_items_with_check(Elm_Object_Item *nf_it, bool b_disabled,
-                                     char *check_str, bool b_check_disabled);
-int _gl_ctrl_disable_item_with_check(Elm_Object_Item *nf_it, char *check_str,
-                                    bool b_disabled);
 int _gl_ctrl_disable_item(Elm_Object_Item *it, Eina_Bool b_disabled);
 
 #endif /* _GL_CONTROLBAR_H_ */
index e92f9151ab822b5a296509cc05f703a7b309a0a8..06fc092fabd949abf40c458d48826d5ba81f083f 100644 (file)
@@ -21,8 +21,6 @@ typedef int (*ctx_append_cb) (void *data, Evas_Object *parent);
 
 Elm_Object_Item *_gl_ctxpopup_append(Evas_Object *obj, char *label_id,
                                     Evas_Smart_Cb func, const void *data);
-Elm_Object_Item *_gl_ctxpopup_append_with_icon(Evas_Object *obj, char *label,
-                                    char *icon_path, Evas_Smart_Cb func, const void *data);
 int _gl_ctxpopup_create(void *data, Evas_Object *but, ctx_append_cb append_cb);
 int _gl_ctxpopup_del(void *data);
 
index 61fff2982cd4f88c4008bd0f16d201167eaa1b0f..96838897971cd56ec360e77e48b9c5954fad21e3 100644 (file)
@@ -24,11 +24,6 @@ extern "C"
 {
 #endif
 
-Evas_Object *_gl_editfield_create(void *data, Evas_Object *parent,
-                                 char *default_label);
-Evas_Object *_gl_editfield_create_genlist(void *data, Evas_Object *parent,
-                                          Elm_Object_Item *it, char *label);
-Evas_Object *_gl_editfield_create_entry(void *data, Evas_Object *layout, char *text);
 int _gl_editfield_hide_imf(void *data);
 int _gl_editfield_show_imf(void *data);
 int _gl_editfield_destroy_imf(void *data);
index c08f70baf668bf7195ce357b5daf01cd7f46f9ca..45059997467787a68876e117e6e7781f92351104 100644 (file)
@@ -27,11 +27,6 @@ extern "C"
 int _gl_notify_create_notiinfo(const char *text);
 int _gl_notify_check_selall(void *data, Elm_Object_Item *nf_it, int all_cnt,
                            int selected_cnt);
-int _gl_notify_destroy(void *noti);
-int _gl_notify_update_size(void *noti, unsigned long long total);
-int _gl_notify_update_progress(void *noti, unsigned long long total,
-                              unsigned long long byte);
-
 #ifdef __cplusplus
 }
 #endif
index 9e6a398af67e7ee1d45729fa1f968114e3a7a24c..fb7d7f97163a23f5482db3ba263a4ff49b17b5e0 100644 (file)
@@ -53,14 +53,6 @@ int _gl_popup_create_del(void *data, int mode, void *sel_cb, void *del_cb,
 int gl_popup_create_popup(void *data, gl_popup_mode mode, char *desc);
 Evas_Object *_gl_popup_create_local(void *data, gl_popup_mode mode, char *desc);
 int _gl_popup_create_slideshow(void *data, void *op_func);
-int _gl_popup_create_move(void *data, void *op_func);
-int _gl_popup_create_copy(void *data, void *op_func);
-int _gl_popup_create_move_with_append(void *data, void *op_func, void *append_func, const char *title);
-int _gl_popup_create_longpressed_album(void *data, void *op_func, char *album_name);
-int _gl_popup_create_longpressed_thumb(void *data, void *op_func, char *file_name);
-int _gl_popup_create_longpressed_album_with_append(void *data, void *op_func, void *append_func, const char *title);
-int _gl_popup_add_buttons(void *data, const char *text, Evas_Smart_Cb cb_func);
-int _gl_popup_add_block_callback(void *data);
 void _gl_list_pop_create(void *data, Evas_Object *obj, void *ei, char *title, char *first_text, char *second_text, int state_index);
 int _gl_popup_create_copy_move(void *data, void *sel_cb, void *cb_data);
 void _gl_update_copy_move_popup(void *data);
index 23106832db51421e1515f5506636ac7219c9adca..f4cccc68630c3576b3552374a1848852d489ec70 100644 (file)
@@ -21,7 +21,6 @@
 #define GL_FONT_STYLE_POP_S "<color=#eec900><font=Tizen:style=Medium text_class=tizen><font_size=30>"
 #define GL_FONT_STYLE_POP_E "</font_size></font></color>"
 
-int gl_pb_add_pbar_timer(void *data);
 int gl_pb_make_thread_pbar(void *data, Evas_Object * parent, char *title);
 int gl_pb_make_thread_pbar_wheel(void *data, Evas_Object * parent, char *title);
 int gl_pb_refresh_thread_pbar(void *data, int cur_cnt, int total_cnt);
index 03f64dc043d1ff7c158c53e71e487a227b33c499..73773409700fc0ede2bff4c5149401db7e7c5bf9 100644 (file)
 
 typedef enum _gl_cm_mode_t {
        GL_CM_MODE_NORMAL               = 0,
-       GL_CM_MODE_PANORAMA             = 1,
-       GL_CM_MODE_SOUND                = 2,
-       GL_CM_MODE_ANIMATE              = 3,
-       GL_CM_MODE_BEST                 = 4,
-       GL_CM_MODE_FB                   = 5,
-       GL_CM_MODE_VOICE_REC    = 10,
-       GL_CM_MODE_BURSTSHOT    = 11, /* burstshot mode is not defined media content db */
-       GL_CM_MODE_MAX,
 } gl_cm_mode_e;
 
 Evas_Object *_gl_thumb_show_image(Evas_Object *obj, char *path, int orient,
                                  int w, int h, int zoom_level);
-Evas_Object *_gl_thumb_show_burstshot(Evas_Object *obj, char *path1,
-                                     char *path2, char *path3,
-                                     unsigned int orient, int w, int h,
-                                     int zoom_level);
 Evas_Object *_gl_thumb_show_video(Evas_Object *obj, char *path,
                                  unsigned int v_dur, int w, int h,
                                  int zoom_level);
 Evas_Object *_gl_thumb_show_checkbox(Evas_Object *obj, bool checked,
                                     Evas_Smart_Cb func, const void *data);
-Evas_Object *_gl_thumb_show_mode(Evas_Object *obj, gl_cm_mode_e mode);
 Evas_Object *_gl_thumb_add_gengrid(Evas_Object *parent);
 int _gl_thumb_update_gengrid(Evas_Object *view);
 int _gl_thumb_set_size(void *data, Evas_Object *view, int *size_w, int *size_h);
 int _gl_thumb_split_set_size(void *data, Evas_Object *view);
-bool _gl_thumb_insert_date(void *data, Evas_Object *parent);
 
 #endif
 
index 5bfabceea3bf73cefae769a8429d75d5aa776abd..b89f7bd88beeef99c073ce8b69a0522793959fc8 100644 (file)
@@ -49,10 +49,7 @@ Evas_Object *_gl_tile_show_part_checkbox_grid(Evas_Object *obj, bool checked,
                                              const void *data);
 Evas_Object *_gl_tile_show_part_checkbox(Evas_Object *obj, bool checked,
                                         Evas_Smart_Cb func, const void *data);
-Evas_Object *_gl_tile_show_part_rename(Evas_Object *obj, Evas_Smart_Cb func,
-                                      const void *data);
 Evas_Object *_gl_tile_show_part_type_icon(Evas_Object *obj, int sns_type);
-int _gl_tile_get_mtime(time_t *mtime1, time_t *mtime2, char *buf, int max_len);
 Evas_Object *_gl_tile_add_gengrid(Evas_Object *parent);
 int _gl_tile_update_item_size(void *data, Evas_Object *grid, bool b_update);
 Evas_Object *_gl_tile_add_gesture(void *data, Evas_Object *parent);
index c54960ba6a219c038647bbc9620aa6165136c347..5242e2d0cc3119f6f14a22293b19c7924e861ddb 100644 (file)
@@ -809,15 +809,8 @@ Evas_Object *_gl_timeline_thumbs_get_content(void *data, Evas_Object *parent,
                layout = _gl_thumb_show_video(parent, path, v_dur, w, h,
                                              zoom_level);
        } else {
-               if (item->image_info &&
-                       item->image_info->burstshot_id) {
-                       layout = _gl_thumb_show_image(parent, path, 0, w, h,
-                                                     zoom_level);
-                       item->mode = GL_CM_MODE_BURSTSHOT;
-               } else {
-                       layout = _gl_thumb_show_image(parent, path, 0, w, h,
-                                                     zoom_level);
-               }
+               layout = _gl_thumb_show_image(parent, path, 0, w, h,
+                               zoom_level);
        }
        return layout;
 }
index 0ae973f179e216a35ea24bfdc7090c2856524fe9..e8cafa4903ae39d6d4063f5a0ddd23eb81a09d5f 100644 (file)
@@ -396,8 +396,6 @@ static Evas_Object *__gl_thumbs_get_content(void *data, Evas_Object *obj,
                        }
                }
                return btn;
-       } else if (!g_strcmp0(part, GL_THUMB_MODE)) {
-               return _gl_thumb_show_mode(obj, gitem->item->mode);
        }
        return NULL;
 }
@@ -1125,15 +1123,9 @@ Evas_Object *_gl_thumbs_get_content(void *data, Evas_Object *parent,
                layout = _gl_thumb_show_video(parent, path, v_dur, w, h,
                                              zoom_level);
        } else {
-               if (gitem->item->image_info &&
-                       gitem->item->image_info->burstshot_id) {
-                       layout = _gl_thumb_show_image(parent, path, 0, w, h,
-                                                     zoom_level);
-                       gitem->item->mode = GL_CM_MODE_BURSTSHOT;
-               } else {
-                       layout = _gl_thumb_show_image(parent, path, 0, w, h,
-                                                     zoom_level);
-               }
+
+               layout = _gl_thumb_show_image(parent, path, 0, w, h,
+                               zoom_level);
        }
        return layout;
 }
index f5b011a912d678032aed654eb4a6966b97a0091d..a07b24e818ba8719c16533aab59d26dfab0433d0 100644 (file)
@@ -72,7 +72,6 @@ int _gl_ctrl_show_view(void *data, const char *label)
                _gl_ctrl_set_tab_mode(ad, GL_CTRL_TAB_ALBUMS);
                _gl_albums_show_view_tab(data, ad->ctrlinfo.ctrlbar_view_ly);
        } else if (!g_strcmp0(label, "Timeline"/*_gl_str(GL_STR_ID_TIME_LINE)*/)) {
-//     :TODO Timeline need to be addressed
                gl_dbg(" Timeline");
                if (tab_mode == GL_CTRL_TAB_TIMELINE) {
                        gl_dbg("Already in Timeline Tab.");
@@ -209,50 +208,11 @@ int _gl_ctrl_get_tab_mode(void *data)
        return ad->ctrlinfo.tab_mode;
 }
 
-int _gl_ctrl_change_easymode(void *data)
-{
-       GL_CHECK_VAL(data, -1);
-
-       /* Remove ctxpopup */
-       _gl_ctxpopup_del(data);
-       /* Clear old view first */
-       gl_pop_to_ctrlbar_ly(data);
-       /* Initialize tab view */
-       __gl_ctrl_reset_previous_tab(data);
-       /* Reset tab view mode to re-entrance same tab view */
-       _gl_ctrl_set_tab_mode(data, GL_CTRL_TAB_INIT);
-       _gl_ctrl_show_view(data, GL_STR_ALBUMS);
-       return 0;
-}
-
 int _gl_ctrl_enable_btns(void *data, Elm_Object_Item *nf_it)
 {
        return __gl_ctrl_enable_btns(data, nf_it);
 }
 
-Evas_Object *_gl_ctrl_add_toolbar(Evas_Object *parent)
-{
-       Evas_Object *toolbar = elm_toolbar_add(parent);
-       GL_CHECK_NULL(toolbar);
-       elm_object_style_set(toolbar, "default");
-       elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
-       elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
-       elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_NONE);
-       return toolbar;
-}
-
-Elm_Object_Item *_gl_ctrl_append_item(Evas_Object *obj, const char *icon,
-                                      const char *label, Evas_Smart_Cb func,
-                                      const void *data)
-{
-       Elm_Object_Item *it = NULL;
-       it = elm_toolbar_item_append(obj, icon, label, func, data);
-       if (label) {
-               _gl_ui_set_translatable_item(it, label);
-       }
-       return it;
-}
-
 int _gl_ctrl_disable_items(Elm_Object_Item *nf_it, bool b_disabled)
 {
        GL_CHECK_VAL(nf_it, -1);
@@ -278,64 +238,6 @@ int _gl_ctrl_disable_items(Elm_Object_Item *nf_it, bool b_disabled)
        return 0;
 }
 
-int _gl_ctrl_disable_items_with_check(Elm_Object_Item *nf_it, bool b_disabled,
-                                      char *check_str, bool b_check_disabled)
-{
-       GL_CHECK_VAL(nf_it, -1);
-       Evas_Object *toolbar = NULL;
-       toolbar = elm_object_item_part_content_get(nf_it, "toolbar");
-       GL_CHECK_VAL(toolbar, -1);
-
-       Elm_Object_Item *it = NULL;
-       Elm_Object_Item *next_it = NULL;
-       char *text = NULL;
-       it = elm_toolbar_first_item_get(toolbar);
-       while (it) {
-               next_it = elm_toolbar_item_next_get(it);
-               text = (char *)elm_object_item_text_get(it);
-               if (text && !g_strcmp0(text, _gl_str(GL_STR_ID_CANCEL))) {
-                       it = next_it;
-                       continue;
-               }
-               if (check_str) {
-                       if (text && !g_strcmp0(text, _gl_str(check_str))) {
-                               _gl_ctrl_disable_item(it, b_check_disabled);
-                       } else {
-                               _gl_ctrl_disable_item(it, b_disabled);
-                       }
-               } else {
-                       _gl_ctrl_disable_item(it, b_disabled);
-               }
-               it = next_it;
-       }
-       return 0;
-}
-
-int _gl_ctrl_disable_item_with_check(Elm_Object_Item *nf_it, char *check_str,
-                                     bool b_disabled)
-{
-       GL_CHECK_VAL(check_str, -1);
-       GL_CHECK_VAL(nf_it, -1);
-       Evas_Object *toolbar = NULL;
-       toolbar = elm_object_item_part_content_get(nf_it, "toolbar");
-       GL_CHECK_VAL(toolbar, -1);
-
-       Elm_Object_Item *it = NULL;
-       Elm_Object_Item *next_it = NULL;
-       char *text = NULL;
-       it = elm_toolbar_first_item_get(toolbar);
-       while (it) {
-               next_it = elm_toolbar_item_next_get(it);
-               text = (char *)elm_object_item_text_get(it);
-               if (text && !g_strcmp0(text, _gl_str(check_str))) {
-                       _gl_ctrl_disable_item(it, b_disabled);
-                       return 0;
-               }
-               it = next_it;
-       }
-       return -1;
-}
-
 int _gl_ctrl_disable_item(Elm_Object_Item *it, Eina_Bool b_disabled)
 {
        GL_CHECK_VAL(it, -1);
index 73a859d19737ce8f7ebf9fbf884dd5322e01fe2a..d95887b3f63b79778d182bce9e6bc1ac05851f98 100644 (file)
@@ -288,26 +288,6 @@ Elm_Object_Item *_gl_ctxpopup_append(Evas_Object *obj, char *label_id,
        return elm_ctxpopup_item_append(obj, _gl_str(label_id), NULL, func, data);
 }
 
-Elm_Object_Item *_gl_ctxpopup_append_with_icon(Evas_Object *obj, char *label,
-                                       char *icon_path, Evas_Smart_Cb func, const void *data)
-{
-       Evas_Object *ic = NULL;
-
-       if (icon_path) {
-               ic = elm_image_add(obj);
-               GL_CHECK_NULL(ic);
-               GL_ICON_SET_FILE(ic, icon_path);
-       }
-
-       gl_ctx_data_s *ctx_data = NULL;
-       ctx_data = (gl_ctx_data_s *)evas_object_data_get(obj,
-                  GL_CTXPOPUP_OBJ_DATA_KEY);
-       if (ctx_data) {
-               ctx_data->items_count++;
-       }
-       return elm_ctxpopup_item_append(obj, label, ic, func, data);
-}
-
 int _gl_ctxpopup_create(void *data, Evas_Object *but, ctx_append_cb append_cb)
 {
        gl_dbg("");
index 00833dd26978ce54aae2516c752fb84a68dcf9b2..f55d8e8650b8a107f60768a2e5b16de4dec6454c 100644 (file)
@@ -155,146 +155,6 @@ int __gl_editfield_set_entry(void *data, Evas_Object *layout,
        return 0;
 }
 
-Evas_Object *_gl_editfield_create(void *data, Evas_Object *parent,
-                                  char *default_label)
-{
-       GL_CHECK_NULL(data);
-       gl_appdata *ad = (gl_appdata *)data;
-       GL_CHECK_NULL(parent);
-       Evas_Object *layout = NULL;
-       Evas_Object *entry_layout = NULL;
-       Evas_Object *entry = NULL;
-
-       layout = elm_layout_add(parent);
-       GL_CHECK_NULL(layout);
-       elm_layout_theme_set(layout, "layout", "application", "searchbar_base");
-       elm_object_signal_emit(layout, "elm,state,show,searchbar", "elm");
-
-       entry_layout = elm_layout_add(layout);
-       if (entry_layout == NULL) {
-               evas_object_del(layout);
-               return NULL;
-       }
-       /* Customized theme */
-       elm_layout_theme_set(entry_layout, "layout", "searchbar", "default");
-       elm_object_part_content_set(layout, "searchbar", entry_layout);
-
-       entry = elm_entry_add(entry_layout);
-       if (entry == NULL) {
-               evas_object_del(entry_layout);
-               return NULL;
-       }
-
-       elm_entry_single_line_set(entry, EINA_TRUE);
-       elm_entry_scrollable_set(entry, EINA_TRUE);
-       elm_object_part_content_set(entry_layout, "elm.swallow.content", entry);
-       elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
-       elm_entry_input_panel_layout_set(entry, ELM_INPUT_PANEL_LAYOUT_NORMAL);
-
-       ad->entryinfo.entry = entry;
-       ad->entryinfo.context = elm_entry_imf_context_get(ad->entryinfo.entry);
-       ad->entryinfo.editfield = entry_layout;
-       /* Set callback */
-       __gl_editfield_set_entry(ad, entry_layout, entry, default_label);
-       evas_object_show(entry_layout);
-
-       return layout;
-}
-
-/* Add editfield to genlist item */
-Evas_Object *_gl_editfield_create_genlist(void *data, Evas_Object *parent,
-                               Elm_Object_Item *it, char *label)
-{
-       GL_CHECK_NULL(label);
-       GL_CHECK_NULL(parent);
-       GL_CHECK_NULL(data);
-       gl_appdata *ad = (gl_appdata *)data;
-       gl_dbg("");
-       Evas_Object *entry = NULL;
-
-       _gl_editfield_destroy_imf(ad);
-       entry = elm_entry_add(parent);
-       if (entry == NULL) {
-               gl_dbgE("elm_entry_add failed!");
-               return NULL;
-       }
-
-       elm_entry_single_line_set(entry, EINA_TRUE);
-       elm_entry_scrollable_set(entry, EINA_TRUE);
-       GL_FREEIF(ad->entryinfo.limit_filter);
-       Elm_Entry_Filter_Limit_Size *limit_filter = (Elm_Entry_Filter_Limit_Size *)calloc(1, sizeof(Elm_Entry_Filter_Limit_Size));
-       GL_CHECK_NULL(limit_filter);
-       ad->entryinfo.limit_filter = limit_filter;
-       /* Tag name, the length is limited to 255 Chars */
-       limit_filter->max_char_count = GL_ENTRY_STR_CHAR_MAX;
-       limit_filter->max_byte_count = 0;
-       elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
-       elm_entry_input_panel_return_key_type_set(entry,
-               ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
-       elm_entry_autocapital_type_set(entry, ELM_AUTOCAPITAL_TYPE_SENTENCE);
-       elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size,
-                                      limit_filter);
-       evas_object_smart_callback_add(entry, "maxlength,reached",
-                                      __gl_editfield_maxlen_reached_cb, ad);
-       evas_object_smart_callback_add(entry, "activated",
-                                      __gl_editfield_enter_cb, ad);
-       /**
-        * Do not unset rename mode on unfocused event
-        *otherwise clipboard does not work properly
-        */
-       ad->entryinfo.entry = entry;
-       ad->entryinfo.context = elm_entry_imf_context_get(entry);
-
-       _gl_editfield_show_imf(data);
-       gl_set_entry_text(entry, label);
-       elm_entry_cursor_end_set(entry);
-
-       if (!ad->entryinfo.b_hide_toolbar) {
-               ad->entryinfo.b_hide_toolbar = true;
-               _gl_ui_set_toolbar_state(data, ad->entryinfo.b_hide_toolbar);
-       }
-       return entry;
-}
-
-Evas_Object *_gl_editfield_create_entry(void *data, Evas_Object *layout, char *text)
-{
-       GL_CHECK_NULL(data);
-       gl_appdata *ad = (gl_appdata *)data;
-       static Elm_Entry_Filter_Limit_Size limit_filter_data;
-
-       Evas_Object *entry = elm_entry_add(layout);
-       GL_CHECK_NULL(entry);
-
-       elm_entry_single_line_set(entry, EINA_TRUE);
-       elm_entry_scrollable_set(entry, EINA_TRUE);
-
-       limit_filter_data.max_char_count = GL_ENTRY_STR_CHAR_MAX;
-       if (text) {
-               elm_entry_entry_set(entry, text);
-       }
-       elm_entry_cursor_end_set(entry);
-
-       elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size,
-                                      &limit_filter_data);
-
-       evas_object_smart_callback_add(entry, "maxlength,reached",
-                                      __gl_editfield_maxlen_reached_cb, data);
-       evas_object_smart_callback_add(entry, "changed",
-                                      __gl_editfield_space_check_cb, data);
-       evas_object_smart_callback_add(entry, "preedit,changed",
-                                      __gl_editfield_space_check_cb, data);
-       evas_object_smart_callback_add(entry, "activated",
-                                      __gl_editfield_enter_cb, data);
-       elm_entry_cnp_mode_set(entry, ELM_CNP_MODE_PLAINTEXT);
-       elm_entry_input_panel_return_key_type_set(entry,
-               ELM_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
-       elm_entry_autocapital_type_set(entry, ELM_AUTOCAPITAL_TYPE_SENTENCE);
-       ad->entryinfo.entry = entry;
-       ad->entryinfo.context = elm_entry_imf_context_get(entry);
-
-       return entry;
-}
-
 /* Hide input panel and entry cursor */
 int _gl_editfield_hide_imf(void *data)
 {
index 688a96bc82feb7d9d7f568c473fe30b5c12998ba..79835a54cf4c474843b0c1b80bf5cff4d6e636b1 100644 (file)
@@ -80,7 +80,6 @@ static gl_pinch_event_s *__gl_gesture_create_event_obj(void *data,
        GL_CHECK_NULL(data);
        gl_gesture_s *gesture_d = (gl_gesture_s *)data;
        gl_pinch_event_s *ev = NULL;
-       /*gl_dbg(""); */
 
        ev = calloc(1, sizeof(gl_pinch_event_s));
        if (ev == NULL) {
@@ -102,7 +101,6 @@ static int __gl_gesture_destroy_event_obj(void *data, gl_pinch_event_s *ev)
        GL_CHECK_VAL(ev, -1);
        GL_CHECK_VAL(data, -1);
        gl_gesture_s *gesture_d = (gl_gesture_s *)data;
-       /*gl_dbg(""); */
 
        ev->pinch_obj = NULL;
        ev->pinch_dis = 0;
@@ -232,10 +230,8 @@ static void __gl_gesture_mouse_up_event(void *data, Evas *e,
        }
        /* check whether device multi is on or off */
        mdevice = __gl_gesture_get_multi_device(data);
-       /*gl_dbg("mdevice[%d]", mdevice); */
        if (mdevice == 0) {
        } else {
-               /*gl_dbg(" device multi is on"); */
                /* when device multi is on */
                ev = __gl_gesture_get_event_obj(data, mdevice);
                if (ev == NULL) {
@@ -265,7 +261,6 @@ static void __gl_gesture_multi_up_event(void *data, Evas *evas,
        Evas_Event_Multi_Up *up = (Evas_Event_Multi_Up *)ei;
        gl_pinch_event_s *ev0 = NULL;
        gl_pinch_event_s *ev = NULL;
-       /*gl_dbg(""); */
 
        ev = __gl_gesture_get_event_obj(data, up->device);
        if (ev == NULL) {
@@ -275,7 +270,6 @@ static void __gl_gesture_multi_up_event(void *data, Evas *evas,
 
        gesture_d->dis_old = 0;
        gesture_d->pinch_dis_old = 0;
-       /*dis_old = 0; */
 
        /* act depends on device 0 on or off */
        ev0 = __gl_gesture_get_event_obj(data, 0);
@@ -297,13 +291,10 @@ static void __gl_gesture_mouse_move_event(void *data, Evas *e,
 {
        GL_CHECK(ei);
        GL_CHECK(data);
-//     Evas_Event_Mouse_Move *ev = (Evas_Event_Mouse_Move *)ei;
        gl_pinch_event_s *ev0;
-       /*gl_dbg(""); */
 
        ev0 = __gl_gesture_get_event_obj(data, 0);
        if (ev0 == NULL) {
-               /*gl_dbg("Cannot get device0"); */
                return;
        }
 
@@ -355,7 +346,6 @@ static void __gl_gesture_multi_move_event(void *data, Evas *evas,
        int dis_new;
        gl_pinch_event_s *ev0;
        gl_pinch_event_s *ev;
-       /*(gl_dbg(""); */
 
        ev = __gl_gesture_get_event_obj(data, move->device);
        if (ev == NULL) {
index f62872a2b3db1807fa3bc9d24dae483ba4b04d17..5a9fdeb5a70c127b80d2641d22fe3ab51d6b2cd2 100644 (file)
@@ -82,60 +82,3 @@ int _gl_notify_check_selall(void *data, Elm_Object_Item *nf_it, int all_cnt,
 
        return 0;
 }
-
-int _gl_notify_destroy(void *noti)
-{
-       GL_CHECK_VAL(noti, -1);
-       gl_noti_s *noti_d = noti;
-
-       if (noti_d->handle) {
-               int err = 0;
-               err = notification_delete(noti_d->handle);
-               if (err != NOTIFICATION_ERROR_NONE) {
-                       gl_dbgE("notification_delete().. [0x%x]", err);
-               }
-
-               err = notification_free(noti_d->handle);
-               if (err != NOTIFICATION_ERROR_NONE) {
-                       gl_dbgE("notification_free().. [0x%x]", err);
-               }
-       }
-       noti_d->handle = NULL;
-       GL_GFREE(noti_d);
-       return 0;
-}
-
-int _gl_notify_update_size(void *noti, unsigned long long total)
-{
-       GL_CHECK_VAL(noti, -1);
-       gl_noti_s *noti_d = noti;
-       GL_CHECK_VAL(noti_d->handle, -1);
-       gl_dbg("%lld", total);
-
-       int err = 0;
-       err = notification_set_size(noti_d->handle, (double)total);
-       if (err != NOTIFICATION_ERROR_NONE) {
-               gl_dbgE("notification_update_size().. [0x%x]", err);
-               return -1;
-       }
-       return 0;
-}
-
-int _gl_notify_update_progress(void *noti, unsigned long long total,
-                               unsigned long long byte)
-{
-       GL_CHECK_VAL(noti, -1);
-       gl_noti_s *noti_d = noti;
-       GL_CHECK_VAL(noti_d->handle, -1);
-       gl_dbg("%lld/%lld", byte, total);
-
-       int err = 0;
-       double progress = (double)byte / total;
-       err = notification_set_progress(noti_d->handle, progress);
-       if (err != NOTIFICATION_ERROR_NONE) {
-               gl_dbgE("notification_update_progress().. [0x%x]", err);
-               return -1;
-       }
-       return 0;
-}
-
index d112918e0b14e8bd62c2f63860fbf83be2af0268..7a71ea035c64c84c123697bb455d9c2310cfe635 100644 (file)
@@ -36,8 +36,6 @@ enum  gl_popup_obj_del_cb_type {
 
 #define GL_POPUP_GENLIST_ITEM_W 618
 
-#define GL_POPUP_TIMEOUT_1S 1.0
-#define GL_POPUP_TIMEOUT_2S 2.0
 #define GL_POPUP_TIMEOUT_3S 3.0
 #define GL_POPUP_OBJ_DATA_KEY "gl_popup_data_key"
 #define GL_POPUP_OBJ_DEL_CB_KEY "gl_popup_cb_key"
@@ -46,11 +44,8 @@ enum  gl_popup_obj_del_cb_type {
 #define GL_POPUP_GENLIST_DATA_KEY "gl_popup_genlist_data_key"
 #define SETTINGS_STORAGE_UG_NAME "org.tizen.setting-storage"
 #define GL_POPUP_GENLIST_HEIGHT_HD 260
-#define GL_POPUP_GENLIST_WIDTH_HD 630
 #define GL_POPUP_GENLIST_HEIGHT_QHD 185
-#define GL_POPUP_GENLIST_WIDTH_QHD 450
 #define GL_POPUP_GENLIST_HEIGHT_WVGA 202
-#define GL_POPUP_GENLIST_WIDTH_WVGA 480
 
 typedef struct _gl_popup_t gl_popup_s;
 typedef struct _gl_popup_menu_t gl_popup_menu_s;
@@ -250,14 +245,6 @@ static void __gl_popup_resp_cb(void *data, Evas_Object *obj, void *ei)
        __gl_popup_resp(data, text);
 }
 
-static void __gl_popup_block_clicked_cb(void *data, Evas_Object *obj, void *ei)
-{
-       GL_CHECK(data);
-       gl_appdata *ad = (gl_appdata *)data;
-       _gl_free_selected_list(data);
-       GL_IF_DEL_OBJ(ad->popupinfo.popup);
-}
-
 static void __gl_popup_genlist_delete_cb(void *data, Evas *e, Evas_Object *obj,
                        void *ei)
 {
@@ -278,35 +265,6 @@ static void __gl_popup_genlist_delete_cb(void *data, Evas *e, Evas_Object *obj,
        gl_dbg("Delete genlist +++");
 }
 
-/* This works if mini_menustyle used */
-static int __gl_popup_set_min_size(Evas_Object *box, int cnt)
-{
-       GL_CHECK_VAL(box, -1);
-
-       /* #define GENLIST_HEIGHT_1LINE  110  // (114 - top/bottom padding) */
-       /*modify the hight to solve the pop up scroll issue*/
-#define GL_POPUP_GENLIST_ITEM_H 114
-#define GL_POPUP_GENLIST_ITEM_H2 136
-
-       int item_height = GL_POPUP_GENLIST_ITEM_H;
-       int font_size = _gl_get_font_size();
-       gl_dbg("font size: %d", font_size);
-       if (font_size == 4) {
-               item_height = GL_POPUP_GENLIST_ITEM_H2;
-       }
-       int min_h = 0;
-       if (cnt > 3) {
-               min_h = item_height * 4;
-       } else {
-               min_h = item_height * cnt;
-       }
-
-       evas_object_size_hint_min_set(box,
-                                     GL_POPUP_GENLIST_ITEM_W * elm_config_scale_get(),
-                                     min_h * elm_config_scale_get());
-       return item_height;
-}
-
 static void __gl_popup_mouseup_cb(void *data, Evas *e, Evas_Object *obj,
                                   void *event_info)
 {
@@ -320,20 +278,6 @@ static void __gl_popup_mouseup_cb(void *data, Evas *e, Evas_Object *obj,
        }
 }
 
-/*static void __gl_popup_keydown_cb(void *data, Evas *e, Evas_Object *obj,
-                                 void *event_info)
-{
-       gl_dbg("");
-       GL_CHECK(data);
-       GL_CHECK(event_info);
-       Evas_Event_Key_Down *ev = event_info;
-       if (!strcmp(ev->keyname, KEY_BACK)) {
-               gl_dbg("Delete popup!");
-               __gl_popup_resp(data, _gl_str(GL_STR_ID_CANCEL));
-       }
-}*/
-
-
 /* We need to perform cancellation, not just delete popup */
 static inline void __gl_popup_ea_back_cb(void *data, Evas_Object *obj, void *ei)
 {
@@ -358,18 +302,6 @@ static void __gl_popup_local_mouseup_cb(void *data, Evas *e, Evas_Object *obj, v
        }
 }
 
-/*static void __gl_popup_local_keydown_cb(void *data, Evas *e, Evas_Object *obj,  void *ei)
-{
-       gl_dbg("");
-       GL_CHECK(data);
-       GL_CHECK(ei);
-       Evas_Event_Key_Down *ev = ei;
-       if (!strcmp(ev->keyname, KEY_BACK)) {
-               gl_dbg("Delete popup!");
-               GL_IF_DEL_OBJ(obj);
-       }
-}*/
-
 static void __gl_popup_local_delete_cb(void *data, Evas *e, Evas_Object *obj, void *ei)
 {
        gl_dbg("Delete popup ---");
@@ -425,9 +357,6 @@ static Evas_Object *__gl_popup_add(Evas_Object *parent, const char *style,
        /*Add callback for Hardware Key*/
        evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP,
                                       __gl_popup_mouseup_cb, data);
-       /* Disable EVAS_CALLBACK_KEY_DOWN event */
-       /*evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN,
-                                      __gl_popup_keydown_cb, data);*/
        /*Delete the Popup if the Popup has a BACK event.*/
        eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK,
                                       __gl_popup_ea_back_cb, data);
@@ -456,9 +385,6 @@ static Evas_Object *__gl_popup_add_local(Evas_Object *parent, const char *style,
        /*Add callback for Hardware Key*/
        evas_object_event_callback_add(popup, EVAS_CALLBACK_MOUSE_UP,
                                       __gl_popup_local_mouseup_cb, data);
-       /* Disable EVAS_CALLBACK_KEY_DOWN event */
-       /*evas_object_event_callback_add(popup, EVAS_CALLBACK_KEY_DOWN,
-                                      __gl_popup_local_keydown_cb, data);*/
        /*Delete the Popup if the Popup has a BACK event.*/
        eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK,
                                       eext_popup_back_cb, NULL);
@@ -527,381 +453,10 @@ static void __gl_popup_delete_cb(void *data, Evas *e, Evas_Object *obj, void *ei
        gl_dbg("Delete popup ---");
        evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_UP,
                                       __gl_popup_mouseup_cb);
-       /* Disable EVAS_CALLBACK_KEY_DOWN event */
-       /*evas_object_event_callback_del(obj, EVAS_CALLBACK_KEY_DOWN,
-                                      __gl_popup_keydown_cb);*/
-       GL_FREEIF(data);
-       gl_dbg("Delete popup +++");
-}
-
-static void __gl_popup_menu_delete_cb(void *data, Evas *e, Evas_Object *obj,
-                                      void *ei)
-{
-       gl_dbg("Delete popup ---");
-
-       evas_object_event_callback_del(obj, EVAS_CALLBACK_MOUSE_UP,
-                                      __gl_popup_mouseup_cb);
-       /* Disable EVAS_CALLBACK_KEY_DOWN event */
-       /*evas_object_event_callback_del(obj, EVAS_CALLBACK_KEY_DOWN,
-                                      __gl_popup_keydown_cb);*/
-       /* Remove key data for popup */
-       evas_object_data_del(obj, GL_POPUP_OBJ_DATA_KEY);
-
        GL_FREEIF(data);
        gl_dbg("Delete popup +++");
 }
 
-static void __gl_popup_menu_sel_cb(void *data, Evas_Object *obj, void *ei)
-{
-       GL_CHECK(ei);
-       GL_CHECK(data);
-       gl_popup_menu_s *share_d = (gl_popup_menu_s *)data;
-       GL_CHECK(share_d->ad);
-       gl_appdata *ad = share_d->ad;
-       char *id = NULL;
-
-       id = (char *)elm_object_item_data_get(ei);
-       GL_CHECK(id);
-       gl_sdbg("label id: %s", id);
-
-       int (*op_cb)(void * data, const char * label) = NULL;
-       if (share_d->op_func) {
-               op_cb = share_d->op_func;
-       }
-       GL_IF_DEL_OBJ(ad->popupinfo.popup);
-       ad->popupinfo.mode = GL_POPUP_NOBUT;
-       if (op_cb) {
-               op_cb(ad, _gl_str(id));
-       }
-}
-
-static char *__gl_popup_menu_get_text(void *data, Evas_Object *obj,
-                                      const char *part)
-{
-       if (!strcmp(part, "elm.text")) {
-               char *str = NULL;
-               GL_CHECK_NULL(data);
-               str = _gl_str((char *)data);
-               if (str) {
-                       return strdup(str);
-               }
-       }
-       return NULL;
-}
-
-static void __gl_popup_thumb_longpressed_append(void *data, Evas_Object *gl,
-                       Elm_Genlist_Item_Class *gic)
-{
-       GL_CHECK(gic);
-       GL_CHECK(gl);
-       GL_CHECK(data);
-       gl_dbg("append items");
-       gl_popup_menu_s *share_d = (gl_popup_menu_s *)data;
-       GL_CHECK(share_d->ad);
-       gl_appdata *ad = share_d->ad;
-       GL_CHECK(ad->selinfo.elist);
-       gl_item *gitem = (gl_item *)eina_list_nth(ad->selinfo.elist, 0);
-       GL_CHECK(gitem);
-       GL_CHECK(gitem->item);
-       gl_dbg("item storage type: %d", gitem->item->storage_type);
-       elm_genlist_item_append(gl, gic, (void *)GL_STR_ID_SHARE,
-                               NULL, ELM_GENLIST_ITEM_NONE,
-                               __gl_popup_menu_sel_cb, data);
-       if ((GL_STORE_T_PHONE == gitem->item->storage_type ||
-               GL_STORE_T_MMC == gitem->item->storage_type) &&
-               MEDIA_CONTENT_TYPE_IMAGE == gitem->item->type)
-               elm_genlist_item_append(gl, gic, (void *)GL_STR_ID_EDIT,
-                                       NULL, ELM_GENLIST_ITEM_NONE,
-                                       __gl_popup_menu_sel_cb, data);
-       if (GL_STORE_T_PHONE == gitem->item->storage_type ||
-               GL_STORE_T_MMC == gitem->item->storage_type) {
-               elm_genlist_item_append(gl, gic, (void *)GL_STR_ID_DELETE,
-                                       NULL, ELM_GENLIST_ITEM_NONE,
-                                       __gl_popup_menu_sel_cb, data);
-       }
-
-       if ((GL_STORE_T_PHONE == gitem->item->storage_type ||
-               GL_STORE_T_MMC == gitem->item->storage_type)) {
-               elm_genlist_item_append(gl, gic, (void *)GL_STR_ID_MOVE,
-                                       NULL, ELM_GENLIST_ITEM_NONE,
-                                       __gl_popup_menu_sel_cb, data);
-               elm_genlist_item_append(gl, gic, (void *)GL_STR_ID_COPY,
-                                       NULL, ELM_GENLIST_ITEM_NONE,
-                                       __gl_popup_menu_sel_cb, data);
-       }
-       /*
-       if (MEDIA_CONTENT_TYPE_IMAGE == gitem->item->type)
-               elm_genlist_item_append(gl, gic, (void *)GL_STR_ID_DETAILS,
-                                       NULL, ELM_GENLIST_ITEM_NONE,
-                                       __gl_popup_menu_sel_cb, data);*/
-}
-
-static void __gl_popup_btn_new_album_cb(void *data, Evas_Object *obj, void *ei)
-{
-       gl_dbg("");
-       GL_CHECK(data);
-       gl_popup_menu_s *menu_d = NULL;
-       menu_d = (gl_popup_menu_s *)data;
-       GL_CHECK(menu_d->ad);
-       gl_appdata *ad = menu_d->ad;
-
-       _gl_albums_new_create_view(ad, menu_d->op_func);
-       ad->popupinfo.mode = GL_POPUP_NOBUT;
-}
-
-static void __gl_popup_move_cb(void *data, Evas_Object *obj, void *ei)
-{
-       gl_dbg("");
-       /* Get 'menu data' via 'GL_POPUP_OBJ_DATA_KEY' */
-       GL_CHECK(obj);
-       gl_popup_menu_s *menu_d = NULL;
-       menu_d = (gl_popup_menu_s *)evas_object_data_get(obj, GL_POPUP_OBJ_DATA_KEY);
-       GL_CHECK(menu_d);
-       GL_CHECK(menu_d->ad);
-       gl_appdata *ad = menu_d->ad;
-       GL_FREEIF(ad->albuminfo.path);
-
-       if (data) {
-               GL_CHECK(menu_d->op_func);
-               ad->albuminfo.path = strdup((char *)data);
-               gl_sdbg("Dest album path: %s", ad->albuminfo.path);
-               int (*mc_cb)(void * data);
-               mc_cb = menu_d->op_func;
-               mc_cb(ad);
-       }
-
-       GL_IF_DEL_OBJ(ad->popupinfo.popup);
-       ad->popupinfo.mode = GL_POPUP_NOBUT;
-}
-
-static void __gl_popup_move_append(void *data, Evas_Object *gl,
-                                   Elm_Genlist_Item_Class *gic)
-{
-       GL_CHECK(gic);
-       GL_CHECK(gl);
-       GL_CHECK(data);
-       gl_popup_menu_s *menu_d = (gl_popup_menu_s *)data;
-       GL_CHECK(menu_d->ad);
-       gl_appdata *ad = menu_d->ad;
-       GL_CHECK(menu_d->op_func);
-       GL_CHECK(ad->maininfo.naviframe);
-       int i = 0;
-       Eina_List *album_list = NULL;
-       int all_count = 0;
-       char *label = NULL;
-       gl_cluster *album = NULL;
-       gl_cluster *cur_album = _gl_albums_get_current(ad);
-       evas_object_data_set(gl, GL_POPUP_OBJ_DATA_KEY, menu_d);
-       /*elm_genlist_item_append(gl, gic, (void *)GL_STR_ID_NEW_ALBUM,
-                               NULL, ELM_GENLIST_ITEM_NONE,
-                               __gl_popup_move_cb, NULL);*/
-
-       if (ad->albuminfo.elist && ad->albuminfo.elist->clist) {
-               album_list = ad->albuminfo.elist->clist;
-               all_count = eina_list_count(album_list);
-       } else {
-               gl_dbgE("cluster list is NULL");
-               return;
-       }
-
-       gl_dbg("cluster list length: %d", all_count);
-       for (i = 0; i < all_count; i++) {
-               album = eina_list_nth(album_list, i);
-               GL_CHECK(album);
-               GL_CHECK(album->cluster);
-               GL_CHECK(album->cluster->display_name);
-               GL_CHECK(album->cluster->uuid);
-
-               if (cur_album && cur_album->cluster &&
-                       cur_album->cluster->uuid &&
-                       !g_strcmp0(album->cluster->uuid, cur_album->cluster->uuid)) {
-                       continue;
-               }
-               if (album->cluster->type == GL_STORE_T_MMC ||
-                       album->cluster->type == GL_STORE_T_PHONE) {
-                       label = _gl_get_i18n_album_name(album->cluster);
-                       elm_genlist_item_append(gl, gic, (void *)label,
-                                               NULL, ELM_GENLIST_ITEM_NONE,
-                                               __gl_popup_move_cb,
-                                               album->cluster->path);
-               }
-       }
-}
-
-static void __gl_popup_genlist_resize_job_cb(void *data)
-{
-       GL_CHECK(data);
-       gl_popup_resize_s *resize_d = (gl_popup_resize_s *)data;
-       Evas_Object *track = NULL;
-       Elm_Object_Item *item = elm_genlist_first_item_get(resize_d->genlist);
-       track = elm_object_item_track(item);
-       if (track) {
-               Evas_Coord h = 0;
-               evas_object_geometry_get(track, NULL, NULL, NULL, &h);
-               gl_dbg("size diff: %d-%d", h, resize_d->item_height);
-               if (resize_d->item_height != h) {
-                       int cnt = elm_genlist_items_count(resize_d->genlist);
-                       int min_h = 0;
-                       if (cnt > 3) {
-                               min_h = h * 4;
-                       } else {
-                               min_h = h * cnt;
-                       }
-
-                       evas_object_size_hint_min_set(resize_d->box,
-                                                     GL_POPUP_GENLIST_ITEM_W * elm_config_scale_get(),
-                                                     min_h);
-               }
-       }
-       elm_object_item_untrack(item);
-       GL_IF_DEL_JOB(resize_d->job);
-}
-
-static void __gl_popup_genlist_realized_resize(void *data, Evas_Object *obj, void *ei)
-{
-       GL_CHECK(data);
-       gl_popup_resize_s *resize_d = (gl_popup_resize_s *)data;
-       GL_IF_DEL_JOB(resize_d->job);
-       resize_d->job = ecore_job_add(__gl_popup_genlist_resize_job_cb, data);
-}
-
-static int __gl_popup_add_resize_op(gl_appdata *ad, Evas_Object *box, Evas_Object *genlist)
-{
-       gl_popup_resize_s *resize_d = NULL;
-       resize_d = (gl_popup_resize_s *)calloc(1, sizeof(gl_popup_resize_s));
-       GL_CHECK_VAL(resize_d, -1);
-
-       resize_d->box = box;
-       resize_d->genlist = genlist;
-       resize_d->ad = ad;
-       evas_object_smart_callback_add(genlist, "popup,genlist,realized",
-                                      __gl_popup_genlist_realized_resize,
-                                      (void *)resize_d);
-       evas_object_data_set(genlist, GL_POPUP_GENLIST_DATA_KEY,
-                            (void *)resize_d);
-
-       resize_d->item_height = __gl_popup_set_min_size(box,
-                               elm_genlist_items_count(genlist));
-       return 0;
-}
-
-/* Title + menustyle(genlist) + one button */
-static int __gl_popup_create_menu(void *data, const char *title,
-                                  void *append_func, void *op_func, int mode)
-{
-       gl_dbg("");
-       GL_CHECK_VAL(data, -1);
-       gl_appdata *ad = (gl_appdata *)data;
-
-       if (ad->popupinfo.popup) {
-               gl_dbg("The existed popup is deleted");
-               evas_object_del(ad->popupinfo.popup);
-               ad->popupinfo.popup = NULL;
-       }
-
-       gl_popup_menu_s *menu_d = NULL;
-       menu_d = (gl_popup_menu_s *)calloc(1, sizeof(gl_popup_menu_s));
-       GL_CHECK_VAL(menu_d, -1);
-
-       Evas_Object *box = NULL;
-       Evas_Object *genlist = NULL;
-       Evas_Object *popup = __gl_popup_add(ad->maininfo.win,
-                                           "content_no_vhpad",
-                                           title, NULL, data);
-       if (popup == NULL) {
-               GL_FREE(menu_d);
-               return -1;
-       }
-       /* Register delete callback */
-       evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL,
-                                      __gl_popup_menu_delete_cb, menu_d);
-       menu_d->ad = ad;
-       menu_d->popup = popup;
-       menu_d->op_func = op_func;
-       evas_object_data_set(popup, GL_POPUP_OBJ_DATA_KEY, menu_d);
-
-       box = elm_box_add(popup);
-       evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND,
-                                        EVAS_HINT_EXPAND);
-       /* Create genlist */
-       genlist = __gl_popup_add_genlist(menu_d, box, "1text/popup",
-                                        __gl_popup_menu_get_text, NULL,
-                                        append_func);
-       __gl_popup_add_resize_op(ad, box, genlist);
-
-       elm_box_pack_end(box, genlist);
-       evas_object_show(genlist);
-       evas_object_show(box);
-       elm_object_content_set(popup, box);
-       evas_object_show(popup);
-       ad->popupinfo.popup = popup;
-       ad->popupinfo.mode = mode;
-       return 0;
-}
-
-/* Title + menustyle(genlist) + one button */
-static int __gl_popup_create_album_menu(void *data, const char *title,
-                                        void *append_func, void *op_func, int mode)
-{
-       gl_dbg("");
-       GL_CHECK_VAL(data, -1);
-       gl_appdata *ad = (gl_appdata *)data;
-
-       if (ad->popupinfo.popup) {
-               gl_dbg("The existed popup is deleted");
-               evas_object_del(ad->popupinfo.popup);
-               ad->popupinfo.popup = NULL;
-       }
-
-       gl_popup_menu_s *menu_d = NULL;
-       menu_d = (gl_popup_menu_s *)calloc(1, sizeof(gl_popup_menu_s));
-       GL_CHECK_VAL(menu_d, -1);
-
-       Evas_Object *box = NULL;
-       Evas_Object *genlist = NULL;
-       Evas_Object *popup = __gl_popup_add(ad->maininfo.win, NULL,
-                                           title, NULL, data);
-       if (popup == NULL) {
-               GL_FREE(menu_d);
-               return -1;
-       }
-       /* Register delete callback */
-       evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL,
-                                      __gl_popup_menu_delete_cb, menu_d);
-       menu_d->ad = ad;
-       menu_d->popup = popup;
-       menu_d->op_func = op_func;
-       evas_object_data_set(popup, GL_POPUP_OBJ_DATA_KEY, menu_d);
-
-       box = elm_box_add(popup);
-       evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND,
-                                        EVAS_HINT_EXPAND);
-       /* Create genlist */
-       genlist = __gl_popup_add_genlist(menu_d, box, "1text/popup",
-                                        __gl_popup_menu_get_text, NULL,
-                                        append_func);
-
-       if (elm_genlist_items_count(genlist) > 0) {
-//             __gl_popup_add_resize_op(ad, box, genlist);
-               elm_box_pack_end(box, genlist);
-               evas_object_show(genlist);
-               evas_object_show(box);
-
-               elm_object_style_set(popup, "content_no_vhpad");
-               elm_object_content_set(popup, box);
-       } else {
-               GL_IF_DEL_OBJ(genlist);
-               GL_IF_DEL_OBJ(box);
-
-               _gl_ui_set_translate_str(popup, GL_STR_ID_THERE_IS_ONLY_ONE_ALBUM);
-       }
-
-       evas_object_show(popup);
-       ad->popupinfo.popup = popup;
-       ad->popupinfo.mode = mode;
-       return 0;
-}
-
 int _gl_popup_create(void *data, const char *title, const char *text,
                      const char *str1, Evas_Smart_Cb cb1, const void *data1,
                      const char *str2, Evas_Smart_Cb cb2, const void *data2,
@@ -1198,96 +753,6 @@ Evas_Object *_gl_popup_create_local(void *data, gl_popup_mode mode, char *desc)
        return popup;
 }
 
-int _gl_popup_create_move(void *data, void *op_func)
-{
-       gl_dbg("");
-       GL_CHECK_VAL(data, -1);
-       __gl_popup_create_album_menu(data, GL_STR_ID_MOVE,
-                                    __gl_popup_move_append, op_func,
-                                    GL_POPUP_MEDIA_MOVE);
-       _gl_popup_add_buttons(data, GL_STR_ID_NEW_ALBUM,
-                             __gl_popup_btn_new_album_cb);
-       return 0;
-}
-
-int _gl_popup_create_copy(void *data, void *op_func)
-{
-       gl_dbg("");
-       GL_CHECK_VAL(data, -1);
-       __gl_popup_create_album_menu(data, GL_STR_ID_COPY,
-                                    __gl_popup_move_append, op_func,
-                                    GL_POPUP_MEDIA_MOVE);
-       _gl_popup_add_buttons(data, GL_STR_ID_NEW_ALBUM,
-                             __gl_popup_btn_new_album_cb);
-       return 0;
-}
-
-int _gl_popup_create_move_with_append(void *data, void *op_func, void *append_func, const char *title)
-{
-       gl_dbg("");
-       GL_CHECK_VAL(data, -1);
-       __gl_popup_create_album_menu(data, title, append_func, op_func,
-                                    GL_POPUP_MEDIA_MOVE);
-       return 0;
-}
-
-int _gl_popup_create_longpressed_album_with_append(void *data, void *op_func, void *append_func, const char *title)
-{
-       gl_dbg("");
-       GL_CHECK_VAL(data, -1);
-       __gl_popup_create_menu(data, title, append_func, op_func,
-                              GL_POPUP_LONGPRESSED);
-       _gl_popup_add_block_callback(data);
-       return 0;
-}
-
-int _gl_popup_create_longpressed_thumb_with_append(void *data, void *op_func, void *append_func, const char *title)
-{
-       gl_dbg("");
-       GL_CHECK_VAL(data, -1);
-       __gl_popup_create_menu(data, title, append_func, op_func,
-                              GL_POPUP_LONGPRESSED);
-       _gl_popup_add_block_callback(data);
-       return 0;
-}
-
-int _gl_popup_create_longpressed_thumb(void *data, void *op_func, char *file_name)
-{
-       gl_dbg("");
-       GL_CHECK_VAL(data, -1);
-       __gl_popup_create_menu(data, file_name,
-                              __gl_popup_thumb_longpressed_append, op_func,
-                              GL_POPUP_LONGPRESSED);
-       _gl_popup_add_block_callback(data);
-       return 0;
-}
-
-int _gl_popup_add_buttons(void *data, const char *text, Evas_Smart_Cb cb_func)
-{
-       Evas_Object *btn1 = NULL;
-       Evas_Object *btn2 = NULL;
-       gl_appdata *ad = (gl_appdata *)data;
-       /* Button 'cancel' */
-       btn1 = _gl_but_create_but_popup(ad->popupinfo.popup, GL_STR_ID_CANCEL,
-                                       __gl_popup_resp_cb, data);
-       elm_object_part_content_set(ad->popupinfo.popup, "button1", btn1);
-
-       void *menu_data = evas_object_data_get(ad->popupinfo.popup,
-                                              GL_POPUP_OBJ_DATA_KEY);
-       btn2 = _gl_but_create_but_popup(ad->popupinfo.popup, text, cb_func,
-                                       menu_data);
-       elm_object_part_content_set(ad->popupinfo.popup, "button2", btn2);
-       return 0;
-}
-
-int _gl_popup_add_block_callback(void *data)
-{
-       gl_appdata *ad = (gl_appdata *)data;
-       evas_object_smart_callback_add(ad->popupinfo.popup, "block,clicked",
-                                      __gl_popup_block_clicked_cb, data);
-       return 0;
-}
-
 void _gl_time_view_selected_cb(void *data, Evas_Object *obj, void *event_info)
 {
        gl_dbg("ENTRY");
index 47a7e048abf7b1de877d2b8bccd783b02a08d409..893938ae4a6e5b3a36b32ae2e0cbad2d26b62ddd 100644 (file)
@@ -41,13 +41,6 @@ static void __gl_pb_cancel_thread_pbar_cb(void *data, Evas_Object *obj, void *ei
        gl_pb_del_pbar(data);
 }
 
-static Eina_Bool __gl_pb_pbar_timer_cb(void *data)
-{
-       gl_dbg("Timeout, destroy progressbar and timer.");
-       gl_pb_del_pbar(data);
-       return ECORE_CALLBACK_CANCEL;
-}
-
 /* We need to perform cancellation, not just delete popup */
 static inline void __gl_pb_ea_back_cb(void *data, Evas_Object *obj, void *ei)
 {
@@ -192,16 +185,6 @@ int gl_pb_refresh_thread_pbar(void *data, int cur_cnt, int total_cnt)
        return 0;
 }
 
-/* Use timer to destroy progressbar */
-int gl_pb_add_pbar_timer(void *data)
-{
-       GL_CHECK_VAL(data, -1);
-       gl_appdata *ad = (gl_appdata *)data;
-       ad->pbarinfo.pbar_timer = ecore_timer_add(1.0f, __gl_pb_pbar_timer_cb,
-                                 data);
-       return 0;
-}
-
 int gl_pb_del_pbar(void *data)
 {
        GL_CHECK_VAL(data, -1);
index 11c3356214fa89cbc741d32f10634685e52d0e0c..30d2cbe6a78bf655dbf845cd4f3c177e76e1709c 100644 (file)
@@ -104,56 +104,6 @@ Evas_Object *_gl_thumb_show_image(Evas_Object *obj, char *path, int orient,
        return layout;
 }
 
-Evas_Object *_gl_thumb_show_burstshot(Evas_Object *obj, char *path1,
-                                      char *path2, char *path3,
-                                      unsigned int orient, int w, int h,
-                                      int zoom_level)
-{
-       GL_CHECK_NULL(obj);
-       Evas_Object *bg = NULL;
-       char *part = NULL;
-       char *path = NULL;
-       int i = 0;
-
-       Evas_Object *layout = elm_layout_add(obj);
-       GL_CHECK_NULL(layout);
-       const char *bs_style = GL_PHOTOFRAME_BURSTSHOT;
-       if (zoom_level == GL_ZOOM_IN_ONE) {
-               bs_style = GL_PHOTOFRAME_BURSTSHOT1;
-       } else if (zoom_level == GL_ZOOM_IN_TWO) {
-               bs_style = GL_PHOTOFRAME_BURSTSHOT2;
-       }
-       elm_layout_theme_set(layout, GL_CLASS_GENGRID, GL_GRP_PHOTOFRAME,
-                            bs_style);
-
-       /* Add bg for burstshot mode */
-       for (i = 0; i < 3; i++) {
-               switch (i) {
-               case 0:
-                       part = "elm.swallow.icon1";
-                       path = path1;
-                       break;
-               case 1:
-                       part = "elm.swallow.icon2";
-                       path = path2;
-                       break;
-               case 2:
-                       part = "elm.swallow.icon3";
-                       path = path3;
-                       break;
-               }
-
-               bg = __gl_thumb_add_image(layout, path, orient, w, h);
-               if (bg == NULL) {
-                       evas_object_del(layout);
-                       return NULL;
-               }
-               elm_object_part_content_set(layout, part, bg);
-       }
-       evas_object_show(layout);
-       return layout;
-}
-
 Evas_Object *_gl_thumb_show_video(Evas_Object *obj, char *path,
                                   unsigned int v_dur, int w, int h,
                                   int zoom_level)
@@ -212,41 +162,6 @@ Evas_Object *_gl_thumb_show_checkbox(Evas_Object *obj, bool checked,
        return ck;
 }
 
-Evas_Object *_gl_thumb_show_mode(Evas_Object *obj, gl_cm_mode_e mode)
-{
-       Evas_Object *icon = NULL;
-       const char *file = NULL;
-
-       switch (mode) {
-       case GL_CM_MODE_PANORAMA:
-               file = GL_ICON_PANORAMA;
-               break;
-       case GL_CM_MODE_BURSTSHOT:
-               file = GL_ICON_BURSTSHOT;
-               break;
-       case GL_CM_MODE_SOUND:
-               file = GL_ICON_SOUND_SHOT;
-               break;
-       case GL_CM_MODE_ANIMATE:
-               file = GL_ICON_SOUND_SHOT;
-               break;
-       case GL_CM_MODE_BEST:
-               file = GL_ICON_SOUND_SHOT;
-               break;
-       default:
-               break;
-       }
-
-       if (file) {
-               GL_CHECK_NULL(obj);
-               icon = elm_icon_add(obj);
-               GL_CHECK_NULL(icon);
-               GL_ICON_SET_FILE(icon, file);
-               evas_object_show(icon);
-       }
-       return icon;
-}
-
 Evas_Object *_gl_thumb_add_gengrid(Evas_Object *parent)
 {
        GL_CHECK_NULL(parent);
@@ -336,10 +251,6 @@ GL_THUMB_SIZE:
                        *size_h = _h - 4;
                }
        }
-       /*if (elm_gengrid_items_count(view) <= align_c)
-               elm_gengrid_align_set(view, 0.5, 0.5);
-       else
-               elm_gengrid_align_set(view, 0.0, 0.0);*/
        if (size_w && size_h) {
                gl_dbg("P: %dx%d, size_w: %d,size_h: %d", _w, _h, *size_w, *size_h);
        }
@@ -376,78 +287,3 @@ int _gl_thumb_split_set_size(void *data, Evas_Object *view)
 
        return 0;
 }
-
-/*Preappend date item*/
-bool _gl_thumb_insert_date(void *data, Evas_Object *parent)
-{
-       GL_CHECK_FALSE(data);
-       GL_CHECK_FALSE(parent);
-       gl_appdata *ad = (gl_appdata *)data;
-       bool b_remove = false;
-
-       if (ad->pinchinfo.zoom_level != GL_ZOOM_DEFAULT) {
-               b_remove = true;
-       }
-
-       gl_item *gitem = NULL;
-       gl_item *pre_gitem = NULL;
-       gl_item *inserted_gitem = NULL;
-       bool b_insert = false;
-       Elm_Object_Item *elm_item = NULL;
-       Elm_Object_Item *next_elm_item = NULL;
-       Elm_Gengrid_Item_Class *dgic = &(ad->gridinfo.date_gic);
-
-       elm_item = elm_gengrid_first_item_get(parent);
-       while (elm_item) {
-               next_elm_item = elm_gengrid_item_next_get(elm_item);
-               gitem = elm_object_item_data_get(elm_item);
-               if (gitem == NULL) {
-                       gl_dbgE("Invalid data item!");
-                       continue;
-               } else if (b_remove) { /* Remove */
-                       if (elm_gengrid_item_item_class_get(elm_item) == dgic) {
-                               gl_dbg("Remove date item %p", dgic);
-                               gitem->preappend = false;
-                               elm_object_item_del(elm_item);
-                       }
-                       goto GL_THUMB_NEXT;
-               } else if (pre_gitem == NULL) { /* Insert */
-                       b_insert = true;
-               } else if (gitem->elm_item && !gitem->preappend &&
-                          pre_gitem->item) {
-                       struct tm t1;
-                       struct tm t2;
-                       int mth = 0;
-                       int yth = 0;
-                       localtime_r((time_t *) & (pre_gitem->item->mtime),
-                                   &t1);
-                       mth = t1.tm_mon;
-                       yth = t1.tm_year;
-                       localtime_r((time_t *) & (gitem->item->mtime), &t2);
-                       if (mth != t2.tm_mon || yth != t2.tm_year) {
-                               b_insert = true;
-                       }
-               }
-               if (b_insert && gitem->elm_item && !gitem->preappend) {
-                       elm_gengrid_item_insert_before(parent, dgic,
-                                                      gitem, gitem->elm_item,
-                                                      NULL, NULL);
-                       gitem->preappend = true;
-                       gitem->pre_gitem = gitem;
-                       inserted_gitem = gitem;
-               } else if (inserted_gitem) {
-                       gitem->pre_gitem = inserted_gitem;
-               }
-
-               pre_gitem = gitem;
-               b_insert = false;
-
-GL_THUMB_NEXT:
-
-               gitem->pre_gitem = NULL;
-               elm_item = next_elm_item;
-       }
-
-       return true;
-}
-
index dbd6e593188f07ac96769087529cf8cc4dd6d170..3556961c2fa4de95413755281ea950f48d97ae05 100644 (file)
@@ -29,8 +29,6 @@
 /* Width and height of album item (4+331, 4+331) */
 #define GL_TILE_ITEM_WIDTH 360
 #define GL_TILE_ITEM_HEIGHT 354
-//#define GL_TILE_ITEM_L_W 426
-//#define GL_TILE_ITEM_L_H 426
 #define GL_TILE_2_PER_ROW 2
 #define GL_TILE_3_PER_ROW 3
 #define GL_TILE_4_PER_ROW 4
 #define GL_TILE_ITEM_CNT2 12
 #define GL_TILE_ITEM_L_CNT 3
 /* Items count of each column */
-//#define GL_TILE_ITEM_C_CNT 3
-//#define GL_TILE_ALIGN_LEFT 0.0f
 #define GL_TILE_ALIGN_CON1 0.25f
 #define GL_TILE_ALIGN_CON2 0.75f
 #define GL_TILE_ALIGN_MID 0.5f
-//#define GL_TILE_ALIGN_BOT 1.0f
 /* Size of album icon */
 #define GL_TILE_W (GL_TILE_ITEM_WIDTH-8)
 #define GL_TILE_H (GL_TILE_ITEM_HEIGHT-8)
@@ -248,19 +243,6 @@ Evas_Object *_gl_tile_show_part_checkbox(Evas_Object *obj, bool checked,
        return ck;
 }
 
-Evas_Object *_gl_tile_show_part_rename(Evas_Object *obj, Evas_Smart_Cb func,
-                                       const void *data)
-{
-       GL_CHECK_NULL(func);
-       GL_CHECK_NULL(obj);
-       Evas_Object *btn = NULL;
-       btn = _gl_but_create_but(obj, NULL, NULL, GL_BUTTON_STYLE_RENAME, func,
-                                data);
-       GL_CHECK_NULL(btn);
-       evas_object_propagate_events_set(btn, EINA_FALSE);
-       return btn;
-}
-
 Evas_Object *_gl_tile_show_part_type_icon(Evas_Object *obj, int sns_type)
 {
        GL_CHECK_NULL(obj);
@@ -288,56 +270,6 @@ Evas_Object *_gl_tile_show_part_type_icon(Evas_Object *obj, int sns_type)
        return icon;
 }
 
-int _gl_tile_get_mtime(time_t *mtime1, time_t *mtime2, char *buf, int max_len)
-{
-       char *date1 = NULL;
-       char *date2 = NULL;
-       char *date3 = NULL;
-
-       date1 = (char *)calloc(1, GL_DATE_INFO_LEN_MAX);
-       GL_CHECK_VAL(date1, -1);
-
-       date2 = (char *)calloc(1, GL_DATE_INFO_LEN_MAX);
-       if (date2 == NULL) {
-               goto GL_TILE_ERROR;
-       }
-
-       date3 = (char *)calloc(1, GL_DATE_INFO_LEN_MAX);
-       if (date3 == NULL) {
-               goto GL_TILE_ERROR;
-       }
-
-       struct tm t1;
-       memset(&t1, 0x00, sizeof(struct tm));
-       localtime_r(mtime1, &t1);
-       strftime(date1, GL_DATE_INFO_LEN_MAX, "%Y.%m.%d", &t1);
-       strftime(date3, GL_DATE_INFO_LEN_MAX, "%Y.%m", &t1);
-
-       struct tm t2;
-       memset(&t2, 0x00, sizeof(struct tm));
-       localtime_r(mtime2, &t2);
-       strftime(date2, GL_DATE_INFO_LEN_MAX, "%Y.%m.%d", &t2);
-
-       if (!g_strcmp0(date1, date2)) {
-               g_strlcpy(buf, date1, max_len);
-       } else {
-               strftime(date2, GL_DATE_INFO_LEN_MAX, "%Y.%m", &t2);
-               snprintf(buf, max_len, "%s - %s", date2, date3);
-       }
-
-       GL_FREEIF(date1);
-       GL_FREEIF(date2);
-       GL_FREEIF(date3);
-       return 0;
-
-GL_TILE_ERROR:
-
-       GL_FREEIF(date1);
-       GL_FREEIF(date2);
-       GL_FREEIF(date3);
-       return -1;
-}
-
 Evas_Object *_gl_tile_add_gengrid(Evas_Object *parent)
 {
        GL_CHECK_NULL(parent);
@@ -407,7 +339,6 @@ int _gl_tile_update_item_size(void *data, Evas_Object *grid, bool b_update)
 
        if ((rotate_mode == APP_DEVICE_ORIENTATION_270) ||
                (rotate_mode == APP_DEVICE_ORIENTATION_90)) {
-               /* >=3, (0.5, 0.0);  <3, (0.5, 0.5) */
                if (count >= c_l && align_y > GL_TILE_ALIGN_CON1) {
                        elm_gengrid_align_set(grid, GL_TILE_ALIGN_MID, 0.0);
                } else if (count < c_l && align_y < GL_TILE_ALIGN_CON1) {
@@ -416,7 +347,6 @@ int _gl_tile_update_item_size(void *data, Evas_Object *grid, bool b_update)
 
                elm_gengrid_item_size_set(grid, w_l, h_l);
        } else {
-               /* >=6, (0.5, 0.0);  <3, (0.5, 0.5);  <6, (0.5, 1.0) */
                if (count >= c && (align_x > GL_TILE_ALIGN_CON1 ||
                                   align_y < GL_TILE_ALIGN_CON2)) {
                        elm_gengrid_align_set(grid, GL_TILE_ALIGN_MID, 0.0);