commit 25ff03d120725ad736de25366e98f1e797b643bc
Author: Kornel Benko <[email protected]>
Date: Sat Jun 23 19:00:04 2018 +0200
Cmake tests: Adapt some keytests due to changed key-bindings
---
development/autotests/findadv-06-in.txt | 8 ++--
development/autotests/findadv-07-in.txt | 8 ++--
development/autotests/findadv-09-in.txt | 6 ++--
development/autotests/findadv-14-in.txt | 13 ++++----
development/autotests/keytest.py | 2 +-
lib/bind/sk/menus.bind | 47 +++++++++++++++++++++++++++---
6 files changed, 60 insertions(+), 24 deletions(-)
diff --git a/development/autotests/findadv-06-in.txt
b/development/autotests/findadv-06-in.txt
index 73060e4..f3c16fb 100644
--- a/development/autotests/findadv-06-in.txt
+++ b/development/autotests/findadv-06-in.txt
@@ -5,16 +5,16 @@ CO: findadv-06.ctrl
TestBegin test.lyx -dbg key,find > findadv-06.loga.txt 2>&1
CN: Part 1
KK: foo\[Return]
-KK: \Ap2
+KK: \Ao2
KK: foo\[Return]
-KK: \Aps
+KK: \Ao9
KK: foo\C\[Home]
KK: \Axbuffer-write\[Return]
KK: \Axdialog-show findreplaceadv\[Return]
# Uncheck ignore format
KK: \At\Ai\Ah
KK: \Aj
-KK: \Ap2
+KK: \Ao2
KK: foo\[Return]
CP: Putting selection at .*idx: 0 par: 1 pos: 0\n with len: 3
#
@@ -25,7 +25,7 @@ KK: \Axdialog-show findreplaceadv\[Return]
KK: \[Delete]
# Uncheck ignore format
#KK: \At\Ai\Ah
-KK: \Aps
+KK: \Ao9
KK: foo\[Return]\[Return]
CP: Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 3
CP: Putting selection at .*idx: 0 par: 2 pos: 0\n with len: 3
diff --git a/development/autotests/findadv-07-in.txt
b/development/autotests/findadv-07-in.txt
index ab6cecf..3d60933 100644
--- a/development/autotests/findadv-07-in.txt
+++ b/development/autotests/findadv-07-in.txt
@@ -6,15 +6,15 @@ TestBegin test.lyx -dbg key,find > findadv-07.loga.txt 2>&1
CN: Part 1
KK: foo bar\[Return]
#select itemized
-KK: \Apb
+KK: \Aob
KK: foo bar\[Return]
-KK: \Aps
+KK: \Ao9
KK: foo bar\C\[Home]
KK: \Axbuffer-write\[Return]
KK: \Axdialog-show findreplaceadv\[Return]
# Uncheck ignore format
KK: \At\Ai\Ah
-KK: \Apb
+KK: \Aob
KK: foo\[Return]
CP: Putting selection at .*idx: 0 par: 1 pos: 0\n with len: 3
#
@@ -25,7 +25,7 @@ KK: \CF
KK: \[Delete]
# Uncheck ignore format
#KK: \At\Ai\Ah
-KK: \Apb
+KK: \Aob
KK: bar\[Return]
CP: Putting selection at .*idx: 0 par: 1 pos: 4\n with len: 3
TestEnd
diff --git a/development/autotests/findadv-09-in.txt
b/development/autotests/findadv-09-in.txt
index bc706f5..10de532 100644
--- a/development/autotests/findadv-09-in.txt
+++ b/development/autotests/findadv-09-in.txt
@@ -4,12 +4,12 @@ Lang sk_SK.utf8
CO: findadv-09.ctrl
TestBegin test.lyx -dbg key,find > findadv-09.loga.txt 2>&1
CN: Part 1
-KK: \Apb
+KK: \Aob
KK: one\[Return]two\[Return]three\C\[Home]\Cs
KK: \CF
# Uncheck ignore format
KK: \At\Ai\Ah
-KK: \Apb
+KK: \Aob
KK: \Axregexp-mode\[Return][a-z]* \[Return]
CP: Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 3
@@ -20,7 +20,7 @@ KK: \CF
KK: \[Delete]
# Uncheck ignore format
#KK: \At\Ai\Ah
-KK: \Apb
+KK: \Aob
KK: \Axregexp-mode\[Return][a-z]* \[Return]\[Return]
CP: Putting selection at .*idx: 0 par: 0 pos: 0\n with len: 3
CP: Putting selection at .*idx: 0 par: 1 pos: 0\n with len: 3
diff --git a/development/autotests/findadv-14-in.txt
b/development/autotests/findadv-14-in.txt
index b821f8e..fb8fd4c 100644
--- a/development/autotests/findadv-14-in.txt
+++ b/development/autotests/findadv-14-in.txt
@@ -1,18 +1,17 @@
# Finding displayed maths with ignore-format on&off (might affect #7596)
-UseShortcut "C-F23" "math-display"
-PrepareShortcuts
+# \Amd ==> math-display
#
Lang sk_SK.utf8
CO: findadv-14.ctrl
TestBegin test.lyx -dbg key,find > findadv-14.loga.txt 2>&1
CN: Part 1
-KK: \C\[F23]
+KK: \Amd
KK: x^2 +x^2\C\[Home]
KK: \Cs
KK: \CF
# Uncheck ignore format
KK: \At\Ai\Ah
-KK: \C\[F23]
+KK: \Amd
KK: x^2\[Return]
CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n with
len: 1
#
@@ -21,7 +20,7 @@ KK: \[Escape]\C\[Home]
CP: Key (queried) [action=buffer-begin][Ctrl+Home]
KK: \CF
KK: \[Delete]
-KK: \C\[F23]
+KK: \Amd
KK: x^2\[Return]\[Return]
CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n with
len: 1
CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 2\n with
len: 1
@@ -33,7 +32,7 @@ CP: Key (queried) [action=buffer-begin][Ctrl+Home]
KK: \CF
KK: \[Delete]
KK: \At\Ai\Ah
-KK: \C\[F23]
+KK: \Amd
KK: x^2\[Return]
CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n with
len: 1
@@ -43,7 +42,7 @@ KK: \[Escape]\C\[Home]
CP: Key (queried) [action=buffer-begin][Ctrl+Home]
KK: \CF
KK: \[Delete]
-KK: \C\[F23]
+KK: \Amd
KK: x^2\[Return]\[Return]
CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 0\n with
len: 1
CP: Putting selection at .*idx: 0 par: 0 pos: 0\n.*idx: 0 par: 0 pos: 2\n with
len: 1
diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py
index 02c1d5f..404f2c5 100755
--- a/development/autotests/keytest.py
+++ b/development/autotests/keytest.py
@@ -554,7 +554,7 @@ lyx_window_name = os.environ.get('LYX_WINDOW_NAME')
lyx_other_window_name = None
screenshot_out = os.environ.get('SCREENSHOT_OUT')
lyx_userdir = os.environ.get('LYX_USERDIR')
-lyx_userdir_ver = os.environ.get('LYX_USERDIR_23x')
+lyx_userdir_ver = os.environ.get('LYX_USERDIR_24x')
if lyx_userdir is None:
lyx_userdir = lyx_userdir_ver
diff --git a/lib/bind/sk/menus.bind b/lib/bind/sk/menus.bind
index 3bcd712..fd7770f 100644
--- a/lib/bind/sk/menus.bind
+++ b/lib/bind/sk/menus.bind
@@ -54,13 +54,13 @@ Format 4
# Paragraph menu
#
-\bind "M-o l" "paragraph-params \align left"
-\bind "M-o r" "paragraph-params \align right"
-\bind "M-o c" "paragraph-params \align center"
+#\bind "M-o l" "paragraph-params \align left"
+#\bind "M-o r" "paragraph-params \align right"
+#\bind "M-o c" "paragraph-params \align center"
# It's called Justified in the UI
\bind "M-o j" "paragraph-params \align block"
-\bind "M-o e" "paragraph-params \align default"
-\bind "M-o i" "paragraph-params \indent-toggle"
+#\bind "M-o e" "paragraph-params \align default"
+#\bind "M-o i" "paragraph-params \indent-toggle"
\bind "M-o s" "paragraph-params \paragraph_spacing single"
#
@@ -89,9 +89,46 @@ Format 4
\bind "M-o ~S-4" "layout Subsubsection"
\bind "M-o ~S-5" "layout Paragraph"
\bind "M-o ~S-6" "layout Subparagraph"
+\bind "M-o ~S-9" "layout Standard"
\bind "M-o ~S-asterisk ~S-0" "layout Part*"
\bind "M-o ~S-asterisk ~S-1" "layout Chapter*"
\bind "M-o ~S-asterisk ~S-2" "layout Section*"
+\bind "M-o ~S-asterisk ~S-3" "layout Subsection*"
+\bind "M-o ~S-asterisk ~S-4" "layout Subsubsection*"
+\bind "M-o ~S-asterisk ~S-5" "layout Paragraph*"
+\bind "M-o ~S-asterisk ~S-6" "layout Subparagraph*"
+\bind "M-o a" "layout Abstract"
+\bind "M-o S-A" "layout Author"
+\bind "M-o M-a" "layout Address"
+\bind "M-o C-a" "layout Right_Address"
+\bind "M-o b" "layout Itemize" # bulleted list
+\bind "M-o S-B" "layout Bibliography"
+\bind "M-o c" "layout LyX-Code"
+\bind "M-o S-C" "layout Comment"
+\bind "M-o d" "layout Description"
+\bind "M-o S-D" "layout Date"
+\bind "M-o e" "layout Enumerate" # numbered list
+\bind "M-o f" "layout ShortFoilhead" # Foils!!
+\bind "M-o S-F" "layout Foilhead" # Foils!!
+\bind "M-o i" "layout Itemize" # bulleted list
+\bind "M-o l" "layout List"
+\bind "M-o S-L" "layout LaTeX"
+\bind "M-o n" "layout Enumerate" # numbered list
+\bind "M-o q" "layout Quote"
+\bind "M-o S-Q" "layout Quotation"
+\bind "M-o r" "layout ShortRotatefoilhead" # Foils!!
+\bind "M-o S-R" "layout Rotatefoilhead" # Foils!!
+\bind "M-o t" "layout Title"
+\bind "M-o space" "drop-layouts-choice"
+\bind "M-o v" "layout Verse"
+
+\bind "M-o Left" "outline-out"
+\bind "M-o Right" "outline-in"
+\bind "M-o Up" "outline-up"
+\bind "M-o Down" "outline-down"
+
+\bind "M-o Return" "command-alternatives environment-split ;
environment-split previous"
+\bind "M-o S-Return" "environment-split outer"
#
# Clashes
