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 4dc287b69972c30b755b3ff358fc64f7851fe0c6..3fa02178988ac1951743906c3fe64e54b2370947 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,17 @@
+2003-01-15  Angus Leeming  <leeming@lyx.org>
+
+       * 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  <j.spitzmueller@gmx.de>
 
        * 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 2f167d30c7955c2a911d95db028206036fef8833..4425d27ba69f32e124b9e31230e3ff34f1f60ed7 100644 (file)
--- 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 fb7c83d5686455044b8a015ed972a2f841606346..34df4757360481d7e446886aa7162299bf8067d1 100644 (file)
--- 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 539d107c1cf5883162dd3dc3c900d4a984445073..f37d24fa18e49e2e91dfa66d409c0794909d7648 100644 (file)
--- 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 3a7d6967ee1aa4ebf9638f4b616a4e09b82d08df..5ef20c9bdfec6e5bf54f75514f93385c6c620af6 100644 (file)
--- 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 46fcb0ff066f1ad068737edd8e55ada3b286aab2..235b14f3d519df1cf4a339a783a4ddf2f764b428 100644 (file)
--- 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 095de3709632a34a737b31122d9afe5a823bf41d..707f9b74a8a59e27322520b4f613a2ced17565d6 100644 (file)
--- 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 c47a63a6121ddd7d36e5ba361445b5565434917b..0b72303397dc63c8505ff2702703fddd35a3e434 100644 (file)
--- 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 a031853515aeba09c125a79a9193593a00ad46b3..4629969893db4e064cdf106384f278098e6f71e0 100644 (file)
--- 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 333b0aa04936b96ec43fb56c0f5ebb0ebdeb3f3b..a8dbe4d8d692a72fece1bf8b05dd473b9f29122c 100644 (file)
--- 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