This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository efm2.
View the commit online.
commit 4537fac1f4e8be08cf92455939b0a06220ab5daa
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
AuthorDate: Mon May 26 22:08:32 2025 +0100
add missing select none and trash vs del in menu
---
src/efm/efm_popup_menu.c | 51 ++++++++++++++++++++++++++++++++++++++----------
1 file changed, 41 insertions(+), 10 deletions(-)
diff --git a/src/efm/efm_popup_menu.c b/src/efm/efm_popup_menu.c
index 2e315e8..5762b86 100644
--- a/src/efm/efm_popup_menu.c
+++ b/src/efm/efm_popup_menu.c
@@ -166,19 +166,44 @@ _cb_menu_item_paste(void *data, void *data2, Evas_Object *efm,
}
static void
-_cb_menu_item_delete(void *data, void *data2 EINA_UNUSED,
+_cb_menu_item_trash(void *data, void *data2 EINA_UNUSED,
Evas_Object *efm EINA_UNUSED,
const Efm_Menu_Item *menu_item EINA_UNUSED)
{
- Popup_Context *ctx = data;
- Eina_Strbuf *strbuf;
+ Popup_Context *ctx = data;
+ Eina_Strbuf *strbuf;
+
+ printf("XXX: trash\n");
+ // ask backed to file-trash
+ strbuf = eina_strbuf_new();
+ if (strbuf)
+ {
+ Eina_Strbuf *buf = cmd_strbuf_new("file-trash");
+
+ if (_selected_icons_uri_strbuf_append(ctx->sd, strbuf))
+ {
+ _file_list_cmd_strbuf_append(buf, "path",
+ eina_strbuf_string_get(strbuf));
+ }
+ cmd_strbuf_exe_consume(buf, ctx->sd->exe_open);
+ eina_strbuf_free(strbuf);
+ }
+}
+
+static void
+_cb_menu_item_delete(void *data, void *data2 EINA_UNUSED,
+ Evas_Object *efm EINA_UNUSED,
+ const Efm_Menu_Item *menu_item EINA_UNUSED)
+{
+ Popup_Context *ctx = data;
+ Eina_Strbuf *strbuf;
printf("XXX: delete\n");
// ask backed to file-unlink
strbuf = eina_strbuf_new();
if (strbuf)
{
- Eina_Strbuf *buf = cmd_strbuf_new("file-trash");
+ Eina_Strbuf *buf = cmd_strbuf_new("file-unlink");
if (_selected_icons_uri_strbuf_append(ctx->sd, strbuf))
{
@@ -199,7 +224,7 @@ _cb_menu_item_props(void *data, void *data2, Evas_Object *efm,
}
static void
-_cb_menu_item_sel_all(void *data, void *data2 EINA_UNUSED,
+_cb_menu_item_sel_all(void *data, void *data2 EINA_UNUSED,
Evas_Object *efm EINA_UNUSED,
const Efm_Menu_Item *menu_item EINA_UNUSED)
{
@@ -209,7 +234,7 @@ _cb_menu_item_sel_all(void *data, void *data2 EINA_UNUSED,
}
static void
-_cb_menu_item_sel_none(void *data, void *data2 EINA_UNUSED,
+_cb_menu_item_sel_none(void *data, void *data2 EINA_UNUSED,
Evas_Object *efm EINA_UNUSED,
const Efm_Menu_Item *menu_item EINA_UNUSED)
{
@@ -348,7 +373,9 @@ _efm_popup_icon_menu_add(Smart_Data *sd, Icon *ic, Evas_Coord x, Evas_Coord y)
NULL);
_efm_menu_it_normal(m2, "Rename", "std:edit-rename", _cb_menu_item_rename,
ctx, NULL);
- _efm_menu_it_normal(m2, "Delete", "std:delete", _cb_menu_item_delete, ctx,
+ _efm_menu_it_normal(m2, "Trash", "std:delete", _cb_menu_item_trash, ctx,
+ NULL);
+ _efm_menu_it_normal(m2, "Delete", "std:close", _cb_menu_item_delete, ctx,
NULL);
_efm_menu_it_separator(m2);
_efm_menu_it_normal(m2, "Properties", "std:document-properties",
@@ -361,10 +388,12 @@ _efm_popup_icon_menu_add(Smart_Data *sd, Icon *ic, Evas_Coord x, Evas_Coord y)
{
m2 = _efm_menu_add("View", NULL, NULL, NULL, NULL);
_efm_menu_it_sub(m1, "View", NULL, m2);
- _efm_menu_it_normal(m2, "Select All", "std:edit-select-all",
+ _efm_menu_it_normal(m2, "Select All", "std:edit-select-all",
_cb_menu_item_sel_all, ctx, NULL);
- _efm_menu_it_normal(m2, "Select None", NULL, _cb_menu_item_sel_none, ctx, NULL);
- _efm_menu_it_normal(m2, "Refresh", "std:view-refresh", _cb_menu_item_refresh, ctx, NULL);
+ _efm_menu_it_normal(m2, "Select None", NULL,
+ _cb_menu_item_sel_none, ctx, NULL);
+ _efm_menu_it_normal(m2, "Refresh", "std:view-refresh",
+ _cb_menu_item_refresh, ctx, NULL);
// XXX: sort
// XXX: show hidden
}
@@ -416,6 +445,8 @@ _efm_popup_main_menu_add(Smart_Data *sd, Evas_Coord x, Evas_Coord y)
_efm_menu_it_sub(m1, "View", NULL, m2);
_efm_menu_it_normal(m2, "Select All", "std:edit-select-all",
_cb_menu_item_sel_all, ctx, NULL);
+ _efm_menu_it_normal(m2, "Select None", NULL,
+ _cb_menu_item_sel_none, ctx, NULL);
_efm_menu_it_normal(m2, "Refresh", "std:view-refresh",
_cb_menu_item_refresh, ctx, NULL);
// XXX: sort
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
