diff options
| author | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:05:07 +0900 |
|---|---|---|
| committer | Jinkun Jang <jinkun.jang@samsung.com> | 2013-03-16 01:05:07 +0900 |
| commit | a957a0a7a609392ae358efedbe368a099ac8c4d8 (patch) | |
| tree | e87c6de5990330992a2c96c73da2952c763e126a /src/widget/mf-ug-genlist.c | |
| parent | 3c23b68d6288c6a56975f3591b4cfeddafb79134 (diff) | |
| download | ug-myfile-efl-a957a0a7a609392ae358efedbe368a099ac8c4d8.tar.gz ug-myfile-efl-a957a0a7a609392ae358efedbe368a099ac8c4d8.tar.bz2 ug-myfile-efl-a957a0a7a609392ae358efedbe368a099ac8c4d8.zip | |
merge with master
Diffstat (limited to 'src/widget/mf-ug-genlist.c')
| -rw-r--r-- | src/widget/mf-ug-genlist.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/widget/mf-ug-genlist.c b/src/widget/mf-ug-genlist.c index 909ca06..e57f78a 100644 --- a/src/widget/mf-ug-genlist.c +++ b/src/widget/mf-ug-genlist.c @@ -164,7 +164,7 @@ static void __mf_ug_genlist_show_select_info(void *data) int iDirCount = 0, iFileCount = 0; Elm_Object_Item *it = NULL; - Evas_Object *pGenlist = ugd->ug_MainWindow.ug_pContent; + Evas_Object *pGenlist = ugd->ug_MainWindow.ug_pNaviGenlist; it = elm_genlist_first_item_get(pGenlist); while (it) { @@ -854,7 +854,7 @@ static void __mf_ug_genlist_del_gl(void *data, Evas_Object *obj) /****************************** -** Prototype : __mf_ug_genlist_selected_gl +** Prototype : mf_ug_genlist_selected_gl ** Description : Samsung ** Input : void *data ** Evas_Object *obj @@ -870,7 +870,7 @@ static void __mf_ug_genlist_del_gl(void *data, Evas_Object *obj) ** Modification : Created function ** ******************************/ -static void __mf_ug_genlist_selected_gl(void *data, Evas_Object *obj, void *event_info) +void mf_ug_genlist_selected_gl(void *data, Evas_Object *obj, void *event_info) { UG_TRACE_BEGIN; ugData *ugd = (ugData *)data; @@ -890,7 +890,7 @@ static void __mf_ug_genlist_selected_gl(void *data, Evas_Object *obj, void *even return; if (!ecore_file_is_dir(selected->ug_pItemName->str)) { - if (ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE) { + if (ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == SAVE_MODE) { return; } @@ -1111,7 +1111,7 @@ Evas_Object *__mf_ug_genlist_create_gl(void *data) evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_smart_callback_add(genlist, "selected", __mf_ug_genlist_selected_gl, ugd); + evas_object_smart_callback_add(genlist, "selected", mf_ug_genlist_selected_gl, ugd); #ifdef UG_THUMB_REAL_TIME_UPDATE if (ugd->ug_Status.ug_pThumbUpdateTimer != NULL) { @@ -1130,6 +1130,7 @@ Evas_Object *__mf_ug_genlist_create_gl(void *data) ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE || + ugd->ug_UiGadget.ug_iSelectMode == SAVE_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { ugd->ug_Status.ug_normalitc.item_style = "1text.1icon.2"; ugd->ug_Status.ug_normalitc.func.text_get = __mf_ug_genlist_get_gl_label; @@ -1404,7 +1405,7 @@ Evas_Object *mf_ug_genlist_create_content_list_view(void *data) genlist = __mf_ug_genlist_create_gl(ugd); - ugd->ug_MainWindow.ug_pContent = genlist; + ugd->ug_MainWindow.ug_pNaviGenlist = genlist; GString *fullpath = g_string_new(ugd->ug_Status.ug_pPath->str); @@ -1477,6 +1478,7 @@ if (ugd->ug_UiGadget.ug_iSelectMode == MULTI_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE || + ugd->ug_UiGadget.ug_iSelectMode == SAVE_MODE || ugd->ug_UiGadget.ug_iSelectMode == IMPORT_SINGLE) { mf_ug_genlist_item_append(genlist, pNode, ugd, 0, &ugd->ug_Status.ug_normalitc); @@ -1491,7 +1493,7 @@ if (ugd->ug_UiGadget.ug_iSelectMode == MULTI_FILE_MODE || if (ugd->ug_UiGadget.ug_iSelectMode == SINGLE_ALL_MODE || ugd->ug_UiGadget.ug_iSelectMode == SINGLE_FILE_MODE) { mf_ug_genlist_item_append(genlist, pNode, ugd, groupValue, &ugd->ug_Status.ug_itc); groupValue++; - } else if (ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE) { + } else if (ugd->ug_UiGadget.ug_iSelectMode == EXPORT_MODE || ugd->ug_UiGadget.ug_iSelectMode == SAVE_MODE) { mf_ug_genlist_item_append(genlist, pNode, ugd, 0, &ugd->ug_Status.ug_normalitc); } else { mf_ug_genlist_item_append(genlist, pNode, ugd, 0, &ugd->ug_Status.ug_itc); |