forked from enlightenment/enlightenment
add fileman config option for new mv setting, also implement necessary backend features in efm slave for using mv operations
SVN revision: 76676
This commit is contained in:
parent
542501a85a
commit
c9f7684c02
|
@ -588,7 +588,7 @@ _e_fm_ipc_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_FM_OP_MOVE: /* fop mv file/dir */
|
case E_FM_OP_MOVE: /* fop cp file/dir && rm file/dir */
|
||||||
{
|
{
|
||||||
_e_fm_ipc_slave_run(E_FM_OP_MOVE, (const char *)e->data, e->ref);
|
_e_fm_ipc_slave_run(E_FM_OP_MOVE, (const char *)e->data, e->ref);
|
||||||
}
|
}
|
||||||
|
@ -606,6 +606,12 @@ _e_fm_ipc_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case E_FM_OP_RENAME: /* fop mv */
|
||||||
|
{
|
||||||
|
_e_fm_ipc_slave_run(E_FM_OP_RENAME, (const char *)e->data, e->ref);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case E_FM_OP_MKDIR: /* fop mkdir */
|
case E_FM_OP_MKDIR: /* fop mkdir */
|
||||||
{
|
{
|
||||||
const char *src, *rel;
|
const char *src, *rel;
|
||||||
|
@ -1435,6 +1441,8 @@ _e_fm_ipc_prepare_command(E_Fm_Op_Type type, const char *args)
|
||||||
strcpy(command, "cp");
|
strcpy(command, "cp");
|
||||||
else if (type == E_FM_OP_SYMLINK)
|
else if (type == E_FM_OP_SYMLINK)
|
||||||
strcpy(command, "lns");
|
strcpy(command, "lns");
|
||||||
|
else if (type == E_FM_OP_RENAME)
|
||||||
|
strcpy(command, "mvf");
|
||||||
else
|
else
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -82,6 +82,8 @@ struct _E_Config_Dialog_Data
|
||||||
int auto_open;
|
int auto_open;
|
||||||
} dbus;
|
} dbus;
|
||||||
|
|
||||||
|
int copy;
|
||||||
|
|
||||||
Evas_Object *dir_sort_first;
|
Evas_Object *dir_sort_first;
|
||||||
Evas_Object *dir_sort_last;
|
Evas_Object *dir_sort_last;
|
||||||
E_Config_Dialog *cfd;
|
E_Config_Dialog *cfd;
|
||||||
|
@ -138,6 +140,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
||||||
cfdata->view.mode = fileman_config->view.mode;
|
cfdata->view.mode = fileman_config->view.mode;
|
||||||
cfdata->view.open_dirs_in_place = fileman_config->view.open_dirs_in_place;
|
cfdata->view.open_dirs_in_place = fileman_config->view.open_dirs_in_place;
|
||||||
cfdata->view.single_click = fileman_config->view.single_click;
|
cfdata->view.single_click = fileman_config->view.single_click;
|
||||||
|
cfdata->copy = e_config->filemanager_copy;
|
||||||
cfdata->view.show_full_path = fileman_config->view.show_full_path;
|
cfdata->view.show_full_path = fileman_config->view.show_full_path;
|
||||||
cfdata->view.show_desktop_icons = fileman_config->view.show_desktop_icons;
|
cfdata->view.show_desktop_icons = fileman_config->view.show_desktop_icons;
|
||||||
cfdata->view.show_toolbar = fileman_config->view.show_toolbar;
|
cfdata->view.show_toolbar = fileman_config->view.show_toolbar;
|
||||||
|
@ -176,6 +179,7 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__,
|
||||||
fileman_config->view.mode = cfdata->view.mode;
|
fileman_config->view.mode = cfdata->view.mode;
|
||||||
fileman_config->view.open_dirs_in_place = cfdata->view.open_dirs_in_place;
|
fileman_config->view.open_dirs_in_place = cfdata->view.open_dirs_in_place;
|
||||||
e_config->filemanager_single_click = fileman_config->view.single_click = cfdata->view.single_click;
|
e_config->filemanager_single_click = fileman_config->view.single_click = cfdata->view.single_click;
|
||||||
|
e_config->filemanager_copy = cfdata->copy;
|
||||||
fileman_config->view.show_full_path = cfdata->view.show_full_path;
|
fileman_config->view.show_full_path = cfdata->view.show_full_path;
|
||||||
fileman_config->view.show_desktop_icons = cfdata->view.show_desktop_icons;
|
fileman_config->view.show_desktop_icons = cfdata->view.show_desktop_icons;
|
||||||
fileman_config->view.show_toolbar = cfdata->view.show_toolbar;
|
fileman_config->view.show_toolbar = cfdata->view.show_toolbar;
|
||||||
|
@ -225,6 +229,7 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__,
|
||||||
(fileman_config->view.mode != cfdata->view.mode) ||
|
(fileman_config->view.mode != cfdata->view.mode) ||
|
||||||
(fileman_config->view.open_dirs_in_place != cfdata->view.open_dirs_in_place) ||
|
(fileman_config->view.open_dirs_in_place != cfdata->view.open_dirs_in_place) ||
|
||||||
(fileman_config->view.single_click != cfdata->view.single_click) ||
|
(fileman_config->view.single_click != cfdata->view.single_click) ||
|
||||||
|
(e_config->filemanager_copy != cfdata->copy) ||
|
||||||
(fileman_config->view.show_full_path != cfdata->view.show_full_path) ||
|
(fileman_config->view.show_full_path != cfdata->view.show_full_path) ||
|
||||||
(fileman_config->view.show_desktop_icons != cfdata->view.show_desktop_icons) ||
|
(fileman_config->view.show_desktop_icons != cfdata->view.show_desktop_icons) ||
|
||||||
(fileman_config->view.show_toolbar != cfdata->view.show_toolbar) ||
|
(fileman_config->view.show_toolbar != cfdata->view.show_toolbar) ||
|
||||||
|
@ -376,6 +381,9 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__,
|
||||||
ob = e_widget_check_add(evas, _("Use Single Click"),
|
ob = e_widget_check_add(evas, _("Use Single Click"),
|
||||||
&(cfdata->view.single_click));
|
&(cfdata->view.single_click));
|
||||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||||
|
ob = e_widget_check_add(evas, _("Really Move"),
|
||||||
|
&(cfdata->copy));
|
||||||
|
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||||
ob = e_widget_check_add(evas, _("Use Alternate Selection Modifiers"),
|
ob = e_widget_check_add(evas, _("Use Alternate Selection Modifiers"),
|
||||||
&(cfdata->selection.windows_modifiers));
|
&(cfdata->selection.windows_modifiers));
|
||||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||||
|
|
Loading…
Reference in New Issue