[elm_entry/modules]added ctx menu disabling in copy paste modules.

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index a70172e..9859921 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1913,6 +1913,7 @@ EAPI void elm_entry_extension_module_data_get(Evas_Object *obj,Elm_Entry_Extensi
    ext_mod->have_selection = wd->have_selection;
    ext_mod->password = wd->password;
    ext_mod->selmode = wd->selmode;
+   ext_mod->context_menu = wd->context_menu;
 }
 
 /**

diff --git a/src/lib/elm_module_priv.h b/src/lib/elm_module_priv.h
index 9b34097..2723dba 100644 (file)
--- a/src/lib/elm_module_priv.h
+++ b/src/lib/elm_module_priv.h
@@ -21,6 +21,7 @@ struct _Elm_Entry_Extension_data
        Eina_Bool editable :1;\r
        Eina_Bool have_selection: 1;\r
        Eina_Bool selmode :1;\r
+       Eina_Bool context_menu : 1;\r
 };\r
 \r
 struct _Elm_Entry_Context_Menu_Item\r

diff --git a/src/modules/ctxpopup_copypasteUI/copypaste.c b/src/modules/ctxpopup_copypasteUI/copypaste.c
index 4f38939..68189e0 100644 (file)
--- a/src/modules/ctxpopup_copypasteUI/copypaste.c
+++ b/src/modules/ctxpopup_copypasteUI/copypaste.c
@@ -119,23 +119,24 @@ obj_longpress(Evas_Object *obj)
 
        /*update*/
        elm_entry_extension_module_data_get(obj,ext_mod);
-
-       if (ext_mod->popup) evas_object_del(ext_mod->popup);
-       else elm_widget_scroll_freeze_push(obj);
-       top = elm_widget_top_get(obj);
-       if(top)
-               ext_mod->popup = elm_ctxpopup_add(top);
-       /*currently below theme not used,when guideline comes a new theme can be created if required*/
-       //elm_object_style_set(ext_mod->popup,"entry");
-       elm_ctxpopup_scroller_disabled_set(ext_mod->popup, EINA_TRUE);
-       context_menu_orientation = edje_object_data_get
-       (ext_mod->ent, "context_menu_orientation");
-       if ((context_menu_orientation) &&
-       (!strcmp(context_menu_orientation, "horizontal")))
+       if (ext_mod->context_menu)
+       {
+               if (ext_mod->popup) evas_object_del(ext_mod->popup);
+       else elm_widget_scroll_freeze_push(obj);
+               top = elm_widget_top_get(obj);
+               if(top)
+                       ext_mod->popup = elm_ctxpopup_add(top);
+               /*currently below theme not used,when guideline comes a new theme can be created if required*/
+               //elm_object_style_set(ext_mod->popup,"entry");
+               elm_ctxpopup_scroller_disabled_set(ext_mod->popup, EINA_TRUE);
+               context_menu_orientation = edje_object_data_get
+               (ext_mod->ent, "context_menu_orientation");
+               if ((context_menu_orientation) &&
+               (!strcmp(context_menu_orientation, "horizontal")))
                elm_ctxpopup_horizontal_set(ext_mod->popup, EINA_TRUE);
 
-       elm_widget_sub_object_add(obj, ext_mod->popup);
-       if (!ext_mod->selmode)
+               elm_widget_sub_object_add(obj, ext_mod->popup);
+               if (!ext_mod->selmode)
                {       
                        if (!ext_mod->password)
                                elm_ctxpopup_item_add(ext_mod->popup, NULL, "Select",_select, obj );
@@ -146,7 +147,7 @@ obj_longpress(Evas_Object *obj)
                                }
        //              elm_ctxpopup_item_add(wd->ctxpopup, NULL, "Selectall",_select_all, obj );
                }
