From: Angus Leeming Date: Wed, 15 Jan 2003 21:21:01 +0000 (+0000) Subject: Consistent use of Escape and Return as accelerators for Cancel/Close and OK. X-Git-Tag: 1.6.10~17679 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bdbe3acb35f6c3bb8fcc57299014a3b81e7edf76;p=features.git Consistent use of Escape and Return as accelerators for Cancel/Close and OK. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5962 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 4dc287b699..3fa0217898 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,17 @@ +2003-01-15 Angus Leeming + + * forms/form_graphics.fd: s/Ok/OK/ consistent with all other dialogs. + + * form_character.fd: + * form_error.fd: + * form_external.fd: + * form_maths_panel.fd: + * form_maths_space.fd: + * form_maths_style.fd: + * form_spellchecker.fd: + * form_thesaurus.fd: Cancel/Close have Escape and occasionally Return + as accelerators only. + 2003-01-11 Juergen Spitzmueller * FileDialog.C: implement opendir [bug 824], fix mask. diff --git a/src/frontends/xforms/forms/form_character.fd b/src/frontends/xforms/forms/form_character.fd index 2f167d30c7..4425d27ba6 100644 --- a/src/frontends/xforms/forms/form_character.fd +++ b/src/frontends/xforms/forms/form_character.fd @@ -159,7 +159,7 @@ argument: 0 -------------------- class: FL_BUTTON -type: RETURN_BUTTON +type: NORMAL_BUTTON box: 175 375 80 30 boxtype: FL_UP_BOX colors: FL_COL1 FL_COL1 @@ -167,8 +167,8 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Cancel|#N^[ -shortcut: ^M +label: Cancel|^[ +shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast name: button_close diff --git a/src/frontends/xforms/forms/form_error.fd b/src/frontends/xforms/forms/form_error.fd index fb7c83d568..34df475736 100644 --- a/src/frontends/xforms/forms/form_error.fd +++ b/src/frontends/xforms/forms/form_error.fd @@ -58,8 +58,8 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_DEFAULT_SIZE lcol: FL_BLACK -label: Close|^[^M -shortcut: +label: Close|^[ +shortcut: ^M resize: FL_RESIZE_NONE gravity: FL_South FL_South name: button_close diff --git a/src/frontends/xforms/forms/form_external.fd b/src/frontends/xforms/forms/form_external.fd index 539d107c1c..f37d24fa18 100644 --- a/src/frontends/xforms/forms/form_external.fd +++ b/src/frontends/xforms/forms/form_external.fd @@ -220,7 +220,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_SouthEast FL_SouthEast diff --git a/src/frontends/xforms/forms/form_graphics.fd b/src/frontends/xforms/forms/form_graphics.fd index 3a7d6967ee..5ef20c9bdf 100644 --- a/src/frontends/xforms/forms/form_graphics.fd +++ b/src/frontends/xforms/forms/form_graphics.fd @@ -77,7 +77,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Ok +label: OK shortcut: ^M resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_maths_panel.fd b/src/frontends/xforms/forms/form_maths_panel.fd index 46fcb0ff06..235b14f3d5 100644 --- a/src/frontends/xforms/forms/form_maths_panel.fd +++ b/src/frontends/xforms/forms/form_maths_panel.fd @@ -41,7 +41,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Close +label: Close|^[ shortcut: ^M resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast diff --git a/src/frontends/xforms/forms/form_maths_space.fd b/src/frontends/xforms/forms/form_maths_space.fd index 095de37096..707f9b74a8 100644 --- a/src/frontends/xforms/forms/form_maths_space.fd +++ b/src/frontends/xforms/forms/form_maths_space.fd @@ -167,7 +167,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Close +label: Close|^[ shortcut: ^M resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_maths_style.fd b/src/frontends/xforms/forms/form_maths_style.fd index c47a63a612..0b72303397 100644 --- a/src/frontends/xforms/forms/form_maths_style.fd +++ b/src/frontends/xforms/forms/form_maths_style.fd @@ -77,7 +77,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Close +label: Close|^[ shortcut: ^M resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/frontends/xforms/forms/form_spellchecker.fd b/src/frontends/xforms/forms/form_spellchecker.fd index a031853515..4629969893 100644 --- a/src/frontends/xforms/forms/form_spellchecker.fd +++ b/src/frontends/xforms/forms/form_spellchecker.fd @@ -203,7 +203,7 @@ alignment: FL_ALIGN_CENTER style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: Close|#C^[ +label: Close|^[ shortcut: resize: FL_RESIZE_NONE gravity: FL_SouthEast FL_SouthEast diff --git a/src/frontends/xforms/forms/form_thesaurus.fd b/src/frontends/xforms/forms/form_thesaurus.fd index 333b0aa049..a8dbe4d8d6 100644 --- a/src/frontends/xforms/forms/form_thesaurus.fd +++ b/src/frontends/xforms/forms/form_thesaurus.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|^[ shortcut: resize: FL_RESIZE_ALL gravity: FL_NorthWest FL_NorthWest