[SR][Request]Change licence issue

Change-Id: Ie8efd4e6b4dec347c7a5b7075d4d7bcd254471a8

diff --git a/LICENSE.Flora b/LICENSE.Flora
index 33e3038..0e9a604 100644 (file)
--- a/LICENSE.Flora
+++ b/LICENSE.Flora
@@ -1,6 +1,6 @@
 Flora License
 
-Version 1.0, May, 2013
+Version 1.0, April, 2013
 
 http://floralicense.org/license/
 
@@ -67,8 +67,8 @@ on behalf of whom a Contribution has been received by Licensor and
 subsequently incorporated within the Work.
 
 "Tizen Certified Platform" shall mean a software platform that complies
-with the standards set forth in the Compatibility Definition Document
-and passes the Compatibility Test Suite as defined from time to time
+with the standards set forth in the Tizen Compliance Specification
+and passes the Tizen Compliance Tests as defined from time to time
 by the Tizen Technical Steering Group and certified by the Tizen
 Association or its designated agent.
 
@@ -196,7 +196,7 @@ identification within third-party archives.
    you may not use this file except in compliance with the License.
    You may obtain a copy of the License at
 
-       http://floralicense.org/license/
+       http://floralicense.org/license/license/
 
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,

diff --git a/data/edc_common.h b/data/edc_common.h
index 74bd586..5b00119 100644 (file)
--- a/data/edc_common.h
+++ b/data/edc_common.h
@@ -111,4 +111,12 @@
 
 #define MF_SEARCH_FOLDER_H                     300*MF_SCALE_H
 #define MF_SEARCH_FOLDER_W                     400*MF_SCALE_H
+#define DEFAULT_COLOR                  248 246 239 255
+
+/********* group index ************/
+#define GENLIST_GROUPINDEX_LIST_PRESS_COLOR              132 162 198 255
+#define GENLIST_GROUPINDEX_LIST_COLOR                    59 115 182 255
+#define GENLIST_GROUPINDEX_LIST_FOCUS_COLOR              255 255 255 255
+#define GENLIST_GROUPINDEX_LINE_COLOR                  59 115 182 255
+#define GENLIST_GROUPINDEX_LINE_FOCUS_COLOR            255 255 255 255
 

diff --git a/packaging/org.tizen.myfile.spec b/packaging/org.tizen.myfile.spec
index 1339109..6f1ca84 100644 (file)
--- a/packaging/org.tizen.myfile.spec
+++ b/packaging/org.tizen.myfile.spec
@@ -1,7 +1,7 @@
 #sbs-git:slp/pkgs/m/myfiles myfiles 0.1.6 2caccae458123f3effccfcf34469f363593d375e
 Name:       org.tizen.myfile
 Summary:    Myfile Application v1.0
-Version:    0.2.06
+Version:    0.2.08
 Release:    1
 Group:      TO_BE/FILLED_IN
 License:    Flora

diff --git a/src/common/mf-callback.c b/src/common/mf-callback.c
index 0724a98..8e70bab 100644 (file)
--- a/src/common/mf-callback.c
+++ b/src/common/mf-callback.c
@@ -1390,12 +1390,26 @@ void mf_callback_destory_rename(void *data)
                mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_DEFAULT_ALL, FALSE);
                //mf_ctrl_bar_item_set_disable(ap->mf_MainWindow.pNaviCtrlBar, CTRL_DISABLE_DEFAULT_ALL, FALSE);
        } else {
-               mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_EDIT_ALL, FALSE);
-               //mf_ctrl_bar_item_set_disable(ap->mf_MainWindow.pNaviCtrlBar, CTRL_DISABLE_EDIT_ALL, FALSE);
+               int count_dir = 0;
+               int count_file = 0;
+               ap->mf_Status.flagFolderSelect = FALSE;
+               ap->mf_Status.flagFileSelect = FALSE;
+               if (ap->mf_Status.flagViewType == MF_VIEW_STYLE_LIST || ap->mf_Status.flagViewType == MF_VIEW_SYTLE_LIST_DETAIL) {
+                       Evas_Object *pGenlist = ap->mf_MainWindow.pEditView.pGenlist;
+                       mf_genlist_genlist_item_select(ap, pGenlist, &count_file, &count_dir);
+
+               } else {
+                       Evas_Object *pGengrid = ap->mf_MainWindow.pEditView.pGengrid;
+                       mf_gengrid_item_select(ap, pGengrid, &count_file, &count_dir);
+               }
 
