[elm_entry] disabled clipboard popup at non-editable longpress

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 1d3d597..93494a9 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -948,7 +948,7 @@ _long_pressed(void *data)
                                           _paste, data);
                }
        // start for cbhm
-             if (!wd->password)
+             if ((!wd->password) && (wd->editable))
                elm_hoversel_item_add(wd->hoversel, "More", NULL, ELM_ICON_NONE,
                                      _clipboard_menu, data);
        // end for cbhm
@@ -968,8 +968,9 @@ _long_pressed(void *data)
                   elm_hoversel_item_add(wd->hoversel, "Cancel", NULL, ELM_ICON_NONE,
                                         _cancel, data);
        // start for cbhm
-                  elm_hoversel_item_add(wd->hoversel, "More", NULL, ELM_ICON_NONE,
-                                        _clipboard_menu, data);
+                  if (wd->editable)
+                    elm_hoversel_item_add(wd->hoversel, "More", NULL, ELM_ICON_NONE,
+                                          _clipboard_menu, data);
        // end for cbhm
                }
           }

diff --git a/src/modules/ctxpopup_copypasteUI/copypaste.c b/src/modules/ctxpopup_copypasteUI/copypaste.c
index 958a67a..74d7bd0 100644 (file)
--- a/src/modules/ctxpopup_copypasteUI/copypaste.c
+++ b/src/modules/ctxpopup_copypasteUI/copypaste.c
@@ -188,7 +188,7 @@ obj_longpress(Evas_Object *obj)
                                }
        //              elm_ctxpopup_item_append(wd->ctxpopup, NULL, "Selectall",_select_all, obj );
        // start for cbhm
-                       if (!ext_mod->password)
+                       if ((!ext_mod->password) && (ext_mod->editable))
                        {
                                icon = elm_icon_add(ext_mod->popup);
                                snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
@@ -225,11 +225,14 @@ obj_longpress(Evas_Object *obj)
                                                                }
                                                }
        // start for cbhm
-                                       icon = elm_icon_add(ext_mod->popup);
-                                       snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
-                                       elm_icon_file_set(icon, buf, NULL);
-                                       elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
-                                       //elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj );
+                                       if (ext_mod->editable)
+                                       {
+                                               icon = elm_icon_add(ext_mod->popup);
+                                               snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
+                                               elm_icon_file_set(icon, buf, NULL);
+                                               elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
+                                               //elm_ctxpopup_item_append(ext_mod->popup, "More", NULL, _clipboard_menu, obj );
+                                       }
        // end for cbhm
                                }
                }

diff --git a/src/modules/ctxpopup_copypasteshareUI/copypaste.c b/src/modules/ctxpopup_copypasteshareUI/copypaste.c
index e64b6f0..80d8b1f 100644 (file)
--- a/src/modules/ctxpopup_copypasteshareUI/copypaste.c
+++ b/src/modules/ctxpopup_copypasteshareUI/copypaste.c
@@ -210,7 +210,7 @@ obj_longpress(Evas_Object *obj)
                                                elm_ctxpopup_item_append(ext_mod->popup, "Paste", NULL, _paste, obj );
                                }
        // start for cbhm
-                       if (!ext_mod->password)
+                       if ((!ext_mod->password) && (ext_mod->editable))
                        {
                                icon = elm_icon_add(ext_mod->popup);
                                snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
@@ -250,10 +250,13 @@ obj_longpress(Evas_Object *obj)
                                                                }
                                                }
        // start for cbhm
-                                       icon = elm_icon_add(ext_mod->popup);
-                                       snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
-                                       elm_icon_file_set(icon, buf, NULL);
-                                       elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
+                                       if (ext_mod->editable)
+                                       {
+                                               icon = elm_icon_add(ext_mod->popup);
+                                               snprintf(buf, sizeof(buf), "%s/images/copypaste_icon_clipboard.png", PACKAGE_DATA_DIR);
+                                               elm_icon_file_set(icon, buf, NULL);
+                                               elm_ctxpopup_item_append(ext_mod->popup, NULL, icon, _clipboard_menu, obj);
+                                       }
        // end for cbhm
                                }
                }

diff --git a/src/modules/popup_copypasteUI/copypaste.c b/src/modules/popup_copypasteUI/copypaste.c
index b3beebd..9abb8e3 100644 (file)
--- a/src/modules/popup_copypasteUI/copypaste.c
+++ b/src/modules/popup_copypasteUI/copypaste.c
@@ -146,7 +146,7 @@ obj_longpress(Evas_Object *obj)
                                }
        //              elm_ctxpopup_item_add(wd->ctxpopup, NULL, "Selectall",_select_all, obj );
        // start for cbhm
-                       if (!ext_mod->password)
+                       if ((!ext_mod->password) && (ext_mod->editable))
                                elm_list_item_append(list, "More", NULL, NULL,_clipboard_menu, obj);
        // end for cbhm
                }
@@ -171,7 +171,8 @@ obj_longpress(Evas_Object *obj)
                                                                }
                                                }
        // start for cbhm
-                                       elm_list_item_append(list, "More", NULL, NULL,_clipboard_menu, obj);
+                                       if (ext_mod->editable)
+                                               elm_list_item_append(list, "More", NULL, NULL,_clipboard_menu, obj);
        // end for cbhm
                                }
                }