mirror of https://github.com/MidnightCommander/mc
* edit/editcmd.c: Do not set the field `histname' of `QuickWidget' unless
the widget is of type `quick_input'. * src/boxes.c: Likewise. * src/filegui.c: Likewise. * src/hotlist.c: Likewise.
This commit is contained in:
Pavel Tsekov
parent
3f581584d5
commit
b0ced33741
|
|
@ -1,3 +1,8 @@
|
|||
2006-01-30 Pavel Tsekov <ptsekov@gmx.net>
|
||||
|
||||
* editcmd.c: Do not set the field `histname' of `QuickWidget'
|
||||
unless the widget is of type `quick_input'.
|
||||
|
||||
2006-01-27 Pavel Tsekov <ptsekov@gmx.net>
|
||||
|
||||
* editcmd.c (edit_block_copy_cmd): Allow a block of selected
|
||||
|
|
|
|||
|
|
@ -396,15 +396,15 @@ void menu_save_mode_cmd (void)
|
|||
static QuickWidget widgets[] =
|
||||
{
|
||||
{quick_button, 18, DLG_X, 7, DLG_Y, N_("&Cancel"), 0,
|
||||
B_CANCEL, 0, 0, "c"},
|
||||
B_CANCEL, 0, 0, NULL},
|
||||
{quick_button, 6, DLG_X, 7, DLG_Y, N_("&OK"), 0,
|
||||
B_ENTER, 0, 0, "o"},
|
||||
B_ENTER, 0, 0, NULL},
|
||||
{quick_input, 23, DLG_X, 5, DLG_Y, 0, 9,
|
||||
0, 0, &str_result, "edit-backup-ext"},
|
||||
{quick_label, 22, DLG_X, 4, DLG_Y, N_("Extension:"), 0,
|
||||
0, 0, 0, "savemext"},
|
||||
0, 0, 0, NULL},
|
||||
{quick_radio, 4, DLG_X, 3, DLG_Y, "", 3,
|
||||
0, &save_mode_new, (char **) str, "t"},
|
||||
0, &save_mode_new, (char **) str, NULL},
|
||||
NULL_QuickWidget};
|
||||
static QuickDialog dialog =
|
||||
{DLG_X, DLG_Y, -1, -1, N_(" Edit Save Mode "), "[Edit Save Mode]",
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
2006-01-30 Pavel Tsekov <ptsekov@gmx.net>
|
||||
|
||||
* boxes.c: Do not set the field `histname' of `QuickWidget'
|
||||
unless the widget is of type `quick_input'.
|
||||
* filegui.c: Likewise.
|
||||
* hotlist.c: Likewise.
|
||||
|
||||
2006-01-30 Roland Illig <roland.illig@gmx.de>
|
||||
|
||||
* view.c (view_display_hex): Bug fix: The list iterator from the
|
||||
|
|
|
|||
44
src/boxes.c
44
src/boxes.c
|
|
@ -372,20 +372,20 @@ static int my_exit;
|
|||
|
||||
static QuickWidget conf_widgets [] = {
|
||||
{ quick_button, 4, 6, 4, CONFY, N_("&Cancel"),
|
||||
0, B_CANCEL, 0, 0, "c" },
|
||||
0, B_CANCEL, 0, 0, NULL },
|
||||
{ quick_button, 4, 6, 3, CONFY, N_("&OK"),
|
||||
0, B_ENTER, 0, 0, "o" },
|
||||
0, B_ENTER, 0, 0, NULL },
|
||||
|
||||
{ quick_checkbox, 1, 13, 7, CONFY, N_(" confirm di&Rectory hotlist delete "),
|
||||
11, 0, &my_directory_hotlist_delete, NULL, NULL },
|
||||
{ quick_checkbox, 1, 13, 6, CONFY, N_(" confirm &Exit "),
|
||||
9, 0, &my_exit, 0, "e" },
|
||||
9, 0, &my_exit, 0, NULL },
|
||||
{ quick_checkbox, 1, 13, 5, CONFY, N_(" confirm e&Xecute "),
|
||||
10, 0, &my_execute, 0, "x" },
|
||||
10, 0, &my_execute, 0, NULL },
|
||||
{ quick_checkbox, 1, 13, 4, CONFY, N_(" confirm o&Verwrite "),
|
||||
10, 0, &my_overwrite, 0, "ov" },
|
||||
10, 0, &my_overwrite, 0, NULL },
|
||||
{ quick_checkbox, 1, 13, 3, CONFY, N_(" confirm &Delete "),
|
||||
9, 0, &my_delete, 0, "de" },
|
||||
9, 0, &my_delete, 0, NULL },
|
||||
NULL_QuickWidget
|
||||
};
|
||||
|
||||
|
|
@ -468,13 +468,13 @@ static const char *display_bits_str [] =
|
|||
|
||||
static QuickWidget display_widgets [] = {
|
||||
{ quick_button, 4, 6, 4, DISPY, N_("&Cancel"),
|
||||
0, B_CANCEL, 0, 0, "c" },
|
||||
0, B_CANCEL, 0, 0, NULL },
|
||||
{ quick_button, 4, 6, 3, DISPY, N_("&OK"),
|
||||
0, B_ENTER, 0, 0, "o" },
|
||||
0, B_ENTER, 0, 0, NULL },
|
||||
{ quick_checkbox, 4, DISPX, 7, DISPY, N_("F&ull 8 bits input"),
|
||||
0, 0, &new_meta, 0, "u" },
|
||||
0, 0, &new_meta, 0, NULL },
|
||||
{ quick_radio, 4, DISPX, 3, DISPY, "", 3, 0,
|
||||
&new_mode, const_cast(char **, display_bits_str), "r" },
|
||||
&new_mode, const_cast(char **, display_bits_str), NULL },
|
||||
NULL_QuickWidget
|
||||
};
|
||||
|
||||
|
|
@ -719,37 +719,37 @@ static int ret_ftpfs_use_passive_connections_over_proxy;
|
|||
|
||||
static QuickWidget confvfs_widgets [] = {
|
||||
{ quick_button, 30, VFSX, VFSY - 3, VFSY, N_("&Cancel"),
|
||||
0, B_CANCEL, 0, 0, "button-cancel" },
|
||||
0, B_CANCEL, 0, 0, NULL },
|
||||
{ quick_button, 12, VFSX, VFSY - 3, VFSY, N_("&OK"),
|
||||
0, B_ENTER, 0, 0, "button-ok" },
|
||||
0, B_ENTER, 0, 0, NULL },
|
||||
#if defined(USE_NETCODE)
|
||||
{ quick_checkbox, 4, VFSX, 12, VFSY, N_("Use passive mode over pro&xy"), 0, 0,
|
||||
&ret_ftpfs_use_passive_connections_over_proxy, 0, "check-use-passive-mode-proxy" },
|
||||
&ret_ftpfs_use_passive_connections_over_proxy, 0, NULL },
|
||||
{ quick_checkbox, 4, VFSX, 11, VFSY, N_("Use &passive mode"), 0, 0,
|
||||
&ret_ftpfs_use_passive_connections, 0, "check-use-passive-mode" },
|
||||
&ret_ftpfs_use_passive_connections, 0, NULL },
|
||||
{ quick_checkbox, 4, VFSX, 10, VFSY, N_("&Use ~/.netrc"), 0, 0,
|
||||
&ret_use_netrc, 0, "check-use-netrc" },
|
||||
&ret_use_netrc, 0, NULL },
|
||||
{ quick_input, 4, VFSX, 9, VFSY, "", 48, 0, 0, &ret_ftp_proxy,
|
||||
"input-ftp-proxy" },
|
||||
{ quick_checkbox, 4, VFSX, 8, VFSY, N_("&Always use ftp proxy"), 0, 0,
|
||||
&ftpfs_always_use_proxy, 0, "check-ftp-proxy" },
|
||||
&ftpfs_always_use_proxy, 0, NULL },
|
||||
{ quick_label, 49, VFSX, 7, VFSY, N_("sec"),
|
||||
0, 0, 0, 0, "label-sec" },
|
||||
0, 0, 0, 0, NULL },
|
||||
{ quick_input, 38, VFSX, 7, VFSY, "", 10, 0, 0, &ret_directory_timeout,
|
||||
"input-timeout" },
|
||||
{ quick_label, 4, VFSX, 7, VFSY, N_("ftpfs directory cache timeout:"),
|
||||
0, 0, 0, 0, "label-cache"},
|
||||
0, 0, 0, 0, NULL },
|
||||
{ quick_input, 4, VFSX, 6, VFSY, "", 48, 0, 0, &ret_passwd,
|
||||
"input-passwd" },
|
||||
{ quick_label, 4, VFSX, 5, VFSY, N_("ftp anonymous password:"),
|
||||
0, 0, 0, 0, "label-pass"},
|
||||
0, 0, 0, 0, NULL },
|
||||
#endif
|
||||
{ quick_label, 49, VFSX, 3, VFSY, "sec",
|
||||
0, 0, 0, 0, "label-sec2" },
|
||||
0, 0, 0, 0, NULL },
|
||||
{ quick_input, 38, VFSX, 3, VFSY, "", 10, 0, 0, &ret_timeout,
|
||||
"input-timo-vfs" },
|
||||
{ quick_label, 4, VFSX, 3, VFSY, N_("Timeout for freeing VFSs:"),
|
||||
0, 0, 0, 0, "label-vfs" },
|
||||
0, 0, 0, 0, NULL },
|
||||
NULL_QuickWidget
|
||||
};
|
||||
|
||||
|
|
@ -802,7 +802,7 @@ cd_dialog (void)
|
|||
QuickDialog Quick_input;
|
||||
QuickWidget quick_widgets [] = {
|
||||
{ quick_input, 6, 57, 2, 0, "", 50, 0, 0, 0, "input" },
|
||||
{ quick_label, 3, 57, 2, 0, "", 0, 0, 0, 0, "label" },
|
||||
{ quick_label, 3, 57, 2, 0, "", 0, 0, 0, 0, NULL },
|
||||
NULL_QuickWidget
|
||||
};
|
||||
char *my_str;
|
||||
|
|
|
|||
|
|
@ -730,12 +730,12 @@ static QuickWidget fmd_widgets[] = {
|
|||
#define FMCB11 1
|
||||
/* follow symlinks and preserve Attributes must be the first */
|
||||
{quick_checkbox, 3, 64, 8, FMDY, N_("preserve &Attributes"), 9, 0,
|
||||
0 /* &op_preserve */ , 0, "preserve"},
|
||||
0 /* &op_preserve */ , 0, NULL},
|
||||
{quick_checkbox, 3, 64, 7, FMDY, N_("follow &Links"), 7, 0,
|
||||
0 /* &file_mask_op_follow_links */ , 0, "follow"},
|
||||
{quick_label, 3, 64, 5, FMDY, N_("to:"), 0, 0, 0, 0, "to"},
|
||||
0 /* &file_mask_op_follow_links */ , 0, NULL},
|
||||
{quick_label, 3, 64, 5, FMDY, N_("to:"), 0, 0, 0, 0, NULL},
|
||||
{quick_checkbox, 37, 64, 4, FMDY, N_("&Using shell patterns"), 0, 0,
|
||||
0 /* &source_easy_patterns */ , 0, "using-shell"},
|
||||
0 /* &source_easy_patterns */ , 0, NULL},
|
||||
{quick_input, 3, 64, 3, FMDY, "", 58,
|
||||
0, 0, 0, "input-def"},
|
||||
#define FMDI1 4
|
||||
|
|
@ -744,10 +744,10 @@ static QuickWidget fmd_widgets[] = {
|
|||
{quick_input, 3, 64, 6, FMDY, "", 58, 0,
|
||||
0, 0, "input2"},
|
||||
#define FMDI0 6
|
||||
{quick_label, 3, 64, 2, FMDY, "", 0, 0, 0, 0, "ql"},
|
||||
{quick_label, 3, 64, 2, FMDY, "", 0, 0, 0, 0, NULL},
|
||||
#define FMBRGT 7
|
||||
{quick_button, 42, 64, 9, FMDY, N_("&Cancel"), 0, B_CANCEL, 0, 0,
|
||||
"cancel"},
|
||||
NULL},
|
||||
#undef SKIP
|
||||
#ifdef WITH_BACKGROUND
|
||||
# define SKIP 5
|
||||
|
|
@ -756,7 +756,7 @@ static QuickWidget fmd_widgets[] = {
|
|||
# define FMBLFT 9
|
||||
# define FMBMID 8
|
||||
{quick_button, 25, 64, 9, FMDY, N_("&Background"), 0, B_USER, 0, 0,
|
||||
"back"},
|
||||
NULL},
|
||||
#else /* WITH_BACKGROUND */
|
||||
# define SKIP 4
|
||||
# define FMCB21 10
|
||||
|
|
@ -764,12 +764,12 @@ static QuickWidget fmd_widgets[] = {
|
|||
# define FMBLFT 8
|
||||
# undef FMBMID
|
||||
#endif
|
||||
{quick_button, 14, 64, 9, FMDY, N_("&OK"), 0, B_ENTER, 0, 0, "ok"},
|
||||
{quick_button, 14, 64, 9, FMDY, N_("&OK"), 0, B_ENTER, 0, 0, NULL},
|
||||
{quick_checkbox, 42, 64, 8, FMDY, N_("&Stable Symlinks"), 0, 0,
|
||||
0 /* &file_mask_stable_symlinks */ , 0, "stab-sym"},
|
||||
0 /* &file_mask_stable_symlinks */ , 0, NULL},
|
||||
{quick_checkbox, 31, 64, 7, FMDY, N_("&Dive into subdir if exists"), 0,
|
||||
0,
|
||||
0 /* &dive_into_subdirs */ , 0, "dive"},
|
||||
0 /* &dive_into_subdirs */ , 0, NULL},
|
||||
NULL_QuickWidget
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -837,19 +837,19 @@ add_new_entry_input (const char *header, const char *text1, const char *text2,
|
|||
QuickDialog Quick_input;
|
||||
static QuickWidget quick_widgets [] = {
|
||||
{ quick_button, 55, 80, RELATIVE_Y_BUTTONS, 0, N_("&Cancel"), 0, B_CANCEL,
|
||||
0, 0, "button-cancel" },
|
||||
0, 0, NULL },
|
||||
{ quick_button, 30, 80, RELATIVE_Y_BUTTONS, 0, N_("&Insert"), 0, B_INSERT,
|
||||
0, 0, "button-insert" },
|
||||
0, 0, NULL },
|
||||
{ quick_button, 10, 80, RELATIVE_Y_BUTTONS, 0, N_("&Append"), 0, B_APPEND,
|
||||
0, 0, "button-append" },
|
||||
0, 0, NULL },
|
||||
{ quick_input, 4, 80, RELATIVE_Y_INPUT_PTH, 0, "",58, 0,
|
||||
0, 0, "input-pth" },
|
||||
{ quick_label, RELATIVE_Y_LABEL_PTH, 80, 3, 0, 0, 0, 0,
|
||||
0, 0, "label-pth" },
|
||||
0, 0, NULL },
|
||||
{ quick_input, 4, 80, 3, 0, "", 58, 0,
|
||||
0, 0, "input-lbl" },
|
||||
{ quick_label, 3, 80, 2, 0, 0, 0, 0,
|
||||
0, 0, "label-lbl" },
|
||||
0, 0, NULL },
|
||||
NULL_QuickWidget };
|
||||
|
||||
int len;
|
||||
|
|
@ -940,13 +940,13 @@ add_new_group_input (const char *header, const char *label, char **result)
|
|||
QuickDialog Quick_input;
|
||||
static QuickWidget quick_widgets [] = {
|
||||
{ quick_button, 55, 80, 1, 0, N_("&Cancel"), 0, B_CANCEL, 0, 0,
|
||||
"button-cancel" },
|
||||
NULL },
|
||||
{ quick_button, 30, 80, 1, 0, N_("&Insert"), 0, B_INSERT, 0, 0,
|
||||
"button-insert" },
|
||||
NULL },
|
||||
{ quick_button, 10, 80, 1, 0, N_("&Append"), 0, B_APPEND, 0, 0,
|
||||
"button-append" },
|
||||
NULL },
|
||||
{ quick_input, 4, 80, 0, 0, "", 58, 0, 0, 0, "input" },
|
||||
{ quick_label, 3, 80, 2, 0, 0, 0, 0, 0, 0, "label" },
|
||||
{ quick_label, 3, 80, 2, 0, 0, 0, 0, 0, 0, NULL },
|
||||
NULL_QuickWidget };
|
||||
int relative_y[] = {1, 1, 1, 0, 2}; /* the relative_x component from the
|
||||
quick_widgets variable above */
|
||||
|
|
|
|||
Loading…
Reference in New Issue