enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

efm progress bar thingy now handles secure deletion 

ticket #1702
also renamed the "unknow" operation to "unknown", default theme updated


SVN revision: 78865
This commit is contained in:
Mike Blumenkrantz 2012-11-02 13:45:47 +00:00
parent 7de1d89a0b
commit dc0dd0906f
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/themes/default.edc
View File

@ -16109,7 +16109,7 @@ target: "region";
}
program {
name: "set_icon_unknow";
signal: "e,action,icon,unknow";
signal: "e,action,icon,unknown";
source: "e";
action: STATE_SET "default" 0.0;
target: "icon";
@ -16135,6 +16135,13 @@ target: "region";
action: STATE_SET "delete" 0.0;
target: "icon";
}
program {
name: "set_icon_secure_delete";
signal: "e,action,icon,secure_delete";
source: "e";
action: STATE_SET "delete" 0.0;
target: "icon";
}
program {
name: "bt_abort_down";
signal: "mouse,down,*";

21
src/modules/fileman/e_fwin.c
View File

@ -2924,8 +2924,12 @@ _e_fwin_op_registry_listener_cb(void *data,
edje_object_signal_emit(o, "e,action,icon,delete", "e");
break;
case E_FM_OP_SECURE_REMOVE:
edje_object_signal_emit(o, "e,action,icon,secure_delete", "e");
break;
default:
edje_object_signal_emit(o, "e,action,icon,unknow", "e");
edje_object_signal_emit(o, "e,action,icon,unknown", "e");
}
// Update information text
@ -2946,6 +2950,10 @@ _e_fwin_op_registry_listener_cb(void *data,
snprintf(buf, sizeof(buf), _("Deleting is aborted"));
break;
case E_FM_OP_SECURE_REMOVE:
snprintf(buf, sizeof(buf), _("Secure deletion is aborted"));
break;
default:
snprintf(buf, sizeof(buf), _("Unknown operation from slave is aborted"));
}
@ -2976,6 +2984,13 @@ _e_fwin_op_registry_listener_cb(void *data,
snprintf(buf, sizeof(buf), _("Deleting files..."));
break;
case E_FM_OP_SECURE_REMOVE:
if (ere->finished)
snprintf(buf, sizeof(buf), _("Secure delete done"));
else
snprintf(buf, sizeof(buf), _("Securely deleting files..."));
break;
default:
snprintf(buf, sizeof(buf), _("Unknown operation from slave %d"), ere->id);
}
@ -3058,8 +3073,8 @@ _e_fwin_op_registry_entry_add_cb(void *data,
E_Fwin_Page *page = data;
Evas_Object *o;
if (!(ere->op == E_FM_OP_COPY || ere->op == E_FM_OP_MOVE ||
ere->op == E_FM_OP_REMOVE))
if ((ere->op != E_FM_OP_COPY) && (ere->op != E_FM_OP_MOVE) &&
(ere->op != E_FM_OP_REMOVE) && (ere->op != E_FM_OP_SECURE_REMOVE))
return ECORE_CALLBACK_RENEW;
o = edje_object_add(evas_object_evas_get(page->scrollframe_obj));