From 5ee7cb857c922a3db5fbc5acea0587e63293602c Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Wed, 14 Feb 2001 10:30:46 +0000 Subject: [PATCH] consistent shortcuts on Cancel (Esc) and Close (Esc & Return) buttons git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1503 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 23 +++++++++++++++++++ src/frontends/xforms/FormBrowser.C | 4 ++-- src/frontends/xforms/form_browser.C | 8 +++++-- src/frontends/xforms/form_browser.h | 2 +- src/frontends/xforms/form_citation.C | 2 +- src/frontends/xforms/form_copyright.C | 2 +- src/frontends/xforms/form_document.C | 2 +- src/frontends/xforms/form_error.C | 2 +- src/frontends/xforms/form_index.C | 9 +++++--- src/frontends/xforms/form_paragraph.C | 2 +- src/frontends/xforms/form_preferences.C | 2 +- src/frontends/xforms/form_print.C | 2 +- src/frontends/xforms/form_ref.C | 2 +- src/frontends/xforms/form_tabular.C | 2 +- src/frontends/xforms/form_tabular_create.C | 2 +- src/frontends/xforms/form_toc.C | 2 +- src/frontends/xforms/form_url.C | 2 +- src/frontends/xforms/forms/form_browser.fd | 8 +++---- src/frontends/xforms/forms/form_citation.fd | 2 +- src/frontends/xforms/forms/form_copyright.fd | 2 +- src/frontends/xforms/forms/form_document.fd | 2 +- src/frontends/xforms/forms/form_error.fd | 2 +- src/frontends/xforms/forms/form_index.fd | 6 ++--- src/frontends/xforms/forms/form_paragraph.fd | 2 +- .../xforms/forms/form_preferences.fd | 2 +- src/frontends/xforms/forms/form_print.fd | 2 +- src/frontends/xforms/forms/form_ref.fd | 2 +- src/frontends/xforms/forms/form_tabular.fd | 2 +- .../xforms/forms/form_tabular_create.fd | 2 +- src/frontends/xforms/forms/form_toc.fd | 4 ++-- src/frontends/xforms/forms/form_url.fd | 2 +- 31 files changed, 70 insertions(+), 40 deletions(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 116998db73..e3afa8c0e6 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,26 @@ +2001-02-14 Angus Leeming + + * FormBrowser.C: used OkCancelPolicy for ButtonController rather than + IgnorantPolicy. + + * forms/form_browser.fd: + * forms/form_copyright.fd: + * forms/form_error.fd: + * forms/form_tabular.fd: + * forms/form_toc.fd: + Consistent shortcuts for Close button: Esc and Return only. + + * forms/form_citation.fd: + * forms/form_document.fd: + * forms/form_index.fd: + * forms/form_paragraph.fd: + * forms/form_preferences.fd: + * forms/form_print.fd: + * forms/form_ref.fd: + * forms/form_tabular_create.fd: + * forms/form_url.fd: + Consistent shortcut for Cancel button: Esc only. + 2001-02-12 John Levon * Dialogs.C: new Splash. Include, Bibitem/tex diff --git a/src/frontends/xforms/FormBrowser.C b/src/frontends/xforms/FormBrowser.C index 45bd2ede00..c5d87b3bc8 100644 --- a/src/frontends/xforms/FormBrowser.C +++ b/src/frontends/xforms/FormBrowser.C @@ -24,7 +24,7 @@ using SigC::slot; #endif FormBrowser::FormBrowser(LyXView * lv, Dialogs * d, const string & name) - : FormBaseBD(lv, d, name, new IgnorantPolicy), + : FormBaseBD(lv, d, name, new OkCancelPolicy), dialog_(0) { } @@ -43,7 +43,7 @@ void FormBrowser::build() minh_ = form()->h; // Manage the close button - bc_.setOK(dialog_->button_close); + bc_.setCancel(dialog_->button_close); bc_.refresh(); } diff --git a/src/frontends/xforms/form_browser.C b/src/frontends/xforms/form_browser.C index 73bf6d5c57..7e707d001f 100644 --- a/src/frontends/xforms/form_browser.C +++ b/src/frontends/xforms/form_browser.C @@ -27,10 +27,14 @@ FD_form_browser * FormBrowser::build_browser() obj = fl_add_box(FL_UP_BOX, 0, 0, 470, 380, ""); fdui->browser = obj = fl_add_browser(FL_NORMAL_BROWSER, 10, 10, 450, 320, ""); fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast); - fdui->button_close = obj = fl_add_button(FL_RETURN_BUTTON, 370, 340, 90, 30, _("Close")); + { + char const * const dummy = N_("Close|^[^M"); + fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 340, 90, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); - fl_set_object_callback(obj, C_FormBaseOKCB, 0); + fl_set_object_callback(obj, C_FormBaseCancelCB, 0); { char const * const dummy = N_("Update|#Uu"); fdui->button_update = obj = fl_add_button(FL_NORMAL_BUTTON, 270, 340, 90, 30, idex(_(dummy))); diff --git a/src/frontends/xforms/form_browser.h b/src/frontends/xforms/form_browser.h index 4f061c4528..2a780f7948 100644 --- a/src/frontends/xforms/form_browser.h +++ b/src/frontends/xforms/form_browser.h @@ -5,7 +5,7 @@ #define FD_form_browser_h_ /** Callbacks, globals and object handlers **/ -extern "C" void C_FormBaseOKCB(FL_OBJECT *, long); +extern "C" void C_FormBaseCancelCB(FL_OBJECT *, long); extern "C" void C_FormBaseInputCB(FL_OBJECT *, long); diff --git a/src/frontends/xforms/form_citation.C b/src/frontends/xforms/form_citation.C index a42b253118..f5dbf4058b 100644 --- a/src/frontends/xforms/form_citation.C +++ b/src/frontends/xforms/form_citation.C @@ -107,7 +107,7 @@ FD_form_citation * FormCitation::build_citation() fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); { - char const * const dummy = N_("Cancel|#C^["); + char const * const dummy = N_("Cancel|^["); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 330, 630, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_copyright.C b/src/frontends/xforms/form_copyright.C index eb68ba588d..3d9425c06e 100644 --- a/src/frontends/xforms/form_copyright.C +++ b/src/frontends/xforms/form_copyright.C @@ -38,7 +38,7 @@ FD_form_copyright * FormCopyright::build_copyright() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_lalign(obj, FL_ALIGN_CENTER|FL_ALIGN_INSIDE); { - char const * const dummy = N_("Close|#C^[^M"); + char const * const dummy = N_("Close|^[^M"); fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 160, 390, 140, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_document.C b/src/frontends/xforms/form_document.C index 3c7e0295a5..574eba255a 100644 --- a/src/frontends/xforms/form_document.C +++ b/src/frontends/xforms/form_document.C @@ -30,7 +30,7 @@ FD_form_tabbed_document * FormDocument::build_tabbed_document() fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 20, 15, 435, 365, _("Tabbed folder")); fl_set_object_resize(obj, FL_RESIZE_ALL); { - char const * const dummy = N_("Cancel|#C^["); + char const * const dummy = N_("Cancel|^["); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 355, 410, 100, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_error.C b/src/frontends/xforms/form_error.C index fe14e8377e..591fa980fd 100644 --- a/src/frontends/xforms/form_error.C +++ b/src/frontends/xforms/form_error.C @@ -28,7 +28,7 @@ FD_form_error * FormError::build_error() fdui->message = obj = fl_add_box(FL_FRAME_BOX, 10, 10, 380, 180, ""); fl_set_object_gravity(obj, FL_NorthWest, FL_SouthEast); { - char const * const dummy = N_("Close|#C^[^M"); + char const * const dummy = N_("Close|^[^M"); fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 135, 200, 130, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_index.C b/src/frontends/xforms/form_index.C index c13054afaf..a1ff9c7b37 100644 --- a/src/frontends/xforms/form_index.C +++ b/src/frontends/xforms/form_index.C @@ -25,8 +25,11 @@ FD_form_index * FormIndex::build_index() fdui->form = fl_bgn_form(FL_NO_BOX, 520, 100); fdui->form->u_vdata = this; obj = fl_add_box(FL_UP_BOX, 0, 0, 520, 100, ""); - fdui->input_key = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 420, 30, _("Keyword")); - fl_set_input_shortcut(obj, scex(_("Keyword|#K")), 1); + { + char const * const dummy = N_("Keyword|#K"); + fdui->input_key = obj = fl_add_input(FL_NORMAL_INPUT, 90, 10, 420, 30, idex(_(dummy))); + fl_set_button_shortcut(obj, scex(_(dummy)), 1); + } fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseInputCB, 0); @@ -50,7 +53,7 @@ FD_form_index * FormIndex::build_index() fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); { - char const * const dummy = N_("Cancel|#C^["); + char const * const dummy = N_("Cancel|^["); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 60, 100, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_paragraph.C b/src/frontends/xforms/form_paragraph.C index 69ba516349..08fb5791a8 100644 --- a/src/frontends/xforms/form_paragraph.C +++ b/src/frontends/xforms/form_paragraph.C @@ -314,7 +314,7 @@ FD_form_tabbed_paragraph * FormParagraph::build_tabbed_paragraph() fdui->tabbed_folder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 10, 10, 490, 270, _("Tabbed folder")); fl_set_object_resize(obj, FL_RESIZE_ALL); { - char const * const dummy = N_("Cancel|C#C^["); + char const * const dummy = N_("Cancel|^["); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 400, 310, 100, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C index 7ac1325dac..30aabf7eb7 100644 --- a/src/frontends/xforms/form_preferences.C +++ b/src/frontends/xforms/form_preferences.C @@ -35,7 +35,7 @@ FD_form_preferences * FormPreferences::build_preferences() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); { - char const * const dummy = N_("Cancel|C#C^["); + char const * const dummy = N_("Cancel|^["); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 370, 390, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_print.C b/src/frontends/xforms/form_print.C index 1ae592570e..b09ddd223d 100644 --- a/src/frontends/xforms/form_print.C +++ b/src/frontends/xforms/form_print.C @@ -60,7 +60,7 @@ FD_form_print * FormPrint::build_print() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); { - char const * const dummy = N_("Cancel|C#C^["); + char const * const dummy = N_("Cancel|^["); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 230, 350, 100, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_ref.C b/src/frontends/xforms/form_ref.C index 0956ba796f..6c950cd066 100644 --- a/src/frontends/xforms/form_ref.C +++ b/src/frontends/xforms/form_ref.C @@ -72,7 +72,7 @@ FD_form_ref * FormRef::build_ref() fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseOKCB, 0); { - char const * const dummy = N_("Cancel|#C^["); + char const * const dummy = N_("Cancel|^["); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 430, 300, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_tabular.C b/src/frontends/xforms/form_tabular.C index cd8ace95d7..ca7c8d5114 100644 --- a/src/frontends/xforms/form_tabular.C +++ b/src/frontends/xforms/form_tabular.C @@ -28,7 +28,7 @@ FD_form_tabular * FormTabular::build_tabular() fdui->tabFolder = obj = fl_add_tabfolder(FL_TOP_TABFOLDER, 0, 0, 505, 250, _("Tabbed folder")); fl_set_object_resize(obj, FL_RESIZE_ALL); { - char const * const dummy = N_("Close|#C^["); + char const * const dummy = N_("Close|^[^M"); fdui->button_close = obj = fl_add_button(FL_NORMAL_BUTTON, 415, 260, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_tabular_create.C b/src/frontends/xforms/form_tabular_create.C index 471550b25d..80d46292c0 100644 --- a/src/frontends/xforms/form_tabular_create.C +++ b/src/frontends/xforms/form_tabular_create.C @@ -36,7 +36,7 @@ FD_form_tabular_create * FormTabularCreate::build_tabular_create() fl_set_object_lsize(obj, FL_NORMAL_SIZE); fl_set_object_callback(obj, C_FormBaseApplyCB, 0); { - char const * const dummy = N_("Cancel|#C^["); + char const * const dummy = N_("Cancel|^["); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 210, 90, 90, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_toc.C b/src/frontends/xforms/form_toc.C index 9f1701bbec..46538a0e38 100644 --- a/src/frontends/xforms/form_toc.C +++ b/src/frontends/xforms/form_toc.C @@ -45,7 +45,7 @@ FD_form_toc * FormToc::build_toc() fl_set_object_gravity(obj, FL_SouthEast, FL_SouthEast); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Close|#C^[^M"); + char const * const dummy = N_("Close|^[^M"); fdui->button_cancel = obj = fl_add_button(FL_RETURN_BUTTON, 310, 300, 100, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/form_url.C b/src/frontends/xforms/form_url.C index d5fd5e1a2e..4d5e4b002e 100644 --- a/src/frontends/xforms/form_url.C +++ b/src/frontends/xforms/form_url.C @@ -54,7 +54,7 @@ FD_form_url * FormUrl::build_url() fl_set_object_resize(obj, FL_RESIZE_X); fl_set_object_callback(obj, C_FormBaseInputCB, 0); { - char const * const dummy = N_("Cancel|#C^["); + char const * const dummy = N_("Cancel|^["); fdui->button_cancel = obj = fl_add_button(FL_NORMAL_BUTTON, 410, 130, 100, 30, idex(_(dummy))); fl_set_button_shortcut(obj, scex(_(dummy)), 1); } diff --git a/src/frontends/xforms/forms/form_browser.fd b/src/frontends/xforms/forms/form_browser.fd index 525ee0bb2b..2a7071f89a 100644 --- a/src/frontends/xforms/forms/form_browser.fd +++ b/src/frontends/xforms/forms/form_browser.fd @@ -50,7 +50,7 @@ argument: -------------------- class: FL_BUTTON -type: RETURN_BUTTON +type: NORMAL_BUTTON box: 370 340 90 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 @@ -58,12 +58,12 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Close -shortcut: ^M +label: Close|^[^M +shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast name: button_close -callback: C_FormBaseOKCB +callback: C_FormBaseCancelCB argument: 0 -------------------- diff --git a/src/frontends/xforms/forms/form_citation.fd b/src/frontends/xforms/forms/form_citation.fd index 29ea49335c..7f67f87188 100644 --- a/src/frontends/xforms/forms/form_citation.fd +++ b/src/frontends/xforms/forms/form_citation.fd @@ -274,7 +274,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_DEFAULT_SIZE lcol: FL_BLACK -label: Cancel|#C^[ +label: Cancel|^[ shortcut: resize: FL_RESIZE_ALL gravity: FL_SouthEast FL_SouthEast diff --git a/src/frontends/xforms/forms/form_copyright.fd b/src/frontends/xforms/forms/form_copyright.fd index 305fc93cd3..cc16d01bd3 100644 --- a/src/frontends/xforms/forms/form_copyright.fd +++ b/src/frontends/xforms/forms/form_copyright.fd @@ -94,7 +94,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Close|#C^[^M +label: Close|^[^M shortcut: resize: FL_RESIZE_NONE gravity: FL_South FL_South diff --git a/src/frontends/xforms/forms/form_document.fd b/src/frontends/xforms/forms/form_document.fd index 11e2ddbf4d..b8bb057c0c 100644 --- a/src/frontends/xforms/forms/form_document.fd +++ b/src/frontends/xforms/forms/form_document.fd @@ -59,7 +59,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cancel|#C^[ +label: Cancel|^[ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_error.fd b/src/frontends/xforms/forms/form_error.fd index 65f81813cf..e60d43106e 100644 --- a/src/frontends/xforms/forms/form_error.fd +++ b/src/frontends/xforms/forms/form_error.fd @@ -58,7 +58,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_DEFAULT_SIZE lcol: FL_BLACK -label: Close|#C^[^M +label: Close|^[^M shortcut: resize: FL_RESIZE_NONE gravity: FL_South FL_South diff --git a/src/frontends/xforms/forms/form_index.fd b/src/frontends/xforms/forms/form_index.fd index f13056e3aa..4b32d17eac 100644 --- a/src/frontends/xforms/forms/form_index.fd +++ b/src/frontends/xforms/forms/form_index.fd @@ -40,8 +40,8 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Keyword -shortcut: Keyword|#K +label: Keyword|#K +shortcut: resize: FL_RESIZE_X gravity: FL_NoGravity FL_NoGravity name: input_key @@ -112,7 +112,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cancel|#C^[ +label: Cancel|^[ shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast diff --git a/src/frontends/xforms/forms/form_paragraph.fd b/src/frontends/xforms/forms/form_paragraph.fd index 5f3c8ef97d..6e692984c1 100644 --- a/src/frontends/xforms/forms/form_paragraph.fd +++ b/src/frontends/xforms/forms/form_paragraph.fd @@ -970,7 +970,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cancel|C#C^[ +label: Cancel|^[ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd index ac86a3ce6e..e1e1931e39 100644 --- a/src/frontends/xforms/forms/form_preferences.fd +++ b/src/frontends/xforms/forms/form_preferences.fd @@ -77,7 +77,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cancel|C#C^[ +label: Cancel|^[ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_print.fd b/src/frontends/xforms/forms/form_print.fd index 8ad25dc308..548bb50da8 100644 --- a/src/frontends/xforms/forms/form_print.fd +++ b/src/frontends/xforms/forms/form_print.fd @@ -184,7 +184,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cancel|C#C^[ +label: Cancel|^[ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_ref.fd b/src/frontends/xforms/forms/form_ref.fd index 2b2f0e10a1..5a974f4860 100644 --- a/src/frontends/xforms/forms/form_ref.fd +++ b/src/frontends/xforms/forms/form_ref.fd @@ -184,7 +184,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_DEFAULT_SIZE lcol: FL_BLACK -label: Cancel|#C^[ +label: Cancel|^[ shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast diff --git a/src/frontends/xforms/forms/form_tabular.fd b/src/frontends/xforms/forms/form_tabular.fd index 1e65285999..a62399ed84 100644 --- a/src/frontends/xforms/forms/form_tabular.fd +++ b/src/frontends/xforms/forms/form_tabular.fd @@ -59,7 +59,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Close|#C^[ +label: Close|^[^M shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_tabular_create.fd b/src/frontends/xforms/forms/form_tabular_create.fd index 96aa461e58..838c000b14 100644 --- a/src/frontends/xforms/forms/form_tabular_create.fd +++ b/src/frontends/xforms/forms/form_tabular_create.fd @@ -77,7 +77,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cancel|#C^[ +label: Cancel|^[ shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_toc.fd b/src/frontends/xforms/forms/form_toc.fd index 4b801b6f61..75624447cd 100644 --- a/src/frontends/xforms/forms/form_toc.fd +++ b/src/frontends/xforms/forms/form_toc.fd @@ -94,8 +94,8 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Close|#C^[^M -shortcut: ^M +label: Close|^[^M +shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast name: button_cancel diff --git a/src/frontends/xforms/forms/form_url.fd b/src/frontends/xforms/forms/form_url.fd index 5b4374bda1..7fa732da88 100644 --- a/src/frontends/xforms/forms/form_url.fd +++ b/src/frontends/xforms/forms/form_url.fd @@ -94,7 +94,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cancel|#C^[ +label: Cancel|^[ shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast