return NULL;
char buf[1024] = {0,};
- snprintf(buf, sizeof(buf), "MEDIA_PATH=\'%s\'", filepath);
+ snprintf(buf, sizeof(buf), "MEDIA_PATH=\"%s\"", filepath);
media_handle m_handle = NULL;
filter_handle media_filter = NULL;
char buf[1024] = {0,};
- snprintf(buf, sizeof(buf), "FOLDER_PATH=\'%s\'", folderpath);
+ snprintf(buf, sizeof(buf), "FOLDER_PATH=\"%s\"", folderpath);
media_handle m_handle = NULL;
filter_handle media_filter = NULL;
char buf[1024] = {0,};
- snprintf(buf, sizeof(buf), "TAG_NAME=\'%s\'", tagname);
+ snprintf(buf, sizeof(buf), "TAG_NAME=\"%s\"", tagname);
tag_handle t_handle = NULL;
#define PROGRESSBAR_WIDTH 100
#define PROGRESSBAR_HEIGHT 100
-#define NOTIFY_HEIGHT 40
+#define NOTIFY_HEIGHT 47
collections {
group {
#define PADDING_VISIBILITY 0
+#define NOTIFY_HEIGHT 47
+
collections {
#define PROGRESSBAR_WIDTH 100
}
}
+ part { name: "setasview.contents";
+ type: RECT;
+ scale: 1;
+ repeat_events: 0;
+ description { state: "default" 0.0;
+ color: 0 0 0 100;
+ align: 0.0 0.0;
+ rel1.relative: 0.0 0.0;
+ rel1.to_x: "bg";
+ rel1.to_y: "bg";
+ rel1.offset: 0 0;
+ rel2.relative: 1.0 0.0;
+ rel2.to_x: "bg";
+ rel2.to_y: "toolbar_bg";
+ rel2.offset: 0 -NOTIFY_HEIGHT; //for notify
+ visible: 1;
+ }
+ }
+
+ part { name: "setasview.contents.swallow";
+ type: SWALLOW;
+ scale: 1;
+ repeat_events: 0;
+ description { state: "default" 0.0;
+ rel1 { relative: 0 0; to:setasview.contents; }
+ rel2 { relative: 1 1; to:setasview.contents; }
+ visible: 1;
+ }
+ }
+
+ part { name: "setasview.contents.swallow.notify";
+ type: RECT;
+ scale: 1;
+ repeat_events: 0;
+ description { state: "default" 0.0;
+ rel1 { relative: 0 0; to:setasview.contents; }
+ rel2 { relative: 1 1; to:setasview.contents; offset: 0 NOTIFY_HEIGHT;}
+ visible: 1;
+ }
+ }
+
part{
name: "setasview.photocam";
type: SWALLOW;
description {
state: "default" 0.0;
visible: 1;
- rel1 { relative: 0 0; to:bg; }
- rel2 { relative: 1 1; to:bg; }
+ rel1 { relative: 0 0; to:setasview.contents; }
+ rel2 { relative: 1 1; to:setasview.contents; }
}
}
state: "default" 0.0;
align: 0.5 0.5;
visible: 1;
- rel1 { relative: 0 0; to:bg; }
- rel2 { relative: 1 1; to:bg; }
+ rel1 { relative: 0 0; to:setasview.contents; }
+ rel2 { relative: 1 1; to:setasview.contents; }
}
}
description {
state: "default" 0.0;
visible: 0;
- rel1 { relative: 0 0; to:bg; }
- rel2 { relative: 1 1; to:bg; }
- }
- }
-
- part { name: "setasview.contents";
- type: SWALLOW;
- scale: 1;
- repeat_events: 0;
- description { state: "default" 0.0;
- color: 255 0 0 100;
- align: 0.0 0.0;
- rel1.relative: 0.0 0.0;
- rel1.to_x: "bg";
- rel1.to_y: "bg";
- rel1.offset: 0 0;
- rel2.relative: 1.0 0.0;
- rel2.to_x: "bg";
- rel2.to_y: "toolbar_bg";
- visible: 1;
+ rel1 { relative: 0 0; to:setasview.contents; }
+ rel2 { relative: 1 1; to:setasview.contents; }
}
}
}
}
-
-
-collections {
-#define BTN_SET_CALLER_IMAGE_WIDTH 86
-#define BTN_SET_CALLER_IMAGE_HEIGHT 86
-#if 1
- group {
- name: "setas_view_btn";
-
- images {
- image: "00_winset_control_toolbar_bg.png" COMP;
- }
-
- parts{
- part {
- name: "base";
- type: RECT;
- scale:1;
- mouse_events: 1;
- repeat_events: 1;
- description {
- state: "default" 0.0;
- color: 0 0 0 0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- }
- }
- part { name: "controlbar_bg";
- scale: 1;
- description { state: "default" 0.0;
- min: 0 CONTROLBAR_SMALL_HEIGHT_INC;
- max: 999999 CONTROLBAR_SMALL_HEIGHT_INC;
- fixed: 0 1;
- align: 0.0 1.0;
- visible: 1;
- rel1 { to: "base"; }
- rel2 { to: "base"; }
- //image.normal: "00_winset_control_toolbar_bg.png";
- }
- description { state: "hide" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "controlbar_clip";
- type: RECT;
- mouse_events: 0;
- description { state: "default" 0.0;
- rel1.to: "controlbar_bg";
- rel2.to: "controlbar_bg";
- visible: 1;
- }
- description { state: "hide" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part { name: "elm.prev_btn_bg";
- type: RECT;
- scale: 1;
- clip_to: "controlbar_clip";
- description { state: "default" 0.0;
- min: 0 0;
- fixed: 1 0;
- align: 1.0 0.0;
- rel1 { relative: 1.0 0.0; to: "controlbar_bg"; }
- rel2.to: "controlbar_bg";
- visible: 0;
- }
- description { state: "visible" 0.0;
- inherit: "default" 0.0;
- min: NAVIFRAME_TITLE_PREV_BTN_BG_SIZE_INC 0;
- }
- }
- part { name: "elm.swallow.prev_btn";
- type: SWALLOW;
- scale: 1;
- clip_to: "controlbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- align: 0.5 0.5;
- rel1.to: "elm.prev_btn_bg";
- rel2.to: "elm.prev_btn_bg";
- }
- }
- part { name: "controlbar";
- type: SWALLOW;
- scale: 1;
- clip_to: "controlbar_clip";
- description { state: "default" 0.0;
- fixed: 1 1;
- rel1.to: "controlbar_bg";
- rel2 { relative: 0.0 1.0; to: "elm.prev_btn_bg"; }
- visible: 1;
- }
- }
-
- part {
- name: "selectioninfo";
- type: SWALLOW;
- description { state: "default" 0.0;
- fixed: 0 1;
- align: 0.5 1.0;
- rel1 {
- relative: 0.0 0.0; to:"controlbar_bg";
- }
- rel2 {
- relative: 1.0 0.0; to:"controlbar_bg";
- }
- }
- description { state: "hide" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- }
-
- programs {
-
- program {
- name: "hide_menu";
- signal: "elm,state,hide";
- source: "event";
- action: STATE_SET "hide" 0.0;
- target: "controlbar_clip";
- target: "controlbar_bg";
- target: "selectioninfo";
- }
-
- program {
- name: "show_menu";
- signal: "elm,state,show";
- source: "event";
- action: STATE_SET "default" 0.0;
- target: "controlbar_clip";
- target: "controlbar_bg";
- target: "selectioninfo";
- }
- }
- }
-}
-
}
else if(strncmp(val, IVUG_BUNDLE_VALUE_VIEW_MODE_SLIDESHOW, len) == 0)
{
- if(data->view_by != IVUG_VIEW_BY_ALL &&
- data->view_by != IVUG_VIEW_BY_FAVORITES &&
- data->view_by != IVUG_VIEW_BY_TAG &&
- data->view_by != IVUG_VIEW_BY_PLACES)
+ if(data->view_by == IVUG_VIEW_BY_INVAILD)
{
data->view_by = IVUG_VIEW_BY_FOLDER;
}
filter_str->sort_type = param->sort_type;
filter_str->index = param->start_index;
filter_str->selected_list = param->selected_list;
+ if(param->filepath)
+ {
+ filter_str->filepath = strdup(param->filepath);
+ }
if(filter_str->type == FILTER_DB)
{
//flag
bool bShowMenu;
- bool bUseNFC;
ivug_mode mode;
ivug_view_by view_by;
// Slide show;
SlideShow *ssHandle;
- char *ss_music_name;
+
+
bool bClickPrevent;
} Ivug_MainView;
Media_List *mList;
Ecore_Event_Handler *keydown_handler;
+ Ecore_Idler *homekey_idler;
// Slide show;
Media_Item *ss_curItem;
IV_ASSERT(si != NULL );
Media_Data *mdata = ivug_medialist_get_data(si->mitem);
+ if(mdata == NULL)
+ {
+ MSG_SITEM_ERROR("current data is NULL");
+ return;
+ }
MSG_SITEM_HIGH("Start sitem. Type(%d) State(%d) %s", si->type, si->state, mdata->filepath);
#define CROP_EDJ_FILE EDJ_PATH"/ivug-crop-view.edj"
-#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon"
-#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png"
-#define ICON_PATH_PREV CONTROL_ICON_DIRECTORY_PATH"/00_winset_btn_prev.png"
-
static void _on_layout_resized(void *data, Evas *e, Evas_Object *obj, void *event_info)
{
IvugCropView *pCropView = static_cast<IvugCropView *>(data);
MSG_DETAIL_HIGH("Removing Details VIew");
// Layout removed automatically when popping from navi item.
+ if (pDetailsView->genlist) {
+ elm_genlist_clear(pDetailsView->genlist);
+ pDetailsView->genlist = NULL;
+ }
+ if(pDetailsView->bg)
+ {
+ evas_object_del(pDetailsView->bg);
+ pDetailsView->bg = NULL;
+ }
+
if(pDetailsView->layout)
{
evas_object_del(pDetailsView->layout);
void ivug_details_view_update(Ivug_DetailsView *pDetailsView, const char *new_path)
{
+ MSG_IVUG_HIGH("ivug_details_view_update");
+
free(*(pDetailsView->filename));
*(pDetailsView->filename) = ecore_file_strip_ext(ecore_file_file_get(new_path));
free(*(pDetailsView->path));
*(pDetailsView->path) = strdup(new_path);
-
- elm_genlist_realized_items_update(pDetailsView->genlist);
+ //elm_genlist_realized_items_update(pDetailsView->genlist);
+ Elm_Object_Item *item = NULL;
+ if (pDetailsView->genlist) {
+ item = elm_genlist_first_item_get(pDetailsView->genlist);
+ while (item) {
+ elm_genlist_item_update(item);
+ item = elm_genlist_item_next_get(item);
+ }
+ }
}
#include "ivug-slider.h"
-#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon"
-
-#define ICON_PATH_DELETE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_delete.png"
-#define ICON_PATH_SHARE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_share.png"
-#define ICON_PATH_SETAS CONTROL_ICON_DIRECTORY_PATH"/T01_1_title_icon_set_as.png"
-#define ICON_PATH_ADDTAG CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_addtag.png"
-#define ICON_PATH_SLIDESHOW CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_slideshow.png"
-#define ICON_PATH_EDITOR CONTROL_ICON_DIRECTORY_PATH"/T01_Option tray_Edit.png"
-#define ICON_PATH_TRIM CONTROL_ICON_DIRECTORY_PATH"/01_controlbar_icon_trim.png"
-#define ICON_PATH_INFO CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_detail.png"
-#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png"
-#define ICON_PATH_CLOSE CONTROL_ICON_DIRECTORY_PATH"/01_controllbar_icon_close.png"
-#define ICON_PATH_MORE CONTROL_ICON_DIRECTORY_PATH"/T01_Title_icon_more.png"
-
-
#define MIME_TYPE_LEN (255)
#define MIME_TYPE_3GPP "video/3gpp"
#define PATH_CAMERA_LOCAL "/opt/usr/media/Camera"
pMainView->popup = NULL;
}
- if (pMainView->ss_music_name)
- {
- free(pMainView->ss_music_name);
- pMainView->ss_music_name = NULL;
- }
-
if (pMainView->ext_ug)
{
MSG_MAIN_HIGH("External UG Destroy");
#include "ivug-util.h"
-#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon"
-
-#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png"
-#define ICON_PATH_CLOSE CONTROL_ICON_DIRECTORY_PATH"/01_controllbar_icon_close.png"
-
static void
_on_timeout_response(void *data, Evas_Object *obj, void *event_info)
{
#define SETAS_INTERVAL_TIME 0.1
#define SETAS_INTERVAL_TIME_FIRST_LOAD 0.3
-#define POPUP_ICON_DIRECTORY_PATH IMAGE_PATH"/Popup_icon"
-#define ICON_PATH_ROTATE_LEFT POPUP_ICON_DIRECTORY_PATH"/T01_1_popup_icon_Rotate left.png"
-#define ICON_PATH_ROTATE_RIGHT POPUP_ICON_DIRECTORY_PATH"/T01_1_popup_icon_Rotate right.png"
-
-#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon"
-#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png"
-#define ICON_PATH_PREV CONTROL_ICON_DIRECTORY_PATH"/00_winset_btn_prev.png"
-
#define CROP_BOX_INTERVAL_TIME 0.3
typedef struct {
Evas_Object *layout;
Evas_Object *notify;
+ Evas_Object *notify_area;
Evas_Object *photocam;
Evas_Object *contents_area;
evas_object_smart_callback_call(pSetAsData->layout, "loaded", NULL);
- pSetAsData->notify = ivug_notify_static_create(pSetAsData->contents_area, IDS_CALLER_ID_NOTIFY, NOTIFY_ALIGN_BOTTOM);
+ pSetAsData->notify_area = const_cast<Evas_Object *>(edje_object_part_object_get(_EDJ(pSetAsData->layout),
+ "setasview.contents.swallow.notify"));
+
+ pSetAsData->notify = ivug_notify_static_create(pSetAsData->notify_area, IDS_CALLER_ID_NOTIFY, NOTIFY_ALIGN_BOTTOM);
int x, y, w, h;
ivug_image_region_get(pSetAsData->photocam, &x, &y, &w, &h);
MSG_SETAS_ERROR("Cannot create contets_area.");
}
- elm_object_part_content_set(pSetAsData->layout, "setasview.contents", pSetAsData->contents_area);
+ elm_object_part_content_set(pSetAsData->layout, "setasview.contents.swallow", pSetAsData->contents_area);
evas_object_data_set(pSetAsData->layout, "pSetAsData", pSetAsData);
evas_object_event_callback_add(pSetAsData->layout, EVAS_CALLBACK_MOVE, _on_moved, pSetAsData->layout);
#define SETAS_INTERVAL_TIME 0.1
#define SETAS_INTERVAL_TIME_FIRST_LOAD 0.3
-#define CONTROL_ICON_DIRECTORY_PATH IMAGE_PATH"/01_Control icon"
-#define ICON_PATH_ROTATE_LEFT CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_Rotate left.png"
-#define ICON_PATH_ROTATE_RIGHT CONTROL_ICON_DIRECTORY_PATH"/T01_1_controlbar_icon_Rotate right.png"
-#define ICON_PATH_SAVE CONTROL_ICON_DIRECTORY_PATH"/T01_controlbar_icon_save.png"
-#define ICON_PATH_PREV CONTROL_ICON_DIRECTORY_PATH"/00_winset_btn_prev.png"
-
typedef struct {
Evas_Object *layout;
Evas_Object *photocam;
return true;
}
+static Eina_Bool __stop_slideshow_cb(void *data)
+{
+ Ivug_SlideShowView *pSSView = (Ivug_SlideShowView *)data;
+ if (pSSView && (pSSView->ssHandle)) {
+ if(pSSView->homekey_idler)
+ {
+ ecore_idler_del(pSSView->homekey_idler);
+ pSSView->homekey_idler = NULL;
+ }
+ ivug_ss_stop(pSSView->ssHandle);
+ }
+ return ECORE_CALLBACK_CANCEL;
+}
+
static Eina_Bool _on_key_down(void *user_data, int type, void *event)
{
if (!user_data) {
{
MSG_IMAGEVIEW_HIGH("Home key");
/*home key,we need to stop slideshow also*/
- ivug_ss_stop(pSSView->ssHandle);
+ if (pSSView->homekey_idler == NULL) {
+ pSSView->homekey_idler = ecore_idler_add(__stop_slideshow_cb, pSSView);
+ }
}
else if (!strcmp(key_event->keyname, KEY_POWER))
{
ecore_event_handler_del(pSSView->keydown_handler);
pSSView->keydown_handler = NULL;
}
+ if(pSSView->homekey_idler)
+ {
+ ecore_idler_del(pSSView->homekey_idler);
+ pSSView->homekey_idler = NULL;
+ }
if ( pSSView->mList )
{
#ifndef __IVUG_DATA_LIST_H__
#define __IVUG_DATA_LIST_H__
+#include "ivug-define.h"
#include "ivug-medialist.h"
#ifdef __cplusplus
projects / apps / home / ug-image-viewer-efl.git / commitdiff
