Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parameter 'Erase at end' now shows in setup box #173

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions po/ru.po
Original file line number Diff line number Diff line change
Expand Up @@ -1917,6 +1917,9 @@ msgstr "Автоим&я каталога"
msgid "&Preallocate space"
msgstr "Предварительно в&ыделить место"

msgid "&Erase at end of move"
msgstr "&Удалять в конце переноса"

msgid "Esc key mode"
msgstr "Клавиша Esc"

Expand Down
1 change: 1 addition & 0 deletions src/filemanager/boxes.c
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,7 @@ configure_box (void)
QUICK_CHECKBOX (N_("Mkdi&r autoname"), &auto_fill_mkdir_name, NULL),
QUICK_CHECKBOX (N_("&Preallocate space"), &mc_global.vfs.preallocate_space,
NULL),
QUICK_CHECKBOX (N_("&Erase at end of move"), &erase_at_end, NULL),
QUICK_STOP_GROUPBOX,
QUICK_START_GROUPBOX (N_("Esc key mode")),
QUICK_CHECKBOX (N_("S&ingle press"), &old_esc_mode, &configure_old_esc_mode_id),
Expand Down
3 changes: 2 additions & 1 deletion src/filemanager/fileopctx.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
*/

#include <config.h>
#include <src/setup.h>

#include <unistd.h>

Expand Down Expand Up @@ -80,7 +81,7 @@ file_op_context_new (FileOperation op)
ctx->preserve = TRUE;
ctx->preserve_uidgid = (geteuid () == 0);
ctx->umask_kill = 0777777;
ctx->erase_at_end = TRUE;
ctx->erase_at_end = erase_at_end;
ctx->skip_all = FALSE;

return ctx;
Expand Down
4 changes: 4 additions & 0 deletions src/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@ gboolean only_leading_plus_minus = TRUE;
/* Automatically fills name with current selected item name on mkdir */
gboolean auto_fill_mkdir_name = TRUE;

/* Erase files and directories at the end of moving */
gboolean erase_at_end = TRUE;

/* If set and you don't have subshell support, then C-o will give you a shell */
gboolean output_starts_shell = FALSE;

Expand Down Expand Up @@ -365,6 +368,7 @@ static const struct
{ "shadows", &mc_global.tty.shadows },
{ "mcview_remember_file_position", &mcview_remember_file_position },
{ "auto_fill_mkdir_name", &auto_fill_mkdir_name },
{ "erase_at_end", &erase_at_end },
{ "copymove_persistent_attr", &copymove_persistent_attr },
{ NULL, NULL }
};
Expand Down
1 change: 1 addition & 0 deletions src/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ extern gboolean auto_save_setup;
extern gboolean only_leading_plus_minus;
extern int cd_symlinks;
extern gboolean auto_fill_mkdir_name;
extern gboolean erase_at_end;
extern gboolean output_starts_shell;
#ifdef USE_FILE_CMD
extern gboolean use_file_to_check_type;
Expand Down