From 322bf132d702b48ae1ac5f232cc663daab17418f Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Tue, 25 Sep 2012 10:20:18 +0400 Subject: [PATCH] (QUICK_BUTTONS_OK_CANCEL): new macro for often-used dialog buttons. Signed-off-by: Andrew Borodin --- lib/widget/quick.h | 5 +++++ lib/widget/wtools.c | 8 +++----- src/diffviewer/search.c | 4 +--- src/diffviewer/ydiff.c | 4 +--- src/editor/editcmd.c | 12 +++--------- src/editor/editcmd_dialogs.c | 4 +--- src/editor/editoptions.c | 4 +--- src/filemanager/boxes.c | 32 ++++++++------------------------ src/filemanager/option.c | 8 ++------ src/viewer/dialogs.c | 10 +++------- 10 files changed, 28 insertions(+), 63 deletions(-) diff --git a/lib/widget/quick.h b/lib/widget/quick.h index 5e73ec9e5..3b00130e2 100644 --- a/lib/widget/quick.h +++ b/lib/widget/quick.h @@ -197,6 +197,11 @@ } \ } +#define QUICK_BUTTONS_OK_CANCEL \ + QUICK_START_BUTTONS (TRUE, TRUE), \ + QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), \ + QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL) + #define QUICK_END \ { \ .widget_type = quick_end, \ diff --git a/lib/widget/wtools.c b/lib/widget/wtools.c index 7c9b59be2..33e1a5513 100644 --- a/lib/widget/wtools.c +++ b/lib/widget/wtools.c @@ -207,14 +207,12 @@ fg_input_dialog_help (const char *header, const char *text, const char *help, { quick_widget_t quick_widgets[] = { - /* *INDENT-OFF* */ + /* *INDENT-OFF* */ QUICK_LABELED_INPUT (p_text, input_label_above, def_text, flags, histname, &my_str, NULL), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END - /* *INDENT-OFF* */ + /* *INDENT-ON* */ }; quick_dialog_t qdlg = { diff --git a/src/diffviewer/search.c b/src/diffviewer/search.c index 825eb772d..902a5a973 100644 --- a/src/diffviewer/search.c +++ b/src/diffviewer/search.c @@ -96,9 +96,7 @@ mcdiffview_dialog_search (WDiff * dview) QUICK_CHECKBOX (N_("&All charsets"), &mcdiffview_search_options.all_codepages, NULL), #endif QUICK_STOP_COLUMNS, - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; diff --git a/src/diffviewer/ydiff.c b/src/diffviewer/ydiff.c index 9076be8c2..224ce1d80 100644 --- a/src/diffviewer/ydiff.c +++ b/src/diffviewer/ydiff.c @@ -2363,9 +2363,7 @@ dview_diff_options (WDiff * dview) QUICK_CHECKBOX (N_("Strip &trailing carriage return"), &dview->opt.strip_trailing_cr, NULL), QUICK_STOP_GROUPBOX, - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; diff --git a/src/editor/editcmd.c b/src/editor/editcmd.c index 88297eeaf..d072b77d2 100644 --- a/src/editor/editcmd.c +++ b/src/editor/editcmd.c @@ -467,9 +467,7 @@ edit_get_save_file_as (WEdit * edit) QUICK_SEPARATOR (TRUE), QUICK_LABEL (N_("Change line breaks to:"), NULL), QUICK_RADIO (LB_NAMES, lb_names, (int *) &cur_lb, NULL), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -1608,9 +1606,7 @@ edit_save_mode_cmd (void) &edit_save_mode_input_id), QUICK_SEPARATOR (TRUE), QUICK_CHECKBOX (N_("Check &POSIX new line"), &option_check_nl_at_eof, NULL), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -3310,9 +3306,7 @@ edit_mail_dialog (WEdit * edit) QUICK_LABELED_INPUT (N_("Copies to"), input_label_above, mail_cc_last != NULL ? mail_cc_last : "", 0, "mail-dlg-input", &tmail_cc, NULL), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; diff --git a/src/editor/editcmd_dialogs.c b/src/editor/editcmd_dialogs.c index 09e394283..1e169f824 100644 --- a/src/editor/editcmd_dialogs.c +++ b/src/editor/editcmd_dialogs.c @@ -206,9 +206,7 @@ editcmd_dialog_replace_show (WEdit * edit, const char *search_default, const cha QUICK_CHECKBOX (N_("&All charsets"), &edit_search_options.all_codepages, NULL), #endif QUICK_STOP_COLUMNS, - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; diff --git a/src/editor/editoptions.c b/src/editor/editoptions.c index b0ed413ba..785cc1d8c 100644 --- a/src/editor/editoptions.c +++ b/src/editor/editoptions.c @@ -177,9 +177,7 @@ edit_options_dialog (Dlg_head * h) wrap_length, 0, "edit-word-wrap", &p, NULL), QUICK_STOP_GROUPBOX, QUICK_STOP_COLUMNS, - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; diff --git a/src/filemanager/boxes.c b/src/filemanager/boxes.c index c8c42aec6..141c3f1a2 100644 --- a/src/filemanager/boxes.c +++ b/src/filemanager/boxes.c @@ -464,9 +464,7 @@ panel_listing_box (WPanel * panel, char **userp, char **minip, int *use_msformat QUICK_CHECKBOX (N_("User &mini status"), &mini_user_status, &mini_user_status_id), QUICK_INPUT (panel->user_status_format[panel->list_type], INPUT_COMPLETE_DEFAULT, "mini_input", &mini_user_format, &mini_user_format_id), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -544,9 +542,7 @@ sort_box (panel_sort_info_t * info) QUICK_CHECKBOX (N_("Case sensi&tive"), &info->case_sensitive, NULL), QUICK_CHECKBOX (N_("&Reverse"), &info->reverse, NULL), QUICK_STOP_COLUMNS, - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -585,9 +581,7 @@ confirm_box (void) &confirm_directory_hotlist_delete, NULL), QUICK_CHECKBOX (N_("Confirmation|&History cleanup"), &mc_global.widget.confirm_history_cleanup, NULL), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -622,9 +616,7 @@ display_bits_box (void) QUICK_RADIO (4, display_bits_str, ¤t_mode, NULL), QUICK_SEPARATOR (TRUE), QUICK_CHECKBOX (N_("F&ull 8 bits input"), &new_meta, NULL), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -686,9 +678,7 @@ display_bits_box (void) QUICK_STOP_COLUMNS, QUICK_SEPARATOR (TRUE), QUICK_CHECKBOX (N_("F&ull 8 bits input"), &new_meta, NULL), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -806,9 +796,7 @@ configure_vfs (void) QUICK_CHECKBOX (N_("Use passive mode over pro&xy"), &ftpfs_use_passive_connections_over_proxy, NULL), #endif /* ENABLE_VFS_FTP */ - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -894,9 +882,7 @@ symlink_dialog (const vfs_path_t * existing_vpath, const vfs_path_t * new_vpath, QUICK_SEPARATOR (FALSE), QUICK_LABELED_INPUT (N_("Symbolic link filename:"), input_label_above, new, 0, "input-1", ret_new, NULL), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -1012,9 +998,7 @@ vfs_smb_get_authinfo (const char *host, const char *share, const char *domain, c QUICK_SEPARATOR (FALSE), QUICK_INPUT ("", 1, "auth_password", &ret_password, NULL), QUICK_STOP_COLUMNS, - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; diff --git a/src/filemanager/option.c b/src/filemanager/option.c index 2bc06faa6..e80c6c766 100644 --- a/src/filemanager/option.c +++ b/src/filemanager/option.c @@ -147,9 +147,7 @@ configure_box (void) QUICK_SEPARATOR (FALSE), QUICK_STOP_GROUPBOX, QUICK_STOP_COLUMNS, - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; @@ -230,9 +228,7 @@ panel_options_box (void) NULL), QUICK_STOP_GROUPBOX, QUICK_STOP_COLUMNS, - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; diff --git a/src/viewer/dialogs.c b/src/viewer/dialogs.c index e76028540..e56dc364e 100644 --- a/src/viewer/dialogs.c +++ b/src/viewer/dialogs.c @@ -101,11 +101,9 @@ mcview_dialog_search (mcview_t * view) QUICK_CHECKBOX (N_("&All charsets"), &mcview_search_options.all_codepages, NULL), #endif QUICK_STOP_COLUMNS, - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), - /* *INDENT-ON* */ + QUICK_BUTTONS_OK_CANCEL, QUICK_END + /* *INDENT-ON* */ }; quick_dialog_t qdlg = { @@ -202,9 +200,7 @@ mcview_dialog_goto (mcview_t * view, off_t * offset) QUICK_INPUT (INPUT_LAST_TEXT, 0, MC_HISTORY_VIEW_GOTO, &exp, NULL), QUICK_RADIO (num_of_types, (const char **) mc_view_goto_str, (int *) ¤t_goto_type, NULL), - QUICK_START_BUTTONS (TRUE, TRUE), - QUICK_BUTTON (N_("&OK"), B_ENTER, NULL, NULL), - QUICK_BUTTON (N_("&Cancel"), B_CANCEL, NULL, NULL), + QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ }; -- 2.11.4.GIT