-               if (ap->mf_Status.iCtrlDisableItem > 0) {
-                       mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, ap->mf_Status.iCtrlDisableItem, TRUE);
-                       //mf_ctrl_bar_item_set_disable(ap->mf_MainWindow.pNaviCtrlBar, ap->mf_Status.iCtrlDisableItem, TRUE);
+               if (ap->mf_Status.flagFolderSelect) {
+                       mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_EDIT_ALL, true);
+                       mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_USER_FOLDER_SEL, false);
+               } else if (ap->mf_Status.flagFileSelect){
+                       mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_EDIT_ALL, false);
+               } else {
+                       mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_EDIT_ALL, true);
                }
        }
        MF_TRACE_END;

diff --git a/src/mf-main.c b/src/mf-main.c
index 4a3f1bc..cc8674f 100644 (file)
--- a/src/mf-main.c
+++ b/src/mf-main.c
@@ -339,7 +339,6 @@ __mf_main_app_init_idler_cb(void *data)
        }
        ap->mf_Status.doubletab_event_handler = mf_callback_motion_double_tap;
 #endif
-       efreet_mime_init();
 
        MF_TA_ACUM_ITEM_END("    __mf_main_app_init_idler_cb", 0);
 
@@ -606,6 +605,8 @@ bool __mf_main_create_app(void *data)
        MF_TA_ACUM_ITEM_END("    app_init_idler", 0);
 
        evas_object_smart_callback_add(ap->mf_MainWindow.pWindow, "profile,changed", mf_callback_profile_changed_cb, ap);
+       efreet_mime_init();
+       __mf_main_remake_app(NULL, ap);
 
        MF_TA_ACUM_ITEM_END("  __mf_main_create_app", 0);
        MF_TA_ACUM_ITEM_BEGIN("  create_to_reset", 0);
@@ -755,14 +756,12 @@ static void __mf_main_reset_app(service_h service, void *data)
                                /* 20121008 added for fix PLM P121001-0404 temporary { */
                                if (ap->mf_MainWindow.pWindow != NULL && ap->mf_Status.b_run_background)
                                {
+
                                        elm_win_activate(ap->mf_MainWindow.pWindow);
                                        ap->mf_Status.b_run_background = false;
+                                       MF_TRACE_END;
                                        return;
                                }
-                               /* 20121008 added for fix PLM P121001-0404 temporary } */
-                               MF_TA_ACUM_ITEM_BEGIN("    __mf_main_remake_app", 0);
-                               __mf_main_remake_app(service, ap);
-                               MF_TA_ACUM_ITEM_END("    __mf_main_remake_app", 0);
                        }
                }
        }