-       else
+               else
                {
                          if (!ext_mod->password)
                                {
@@ -172,12 +173,13 @@ obj_longpress(Evas_Object *obj)
                {
                        elm_ctxpopup_item_add(ext_mod->popup, NULL, it->label,_item_clicked, it );
                }
-       if (ext_mod->popup)
-               {
-                       _ctxpopup_position(obj);
-                       evas_object_show(ext_mod->popup);                 
+               if (ext_mod->popup)
+                       {
+                               _ctxpopup_position(obj);
+                               evas_object_show(ext_mod->popup);                 
+                       }
                }
-               ext_mod->longpress_timer = NULL;
+       ext_mod->longpress_timer = NULL;
        }
 
 EAPI void

diff --git a/src/modules/popup_copypasteUI/copypaste.c b/src/modules/popup_copypasteUI/copypaste.c
old mode 100755 (executable)
new mode 100644 (file)
index 61b6530..745efab
--- a/src/modules/popup_copypasteUI/copypaste.c
+++ b/src/modules/popup_copypasteUI/copypaste.c
@@ -89,26 +89,26 @@ obj_longpress(Evas_Object *obj)
        if(!ext_mod) return;
        Evas_Object *top;
        Evas_Object *list;
-
+       
        const Eina_List *l;
        const Elm_Entry_Context_Menu_Item *it;
-
        /*update*/
        elm_entry_extension_module_data_get(obj,ext_mod);
-
-       if (ext_mod->popup) evas_object_del(ext_mod->popup);
-       else elm_widget_scroll_freeze_push(obj);
-       top = elm_widget_top_get(obj);
-       if(top)
+       if (ext_mod->context_menu)
+       {
+               if (ext_mod->popup) evas_object_del(ext_mod->popup);
+        else elm_widget_scroll_freeze_push(obj);
+               top = elm_widget_top_get(obj);
+               if(top)
                ext_mod->popup = elm_popup_add(top);
-       elm_object_style_set(ext_mod->popup,"menustyle");
-       elm_popup_set_mode(ext_mod->popup, ELM_POPUP_TYPE_ALERT);
-       elm_popup_title_label_set(ext_mod->popup,"CopyPaste");
-       list = elm_list_add(ext_mod->popup);
-       elm_object_style_set(list,"popup");
-       elm_list_horizontal_mode_set(list, ELM_LIST_COMPRESS);
-       elm_widget_sub_object_add(obj, ext_mod->popup);
-       if (!ext_mod->selmode)
+               elm_object_style_set(ext_mod->popup,"menustyle");
+               elm_popup_set_mode(ext_mod->popup, ELM_POPUP_TYPE_ALERT);
+               elm_popup_title_label_set(ext_mod->popup,"CopyPaste");
+               list = elm_list_add(ext_mod->popup);
+               elm_object_style_set(list,"popup");
+               elm_list_horizontal_mode_set(list, ELM_LIST_COMPRESS);
+               elm_widget_sub_object_add(obj, ext_mod->popup);
+               if (!ext_mod->selmode)
                {       
                        if (!ext_mod->password)
                                elm_list_item_append(list, "Select", NULL, NULL,_select, obj);
@@ -119,7 +119,7 @@ obj_longpress(Evas_Object *obj)
                                }
        //              elm_ctxpopup_item_add(wd->ctxpopup, NULL, "Selectall",_select_all, obj );
                }
-       else
+               else
                {
                          if (!ext_mod->password)
                                {
@@ -145,15 +145,16 @@ obj_longpress(Evas_Object *obj)
                {
                        elm_list_item_append(list, it->label,NULL,NULL, _item_clicked, it);
                }
-       if (ext_mod->popup)
+               if (ext_mod->popup)
                {
                        elm_list_go(list);
                        elm_popup_content_set(ext_mod->popup, list);
                        evas_object_show(ext_mod->popup);              
                        evas_render( evas_object_evas_get( ext_mod->popup ) );
                }
-       ext_mod->longpress_timer = NULL;
        }
+       ext_mod->longpress_timer = NULL;
+}
 
 EAPI void
 obj_mouseup(Evas_Object *obj)