mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-11 05:49:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

(editcmd_dialog_raw_key_query): take gboolean instead of int.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-08-12 19:26:01 +04:00
parent 3b96b9b8b8
commit 603d136db4
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/editor/editcmd.c
View File

@ -1800,7 +1800,7 @@ edit_delete_macro_cmd (WEdit * edit)
{ {
int hotkey; int hotkey;
hotkey = editcmd_dialog_raw_key_query (_("Delete macro"), _("Press macro hotkey:"), 1); hotkey = editcmd_dialog_raw_key_query (_("Delete macro"), _("Press macro hotkey:"), TRUE);
if (hotkey != 0 && !edit_delete_macro (edit, hotkey)) if (hotkey != 0 && !edit_delete_macro (edit, hotkey))
message (D_ERROR, _("Delete macro"), _("Macro not deleted")); message (D_ERROR, _("Delete macro"), _("Macro not deleted"));
@ -1857,7 +1857,8 @@ edit_store_macro_cmd (WEdit * edit)
gboolean have_macro = FALSE; gboolean have_macro = FALSE;
char *skeyname = NULL; char *skeyname = NULL;
hotkey = editcmd_dialog_raw_key_query (_("Save macro"), _("Press the macro's new hotkey:"), 1); hotkey =
editcmd_dialog_raw_key_query (_("Save macro"), _("Press the macro's new hotkey:"), TRUE);
if (hotkey == ESC_CHAR) if (hotkey == ESC_CHAR)
return FALSE; return FALSE;
@ -3338,8 +3339,10 @@ edit_select_codepage_cmd (WEdit * edit)
void void
edit_insert_literal_cmd (WEdit * edit) edit_insert_literal_cmd (WEdit * edit)
{ {
int char_for_insertion = editcmd_dialog_raw_key_query (_("Insert literal"), int char_for_insertion;
_("Press any key:"), 0);
char_for_insertion = editcmd_dialog_raw_key_query (_("Insert literal"),
_("Press any key:"), FALSE);
edit_execute_key_command (edit, -1, ascii_alpha_to_cntrl (char_for_insertion)); edit_execute_key_command (edit, -1, ascii_alpha_to_cntrl (char_for_insertion));
} }

9
src/editor/editcmd_dialogs.c
View File

@ -337,11 +337,14 @@ editcmd_dialog_search_show (WEdit * edit)
and Esc are cannot returned */ and Esc are cannot returned */
int int
editcmd_dialog_raw_key_query (const char *heading, const char *query, int cancel) editcmd_dialog_raw_key_query (const char *heading, const char *query, gboolean cancel)
{ {
int w = str_term_width1 (query) + 7; int w;
struct Dlg_head *raw_dlg;
struct Dlg_head *raw_dlg = w = str_term_width1 (query) + 7;
raw_dlg =
create_dlg (TRUE, 0, 0, 7, w, dialog_colors, editcmd_dialog_raw_key_query_cb, create_dlg (TRUE, 0, 0, 7, w, dialog_colors, editcmd_dialog_raw_key_query_cb,
NULL, heading, DLG_CENTER | DLG_TRYUP | DLG_WANT_TAB); NULL, heading, DLG_CENTER | DLG_TRYUP | DLG_WANT_TAB);
add_widget (raw_dlg, input_new (3 - cancel, w - 5, input_get_default_colors (), add_widget (raw_dlg, input_new (3 - cancel, w - 5, input_get_default_colors (),

2
src/editor/editcmd_dialogs.h
View File

@ -29,7 +29,7 @@ void editcmd_dialog_replace_show (WEdit *, const char *, const char *, char **,
gboolean editcmd_dialog_search_show (WEdit * edit); gboolean editcmd_dialog_search_show (WEdit * edit);
int editcmd_dialog_raw_key_query (const char *, const char *, int); int editcmd_dialog_raw_key_query (const char *heading, const char *query, gboolean cancel);
void editcmd_dialog_completion_show (WEdit *, int, int, struct selection *, int); void editcmd_dialog_completion_show (WEdit *, int, int, struct selection *, int);