[LyX/master] use dialog-show with search dialogs

Juergen Spitzmueller spitz at lyx.org
Tue Feb 16 12:32:21 UTC 2021


commit 222d62312e2e19b2b613e9b109d4817c75e7a3d0
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Tue Feb 16 13:35:04 2021 +0100

    use dialog-show with search dialogs
    
    Now that focus setting works, and since find dialog can be closed with
    Esc, this makes sense to get back from workarea to dialog.
---
 lib/bind/cua.bind     |    4 ++--
 lib/bind/emacs.bind   |    6 +++---
 lib/bind/mac.bind     |    4 ++--
 lib/bind/xemacs.bind  |    6 +++---
 lib/doc/UserGuide.lyx |    6 +-----
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/lib/bind/cua.bind b/lib/bind/cua.bind
index 4e415c2..2ba0064 100644
--- a/lib/bind/cua.bind
+++ b/lib/bind/cua.bind
@@ -72,8 +72,8 @@ Format 5
 \bind "C-S-M"			"math-display"
 \bind "C-M-n"			"command-sequence math-display; math-number-toggle;"
 
-\bind "C-f"			"dialog-toggle findreplace"
-\bind "C-S-f"			"dialog-toggle findreplaceadv"
+\bind "C-f"			"dialog-show findreplace"
+\bind "C-S-f"			"dialog-show findreplaceadv"
 \bind "C-i"			"inset-toggle"		# 'i' for Inset
 \bind "C-M-i"			"inset-settings"
 
diff --git a/lib/bind/emacs.bind b/lib/bind/emacs.bind
index 2062830..3a6a520 100644
--- a/lib/bind/emacs.bind
+++ b/lib/bind/emacs.bind
@@ -54,9 +54,9 @@ Format 5
 # this is "quoted-insert" a total different meaning from "quote-insert"
 \bind "C-q"                    "self-insert \""
 #bind "C-r"                    "------"
-\bind "C-s"                    "dialog-toggle findreplace"
-\bind "C-S-s"                  "dialog-toggle findreplaceadv"
-\bind "M-~S-percent"           "dialog-toggle findreplaceadv"
+\bind "C-s"                    "dialog-show findreplace"
+\bind "C-S-s"                  "dialog-show findreplaceadv"
+\bind "M-~S-percent"           "dialog-show findreplaceadv"
 
 \bind "C-t"                    "chars-transpose"
 
diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind
index 8d54e4c..d90b78b 100644
--- a/lib/bind/mac.bind
+++ b/lib/bind/mac.bind
@@ -143,8 +143,8 @@ Format 5
 \bind "C-e"                          "search-string-set"
 \bind "C-M-e"                        "font-emph"
 #  +: "Command-F"                    # Open a Find window
-\bind "C-f"                          "dialog-toggle findreplace"
-\bind "C-S-f"                        "dialog-toggle findreplaceadv"
+\bind "C-f"                          "dialog-show findreplace"
+\bind "C-S-f"                        "dialog-show findreplaceadv"
 #  -: "Option-Command-F"             # Move to the search field control
 #  +: "Command-G"                    # Find the next occurrence of the selection
 \bind "C-g"                          "word-find-forward"
diff --git a/lib/bind/xemacs.bind b/lib/bind/xemacs.bind
index b091ea1..e336b2a 100644
--- a/lib/bind/xemacs.bind
+++ b/lib/bind/xemacs.bind
@@ -53,9 +53,9 @@ Format 5
 # this is "quoted-insert" a total different meaning from "quote-insert"
 \bind "C-q"                    "self-insert \""
 #bind "C-r"                    "------"
-\bind "C-s"                    "dialog-toggle findreplace"
-\bind "C-S-s"                  "dialog-toggle findreplaceadv"
-\bind "M-~S-percent"           "dialog-toggle findreplaceadv"
+\bind "C-s"                    "dialog-show findreplace"
+\bind "C-S-s"                  "dialog-show findreplaceadv"
+\bind "M-~S-percent"           "dialog-show findreplaceadv"
 
 # should be "chars-transpose" (swaps two chars)
 #bind "C-t"                    "------"
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index f554994..0ed1e6e 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -1253,7 +1253,7 @@ Replace
 
 \begin_inset Info
 type  "shortcut"
-arg   "dialog-toggle findreplace"
+arg   "dialog-show findreplace"
 \end_inset
 
  or
@@ -8953,14 +8953,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is Verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8973,7 +8971,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in Verbatim:"%&$§#~'`
 \backslash
 }][{|
@@ -8997,7 +8994,6 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim*
-
 This is Verbatim*.
 \end_layout
 


More information about the lyx-cvs mailing list