int _gl_popup_create_copy_move(void *data, void *sel_cb, void *cb_data);
void _gl_update_copy_move_popup(void *data);
void _gl_del_popup(void *data);
+void _gl_time_view_selected_cb(void *data, Evas_Object * obj,
+ void *event_info);
+void _gl_album_view_selected_cb(void *data, Evas_Object * obj,
+ void *event_info);
#endif /* _GL_POPUP_H_ */
}
}
+ group {
+ name: "main_view_layout";
+ parts {
+ part { name: "bg";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0; }
+ }
+ part { name: "tabbar";
+ type: SWALLOW;
+ scale: 1;
+ description { state: "default" 0.0;
+ fixed: 0 1;
+ rel1 { relative: 0.0 0.87; }
+ rel2 { relative: 1.0 1.0; }
+ align: 0.5 0.0;
+ }
+ }
+ part { name: "elm.swallow.content";
+ type: SWALLOW;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ rel1 { relative: 0.0 0.0; }
+ rel2 { relative: 1.0 0.875; }
+ }
+ }
+ }
+ }
+
group {
name: "gallery/layout";
parts {
scale: 1;
description {
state: "default" 0.0;
- rel1 { relative: 24/540 0.0; to: "select.all.area.bg";}
+ rel1 { relative: 24/540 0.0; to: "select.all.area.bg"; offset: 90 0;}
rel2 { relative: 0.6 1.0; to: "select.all.area.bg";}
text {
text: "Select All";
- size: 16;
+ size: 10;
align: 0.0 0.5;
}
- color: 0 0 255 255;
- visible: 0;
+ color: 0 0 0 255;
+ visible: 1;
}
description {
state: "visible" 0.0;
description {
state: "default" 0.0;
fixed: 1 1;
- rel1 { relative: 1.0 0.1; to: "select.all.area.bg"; offset: -60 0;}
+ rel1 { relative: 1.0 0.1; to: "select.all.area.bg"; offset: -1200 0;}
rel2 { relative: 1.0 0.9; to: "select.all.area.bg";}
visible: 0;
}
}
}
part { name: "elm.text";
- type: TEXTBLOCK;
- scale: 1;
- description { state: "default" 0.0;
+ type: TEXT;
+ scale: 1;
+ description {
+ state: "default" 0.0;
fixed: 1 1;
- min: 0 0;
- rel1 {
- to_x: "elm.text.bg";
- relative: 0.5 0.0;
- }
- rel2 {
- to_x: "elm.text.bg";
- relative: 0.5 1.0;
- }
- text {
- style: "my_textblock_name_style";
- min: 1 1;
- max: 0 1;
- }
- }
- }
+ align: 0.53 0.85;
+ rel1 {
+ to_x: "elm.text.bg";
+ relative: 0.48 0.0;
+ }
+ rel2 {
+ to_x: "elm.text.bg";
+ relative: 0.5 0.2;
+ }
+ text {
+ font: "font=Sans:style=Regular";
+ size: 10;
+ min: 1 1 ;
+ }
+ color : 0 0 0 255;
+ }
+ }
part { name: "center_padding";
type: SPACER;
scale: 1;
mouse_events: 1; \
description { \
state: "default" 0.0; \
- rel1.to: "elm.icon.clipper"; \
- rel2.to: "elm.icon.clipper"; \
+ rel1 { relative: 0.0 0.0; to: "elm.icon.clipper"; } \
+ rel2 { relative: 0.9 0.857; to: "elm.icon.clipper"; } \
} \
} \
part { \
state: "default" 0.0;
rel1.relative: 0 0;
rel1.to : "elm.swallow.icon";
- rel1.offset : 2 2;
rel2.relative: 1 1;
rel2.to : "elm.swallow.icon";
- color: 230 230 230 255;
+ color: 255 255 255 255;
}
}
GL_ALBUM_BG_IMAGE
GL_ALBUM_PBAR
GL_ALBUM_CHECK_GRID
- GL_GENGRID_FOCUS_EVENT("elm.swallow.icon");
GL_ALBUM_CHECK
GL_ALBUM_DIM
}
state: "default" 0.0;
align: 0.5 0.5;
visible: 1;
- rel1.to : "elm.swallow.icon";
- rel1.offset : 2 2;
- rel2.to : "elm.swallow.icon";
+ rel1{relative: 0.01 0.02;}
+ rel2{relative: 0.915 0.98;}
color: 230 230 230 255;
}
}
state: "default" 0.0;
color: 0 0 0 0;
rel1{relative: 0.0 0.0;}
- rel2{relative: 0.9 1.0;}
+ rel2{relative: 0.93 1.0;}
+ min: 0 182;
}
}
part {
type: SWALLOW; \
description{ \
state: "default" 0.0; \
- rel1 { relative: 0.031 0.0; to: "bg"; } \
+ rel1 { relative: 0.0324 0.0; to: "bg"; } \
rel2 { relative: 1.0 1.0; to: "bg"; } \
align: 0.5 0.5; \
} \
scale: 1;
description{
state: "default" 0.0;
- rel1 { relative: 0.031 0.0; to: "bg"; }
+ rel1 { relative: 0.0324 0.0; to: "bg"; }
rel2 { relative: 1.0 1.0; to: "bg"; }
color: 0 0 0 255;
text{
- size: 12;
+ font: "TizenSans:style=Bold";
+ size: 10;
align: 0.0 0.5;
}
}
msgstr "Close"
msgid "IDS_COM_POP_DELETING"
-msgstr "Deleting..."
+msgstr "Delete files..."
msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
msgstr "Maximum number of characters reached."
msgstr "Select all"
msgid "IDS_COM_BODY_SEP_ABB"
-msgstr "Sep"
+msgstr "September"
msgid "IDS_COM_BODY_OCT_ABB"
-msgstr "Oct"
+msgstr "October"
msgid "IDS_COM_BODY_NOV_ABB"
-msgstr "Nov"
+msgstr "November"
msgid "IDS_COM_BODY_MAY_ABB"
msgstr "May"
msgid "IDS_COM_BODY_MAR_ABB"
-msgstr "Mar"
+msgstr "March"
msgid "IDS_COM_BODY_JUN_ABB"
-msgstr "Jun"
+msgstr "June"
msgid "IDS_COM_BODY_JUL_ABB"
-msgstr "Jul"
+msgstr "July"
msgid "IDS_COM_BODY_JAN_ABB"
-msgstr "Jan"
+msgstr "January"
msgid "IDS_COM_BODY_FEB_ABB"
-msgstr "Feb"
+msgstr "February"
msgid "IDS_COM_BODY_DEC_ABB"
-msgstr "Dec"
+msgstr "December"
msgid "IDS_COM_BODY_AUG_ABB"
-msgstr "Aug"
+msgstr "August"
msgid "IDS_COM_BODY_APR_ABB"
-msgstr "Apr"
+msgstr "April"
msgid "IDS_COM_BODY_COPY"
msgstr "Copy"
msgstr "No albums selected."
msgid "IDS_MEDIABR_HEADER_SELECT_ITEM"
-msgstr "Select item"
+msgstr "Select items"
msgid "IDS_MEDIABR_BODY_NO_ALBUMS"
msgstr "No albums"
msgstr "OK"
msgid "IDS_MEDIABR_BUTTON_SAVE"
-msgstr "Save"
+msgstr "Create"
msgid "IDS_MEDIABR_POP_DELETE_Q"
msgstr "Delete?"
msgstr "Create"
msgid "IDS_MEDIABR_POP_NO_ITEMS"
-msgstr "No items"
+msgstr "No Items Available"
msgid "IDS_MEDIABR_OPT_EDIT_IMAGE"
msgstr "Edit image"
msgstr "Delete"
msgid "IDS_COM_SK_SAVE"
-msgstr "Save"
+msgstr "Create"
msgid "IDS_COM_POP_DELETE_Q"
msgstr "Delete?"
msgstr "Close"
msgid "IDS_COM_POP_DELETING"
-msgstr "Deleting..."
+msgstr "Delete files..."
msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
msgstr "Maximum number of characters reached."
msgstr "Select all"
msgid "IDS_COM_BODY_SEP_ABB"
-msgstr "Sep"
+msgstr "September"
msgid "IDS_COM_BODY_OCT_ABB"
-msgstr "Oct"
+msgstr "October"
msgid "IDS_COM_BODY_NOV_ABB"
-msgstr "Nov"
+msgstr "November"
msgid "IDS_COM_BODY_MAY_ABB"
msgstr "May"
msgid "IDS_COM_BODY_MAR_ABB"
-msgstr "Mar"
+msgstr "March"
msgid "IDS_COM_BODY_JUN_ABB"
-msgstr "Jun"
+msgstr "June"
msgid "IDS_COM_BODY_JUL_ABB"
-msgstr "Jul"
+msgstr "July"
msgid "IDS_COM_BODY_JAN_ABB"
-msgstr "Jan"
+msgstr "January"
msgid "IDS_COM_BODY_FEB_ABB"
-msgstr "Feb"
+msgstr "February"
msgid "IDS_COM_BODY_DEC_ABB"
-msgstr "Dec"
+msgstr "December"
msgid "IDS_COM_BODY_AUG_ABB"
-msgstr "Aug"
+msgstr "August"
msgid "IDS_COM_BODY_APR_ABB"
-msgstr "Apr"
+msgstr "April"
msgid "IDS_COM_BODY_COPY"
msgstr "Copy"
msgstr "No albums selected."
msgid "IDS_MEDIABR_HEADER_SELECT_ITEM"
-msgstr "Select item"
+msgstr "Select items"
msgid "IDS_MEDIABR_BODY_NO_ALBUMS"
msgstr "No albums"
msgstr "OK"
msgid "IDS_MEDIABR_BUTTON_SAVE"
-msgstr "Save"
+msgstr "Create"
msgid "IDS_MEDIABR_POP_DELETE_Q"
msgstr "Delete?"
msgstr "Create"
msgid "IDS_MEDIABR_POP_NO_ITEMS"
-msgstr "No items"
+msgstr "No Items Available"
msgid "IDS_MEDIABR_OPT_EDIT_IMAGE"
msgstr "Edit image"
msgstr "Delete"
msgid "IDS_COM_SK_SAVE"
-msgstr "Save"
+msgstr "Create"
msgid "IDS_COM_POP_DELETE_Q"
msgstr "Delete?"
msgstr "Close"
msgid "IDS_COM_POP_DELETING"
-msgstr "Deleting..."
+msgstr "Delete files..."
msgid "IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED"
msgstr "Maximum number of characters reached."
msgstr "Select all"
msgid "IDS_COM_BODY_SEP_ABB"
-msgstr "Sep"
+msgstr "September"
msgid "IDS_COM_BODY_OCT_ABB"
-msgstr "Oct"
+msgstr "October"
msgid "IDS_COM_BODY_NOV_ABB"
-msgstr "Nov"
+msgstr "November"
msgid "IDS_COM_BODY_MAY_ABB"
msgstr "May"
msgid "IDS_COM_BODY_MAR_ABB"
-msgstr "Mar"
+msgstr "March"
msgid "IDS_COM_BODY_JUN_ABB"
-msgstr "Jun"
+msgstr "June"
msgid "IDS_COM_BODY_JUL_ABB"
-msgstr "Jul"
+msgstr "July"
msgid "IDS_COM_BODY_JAN_ABB"
-msgstr "Jan"
+msgstr "January"
msgid "IDS_COM_BODY_FEB_ABB"
-msgstr "Feb"
+msgstr "February"
msgid "IDS_COM_BODY_DEC_ABB"
-msgstr "Dec"
+msgstr "December"
msgid "IDS_COM_BODY_AUG_ABB"
-msgstr "Aug"
+msgstr "August"
msgid "IDS_COM_BODY_APR_ABB"
-msgstr "Apr"
+msgstr "April"
msgid "IDS_COM_BODY_COPY"
msgstr "Copy"
msgstr "No albums selected."
msgid "IDS_MEDIABR_HEADER_SELECT_ITEM"
-msgstr "Select item"
+msgstr "Select items"
msgid "IDS_MEDIABR_BODY_NO_ALBUMS"
msgstr "No albums"
msgstr "OK"
msgid "IDS_MEDIABR_BUTTON_SAVE"
-msgstr "Save"
+msgstr "Create"
msgid "IDS_MEDIABR_POP_DELETE_Q"
msgstr "Delete?"
msgstr "Create"
msgid "IDS_MEDIABR_POP_NO_ITEMS"
-msgstr "No items"
+msgstr "No Items Available"
msgid "IDS_MEDIABR_OPT_EDIT_IMAGE"
msgstr "Edit image"
msgstr "Delete"
msgid "IDS_COM_SK_SAVE"
-msgstr "Save"
+msgstr "Create"
msgid "IDS_COM_POP_DELETE_Q"
msgstr "Delete?"
Evas_Object *btn2 = elm_button_add(parent);
GL_CHECK_VAL(btn1, -1);
GL_CHECK_VAL(btn2, -1);
- /* Title Cancel Button */
- elm_object_style_set(btn1, "naviframe/title_left");
+ // /* Title Cancel Button */
+ Evas_Object *box = elm_box_add(parent);
+ elm_box_horizontal_set(box, EINA_TRUE);
+ elm_box_padding_set(box, ELM_SCALE_SIZE(20), 0);
+
+ /* Text Button */
+ elm_object_style_set(btn1, "textbutton");
+ evas_object_size_hint_min_set(btn1, ELM_SCALE_SIZE(148), ELM_SCALE_SIZE(48));
+ elm_object_text_set(btn1, "CANCEL");
elm_object_item_part_content_set(ad->ctrlinfo.nf_it,
GL_NAVIFRAME_TITLE_LEFT_BTN, btn1);
- _gl_ui_set_translate_str(btn1, GL_STR_ID_CANCEL_CAP);
- evas_object_smart_callback_add(btn1, "clicked",
- __gl_albums_edit_cancel_cb, ad);
-
- /* Title Done Button */
- elm_object_style_set(btn2, "naviframe/title_right");
+ evas_object_smart_callback_add(btn1, "clicked", __gl_albums_edit_cancel_cb, ad);
+ evas_object_show(btn1);
+ elm_box_pack_end(box, btn1);
+
+ /* Text Button */
+ elm_object_style_set(btn2, "textbutton");
+ evas_object_size_hint_min_set(btn2, ELM_SCALE_SIZE(126), ELM_SCALE_SIZE(48));
+ elm_object_text_set(btn2, "DONE");
elm_object_item_part_content_set(ad->ctrlinfo.nf_it,
GL_NAVIFRAME_TITLE_RIGHT_BTN, btn2);
- _gl_ui_set_translate_str(btn2, GL_STR_ID_DONE_CAP);
- evas_object_smart_callback_add(btn2, "clicked",
- __gl_albums_edit_del_cb, ad);
- elm_object_disabled_set(btn2, EINA_TRUE);
+ evas_object_smart_callback_add(btn2, "clicked", __gl_albums_edit_del_cb, ad);
+ // elm_object_disabled_set(btn2, EINA_TRUE);
+ evas_object_show(btn2);
+ elm_box_pack_end(box, btn2);
+
+ /* Title Content */
+ elm_object_item_part_content_set(nf_it, "title_content", box);
/* Select-all */
ad->selinfo.ck_state = false;
gl_appdata *ad = (gl_appdata *) data;
Evas_Object *layout_inner = elm_gengrid_add(ad->maininfo.win);
- elm_gengrid_align_set(layout_inner, 0.5f, 0.0);
+ elm_gengrid_align_set(layout_inner, 0.0, 0.0);
elm_gengrid_horizontal_set(layout_inner, EINA_FALSE);
elm_scroller_bounce_set(layout_inner, EINA_FALSE, EINA_TRUE);
elm_scroller_policy_set(layout_inner, ELM_SCROLLER_POLICY_OFF,
GL_CHECK(ad);
int view_mode = gl_get_view_mode(ad);
elm_gengrid_item_selected_set(ei, EINA_FALSE);
+ ad->pinchinfo.zoom_level = GL_ZOOM_IN_ONE;
gl_dbg("view mode: %d.", view_mode);
if (view_mode != GL_VIEW_ALBUMS_EDIT
GL_CHECK_NULL(path);
elm_layout_file_set(layout, path, "ceter_algined_text_layout");
elm_object_mirrored_automatic_set(layout, EINA_FALSE);
-
elm_object_mirrored_set(layout, EINA_FALSE);
free(path);
char *i18n_name = _gl_get_i18n_album_name(album_item->cluster);
+ snprintf(cnt, sizeof(cnt), "%s (%d)", _gl_str(i18n_name), (int) (album_item->cluster->count));
elm_layout_text_set(layout, "elm.text",
- elm_entry_utf8_to_markup(_gl_str(i18n_name)));
- snprintf(cnt, sizeof(cnt), "(%d)",
- (int) (album_item->cluster->count));
- _gl_count_set(layout, cnt);
-
+ elm_entry_utf8_to_markup(_gl_str(cnt)));
return layout;
- } else if (!g_strcmp0(part, GL_TILE_ICON)) {
+ } else if (!g_strcmp0(part, GL_TILE_ICON)) {
if (album_item->cover_thumbs_cnt <= 0) {
gl_dbg("Empty album");
}
gl_appdata *ad = (gl_appdata *) data;
if (ad->albuminfo.elist->edit_cnt > 0) {
- /* 1. View As */
- _gl_ctxpopup_append(parent, GL_STR_ID_VIEW_AS,
- __gl_albums_viewas_pop_cb, data);
/* 2. New album */
_gl_ctxpopup_append(parent, GL_STR_ID_NEW_ALBUM,
__gl_albums_newalbum_cb, data);
GL_NAVIFRAME_PREV_BTN);
evas_object_hide(unset);
_gl_ui_disable_menu(ad->ctrlinfo.nf_it, false);
- _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, GL_STR_ID_ALBUM,
+ _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, "",
true);
_gl_update_list_data(data);
evas_object_smart_callback_add(ad->albuminfo.view, "longpressed",
return EINA_FALSE;
}
+static Evas_Object*
+create_toolbar_more_btn(Evas_Object *parent, Evas_Smart_Cb func, void *data)
+{
+ Evas_Object *btn = elm_button_add(parent);
+ if (btn == NULL) return NULL;
+ elm_object_style_set(btn, "naviframe/more/default");
+ evas_object_smart_callback_add(btn, "clicked", func, data);
+ return btn;
+}
+
/**
* When push albums view for the first time, albums list is empty.
* After albums list got from DB then update edit item state.
/* Remove btns */
_gl_ui_clear_btns(data);
/* More */
- btn = _gl_but_create_but(parent, NULL, NULL, GL_BUTTON_STYLE_NAVI_MORE,
- __gl_albums_more_btn_cb, data);
- GL_CHECK_VAL(btn, -1);
+ btn = elm_button_add(parent);
+ elm_object_style_set(btn, "naviframe/more");
+ evas_object_smart_callback_add(btn, "clicked", __gl_albums_more_btn_cb, data);
+
+ /* Title Content */
+ elm_object_item_part_content_set(nf_it, "title_content", btn);
+
+ /* HW More Button */
+ btn = create_toolbar_more_btn(parent, __gl_albums_more_btn_cb, data);
+ elm_object_item_part_content_set(nf_it, "toolbar_more_btn", btn);
- elm_object_item_part_content_set(nf_it, GL_NAVIFRAME_MORE, btn);
_gl_albums_check_btns(data);
return 0;
}
}
evas_object_del(ad->albuminfo.view);
}
- _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, GL_STR_ID_ALBUM,
+ _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, "",
true);
elm_object_signal_emit(ad->ctrlinfo.ctrlbar_view_ly,
"elm,selectall,state,default", "elm");
(void *) __gl_albums_pop_op);
gl_set_view_mode(data, GL_VIEW_ALBUMS);
- _gl_ctrl_show_title(data, GL_CTRL_TAB_ALBUMS);
if (!ad->albuminfo.view) {
gl_dbg("Add gengrid first");
pre_view = elm_object_part_content_unset(ad->ctrlinfo.ctrlbar_view_ly,
"elm.swallow.view");
evas_object_hide(pre_view);
+ ad->pinchinfo.zoom_level = GL_ZOOM_IN_TWO;
return 0;
}
_gl_show_grid_checks_dual(ad->albuminfo.view, GL_TILE_CHECKBOX,
GL_TILE_CHECKBOX_GRID);
} else {
- _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, GL_STR_ID_ALBUM,
+ _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, "",
true);
__gl_albums_add_btns(data);
_gl_albums_edit_pop_view(data);
Evas_Object *btn2 = elm_button_add(parent);
GL_CHECK_VAL(btn1, -1);
GL_CHECK_VAL(btn2, -1);
- /* Title Cancel Button */
- elm_object_style_set(btn1, "naviframe/title_left");
- elm_object_item_part_content_set(nf_it, GL_NAVIFRAME_TITLE_LEFT_BTN,
- btn1);
- _gl_ui_set_translate_str(btn1, GL_STR_ID_CANCEL_CAP);
- evas_object_smart_callback_add(btn1, "clicked",
- __gl_thumbs_edit_cancel_cb, ad);
-
- /* Title Done Button */
- elm_object_style_set(btn2, "naviframe/title_right");
- elm_object_item_part_content_set(nf_it, GL_NAVIFRAME_TITLE_RIGHT_BTN,
- btn2);
- _gl_ui_set_translate_str(btn2, GL_STR_ID_DONE_CAP);
- evas_object_smart_callback_add(btn2, "clicked",
- __gl_thumbs_edit_done_cb, ad);
- elm_object_disabled_set(btn2, EINA_TRUE);
+ // /* Title Cancel Button */
+ Evas_Object *box = elm_box_add(parent);
+ elm_box_horizontal_set(box, EINA_TRUE);
+ elm_box_padding_set(box, ELM_SCALE_SIZE(20), 0);
+
+ /* Text Button */
+ elm_object_style_set(btn1, "textbutton");
+ evas_object_size_hint_min_set(btn1, ELM_SCALE_SIZE(148), ELM_SCALE_SIZE(48));
+ elm_object_text_set(btn1, "CANCEL");
+ elm_object_item_part_content_set(nf_it,
+ GL_NAVIFRAME_TITLE_LEFT_BTN, btn1);
+ evas_object_smart_callback_add(btn1, "clicked", __gl_thumbs_edit_cancel_cb, ad);
+ evas_object_show(btn1);
+ elm_box_pack_end(box, btn1);
+
+ /* Text Button */
+ elm_object_style_set(btn2, "textbutton");
+ evas_object_size_hint_min_set(btn2, ELM_SCALE_SIZE(126), ELM_SCALE_SIZE(48));
+ elm_object_text_set(btn2, "DONE");
+ elm_object_item_part_content_set(nf_it,
+ GL_NAVIFRAME_TITLE_RIGHT_BTN, btn2);
+ evas_object_smart_callback_add(btn2, "clicked", __gl_thumbs_edit_done_cb, ad);
+ // elm_object_disabled_set(btn2, EINA_TRUE);
+ evas_object_show(btn2);
+ elm_box_pack_end(box, btn2);
+
+ /* Title Content */
+ elm_object_item_part_content_set(nf_it, "title_content", box);
return 0;
}
GL_CHECK_VAL(btn1, -1);
GL_CHECK_VAL(btn2, -1);
- /* Title Cancel Button */
- elm_object_style_set(btn1, "naviframe/title_left");
+ // /* Title Cancel Button */
+ Evas_Object *box = elm_box_add(layout);
+ elm_box_horizontal_set(box, EINA_TRUE);
+ elm_box_padding_set(box, ELM_SCALE_SIZE(20), 0);
+
+ /* Text Button */
+ elm_object_style_set(btn1, "textbutton");
+ evas_object_size_hint_min_set(btn1, ELM_SCALE_SIZE(148), ELM_SCALE_SIZE(48));
+ elm_object_text_set(btn1, "CANCEL");
elm_object_item_part_content_set(ad->albuminfo.nf_it_select,
GL_NAVIFRAME_TITLE_LEFT_BTN, btn1);
- _gl_ui_set_translate_str(btn1, GL_STR_ID_CANCEL_CAP);
- evas_object_smart_callback_add(btn1, "clicked",
- __gl_thumbs_sel_cancel_cb, ad);
-
- /* Title Done Button */
- elm_object_style_set(btn2, "naviframe/title_right");
+ evas_object_smart_callback_add(btn1, "clicked", __gl_thumbs_sel_cancel_cb, ad);
+ evas_object_show(btn1);
+ elm_box_pack_end(box, btn1);
+
+ /* Text Button */
+ elm_object_style_set(btn2, "textbutton");
+ evas_object_size_hint_min_set(btn2, ELM_SCALE_SIZE(126), ELM_SCALE_SIZE(48));
+ elm_object_text_set(btn2, "DONE");
elm_object_item_part_content_set(ad->albuminfo.nf_it_select,
GL_NAVIFRAME_TITLE_RIGHT_BTN, btn2);
- _gl_ui_set_translate_str(btn2, GL_STR_ID_DONE_CAP);
- evas_object_smart_callback_add(btn2, "clicked",
- __gl_thumbs_sel_done_cb, ad);
- elm_object_disabled_set(btn2, EINA_TRUE);
+ evas_object_smart_callback_add(btn2, "clicked", __gl_thumbs_sel_done_cb, ad);
+ // elm_object_disabled_set(btn2, EINA_TRUE);
+ evas_object_show(btn2);
+ elm_box_pack_end(box, btn2);
+
+ /* Title Content */
+ elm_object_item_part_content_set(ad->albuminfo.nf_it_select, "title_content", box);
ad->gridinfo.select_view = view;
ad->gridinfo.select_layout = layout;
gl_appdata *ad = (gl_appdata *) data;
Evas_Object *layout_inner = elm_gengrid_add(ad->maininfo.win);
- elm_gengrid_align_set(layout_inner, 0.5f, 0.0);
+ elm_gengrid_align_set(layout_inner, 0.0, 0.0);
elm_gengrid_horizontal_set(layout_inner, EINA_FALSE);
elm_scroller_bounce_set(layout_inner, EINA_FALSE, EINA_TRUE);
elm_scroller_policy_set(layout_inner, ELM_SCROLLER_POLICY_OFF,
if (sel_cnt > 0) {
char *text = NULL;
text = g_strdup_printf(pd_selected, sel_cnt);
- _gl_thumbs_update_label(nf_it, text);
+ _gl_thumbs_update_label(nf_it, GL_STR_ID_SELECT_ITEM);
GL_GFREEIF(text);
} else if (!b_lang) {
/* Don't need to update text if it's called by language_changed_cb */
} else if (view_mode == GL_VIEW_ALBUMS) {
state_index = 1;
}
- _gl_list_pop_create(data, obj, ei, GL_STR_ID_VIEW_AS, GL_STR_TIME_VIEW,
- GL_STR_ALBUMS, state_index);
+ _gl_list_pop_create(data, obj, ei, GL_STR_ID_VIEW_AS, "",
+ "", state_index);
gl_dbg("EXIT");
}
}
if (cnt > 0) {
- /* View As */
- _gl_ctxpopup_append(parent, GL_STR_ID_VIEW_AS,
- __gl_albums_viewas_pop_cb, data);
/* Delete */
_gl_ctxpopup_append(parent, GL_STR_ID_DELETE,
__gl_timeline_edit_cb, data);
__gl_timeline_change_mode(data, GL_TL_VIEW_NORMAL);
}
+static Evas_Object*
+create_toolbar_more_btn(Evas_Object *parent, Evas_Smart_Cb func, void *data)
+{
+ Evas_Object *btn = elm_button_add(parent);
+ if (btn == NULL) return NULL;
+ elm_object_style_set(btn, "naviframe/more/default");
+ evas_object_smart_callback_add(btn, "clicked", func, data);
+ return btn;
+}
+
/**
* Add nafirame buttons
* @param data : App data
Evas_Object *btn = NULL;
/* More */
- btn = _gl_but_create_but(parent, NULL, NULL,
- GL_BUTTON_STYLE_NAVI_MORE,
- __gl_timeline_more_cb, data);
- GL_CHECK_VAL(btn, -1);
- elm_object_item_part_content_set(nf_it, GL_NAVIFRAME_MORE, btn);
+ btn = elm_button_add(parent);
+ elm_object_style_set(btn, "naviframe/more");
+ evas_object_smart_callback_add(btn, "clicked", __gl_timeline_more_cb, data);
+
+ /* Title Content */
+ elm_object_item_part_content_set(nf_it, "title_content", btn);
+
+ /* HW More Button */
+ btn = create_toolbar_more_btn(parent, __gl_timeline_more_cb, data);
+ elm_object_item_part_content_set(nf_it, "toolbar_more_btn", btn);
+
elm_object_signal_emit(ad->ctrlinfo.ctrlbar_view_ly,
"elm,selectall,state,default", "elm");
return 0;
Elm_Object_Item *nf_it = elm_naviframe_top_item_get(parent);
GL_CHECK_VAL(nf_it, -1);
- /* More */
- Evas_Object *btn = _gl_but_create_but(parent, NULL, NULL,
- GL_BUTTON_STYLE_NAVI_MORE,
- __gl_timeline_more_cb, data);
- GL_CHECK_VAL(btn, -1);
- _gl_ui_disable_btn(btn);
- elm_object_item_part_content_set(nf_it, GL_NAVIFRAME_MORE, btn);
-
Evas_Object *btn1 = elm_button_add(parent);
Evas_Object *btn2 = elm_button_add(parent);
GL_CHECK_VAL(btn1, -1);
GL_CHECK_VAL(btn2, -1);
- /* Title Cancel Button */
- elm_object_style_set(btn1, "naviframe/title_left");
+
+ Evas_Object *box = elm_box_add(parent);
+ elm_box_horizontal_set(box, EINA_TRUE);
+ elm_box_padding_set(box, ELM_SCALE_SIZE(20), 0);
+
+ /* Text Button */
+ elm_object_style_set(btn1, "textbutton");
+ evas_object_size_hint_min_set(btn1, ELM_SCALE_SIZE(148), ELM_SCALE_SIZE(48));
+ elm_object_text_set(btn1, "CANCEL");
elm_object_item_part_content_set(ad->ctrlinfo.nf_it,
GL_NAVIFRAME_TITLE_LEFT_BTN, btn1);
- _gl_ui_set_translate_str(btn1, GL_STR_ID_CANCEL_CAP);
- evas_object_smart_callback_add(btn1, "clicked",
- __gl_timeline_edit_cancel_cb, ad);
- /* Title Done Button */
- elm_object_style_set(btn2, "naviframe/title_right");
+ evas_object_smart_callback_add(btn1, "clicked", __gl_timeline_edit_cancel_cb, ad);
+ evas_object_show(btn1);
+ elm_box_pack_end(box, btn1);
+
+ /* Text Button */
+ elm_object_style_set(btn2, "textbutton");
+ evas_object_size_hint_min_set(btn2, ELM_SCALE_SIZE(126), ELM_SCALE_SIZE(48));
+ elm_object_text_set(btn2, "DONE");
elm_object_item_part_content_set(ad->ctrlinfo.nf_it,
GL_NAVIFRAME_TITLE_RIGHT_BTN, btn2);
- _gl_ui_set_translate_str(btn2, GL_STR_ID_DONE_CAP);
- evas_object_smart_callback_add(btn2, "clicked", __gl_timeline_del_cb,
- ad);
- elm_object_disabled_set(btn2, EINA_TRUE);
+ evas_object_smart_callback_add(btn2, "clicked", __gl_timeline_del_cb, ad);
+ // elm_object_disabled_set(btn2, EINA_TRUE);
+ evas_object_show(btn2);
+ elm_box_pack_end(box, btn2);
+
+ /* Title Content */
+ elm_object_item_part_content_set(nf_it, "title_content", box);
gl_dbg("Sending signal to EDC");
elm_object_signal_emit(ad->ctrlinfo.ctrlbar_view_ly,
case GL_TL_VIEW_NORMAL:
gl_dbg("GL_TL_VIEW_NORMAL");
_gl_time_data_selected_list_finalize(data);
- _gl_ui_change_navi_title(ad->tlinfo->nf_it, GL_STR_TIME_VIEW,
+ _gl_ui_change_navi_title(ad->tlinfo->nf_it, "",
true);
__gl_timeline_add_btns(data);
/* Update view to hide checkboxes and clear data */
gl_dbg("content's size(%dx%d)", w, h);
gl_set_view_mode(data, GL_VIEW_TIMELINE);
- _gl_ctrl_show_title(data, GL_CTRL_TAB_TIMELINE);
if (ad->tlinfo) {
gl_dbgW("Update view");
gl_appdata *ad = (gl_appdata *) data;
GL_CHECK_VAL(ad->tlinfo, -1);
GL_CHECK_VAL(ad->tlinfo->nf_it, -1);
- _gl_ui_change_navi_title(ad->tlinfo->nf_it, GL_STR_TIME_VIEW, true);
+ _gl_ui_change_navi_title(ad->tlinfo->nf_it, "", true);
_gl_timeline_update_view(ad);
return 0;
/* Cancel */
left_btn = _gl_but_create_image_but(parent, NULL, GL_STR_ID_CANCEL,
- NULL, __gl_entry_cancel_cb, data,
+ "border", __gl_entry_cancel_cb, data,
EINA_FALSE);
GL_CHECK_VAL(left_btn, -1);
#include "gl-button.h"
#include "gl-tile.h"
#include "gl-db-update.h"
+#include "gl-popup.h"
+#include "gl-albums.h"
+#include "gl-ctxpopup.h"
+#include "gl-albums.h"
#define GL_BG_COLOR_DEFAULT 0
#define GL_BG_COLOR_A 255
elm_exit();
}
+/**
+ *
+ * @param ad
+ * @return
+ */
+static Evas_Object* create_tabbar_with_title(Evas_Object *parent,gl_appdata * ad)
+{
+ Evas_Object *toolbar;
+ toolbar = elm_toolbar_add(parent);
+ elm_object_style_set(toolbar, "tabbar_with_title");
+ elm_toolbar_shrink_mode_set(toolbar, ELM_TOOLBAR_SHRINK_EXPAND);
+ elm_toolbar_transverse_expanded_set(toolbar, EINA_TRUE);
+ elm_toolbar_item_append(toolbar, NULL, "Photos", _gl_time_view_selected_cb, ad);
+ elm_toolbar_item_append(toolbar, NULL, "Albums", _gl_album_view_selected_cb, ad);
+ elm_toolbar_select_mode_set(toolbar, ELM_OBJECT_SELECT_MODE_ALWAYS);
+ if (_gl_get_launch_state_preference()) {
+ elm_toolbar_item_selected_set(elm_toolbar_first_item_get(toolbar),EINA_TRUE);
+ } else {
+ elm_toolbar_item_selected_set(elm_toolbar_last_item_get(toolbar),EINA_TRUE);
+ }
+ return toolbar;
+}
/**
* Perform an UI update according to the given rotation angle.
* Do not call elm_win_rotation_set / elm_win_rotation_with_resize_set.
GL_PROFILE_IN;
GL_CHECK_NULL(parent);
Evas_Object *layout = NULL;
-
- layout = elm_layout_add(parent);
+ char *path = _gl_get_edje_path();
+ layout=gl_ui_load_edj(parent, path, "main_view_layout");
GL_CHECK_NULL(layout);
- /* Apply the layout style */
- elm_layout_theme_set(layout, "layout", "application", "default");
evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_show(layout);
__gl_main_create_naviframe(ad->maininfo.layout);
GL_CHECK_VAL(ad->maininfo.naviframe, -1);
/* Set Naviframe to main layout */
- elm_object_part_content_set(ad->maininfo.layout, "elm.swallow.content",
- ad->maininfo.naviframe);
+ Evas_Object* tabbar=create_tabbar_with_title(ad->maininfo.layout,ad);
+ elm_object_part_content_set(ad->maininfo.layout, "elm.swallow.content",ad->maininfo.naviframe);
+ elm_object_part_content_set(ad->maininfo.layout, "tabbar",tabbar);
/* Save conform pointer to naviframe object */
evas_object_data_set(ad->maininfo.naviframe, GL_NAVIFRAME_OBJ_DATA_KEY,
conform);
if (view_mode == GL_VIEW_ALBUM_REORDER) {
_gl_ui_change_navi_title(ad->ctrlinfo.nf_it, GL_STR_ID_REORDER, true);
} else {
- _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, GL_STR_ID_ALBUM, true);
+ _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, "", true);
}
return 0;
}
char *text = NULL;
text = g_strdup_printf(_gl_str(pd_selected), sel_cnt);
elm_object_item_part_text_set(nf_it, "elm.text.title",
- _gl_str(text));
+ _gl_str(GL_STR_ID_SELECT_ITEM));
gl_dbg("Text is : %s", text);
GL_GFREEIF(text);
} else if (!b_lang) {
break;
case GL_CTRL_TAB_TIMELINE:
// :TODO Timeline token need to be addressed
- text = GL_STR_TIME_VIEW;
+ text = "";
break;
default:
gl_dbgE("Wrong mode!");
if (text) {
gl_sdbg("text: %s", text);
- _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, text, true);
+ _gl_ui_change_navi_title(ad->ctrlinfo.nf_it, "", true);
}
GL_PROFILE_OUT;
return 0;
}
gl_dbg("move_x: %d, move_y: %d", move_x, move_y);
- evas_object_move(ctxpopup, move_x, move_y);
+
+ if(ad->maininfo.view_mode == GL_VIEW_ALBUMS) {
+ evas_object_move(ctxpopup, 1200, 250);
+ } else {
+ evas_object_move(ctxpopup, 1200, 250);
+ }
}
/**
if (__gl_ctxpopup_check_btn_pos
(data, btn, x_position, y_position, w, h) == true) {
/* the more button is inside the main window */
- evas_object_move(ctxpopup, x_position + w / 2, y_position + h / 2);
- gl_dbg("(%d, %d) - (%d, %d)", x_position, y_position, w, h);
+ __gl_ctxpopup_move_for_hwkey(data, ctxpopup);
} else {
/* the more button is not inside the main windown,
possibly because the target has HW more/back keys. */
gl_appdata *ad = (gl_appdata *) data;
GL_CHECK_VAL(ad->maininfo.naviframe, -1);
- _gl_ctxpopup_del(data);
-
gl_ctx_data_s *ctx_data =
(gl_ctx_data_s *) calloc(1, sizeof(gl_ctx_data_s));
GL_CHECK_VAL(ctx_data, -1);
_gl_ui_set_translate_part_str(noc_lay, "elm.text",
_gl_str(GL_STR_ID_NO_ITEMS));
- _gl_ui_set_translate_part_str(noc_lay, "elm.help.text",
- _gl_str(GL_STR_ID_NO_ITEMS_SECOND));
elm_layout_signal_emit(noc_lay, "text,disabled", "");
elm_layout_signal_emit(noc_lay, "align.center", "elm");
return noc_lay;
if (str1 && cb1) {
Evas_Object *btn1 = NULL;
btn1 = _gl_but_create_but_popup(popup, str1, cb1, data1);
+ elm_object_style_set(btn1, "border");
elm_object_part_content_set(popup, "button1", btn1);
popup_d->cb1 = cb1;
popup_d->data1 = data1;
if (str2 && cb2) {
Evas_Object *btn2 = NULL;
btn2 = _gl_but_create_but_popup(popup, str2, cb2, data2);
+ elm_object_style_set(btn2, "default");
elm_object_part_content_set(popup, "button2", btn2);
popup_d->cb2 = cb2;
popup_d->data2 = data2;
if (str3 && cb3) {
Evas_Object *btn3 = NULL;
btn3 = _gl_but_create_but_popup(popup, str3, cb3, data3);
+ elm_object_style_set(btn3, "default");
elm_object_part_content_set(popup, "button3", btn3);
popup_d->cb3 = cb3;
popup_d->data3 = data3;
Evas_Object *btn2 = NULL;
btn1 = _gl_but_create_but_popup(popup, GL_STR_ID_CANCEL,
__gl_popup_del_resp_cb, data);
+ elm_object_style_set(btn1, "border");
btn2 = _gl_but_create_but_popup(popup, GL_STR_ID_DELETE,
__gl_popup_del_resp_cb, data);
+ elm_object_style_set(btn2, "default");
elm_object_part_content_set(popup, "button1", btn1);
elm_object_part_content_set(popup, "button2", btn2);
case GL_POPUP_ALBUM_MEMORY_FULL:
btn1 = _gl_but_create_but_popup(popup, GL_STR_ID_CANCEL_ABB,
__gl_popup_resp_cb, data);
+ elm_object_style_set(btn1, "border");
elm_object_part_content_set(popup, "button1", btn1);
btn2 = _gl_but_create_but_popup(popup, GL_STR_SETTINGS,
__gl_popup_resp_cb, data);
gl_dbg("EXIT 1");
return;
}
+ if(ad->maininfo.ctxpopup) {
+ evas_object_del(ad->maininfo.ctxpopup);
+ ad->maininfo.ctxpopup = NULL;
+ }
+ if (ad->gridinfo.nf_it) {
+ _gl_thumbs_destroy_view(ad,true);
+ }
_gl_ctrl_show_view(data, "Timeline");
gl_dbg("EXIT");
}
gl_dbg("EXIT 1");
return;
}
+ if(ad->maininfo.ctxpopup) {
+ evas_object_del(ad->maininfo.ctxpopup);
+ ad->maininfo.ctxpopup = NULL;
+ }
_gl_ctrl_show_view(data, GL_STR_ALBUMS);
gl_dbg("EXIT");
}
gl_cluster *album_item = (gl_cluster *) data;
Evas_Object *ic = elm_icon_add(obj);
- if (!strcmp(part, "elm.swallow.icon")) {
+ if (!strcmp(part, "elm.icon")) {
if (GL_STORE_T_MMC == album_item->cluster->type) {
GL_ICON_SET_FILE(ic, GL_ICON_MMC);
evas_object_size_hint_aspect_set(ic,
gl_popup_menu_s *menu_d =
evas_object_data_get(genlist, GL_POPUP_OBJ_DATA_KEY);
Evas_Object *gl =
- __gl_popup_add_genlist(menu_d, ad->popupinfo.popup, "default",
+ __gl_popup_add_genlist(menu_d, ad->popupinfo.popup, "1line",
__gl_popup_menu_get_genlist_text,
__gl_popup_menu_get_genlist_content,
_gl_genlist_item_apend);
Evas_Object *btn1 = elm_button_add(parent);
Evas_Object *btn2 = elm_button_add(parent);
- elm_object_style_set(btn1, "default");
+ elm_object_style_set(btn1, "border");
elm_object_style_set(btn2, "default");
evas_object_size_hint_weight_set(btn1, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
menu_d = (gl_popup_menu_s *) calloc(1, sizeof(gl_popup_menu_s));
GL_CHECK_VAL(menu_d, -1);
menu_d->ad = ad;
- Evas_Object *genlist = __gl_popup_add_genlist(menu_d, popup, "default",
+ Evas_Object *genlist = __gl_popup_add_genlist(menu_d, popup, "1line",
__gl_popup_menu_get_genlist_text,
__gl_popup_menu_get_genlist_content,
_gl_genlist_item_apend);
Evas_Object *btn1 = NULL;
btn1 = _gl_but_create_but_popup(popup, GL_STR_ID_CANCEL,
__gl_pb_cancel_thread_pbar_cb, data);
+ elm_object_style_set(btn1, "border");
elm_object_part_content_set(popup, "button1", btn1);
evas_object_show(popup);
#include "gl-timeline.h"
/* 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_WIDTH 280
+#define GL_TILE_ITEM_HEIGHT 280
#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_CNT 6
#define GL_TILE_ITEM_CNT2 12
-#define GL_TILE_ITEM_L_CNT 3
+#define GL_TILE_ITEM_L_CNT 4
/* Items count of each column */
#define GL_TILE_ALIGN_CON1 0.25f
#define GL_TILE_ALIGN_CON2 0.75f
GL_CHECK_NULL(grid);
/* horizontal scrolling */
- elm_gengrid_align_set(grid, GL_TILE_ALIGN_MID, 0.0);
+ elm_gengrid_align_set(grid, 0.0, 0.0);
elm_gengrid_horizontal_set(grid, EINA_FALSE);
elm_scroller_bounce_set(grid, EINA_FALSE, EINA_TRUE);
elm_scroller_policy_set(grid, ELM_SCROLLER_POLICY_OFF,
double scale = _gl_get_win_factor(ad->maininfo.win, &win_w, &win_h);
gl_dbg("rotate_mode: %d, b_update: %d", rotate_mode, b_update);
- w = (int) (win_w / GL_TILE_2_PER_ROW);
+ w = 210;
h = (int) (298 * scale);
w_l = (int) (win_h / GL_TILE_3_PER_ROW);
h_l = w_l;
w_l = (int) (win_h / GL_TILE_4_PER_ROW);
c = GL_TILE_ITEM_CNT2;
}
- h = w + win_w / 9;
+ h = 240;
h_l = w_l + win_h / 9;
gl_dbg("P %dx%d L %dx%d C %dx%d", w, h, w_l, h_l, c, c_l);
if ((rotate_mode == APP_DEVICE_ORIENTATION_270) ||
(rotate_mode == APP_DEVICE_ORIENTATION_90)) {
if (count >= c_l && align_y > GL_TILE_ALIGN_CON1) {
- elm_gengrid_align_set(grid, GL_TILE_ALIGN_MID, 0.0);
+ elm_gengrid_align_set(grid, 0.0, 0.0);
} else if (count < c_l && align_y < GL_TILE_ALIGN_CON1) {
- elm_gengrid_align_set(grid, GL_TILE_ALIGN_MID, 0.0);
+ elm_gengrid_align_set(grid, 0.0, 0.0);
}
-
elm_gengrid_item_size_set(grid, w_l, h_l);
} else {
- 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);
- } else if (count < c && align_y < GL_TILE_ALIGN_CON1) {
- elm_gengrid_align_set(grid, GL_TILE_ALIGN_MID, 0.0);
- }
- elm_gengrid_item_size_set(grid, w, h);
+ if (count >= c && (align_x > GL_TILE_ALIGN_CON1 || align_y < GL_TILE_ALIGN_CON2)) {
+ elm_gengrid_align_set(grid, 0.661, 0.0);
+ } else if (count < c && align_y < GL_TILE_ALIGN_CON1) {
+ if(count==1)
+ elm_gengrid_align_set(grid, 0.0398, 0.0);
+ if(count==2)
+ elm_gengrid_align_set(grid, 0.049, 0.0);
+ if(count==3)
+ elm_gengrid_align_set(grid, 0.063, 0.0);
+ if(count==4)
+ elm_gengrid_align_set(grid, 0.088, 0.0);
+ if(count==5)
+ elm_gengrid_align_set(grid, 0.158, 0.0);
+ }
+ elm_gengrid_item_size_set(grid, 202, 182+80);
}
if (b_update) {
projects / profile / iot / apps / native / gallery.git / commitdiff