diff --git a/src/widget/mf-gengrid.c b/src/widget/mf-gengrid.c
index 24d6d40..b0dfe0b 100644 (file)
--- a/src/widget/mf-gengrid.c
+++ b/src/widget/mf-gengrid.c
@@ -215,6 +215,12 @@ void mf_gengrid_select_all(void *data)
        while (it) {
                it_data = elm_object_item_data_get(it);
                if (it_data) {
+                       if (it_data->ap->mf_Status.more == MORE_SHARE_EDIT) {
+                               if (mf_file_attr_is_dir(it_data->m_ItemName->str)) {
+                                       it = elm_genlist_item_next_get(it);
+                                       continue;
+                               }
+                       }
                        it_data->m_checked = ap->mf_MainWindow.pEditView.bSelectAllChecked;
                        elm_check_state_set(it_data->pCheckBox, it_data->m_checked);
                        elm_gengrid_item_selected_set(it_data->item, it_data->m_checked);
@@ -408,14 +414,24 @@ static Evas_Object *__mf_gengrid_item_icon_get(void *data, Evas_Object *obj, con
                elm_image_aspect_fixed_set(icon, EINA_FALSE);
                evas_object_show(icon);
                return icon;
-       } else if (!strcmp(part, "elm.swallow.block") && params->ap->mf_Status.more == MORE_EDIT) {
+       } else if (!strcmp(part, "elm.swallow.block") && (params->ap->mf_Status.more == MORE_EDIT || params->ap->mf_Status.more == MORE_SHARE_EDIT)) {
+               if (ap->mf_Status.more == MORE_SHARE_EDIT) {
+                       if (mf_file_attr_is_dir(params->m_ItemName->str)) {
+                               return NULL;
+                       }
+               }
                Evas_Object *layout = elm_layout_add(obj);
                elm_layout_theme_set(layout, "gengrid", "item", "block/default");
                evas_object_propagate_events_set(layout, 0);
                evas_object_event_callback_add(layout, EVAS_CALLBACK_MOUSE_DOWN, (Evas_Object_Event_Cb)mf_callback_rename_create_cb, params);
                return layout;
-       } else if (!strcmp(part, "elm.swallow.end") && params->ap->mf_Status.more == MORE_EDIT)
+       } else if (!strcmp(part, "elm.swallow.end") && (params->ap->mf_Status.more == MORE_EDIT || params->ap->mf_Status.more == MORE_SHARE_EDIT))
        {
+               if (ap->mf_Status.more == MORE_SHARE_EDIT) {
+                       if (mf_file_attr_is_dir(params->m_ItemName->str)) {
+                               return NULL;
+                       }
+               }
                Evas_Object *ck = elm_check_add(obj);
                mf_retvm_if(ck == NULL, NULL, "ck is NULL");
                elm_object_focus_set(ck, EINA_FALSE);

diff --git a/src/widget/mf-genlist.c b/src/widget/mf-genlist.c
index b548daf..5e06723 100644 (file)
--- a/src/widget/mf-genlist.c
+++ b/src/widget/mf-genlist.c
@@ -268,7 +268,7 @@ void mf_genlist_gl_mode_cancel(void *data, Evas_Object * obj, void *event_info)
                return;
 
        if (ap->mf_Status.more == MORE_RENAME) {
-               mf_genlist_rename_done(ap, NULL, NULL);
+               //mf_genlist_rename_done(ap, NULL, NULL);
                return;
        } else if(ap->mf_Status.more == MORE_EDIT || ap->mf_Status.more == MORE_SHARE_EDIT) {
                return;
@@ -620,6 +620,12 @@ static void __mf_genlist_selected_all_items_set(Evas_Object *genlist, int value)
        it = elm_genlist_first_item_get(genlist);
        while (it) {
                it_data = elm_object_item_data_get(it);
+               if (it_data && it_data->ap->mf_Status.more == MORE_SHARE_EDIT) {
+                       if (mf_file_attr_is_dir(it_data->m_ItemName->str)) {
+                               it = elm_genlist_item_next_get(it);
+                               continue;
+                       }
+               }
                if (it_data)
                        it_data->m_checked = value;
                //elm_check_state_pointer_set(it_data->pCheckBox, it_data->m_checked);

diff --git a/src/widget/mf-navi-bar.c b/src/widget/mf-navi-bar.c
index 84550e6..86d520d 100644 (file)
--- a/src/widget/mf-navi-bar.c
+++ b/src/widget/mf-navi-bar.c
@@ -235,8 +235,7 @@ Evas_Object *mf_navi_bar_content_create(void *data)
                } else {
                        ap->mf_Status.flagNoContent = EINA_TRUE;
                }
-       }
-       else {
+       } else {
                mf_error();
                MF_TA_ACUM_ITEM_BEGIN("      mf_util_generate_file_list", 0);
                error_code = mf_util_generate_file_list(ap);
@@ -409,7 +408,11 @@ void mf_navi_bar_title_set(void *data)
 
        myfileNaviBar *pNavi_s = mf_navi_bar_get_in_use(ap);
 
-       if (ap->mf_Status.more == MORE_CREATE_FOLDER || ap->mf_Status.more == MORE_THUMBNAIL_RENAME || ap->mf_Status.more == MORE_SEARCH) {
+       if (ap->mf_Status.more == MORE_CREATE_FOLDER
+           || ap->mf_Status.more == MORE_THUMBNAIL_RENAME
+           || ap->mf_Status.more == MORE_SEARCH
+           || ap->mf_Status.more == MORE_EDIT
+           || ap->mf_Status.more == MORE_SHARE_EDIT) {
                __mf_navi_bar_title(ap);
        } else if (more != MORE_EDIT && more != MORE_SEARCH) {
                if (ap->mf_Status.view_type != mf_view_root) {
@@ -864,10 +867,8 @@ void mf_navi_bar_create_default_view(void *data)
        MF_TA_ACUM_ITEM_BEGIN("      set control bar", 0);
        if (ap->mf_Status.flagNoContent == 1) {
                mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_NOCONTENT_VIEW, true);
-               //mf_ctrl_bar_item_set_disable(ap->mf_MainWindow.pNaviCtrlBar, CTRL_DISABLE_NOCONTENT_VIEW, TRUE);
        } else {
                mf_navi_bar_button_set_disable(ap->mf_MainWindow.pNaviItem, CTRL_DISABLE_NOCONTENT_VIEW, FALSE);
-               //mf_ctrl_bar_item_set_disable(ap->mf_MainWindow.pNaviCtrlBar, CTRL_DISABLE_NOCONTENT_VIEW, FALSE);
        }
 #ifdef MYFILE_USB_OTG
        if(mf_fm_svc_wrapper_is_root_path(ap->mf_Status.path->str) == MYFILE_OTG) {
@@ -1275,7 +1276,6 @@ void mf_navi_bar_create_search_view(void *data)
        Evas_Object *pSearchViewLayout = NULL;
        //ap->mf_MainWindow.pNaviLayout = mf_widget_create_layout(ap->mf_MainWindow.pNaviBox, EDJ_NAME, "selectinfo_layout");
 
-#if 1
        ap->mf_MainWindow.pNaviLayout = mf_widget_create_layout(ap->mf_MainWindow.pNaviBar, EDJ_NAME, "search_view_layout");
        ap->mf_MainWindow.pNaviSearchBar = mf_navi_bar_create_search_bar(ap->mf_MainWindow.pNaviLayout, ap);
        pSearchViewLayout = ap->mf_MainWindow.pNaviLayout;
@@ -1295,44 +1295,6 @@ void mf_navi_bar_create_search_view(void *data)
        elm_object_part_content_set(pSearchViewLayout, "search_bar", ap->mf_MainWindow.pNaviSearchBar);
        elm_object_part_content_set(pSearchViewLayout, "content", path_label);
 
-#else
-       ap->mf_MainWindow.pNaviBox = mf_widget_create_box(ap->mf_MainWindow.pNaviBar);
-
-       Evas_Object *pSearchbarLayout = NULL;
-       pSearchbarLayout = mf_widget_create_layout(ap->mf_MainWindow.pNaviBox, EDJ_NAME, "search_bar_layout");
-       evas_object_size_hint_weight_set(pSearchbarLayout, EVAS_HINT_EXPAND, 0);
-       evas_object_size_hint_align_set(pSearchbarLayout, EVAS_HINT_FILL, 0.0);
-
-       ap->mf_MainWindow.pNaviSearchBar = mf_navi_bar_create_search_bar(pSearchbarLayout, ap);
-       pSearchViewLayout = mf_widget_create_layout(ap->mf_MainWindow.pNaviBox, EDJ_NAME, "selectinfo_layout");
-       ap->mf_MainWindow.pNaviLayout = pSearchViewLayout;
-
-       /*set content*/
-       /*2. create path label for the start of search view*/
-       /*2.1 create path label*/
-
-       path_label = elm_entry_add(pSearchViewLayout);
-
-       elm_object_style_set(path_label, "default");
-       elm_entry_single_line_set(path_label, EINA_FALSE);
-       elm_object_focus_set(path_label, EINA_FALSE);
-
-       evas_object_show(path_label);
-       /*2.2 contribute label content*/
-       char *path_in_label = mf_fm_svc_wrapper_translate_path(ap->mf_Status.path->str, MF_TRANS_OPTION_LABEL);
-       char *label_content = g_strconcat(GET_SYS_STR(MF_LABEL_SEARCH), ":", "<br>", path_in_label, NULL);
-       /*2.3 set style for path_label*/
-       elm_entry_editable_set(path_label, EINA_FALSE);
-       elm_entry_entry_set(path_label, label_content);
-
-       /*set title segment or title*/
-       /*navigation view integration*/
-       elm_object_part_content_set(pSearchbarLayout, "content", ap->mf_MainWindow.pNaviSearchBar);
-       elm_object_part_content_set(pSearchViewLayout, "content", path_label);
-       elm_box_pack_start(ap->mf_MainWindow.pNaviBox, pSearchbarLayout);
-       elm_box_pack_end(ap->mf_MainWindow.pNaviBox, pSearchViewLayout);
-#endif
-
        title = g_string_new(GET_SYS_STR(MF_LABEL_SEARCH));
        if (title != NULL) {
                pNavi_s->pNaviTitle = g_strdup(title->str);
@@ -1983,6 +1945,7 @@ void mf_navi_bar_del_item_directly(void *data)
 
 void mf_navi_bar_button_set_disable(Elm_Object_Item *navi_it, int disable_item, bool disable)
 {
+       MF_TRACE_BEGIN;
        mf_retm_if(navi_it == NULL, "navi_it is NULL");
        Evas_Object *btn = NULL;
        if (disable_item & CTRL_DISABLE_EDIT) {
@@ -2032,15 +1995,22 @@ void mf_navi_bar_button_set_disable(Elm_Object_Item *navi_it, int disable_item,
                const char *button_label = elm_object_text_get(btn);
                if (g_strcmp0(button_label, GET_SYS_STR(MF_LABEL_CREATE_FOLDER)) == 0)
                        elm_object_disabled_set(btn, disable);
-
        }
        if (disable_item & CTRL_DISABLE_MORE) {
                btn = elm_object_item_part_content_get(navi_it, NAVI_MORE_BUTTON_PART);
                elm_object_disabled_set(btn, disable);
        }
 
+       if (disable_item & CTRL_DISABLE_SEARCH) {
+               btn = elm_object_item_part_content_get(navi_it, NAVI_BOTTOM_BUTTON_1_PART);
+               elm_object_disabled_set(btn, disable);
+       }
+
+       MF_TRACE_END;
+
 }
 
+
 int mf_navi_bar_button_get_disable(Elm_Object_Item *navi_it)
 {
        mf_retvm_if(navi_it == NULL, 0, "navi_it is NULL");

diff --git a/src/widget/mf-widget.c b/src/widget/mf-widget.c
index 721daed..9c19c6a 100644 (file)
--- a/src/widget/mf-widget.c
+++ b/src/widget/mf-widget.c
@@ -318,9 +318,6 @@ Elm_Object_Item *mf_widget_item_append(Evas_Object *parent, fsNodeInfo *pNode, v
                        m_TempItem->thumb_path = strdup(MF_ICON_ITEM_MMC);
                        m_TempItem->real_thumb_flag = true;
                }
-               /*else if(g_strcmp0(real_name, DROP_BOX_FOLDER) == 0) {
-                       m_TempItem->thumb_path = strdup(MF_ICON_ITEM_DB);
-               }*/
        }
 
        Elm_Object_Item *it = NULL;