Merge branch 'master' of github.com:chrys87/fenrir

chrys87 · Feb 15, 2019 · 851be84 · 851be84
2 parents 287d2e6 + c5160b6
commit 851be84
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 42 deletions.
diff --git a/config/keyboard/desktop.conf b/config/keyboard/desktop.conf
@@ -93,12 +93,6 @@ KEY_FENRIR,KEY_S=spell_check
 2,KEY_FENRIR,KEY_S=add_word_to_spell_check
 KEY_FENRIR,KEY_SHIFT,KEY_S=remove_word_from_spell_check
 KEY_FENRIR,KEY_BACKSPACE=forward_keypress
-KEY_FENRIR,KEY_UP=inc_speech_volume
-KEY_FENRIR,KEY_DOWN=dec_speech_volume
-KEY_FENRIR,KEY_RIGHT=inc_speech_rate
-KEY_FENRIR,KEY_LEFT=dec_speech_rate
-KEY_FENRIR,KEY_ALT,KEY_RIGHT=inc_speech_pitch
-KEY_FENRIR,KEY_ALT,KEY_LEFT=dec_speech_pitch
 KEY_FENRIR,KEY_ALT,KEY_UP=inc_sound_volume
 KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_sound_volume
 KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_C=clear_clipboard

diff --git a/config/keyboard/laptop.conf b/config/keyboard/laptop.conf
@@ -93,12 +93,6 @@ KEY_FENRIR,KEY_S=spell_check
 2,KEY_FENRIR,KEY_S=add_word_to_spell_check
 KEY_FENRIR,KEY_SHIFT,KEY_S=remove_word_from_spell_check
 KEY_FENRIR,KEY_BACKSPACE=forward_keypress
-KEY_FENRIR,KEY_UP=inc_speech_volume
-KEY_FENRIR,KEY_DOWN=dec_speech_volume
-KEY_FENRIR,KEY_RIGHT=inc_speech_rate
-KEY_FENRIR,KEY_LEFT=dec_speech_rate
-KEY_FENRIR,KEY_ALT,KEY_RIGHT=inc_speech_pitch
-KEY_FENRIR,KEY_ALT,KEY_LEFT=dec_speech_pitch
 KEY_FENRIR,KEY_ALT,KEY_UP=inc_sound_volume
 KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_sound_volume
 KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_C=clear_clipboard
@@ -116,12 +110,12 @@ KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
 KEY_FENRIR,KEY_X=set_mark
 KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 KEY_FENRIR,KEY_F10=toggle_vmenu_mode
-#=current_quick_menu_entry
-#=current_quick_menu_value
-#=next_quick_menu_entry
-#=next_quick_menu_value
-#=prev_quick_menu_entry
-#=prev_quick_menu_value
+KEY_FENRIR,KEY_UP=inc_speech_volume
+KEY_FENRIR,KEY_DOWN=dec_speech_volume
+KEY_FENRIR,KEY_RIGHT=inc_speech_rate
+KEY_FENRIR,KEY_LEFT=dec_speech_rate
+KEY_FENRIR,KEY_ALT,KEY_RIGHT=inc_speech_pitch
+KEY_FENRIR,KEY_ALT,KEY_LEFT=dec_speech_pitch
 # linux specific
 KEY_FENRIR,KEY_F7=import_clipboard_from_x
 KEY_FENRIR,KEY_F8=export_clipboard_to_x

diff --git a/config/keyboard/nvda-desktop.conf b/config/keyboard/nvda-desktop.conf
@@ -97,12 +97,6 @@ KEY_FENRIR,KEY_F7=spell_check
 2,KEY_FENRIR,KEY_S=add_word_to_spell_check
 KEY_FENRIR,KEY_SHIFT,KEY_S=remove_word_from_spell_check
 KEY_FENRIR,KEY_F2=forward_keypress
-KEY_FENRIR,KEY_UP=inc_speech_volume
-KEY_FENRIR,KEY_DOWN=dec_speech_volume
-KEY_FENRIR,KEY_RIGHT=inc_speech_rate
-KEY_FENRIR,KEY_LEFT=dec_speech_rate
-KEY_FENRIR,KEY_ALT,KEY_RIGHT=inc_speech_pitch
-KEY_FENRIR,KEY_ALT,KEY_LEFT=dec_speech_pitch
 KEY_FENRIR,KEY_ALT,KEY_UP=inc_sound_volume
 KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_sound_volume
 KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_C=clear_clipboard
@@ -120,12 +114,12 @@ KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
 KEY_FENRIR,KEY_F9=set_mark
 KEY_FENRIR,KEY_F10=marked_text
 KEY_FENRIR,KEY_F10=toggle_vmenu_mode
-#=current_quick_menu_entry
-#=current_quick_menu_value
-#=next_quick_menu_entry
-#=next_quick_menu_value
-#=prev_quick_menu_entry
-#=prev_quick_menu_value
+KEY_FENRIR,KEY_SPACE=current_quick_menu_entry
+KEY_FENRIR,KEY_CTRL,KEY_SPACE=current_quick_menu_value
+KEY_FENRIR,KEY_CTRL,KEY_RIGHT=next_quick_menu_entry
+KEY_FENRIR,KEY_UP=next_quick_menu_value
+KEY_FENRIR,KEY_CTRL,KEY_LEFT=prev_quick_menu_entry
+KEY_FENRIR,KEY_DOWN=prev_quick_menu_value
 # linux specific
 #=import_clipboard_from_x
 KEY_FENRIR,KEY_F8=export_clipboard_to_x

diff --git a/config/keyboard/nvda-laptop.conf b/config/keyboard/nvda-laptop.conf
@@ -97,12 +97,6 @@ KEY_FENRIR,KEY_F7=spell_check
 2,KEY_FENRIR,KEY_S=add_word_to_spell_check
 KEY_FENRIR,KEY_SHIFT,KEY_S=remove_word_from_spell_check
 KEY_FENRIR,KEY_F2=forward_keypress
-#=inc_speech_volume
-#=dec_speech_volume
-#=inc_speech_rate
-#=dec_speech_rate
-KEY_FENRIR,KEY_ALT,KEY_RIGHT=inc_speech_pitch
-KEY_FENRIR,KEY_ALT,KEY_LEFT=dec_speech_pitch
 KEY_FENRIR,KEY_ALT,KEY_UP=inc_sound_volume
 KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_sound_volume
 KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_C=clear_clipboard
@@ -120,12 +114,12 @@ KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
 KEY_FENRIR,KEY_F9=set_mark
 KEY_FENRIR,KEY_F10=marked_text
 KEY_FENRIR,KEY_SHIFT,KEY_F10=toggle_vmenu_mode
-#=current_quick_menu_entry
-#=current_quick_menu_value
-#=next_quick_menu_entry
-#=next_quick_menu_value
-#=prev_quick_menu_entry
-#=prev_quick_menu_value
+KEY_FENRIR,KEY_SPACE=current_quick_menu_entry
+KEY_FENRIR,KEY_CTRL,KEY_SPACE=current_quick_menu_value
+KEY_FENRIR,KEY_CTRL,KEY_RIGHT=next_quick_menu_entry
+KEY_FENRIR,KEY_UP=next_quick_menu_value
+KEY_FENRIR,KEY_CTRL,KEY_LEFT=prev_quick_menu_entry
+KEY_FENRIR,KEY_DOWN=prev_quick_menu_value
 # linux specific
 #=import_clipboard_from_x
 KEY_FENRIR,KEY_F8=export_clipboard_to_x