From ddc1b43304922675c691507d51f98a52beda1c26 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 8 Jun 2025 13:49:22 -0400 Subject: [PATCH] Commit 1 of 2, code refactor and cleanup. --- .../commands/command_template.py | 1 - .../commands/commands/00_init_commands.py | 1 - .../commands/add_word_to_spell_check.py | 1 - .../commands/announce_fenrir_version.py | 1 - .../commands/commands/attribute_cursor.py | 1 - .../commands/commands/bookmark_1.py | 1 - .../commands/commands/bookmark_10.py | 1 - .../commands/commands/bookmark_2.py | 1 - .../commands/commands/bookmark_3.py | 1 - .../commands/commands/bookmark_4.py | 1 - .../commands/commands/bookmark_5.py | 1 - .../commands/commands/bookmark_6.py | 1 - .../commands/commands/bookmark_7.py | 1 - .../commands/commands/bookmark_8.py | 1 - .../commands/commands/bookmark_9.py | 1 - .../commands/commands/clear_bookmark_1.py | 1 - .../commands/commands/clear_bookmark_10.py | 1 - .../commands/commands/clear_bookmark_2.py | 1 - .../commands/commands/clear_bookmark_3.py | 1 - .../commands/commands/clear_bookmark_4.py | 1 - .../commands/commands/clear_bookmark_5.py | 1 - .../commands/commands/clear_bookmark_6.py | 1 - .../commands/commands/clear_bookmark_7.py | 1 - .../commands/commands/clear_bookmark_8.py | 1 - .../commands/commands/clear_bookmark_9.py | 1 - .../commands/commands/clear_clipboard.py | 1 - .../commands/clear_window_application.py | 1 - .../commands/copy_last_echo_to_clipboard.py | 1 - .../commands/copy_marked_to_clipboard.py | 1 - .../commands/commands/curr_clipboard.py | 1 - .../commands/commands/curr_screen.py | 1 - .../commands/curr_screen_after_cursor.py | 1 - .../commands/curr_screen_before_cursor.py | 1 - .../commands/current_quick_menu_entry.py | 1 - .../commands/current_quick_menu_value.py | 1 - .../commands/commands/cursor_column.py | 1 - .../commands/commands/cursor_lineno.py | 1 - .../commands/commands/cursor_position.py | 1 - .../commands/cursor_read_line_to_cursor.py | 1 - .../commands/cursor_read_to_end_of_line.py | 1 - .../commands/commands/date.py | 1 - .../commands/commands/dec_alsa_volume.py | 1 - .../commands/commands/dec_sound_volume.py | 1 - .../commands/commands/dec_speech_pitch.py | 1 - .../commands/commands/dec_speech_rate.py | 1 - .../commands/commands/dec_speech_volume.py | 1 - .../commands/commands/exit_review.py | 1 - .../commands/export_clipboard_to_x.py | 1 - .../commands/commands/first_clipboard.py | 1 - .../commands/commands/forward_keypress.py | 1 - .../commands/import_clipboard_from_file.py | 1 - .../commands/import_clipboard_from_x.py | 1 - .../commands/commands/inc_alsa_volume.py | 1 - .../commands/commands/inc_sound_volume.py | 1 - .../commands/commands/inc_speech_pitch.py | 1 - .../commands/commands/inc_speech_rate.py | 1 - .../commands/commands/inc_speech_volume.py | 1 - .../commands/commands/indent_curr_line.py | 1 - .../commands/commands/last_clipboard.py | 1 - .../commands/commands/marked_text.py | 1 - .../commands/commands/next_clipboard.py | 1 - .../commands/next_quick_menu_entry.py | 1 - .../commands/next_quick_menu_value.py | 1 - .../commands/commands/paste_clipboard.py | 1 - .../commands/commands/present_first_line.py | 1 - .../commands/commands/present_last_line.py | 1 - .../commands/commands/prev_clipboard.py | 1 - .../commands/prev_quick_menu_entry.py | 1 - .../commands/prev_quick_menu_value.py | 1 - .../commands/commands/progress_bar_monitor.py | 1 - .../commands/commands/quit_fenrir.py | 1 - .../commands/commands/remove_marks.py | 1 - .../commands/remove_word_from_spell_check.py | 1 - .../commands/commands/review_bottom.py | 1 - .../commands/commands/review_curr_char.py | 1 - .../commands/review_curr_char_phonetic.py | 1 - .../commands/commands/review_curr_line.py | 1 - .../commands/commands/review_curr_word.py | 1 - .../commands/review_curr_word_phonetic.py | 1 - .../commands/commands/review_down.py | 1 - .../commands/commands/review_line_begin.py | 1 - .../commands/commands/review_line_end.py | 1 - .../commands/review_line_first_char.py | 1 - .../commands/review_line_last_char.py | 1 - .../commands/commands/review_next_char.py | 1 - .../commands/review_next_char_phonetic.py | 1 - .../commands/commands/review_next_line.py | 1 - .../commands/commands/review_next_word.py | 1 - .../commands/review_next_word_phonetic.py | 1 - .../commands/commands/review_prev_char.py | 1 - .../commands/review_prev_char_phonetic.py | 1 - .../commands/commands/review_prev_line.py | 1 - .../commands/commands/review_prev_word.py | 1 - .../commands/review_prev_word_phonetic.py | 1 - .../commands/review_screen_first_char.py | 1 - .../commands/review_screen_last_char.py | 1 - .../commands/commands/review_top.py | 1 - .../commands/commands/review_up.py | 1 - .../commands/commands/save_settings.py | 1 - .../commands/commands/set_bookmark_1.py | 1 - .../commands/commands/set_bookmark_10.py | 1 - .../commands/commands/set_bookmark_2.py | 1 - .../commands/commands/set_bookmark_3.py | 1 - .../commands/commands/set_bookmark_4.py | 1 - .../commands/commands/set_bookmark_5.py | 1 - .../commands/commands/set_bookmark_6.py | 1 - .../commands/commands/set_bookmark_7.py | 1 - .../commands/commands/set_bookmark_8.py | 1 - .../commands/commands/set_bookmark_9.py | 1 - .../commands/commands/set_mark.py | 1 - .../commands/set_window_application.py | 1 - .../commands/commands/shut_up.py | 1 - .../commands/commands/spell_check.py | 1 - .../commands/commands/subprocess.py | 1 - .../commands/commands/temp_disable_speech.py | 1 - .../commands/commands/time.py | 1 - .../commands/commands/toggle_auto_indent.py | 1 - .../commands/commands/toggle_auto_read.py | 1 - .../commands/toggle_auto_spell_check.py | 1 - .../commands/commands/toggle_auto_time.py | 1 - .../commands/commands/toggle_barrier.py | 1 - .../commands/commands/toggle_emoticons.py | 1 - .../commands/commands/toggle_has_attribute.py | 1 - .../commands/toggle_highlight_tracking.py | 1 - .../commands/commands/toggle_output.py | 1 - .../commands/toggle_punctuation_level.py | 1 - .../commands/commands/toggle_sound.py | 2 - .../commands/commands/toggle_speech.py | 1 - .../commands/commands/toggle_tutorial_mode.py | 1 - .../commands/commands/toggle_vmenu_mode.py | 1 - .../commands/help/curr_help.py | 2 - .../commands/help/next_help.py | 2 - .../commands/help/prev_help.py | 2 - .../commands/onByteInput/10000-shut_up.py | 1 - .../onByteInput/15000-enable_temp_speech.py | 1 - .../onCursorChange/15000-char_echo.py | 2 - .../onCursorChange/25000-word_echo_type.py | 1 - .../onCursorChange/35000-spell_check.py | 1 - .../onCursorChange/45000-char_delete_echo.py | 1 - ...resent_char_if_cursor_change_horizontal.py | 1 - .../onCursorChange/55000-tab_completion.py | 1 - .../60000-word_echo_navigation.py | 1 - ...-present_line_if_cursor_change_vertical.py | 1 - .../68000-auto_identation_horizontal.py | 1 - .../onCursorChange/85000-has_attribute.py | 1 - .../onCursorChange/95000-exit_review_mode.py | 1 - .../orig_sorting/45000-char_echo.py | 42 ------ .../orig_sorting/46000-tab_completion.py | 42 ------ ...resent_char_if_cursor_change_horizontal.py | 51 ------- ...-present_line_if_cursor_change_vertical.py | 59 -------- .../orig_sorting/60000-word_echo_type.py | 58 -------- .../61000-word_echo_navigation.py | 54 ------- .../orig_sorting/62000-spell_check.py | 133 ------------------ .../orig_sorting/65000-char_delete_echo.py | 46 ------ .../orig_sorting/66000-exit_review_mode.py | 26 ---- .../orig_sorting/77000-has_attribute.py | 34 ----- .../onCursorChange/resort/15000-char_echo.py | 42 ------ .../resort/25000-word_echo_type.py | 58 -------- .../resort/35000-spell_check.py | 133 ------------------ .../resort/45000-char_delete_echo.py | 46 ------ ...resent_char_if_cursor_change_horizontal.py | 51 ------- .../resort/55000-tab_completion.py | 42 ------ .../resort/60000-word_echo_navigation.py | 54 ------- ...-present_line_if_cursor_change_vertical.py | 59 -------- .../resort/85000-has_attribute.py | 34 ----- .../resort/95000-exit_review_mode.py | 26 ---- .../onHeartBeat/2000-GetSessionInfo.py | 1 - .../commands/onHeartBeat/76000-time.py | 1 - .../commands/onHeartBeat/deactive/1.echo.py | 26 ---- .../commands/onKeyInput/10000-shut_up.py | 2 - .../onKeyInput/15000-enable_temp_speech.py | 1 - .../commands/onKeyInput/80000-capslock.py | 1 - .../commands/onKeyInput/80300-scrolllock.py | 1 - .../commands/onKeyInput/80500-numlock.py | 1 - .../commands/onKeyInput/81000-key_echo.py | 1 - .../onPlugInputDevice/50000-plugSound.py | 1 - .../commands/onScreenChanged/10000-shut_up.py | 2 - .../20000-reset_last_cursor_attribute.py | 2 - .../21000-reset_barrier_change.py | 2 - .../onScreenChanged/70000-barrier_detect.py | 1 - .../80000-screen_change_announcement.py | 1 - .../onScreenChanged/85000-reset_marks.py | 1 - .../89000-leave_review_mode.py | 1 - .../56000-highlight_tracking.py | 1 - .../commands/onScreenUpdate/60000-history.py | 1 - .../commands/onScreenUpdate/70000-incoming.py | 1 - .../onScreenUpdate/75000-incoming_promote.py | 1 - .../onScreenUpdate/80000-barrier_detect.py | 1 - .../onScreenUpdate/rework/70000-incoming.py | 50 ------- .../onSwitchApplicationProfile/default.py | 1 - .../inactive/agetty.py | 31 ---- .../inactive/bash.py | 31 ---- .../inactive/vim.py | 31 ---- .../quickMenu/current_quick_menu_entry.py | 1 - .../quickMenu/current_quick_menu_value.py | 1 - .../quickMenu/next_quick_menu_entry.py | 1 - .../quickMenu/next_quick_menu_value.py | 1 - .../quickMenu/prev_quick_menu_entry.py | 1 - .../quickMenu/prev_quick_menu_value.py | 1 - .../commands/switchTrigger_template.py | 1 - .../vmenu-navigation/curr_vmenu_entry.py | 1 - .../vmenu-navigation/dec_level_vmenu.py | 1 - .../vmenu-navigation/exec_vmenu_entry.py | 1 - .../vmenu-navigation/inc_level_vmenu.py | 1 - .../vmenu-navigation/next_vmenu_entry.py | 1 - .../vmenu-navigation/prev_vmenu_entry.py | 1 - .../commands/vmenu-navigation/search_a.py | 1 - .../commands/vmenu-navigation/search_b.py | 1 - .../commands/vmenu-navigation/search_c.py | 1 - .../commands/vmenu-navigation/search_d.py | 1 - .../commands/vmenu-navigation/search_e.py | 1 - .../commands/vmenu-navigation/search_f.py | 1 - .../commands/vmenu-navigation/search_g.py | 1 - .../commands/vmenu-navigation/search_h.py | 1 - .../commands/vmenu-navigation/search_i.py | 1 - .../commands/vmenu-navigation/search_j.py | 1 - .../commands/vmenu-navigation/search_k.py | 1 - .../commands/vmenu-navigation/search_l.py | 1 - .../commands/vmenu-navigation/search_m.py | 1 - .../commands/vmenu-navigation/search_n.py | 1 - .../commands/vmenu-navigation/search_o.py | 1 - .../commands/vmenu-navigation/search_p.py | 1 - .../commands/vmenu-navigation/search_q.py | 1 - .../commands/vmenu-navigation/search_r.py | 1 - .../commands/vmenu-navigation/search_s.py | 1 - .../commands/vmenu-navigation/search_t.py | 1 - .../commands/vmenu-navigation/search_u.py | 1 - .../commands/vmenu-navigation/search_v.py | 1 - .../commands/vmenu-navigation/search_w.py | 1 - .../commands/vmenu-navigation/search_x.py | 1 - .../commands/vmenu-navigation/search_y.py | 1 - .../commands/vmenu-navigation/search_z.py | 1 - .../vmenu-profiles/KEY/mc/file/open.py | 1 - .../vmenu-profiles/KEY/mc/file/save.py | 1 - .../vmenu-profiles/KEY/mc/search/replace.py | 1 - .../vmenu-profiles/KEY/mc/search/search.py | 1 - .../vmenu-profiles/KEY/mc/search/test.py | 1 - .../vmenu-profiles/KEY/mutt/file/issue.py | 1 - .../vmenu-profiles/KEY/mutt/file/open.py | 1 - .../vmenu-profiles/KEY/mutt/file/save.py | 1 - .../vmenu-profiles/KEY/mutt/search/replace.py | 1 - .../vmenu-profiles/KEY/mutt/search/search.py | 1 - .../vmenu-profiles/KEY/mutt/search/test.py | 1 - .../KEY/nano/Help/about_nano.py | 1 - .../vmenu-profiles/KEY/nano/file/open.py | 1 - .../vmenu-profiles/KEY/nano/file/save.py | 1 - .../vmenu-profiles/KEY/nano/search/replace.py | 1 - .../vmenu-profiles/KEY/nano/search/search.py | 1 - .../vmenu-profiles/KEY/nano/search/test.py | 1 - .../vmenu-profiles/KEY/vim/file/open.py | 1 - .../vmenu-profiles/KEY/vim/file/save.py | 1 - .../vmenu-profiles/KEY/vim/search/replace.py | 1 - .../vmenu-profiles/KEY/vim/search/search.py | 1 - .../vmenu-profiles/KEY/vim/search/test.py | 1 - .../commands/vmenu-profiles/template.py | 1 - src/fenrirscreenreader/core/fenrirManager.py | 2 +- src/fenrirscreenreader/core/screenManager.py | 2 +- src/fenrirscreenreader/core/speechDriver.py | 6 +- src/fenrirscreenreader/utils/line_utils.py | 1 - src/fenrirscreenreader/utils/screen_utils.py | 2 +- 260 files changed, 6 insertions(+), 1505 deletions(-) delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/45000-char_echo.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/46000-tab_completion.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/50000-present_char_if_cursor_change_horizontal.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/55000-present_line_if_cursor_change_vertical.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/60000-word_echo_type.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/61000-word_echo_navigation.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/62000-spell_check.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/65000-char_delete_echo.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/66000-exit_review_mode.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/orig_sorting/77000-has_attribute.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/15000-char_echo.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/25000-word_echo_type.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/35000-spell_check.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/45000-char_delete_echo.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/50000-present_char_if_cursor_change_horizontal.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/55000-tab_completion.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/60000-word_echo_navigation.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/65000-present_line_if_cursor_change_vertical.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/85000-has_attribute.py delete mode 100644 src/fenrirscreenreader/commands/onCursorChange/resort/95000-exit_review_mode.py delete mode 100755 src/fenrirscreenreader/commands/onHeartBeat/deactive/1.echo.py delete mode 100644 src/fenrirscreenreader/commands/onScreenUpdate/rework/70000-incoming.py delete mode 100644 src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/agetty.py delete mode 100644 src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/bash.py delete mode 100644 src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/vim.py diff --git a/src/fenrirscreenreader/commands/command_template.py b/src/fenrirscreenreader/commands/command_template.py index 4b8a1d90..4063c950 100644 --- a/src/fenrirscreenreader/commands/command_template.py +++ b/src/fenrirscreenreader/commands/command_template.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/00_init_commands.py b/src/fenrirscreenreader/commands/commands/00_init_commands.py index a12b0d87..6457a1cc 100644 --- a/src/fenrirscreenreader/commands/commands/00_init_commands.py +++ b/src/fenrirscreenreader/commands/commands/00_init_commands.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug # this command is just to initialize stuff. # like init index lists in memoryManager diff --git a/src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py b/src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py index c7b83f32..80062ad0 100644 --- a/src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py +++ b/src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils import string initialized = False diff --git a/src/fenrirscreenreader/commands/commands/announce_fenrir_version.py b/src/fenrirscreenreader/commands/commands/announce_fenrir_version.py index 8e29064a..6adc18f7 100644 --- a/src/fenrirscreenreader/commands/commands/announce_fenrir_version.py +++ b/src/fenrirscreenreader/commands/commands/announce_fenrir_version.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader import fenrirVersion class command(): diff --git a/src/fenrirscreenreader/commands/commands/attribute_cursor.py b/src/fenrirscreenreader/commands/commands/attribute_cursor.py index 72b66818..ec8010e1 100644 --- a/src/fenrirscreenreader/commands/commands/attribute_cursor.py +++ b/src/fenrirscreenreader/commands/commands/attribute_cursor.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import screen_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/bookmark_1.py b/src/fenrirscreenreader/commands/commands/bookmark_1.py index 23f2b536..0b7c62ec 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_1.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_1.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/bookmark_10.py b/src/fenrirscreenreader/commands/commands/bookmark_10.py index c669abab..75e0ecc2 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_10.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_10.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/bookmark_2.py b/src/fenrirscreenreader/commands/commands/bookmark_2.py index 41b5f18b..7221af45 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_2.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_2.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/bookmark_3.py b/src/fenrirscreenreader/commands/commands/bookmark_3.py index defde3b7..88da7cb9 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_3.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_3.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/bookmark_4.py b/src/fenrirscreenreader/commands/commands/bookmark_4.py index 16428b6b..7f961f47 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_4.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_4.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/bookmark_5.py b/src/fenrirscreenreader/commands/commands/bookmark_5.py index a2859d22..a8e7bd52 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_5.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_5.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/bookmark_6.py b/src/fenrirscreenreader/commands/commands/bookmark_6.py index 4eba278f..e2b89fdf 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_6.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_6.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/bookmark_7.py b/src/fenrirscreenreader/commands/commands/bookmark_7.py index 919d124b..426218db 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_7.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_7.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/bookmark_8.py b/src/fenrirscreenreader/commands/commands/bookmark_8.py index c58a7356..29df0372 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_8.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_8.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/bookmark_9.py b/src/fenrirscreenreader/commands/commands/bookmark_9.py index 57d811a5..7fb4fe11 100644 --- a/src/fenrirscreenreader/commands/commands/bookmark_9.py +++ b/src/fenrirscreenreader/commands/commands/bookmark_9.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils from fenrirscreenreader.utils import line_utils diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_1.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_1.py index 2cbac84e..bbe754cc 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_1.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_1.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_10.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_10.py index 8c19e0ee..50179032 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_10.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_10.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_2.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_2.py index ac084680..a405fc74 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_2.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_2.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_3.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_3.py index 367417d7..8bdd6475 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_3.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_3.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_4.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_4.py index 1d1267b2..8b46f71d 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_4.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_4.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_5.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_5.py index d16ef410..47417c4a 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_5.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_5.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_6.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_6.py index 9797f812..c8a285bb 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_6.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_6.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_7.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_7.py index baaeb133..0e8d6b78 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_7.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_7.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_8.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_8.py index 66328cf3..ad267e11 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_8.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_8.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_bookmark_9.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_9.py index 2a87c4df..5c4a341d 100644 --- a/src/fenrirscreenreader/commands/commands/clear_bookmark_9.py +++ b/src/fenrirscreenreader/commands/commands/clear_bookmark_9.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_clipboard.py b/src/fenrirscreenreader/commands/commands/clear_clipboard.py index a8bb425b..a8d6126f 100644 --- a/src/fenrirscreenreader/commands/commands/clear_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/clear_clipboard.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/clear_window_application.py b/src/fenrirscreenreader/commands/commands/clear_window_application.py index 305f99f5..31e436eb 100644 --- a/src/fenrirscreenreader/commands/commands/clear_window_application.py +++ b/src/fenrirscreenreader/commands/commands/clear_window_application.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py b/src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py index 5129badf..f8b56722 100644 --- a/src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py b/src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py index 7445df70..806aac3e 100644 --- a/src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py @@ -2,7 +2,6 @@ # -*- coding: utf-8 -*- -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/curr_clipboard.py b/src/fenrirscreenreader/commands/commands/curr_clipboard.py index 92d5cd37..0031f835 100644 --- a/src/fenrirscreenreader/commands/commands/curr_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/curr_clipboard.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/curr_screen.py b/src/fenrirscreenreader/commands/commands/curr_screen.py index e4a66fe7..de87910b 100644 --- a/src/fenrirscreenreader/commands/commands/curr_screen.py +++ b/src/fenrirscreenreader/commands/commands/curr_screen.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py b/src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py index cf560d38..6269458a 100644 --- a/src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py +++ b/src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py b/src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py index 627c2cce..7d0afbfc 100644 --- a/src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py +++ b/src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/current_quick_menu_entry.py b/src/fenrirscreenreader/commands/commands/current_quick_menu_entry.py index 0b21ad3c..a89ce3ee 100644 --- a/src/fenrirscreenreader/commands/commands/current_quick_menu_entry.py +++ b/src/fenrirscreenreader/commands/commands/current_quick_menu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/current_quick_menu_value.py b/src/fenrirscreenreader/commands/commands/current_quick_menu_value.py index b9da1e0e..6522e080 100644 --- a/src/fenrirscreenreader/commands/commands/current_quick_menu_value.py +++ b/src/fenrirscreenreader/commands/commands/current_quick_menu_value.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/cursor_column.py b/src/fenrirscreenreader/commands/commands/cursor_column.py index 9f4bb089..f6a9bb82 100644 --- a/src/fenrirscreenreader/commands/commands/cursor_column.py +++ b/src/fenrirscreenreader/commands/commands/cursor_column.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/cursor_lineno.py b/src/fenrirscreenreader/commands/commands/cursor_lineno.py index 739e0b33..938c1356 100644 --- a/src/fenrirscreenreader/commands/commands/cursor_lineno.py +++ b/src/fenrirscreenreader/commands/commands/cursor_lineno.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/cursor_position.py b/src/fenrirscreenreader/commands/commands/cursor_position.py index a267bee1..c00cf38d 100644 --- a/src/fenrirscreenreader/commands/commands/cursor_position.py +++ b/src/fenrirscreenreader/commands/commands/cursor_position.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/cursor_read_line_to_cursor.py b/src/fenrirscreenreader/commands/commands/cursor_read_line_to_cursor.py index 0f0a0fff..80fd8d86 100644 --- a/src/fenrirscreenreader/commands/commands/cursor_read_line_to_cursor.py +++ b/src/fenrirscreenreader/commands/commands/cursor_read_line_to_cursor.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py b/src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py index 4c56f019..5f8b32f6 100644 --- a/src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py +++ b/src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/date.py b/src/fenrirscreenreader/commands/commands/date.py index 3275d2f0..7a95ca1c 100644 --- a/src/fenrirscreenreader/commands/commands/date.py +++ b/src/fenrirscreenreader/commands/commands/date.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import datetime class command(): diff --git a/src/fenrirscreenreader/commands/commands/dec_alsa_volume.py b/src/fenrirscreenreader/commands/commands/dec_alsa_volume.py index 87e719d4..10ef356a 100644 --- a/src/fenrirscreenreader/commands/commands/dec_alsa_volume.py +++ b/src/fenrirscreenreader/commands/commands/dec_alsa_volume.py @@ -11,7 +11,6 @@ try: except: pass -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/dec_sound_volume.py b/src/fenrirscreenreader/commands/commands/dec_sound_volume.py index 097359b8..c0e46354 100644 --- a/src/fenrirscreenreader/commands/commands/dec_sound_volume.py +++ b/src/fenrirscreenreader/commands/commands/dec_sound_volume.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrirscreenreader/commands/commands/dec_speech_pitch.py b/src/fenrirscreenreader/commands/commands/dec_speech_pitch.py index 5ca24a9a..5d9b8d25 100644 --- a/src/fenrirscreenreader/commands/commands/dec_speech_pitch.py +++ b/src/fenrirscreenreader/commands/commands/dec_speech_pitch.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrirscreenreader/commands/commands/dec_speech_rate.py b/src/fenrirscreenreader/commands/commands/dec_speech_rate.py index 1e4462b9..06154298 100644 --- a/src/fenrirscreenreader/commands/commands/dec_speech_rate.py +++ b/src/fenrirscreenreader/commands/commands/dec_speech_rate.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrirscreenreader/commands/commands/dec_speech_volume.py b/src/fenrirscreenreader/commands/commands/dec_speech_volume.py index 6a87edc9..8d44f743 100644 --- a/src/fenrirscreenreader/commands/commands/dec_speech_volume.py +++ b/src/fenrirscreenreader/commands/commands/dec_speech_volume.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrirscreenreader/commands/commands/exit_review.py b/src/fenrirscreenreader/commands/commands/exit_review.py index 01898b14..86ddf87d 100644 --- a/src/fenrirscreenreader/commands/commands/exit_review.py +++ b/src/fenrirscreenreader/commands/commands/exit_review.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py b/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py index 296c93bd..6d460d5c 100644 --- a/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py +++ b/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import os import importlib import _thread diff --git a/src/fenrirscreenreader/commands/commands/first_clipboard.py b/src/fenrirscreenreader/commands/commands/first_clipboard.py index 0511b6da..c2bc287a 100644 --- a/src/fenrirscreenreader/commands/commands/first_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/first_clipboard.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/forward_keypress.py b/src/fenrirscreenreader/commands/commands/forward_keypress.py index c8081254..4c50bc61 100644 --- a/src/fenrirscreenreader/commands/commands/forward_keypress.py +++ b/src/fenrirscreenreader/commands/commands/forward_keypress.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py b/src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py index 249c7c90..0446cb4b 100644 --- a/src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py +++ b/src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils import os diff --git a/src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py b/src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py index 40f395e1..b5ea5222 100644 --- a/src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py +++ b/src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import importlib import _thread import pyperclip diff --git a/src/fenrirscreenreader/commands/commands/inc_alsa_volume.py b/src/fenrirscreenreader/commands/commands/inc_alsa_volume.py index 4580ba25..7a38d4cd 100644 --- a/src/fenrirscreenreader/commands/commands/inc_alsa_volume.py +++ b/src/fenrirscreenreader/commands/commands/inc_alsa_volume.py @@ -11,7 +11,6 @@ try: except: pass -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/inc_sound_volume.py b/src/fenrirscreenreader/commands/commands/inc_sound_volume.py index 9ce291e7..eff01d31 100644 --- a/src/fenrirscreenreader/commands/commands/inc_sound_volume.py +++ b/src/fenrirscreenreader/commands/commands/inc_sound_volume.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrirscreenreader/commands/commands/inc_speech_pitch.py b/src/fenrirscreenreader/commands/commands/inc_speech_pitch.py index 735f7279..fb20a105 100644 --- a/src/fenrirscreenreader/commands/commands/inc_speech_pitch.py +++ b/src/fenrirscreenreader/commands/commands/inc_speech_pitch.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrirscreenreader/commands/commands/inc_speech_rate.py b/src/fenrirscreenreader/commands/commands/inc_speech_rate.py index 91265677..4aa54de0 100644 --- a/src/fenrirscreenreader/commands/commands/inc_speech_rate.py +++ b/src/fenrirscreenreader/commands/commands/inc_speech_rate.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrirscreenreader/commands/commands/inc_speech_volume.py b/src/fenrirscreenreader/commands/commands/inc_speech_volume.py index c4a91444..ecb3dd94 100644 --- a/src/fenrirscreenreader/commands/commands/inc_speech_volume.py +++ b/src/fenrirscreenreader/commands/commands/inc_speech_volume.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrirscreenreader/commands/commands/indent_curr_line.py b/src/fenrirscreenreader/commands/commands/indent_curr_line.py index 3f0ba702..68c12760 100644 --- a/src/fenrirscreenreader/commands/commands/indent_curr_line.py +++ b/src/fenrirscreenreader/commands/commands/indent_curr_line.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/last_clipboard.py b/src/fenrirscreenreader/commands/commands/last_clipboard.py index a5c496ac..e09d7fe8 100644 --- a/src/fenrirscreenreader/commands/commands/last_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/last_clipboard.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/marked_text.py b/src/fenrirscreenreader/commands/commands/marked_text.py index 561f8024..3bf3f094 100644 --- a/src/fenrirscreenreader/commands/commands/marked_text.py +++ b/src/fenrirscreenreader/commands/commands/marked_text.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import mark_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/next_clipboard.py b/src/fenrirscreenreader/commands/commands/next_clipboard.py index 87320f03..7364f62d 100644 --- a/src/fenrirscreenreader/commands/commands/next_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/next_clipboard.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/next_quick_menu_entry.py b/src/fenrirscreenreader/commands/commands/next_quick_menu_entry.py index e14fad03..1d2a5fb1 100644 --- a/src/fenrirscreenreader/commands/commands/next_quick_menu_entry.py +++ b/src/fenrirscreenreader/commands/commands/next_quick_menu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/next_quick_menu_value.py b/src/fenrirscreenreader/commands/commands/next_quick_menu_value.py index ae15c51a..78a0f9ad 100644 --- a/src/fenrirscreenreader/commands/commands/next_quick_menu_value.py +++ b/src/fenrirscreenreader/commands/commands/next_quick_menu_value.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/paste_clipboard.py b/src/fenrirscreenreader/commands/commands/paste_clipboard.py index 60d620bc..565ffc25 100644 --- a/src/fenrirscreenreader/commands/commands/paste_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/paste_clipboard.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import time class command(): diff --git a/src/fenrirscreenreader/commands/commands/present_first_line.py b/src/fenrirscreenreader/commands/commands/present_first_line.py index 8c5c4383..3a901204 100644 --- a/src/fenrirscreenreader/commands/commands/present_first_line.py +++ b/src/fenrirscreenreader/commands/commands/present_first_line.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/present_last_line.py b/src/fenrirscreenreader/commands/commands/present_last_line.py index bd17aadf..274eb721 100644 --- a/src/fenrirscreenreader/commands/commands/present_last_line.py +++ b/src/fenrirscreenreader/commands/commands/present_last_line.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/prev_clipboard.py b/src/fenrirscreenreader/commands/commands/prev_clipboard.py index 531bd2ee..95bca467 100644 --- a/src/fenrirscreenreader/commands/commands/prev_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/prev_clipboard.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/prev_quick_menu_entry.py b/src/fenrirscreenreader/commands/commands/prev_quick_menu_entry.py index 329438b1..87aef5df 100644 --- a/src/fenrirscreenreader/commands/commands/prev_quick_menu_entry.py +++ b/src/fenrirscreenreader/commands/commands/prev_quick_menu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/prev_quick_menu_value.py b/src/fenrirscreenreader/commands/commands/prev_quick_menu_value.py index 64495c68..bfa7e8cb 100644 --- a/src/fenrirscreenreader/commands/commands/prev_quick_menu_value.py +++ b/src/fenrirscreenreader/commands/commands/prev_quick_menu_value.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/progress_bar_monitor.py b/src/fenrirscreenreader/commands/commands/progress_bar_monitor.py index 083e4b6e..b72344fb 100644 --- a/src/fenrirscreenreader/commands/commands/progress_bar_monitor.py +++ b/src/fenrirscreenreader/commands/commands/progress_bar_monitor.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import re import time import threading diff --git a/src/fenrirscreenreader/commands/commands/quit_fenrir.py b/src/fenrirscreenreader/commands/commands/quit_fenrir.py index 18fcdc8f..0baf8449 100644 --- a/src/fenrirscreenreader/commands/commands/quit_fenrir.py +++ b/src/fenrirscreenreader/commands/commands/quit_fenrir.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/remove_marks.py b/src/fenrirscreenreader/commands/commands/remove_marks.py index 4d8ad998..17a62880 100644 --- a/src/fenrirscreenreader/commands/commands/remove_marks.py +++ b/src/fenrirscreenreader/commands/commands/remove_marks.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py b/src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py index fac7f5f4..edff9217 100644 --- a/src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py +++ b/src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils import string initialized = False diff --git a/src/fenrirscreenreader/commands/commands/review_bottom.py b/src/fenrirscreenreader/commands/commands/review_bottom.py index 8cfaf34c..cc529e2b 100644 --- a/src/fenrirscreenreader/commands/commands/review_bottom.py +++ b/src/fenrirscreenreader/commands/commands/review_bottom.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/review_curr_char.py b/src/fenrirscreenreader/commands/commands/review_curr_char.py index 72c07c9a..a8c5e404 100644 --- a/src/fenrirscreenreader/commands/commands/review_curr_char.py +++ b/src/fenrirscreenreader/commands/commands/review_curr_char.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_curr_char_phonetic.py b/src/fenrirscreenreader/commands/commands/review_curr_char_phonetic.py index f118e85e..120045fe 100644 --- a/src/fenrirscreenreader/commands/commands/review_curr_char_phonetic.py +++ b/src/fenrirscreenreader/commands/commands/review_curr_char_phonetic.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_curr_line.py b/src/fenrirscreenreader/commands/commands/review_curr_line.py index 2f3be038..871cc0b7 100644 --- a/src/fenrirscreenreader/commands/commands/review_curr_line.py +++ b/src/fenrirscreenreader/commands/commands/review_curr_line.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_curr_word.py b/src/fenrirscreenreader/commands/commands/review_curr_word.py index c0a2cbab..079eaae1 100644 --- a/src/fenrirscreenreader/commands/commands/review_curr_word.py +++ b/src/fenrirscreenreader/commands/commands/review_curr_word.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py b/src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py index 974112ba..d0158ef0 100644 --- a/src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py +++ b/src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils from fenrirscreenreader.utils import char_utils diff --git a/src/fenrirscreenreader/commands/commands/review_down.py b/src/fenrirscreenreader/commands/commands/review_down.py index d122f36f..8797600a 100644 --- a/src/fenrirscreenreader/commands/commands/review_down.py +++ b/src/fenrirscreenreader/commands/commands/review_down.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_line_begin.py b/src/fenrirscreenreader/commands/commands/review_line_begin.py index e725d75d..5d31a04a 100644 --- a/src/fenrirscreenreader/commands/commands/review_line_begin.py +++ b/src/fenrirscreenreader/commands/commands/review_line_begin.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_line_end.py b/src/fenrirscreenreader/commands/commands/review_line_end.py index df820cc5..5cf18dd2 100644 --- a/src/fenrirscreenreader/commands/commands/review_line_end.py +++ b/src/fenrirscreenreader/commands/commands/review_line_end.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_line_first_char.py b/src/fenrirscreenreader/commands/commands/review_line_first_char.py index 7c7a3e11..35cc4ae9 100644 --- a/src/fenrirscreenreader/commands/commands/review_line_first_char.py +++ b/src/fenrirscreenreader/commands/commands/review_line_first_char.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils from fenrirscreenreader.utils import char_utils diff --git a/src/fenrirscreenreader/commands/commands/review_line_last_char.py b/src/fenrirscreenreader/commands/commands/review_line_last_char.py index 7048c5f0..4586e35f 100644 --- a/src/fenrirscreenreader/commands/commands/review_line_last_char.py +++ b/src/fenrirscreenreader/commands/commands/review_line_last_char.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_next_char.py b/src/fenrirscreenreader/commands/commands/review_next_char.py index 57ec7687..02a91cab 100644 --- a/src/fenrirscreenreader/commands/commands/review_next_char.py +++ b/src/fenrirscreenreader/commands/commands/review_next_char.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_next_char_phonetic.py b/src/fenrirscreenreader/commands/commands/review_next_char_phonetic.py index 0a384d19..2d3a1fb2 100644 --- a/src/fenrirscreenreader/commands/commands/review_next_char_phonetic.py +++ b/src/fenrirscreenreader/commands/commands/review_next_char_phonetic.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_next_line.py b/src/fenrirscreenreader/commands/commands/review_next_line.py index b17018e9..a2870d7f 100644 --- a/src/fenrirscreenreader/commands/commands/review_next_line.py +++ b/src/fenrirscreenreader/commands/commands/review_next_line.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_next_word.py b/src/fenrirscreenreader/commands/commands/review_next_word.py index 6b6eb7cf..488ddc44 100644 --- a/src/fenrirscreenreader/commands/commands/review_next_word.py +++ b/src/fenrirscreenreader/commands/commands/review_next_word.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py b/src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py index fe022ba4..e15fb014 100644 --- a/src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py +++ b/src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils from fenrirscreenreader.utils import char_utils diff --git a/src/fenrirscreenreader/commands/commands/review_prev_char.py b/src/fenrirscreenreader/commands/commands/review_prev_char.py index fba67bc0..bdfe7cff 100644 --- a/src/fenrirscreenreader/commands/commands/review_prev_char.py +++ b/src/fenrirscreenreader/commands/commands/review_prev_char.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_prev_char_phonetic.py b/src/fenrirscreenreader/commands/commands/review_prev_char_phonetic.py index c2909110..8cf125f9 100644 --- a/src/fenrirscreenreader/commands/commands/review_prev_char_phonetic.py +++ b/src/fenrirscreenreader/commands/commands/review_prev_char_phonetic.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_prev_line.py b/src/fenrirscreenreader/commands/commands/review_prev_line.py index ab25c35e..600fd171 100644 --- a/src/fenrirscreenreader/commands/commands/review_prev_line.py +++ b/src/fenrirscreenreader/commands/commands/review_prev_line.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_prev_word.py b/src/fenrirscreenreader/commands/commands/review_prev_word.py index 54ca1dfb..a785eb1d 100644 --- a/src/fenrirscreenreader/commands/commands/review_prev_word.py +++ b/src/fenrirscreenreader/commands/commands/review_prev_word.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py b/src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py index d2222267..96f27f80 100644 --- a/src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py +++ b/src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils from fenrirscreenreader.utils import char_utils diff --git a/src/fenrirscreenreader/commands/commands/review_screen_first_char.py b/src/fenrirscreenreader/commands/commands/review_screen_first_char.py index 74246d11..80247705 100644 --- a/src/fenrirscreenreader/commands/commands/review_screen_first_char.py +++ b/src/fenrirscreenreader/commands/commands/review_screen_first_char.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_screen_last_char.py b/src/fenrirscreenreader/commands/commands/review_screen_last_char.py index 0c4fa1f0..7d8f870e 100644 --- a/src/fenrirscreenreader/commands/commands/review_screen_last_char.py +++ b/src/fenrirscreenreader/commands/commands/review_screen_last_char.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_top.py b/src/fenrirscreenreader/commands/commands/review_top.py index f8fbca94..b3778e92 100644 --- a/src/fenrirscreenreader/commands/commands/review_top.py +++ b/src/fenrirscreenreader/commands/commands/review_top.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/review_up.py b/src/fenrirscreenreader/commands/commands/review_up.py index d6e05b9a..9788cb09 100644 --- a/src/fenrirscreenreader/commands/commands/review_up.py +++ b/src/fenrirscreenreader/commands/commands/review_up.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/commands/save_settings.py b/src/fenrirscreenreader/commands/commands/save_settings.py index 279128dc..9f6ae177 100644 --- a/src/fenrirscreenreader/commands/commands/save_settings.py +++ b/src/fenrirscreenreader/commands/commands/save_settings.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.core import settingsManager class command(): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_1.py b/src/fenrirscreenreader/commands/commands/set_bookmark_1.py index 11042676..f05a1ec0 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_1.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_1.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_10.py b/src/fenrirscreenreader/commands/commands/set_bookmark_10.py index 6e10e5c5..2c5c5a91 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_10.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_10.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_2.py b/src/fenrirscreenreader/commands/commands/set_bookmark_2.py index ca90680e..c48a9985 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_2.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_2.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_3.py b/src/fenrirscreenreader/commands/commands/set_bookmark_3.py index a2e646f1..706e90ac 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_3.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_3.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_4.py b/src/fenrirscreenreader/commands/commands/set_bookmark_4.py index 2b1262ba..2ff016de 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_4.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_4.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_5.py b/src/fenrirscreenreader/commands/commands/set_bookmark_5.py index 5f03f4e6..38afbe90 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_5.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_5.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_6.py b/src/fenrirscreenreader/commands/commands/set_bookmark_6.py index 90c9b2d1..d8ba1670 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_6.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_6.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_7.py b/src/fenrirscreenreader/commands/commands/set_bookmark_7.py index 0ff6e83d..3b7744e1 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_7.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_7.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_8.py b/src/fenrirscreenreader/commands/commands/set_bookmark_8.py index 78c4532a..8dc7cbb2 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_8.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_8.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_bookmark_9.py b/src/fenrirscreenreader/commands/commands/set_bookmark_9.py index 371b1ee8..4793ba9d 100644 --- a/src/fenrirscreenreader/commands/commands/set_bookmark_9.py +++ b/src/fenrirscreenreader/commands/commands/set_bookmark_9.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_mark.py b/src/fenrirscreenreader/commands/commands/set_mark.py index e7b69105..2d22ae2a 100644 --- a/src/fenrirscreenreader/commands/commands/set_mark.py +++ b/src/fenrirscreenreader/commands/commands/set_mark.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/set_window_application.py b/src/fenrirscreenreader/commands/commands/set_window_application.py index a958ee24..bcc3f920 100644 --- a/src/fenrirscreenreader/commands/commands/set_window_application.py +++ b/src/fenrirscreenreader/commands/commands/set_window_application.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/shut_up.py b/src/fenrirscreenreader/commands/commands/shut_up.py index 169db793..1a5aa4b2 100644 --- a/src/fenrirscreenreader/commands/commands/shut_up.py +++ b/src/fenrirscreenreader/commands/commands/shut_up.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/spell_check.py b/src/fenrirscreenreader/commands/commands/spell_check.py index 87d5eeca..df4191e7 100644 --- a/src/fenrirscreenreader/commands/commands/spell_check.py +++ b/src/fenrirscreenreader/commands/commands/spell_check.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils initialized = False try: diff --git a/src/fenrirscreenreader/commands/commands/subprocess.py b/src/fenrirscreenreader/commands/commands/subprocess.py index f23340ef..052923a0 100644 --- a/src/fenrirscreenreader/commands/commands/subprocess.py +++ b/src/fenrirscreenreader/commands/commands/subprocess.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import subprocess, os from subprocess import Popen, PIPE import _thread diff --git a/src/fenrirscreenreader/commands/commands/temp_disable_speech.py b/src/fenrirscreenreader/commands/commands/temp_disable_speech.py index bbd863d4..6af2e32d 100644 --- a/src/fenrirscreenreader/commands/commands/temp_disable_speech.py +++ b/src/fenrirscreenreader/commands/commands/temp_disable_speech.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/time.py b/src/fenrirscreenreader/commands/commands/time.py index cb532e92..96b15b88 100644 --- a/src/fenrirscreenreader/commands/commands/time.py +++ b/src/fenrirscreenreader/commands/commands/time.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import datetime class command(): diff --git a/src/fenrirscreenreader/commands/commands/toggle_auto_indent.py b/src/fenrirscreenreader/commands/commands/toggle_auto_indent.py index 869c6400..7d32187c 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_auto_indent.py +++ b/src/fenrirscreenreader/commands/commands/toggle_auto_indent.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/commands/toggle_auto_read.py b/src/fenrirscreenreader/commands/commands/toggle_auto_read.py index b9f4d0ae..b62eda2e 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_auto_read.py +++ b/src/fenrirscreenreader/commands/commands/toggle_auto_read.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/commands/toggle_auto_spell_check.py b/src/fenrirscreenreader/commands/commands/toggle_auto_spell_check.py index 548ad908..622874fb 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_auto_spell_check.py +++ b/src/fenrirscreenreader/commands/commands/toggle_auto_spell_check.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/toggle_auto_time.py b/src/fenrirscreenreader/commands/commands/toggle_auto_time.py index 7cfeb952..01ce0f41 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_auto_time.py +++ b/src/fenrirscreenreader/commands/commands/toggle_auto_time.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/commands/toggle_barrier.py b/src/fenrirscreenreader/commands/commands/toggle_barrier.py index 141eb93a..c0f8720a 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_barrier.py +++ b/src/fenrirscreenreader/commands/commands/toggle_barrier.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/commands/toggle_emoticons.py b/src/fenrirscreenreader/commands/commands/toggle_emoticons.py index 518a19d2..967976cf 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_emoticons.py +++ b/src/fenrirscreenreader/commands/commands/toggle_emoticons.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/commands/toggle_has_attribute.py b/src/fenrirscreenreader/commands/commands/toggle_has_attribute.py index 63714a11..b9eb7ea3 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_has_attribute.py +++ b/src/fenrirscreenreader/commands/commands/toggle_has_attribute.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/commands/toggle_highlight_tracking.py b/src/fenrirscreenreader/commands/commands/toggle_highlight_tracking.py index e2733355..e2782c4d 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_highlight_tracking.py +++ b/src/fenrirscreenreader/commands/commands/toggle_highlight_tracking.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/commands/toggle_output.py b/src/fenrirscreenreader/commands/commands/toggle_output.py index 7ed8f5e6..f932fcd2 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_output.py +++ b/src/fenrirscreenreader/commands/commands/toggle_output.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/toggle_punctuation_level.py b/src/fenrirscreenreader/commands/commands/toggle_punctuation_level.py index 24c5b0eb..7721e401 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_punctuation_level.py +++ b/src/fenrirscreenreader/commands/commands/toggle_punctuation_level.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/toggle_sound.py b/src/fenrirscreenreader/commands/commands/toggle_sound.py index a176d326..41097d17 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_sound.py +++ b/src/fenrirscreenreader/commands/commands/toggle_sound.py @@ -4,8 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug - class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/commands/toggle_speech.py b/src/fenrirscreenreader/commands/commands/toggle_speech.py index fc918825..c58e9d21 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_speech.py +++ b/src/fenrirscreenreader/commands/commands/toggle_speech.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py b/src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py index b2e45407..9c98f4ba 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py +++ b/src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/commands/toggle_vmenu_mode.py b/src/fenrirscreenreader/commands/commands/toggle_vmenu_mode.py index 4af3a72a..89cdf81d 100644 --- a/src/fenrirscreenreader/commands/commands/toggle_vmenu_mode.py +++ b/src/fenrirscreenreader/commands/commands/toggle_vmenu_mode.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/help/curr_help.py b/src/fenrirscreenreader/commands/help/curr_help.py index 281985ff..3586c63d 100644 --- a/src/fenrirscreenreader/commands/help/curr_help.py +++ b/src/fenrirscreenreader/commands/help/curr_help.py @@ -4,8 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug - class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/help/next_help.py b/src/fenrirscreenreader/commands/help/next_help.py index 46e0f2e9..3e4819b2 100644 --- a/src/fenrirscreenreader/commands/help/next_help.py +++ b/src/fenrirscreenreader/commands/help/next_help.py @@ -4,8 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug - class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/help/prev_help.py b/src/fenrirscreenreader/commands/help/prev_help.py index 27550ec7..62ad1d98 100644 --- a/src/fenrirscreenreader/commands/help/prev_help.py +++ b/src/fenrirscreenreader/commands/help/prev_help.py @@ -4,8 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug - class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/onByteInput/10000-shut_up.py b/src/fenrirscreenreader/commands/onByteInput/10000-shut_up.py index 522ab94a..ef808a0f 100644 --- a/src/fenrirscreenreader/commands/onByteInput/10000-shut_up.py +++ b/src/fenrirscreenreader/commands/onByteInput/10000-shut_up.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onByteInput/15000-enable_temp_speech.py b/src/fenrirscreenreader/commands/onByteInput/15000-enable_temp_speech.py index f9d06a12..3aa0bd90 100644 --- a/src/fenrirscreenreader/commands/onByteInput/15000-enable_temp_speech.py +++ b/src/fenrirscreenreader/commands/onByteInput/15000-enable_temp_speech.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onCursorChange/15000-char_echo.py b/src/fenrirscreenreader/commands/onCursorChange/15000-char_echo.py index a53837dc..e940c6de 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/15000-char_echo.py +++ b/src/fenrirscreenreader/commands/onCursorChange/15000-char_echo.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): @@ -48,7 +47,6 @@ class command(): currDelta.strip() != '': currDelta = currDelta.strip() self.env['runtime']['outputManager'].presentText(currDelta, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False) - print(currDelta) def setCallback(self, callback): pass diff --git a/src/fenrirscreenreader/commands/onCursorChange/25000-word_echo_type.py b/src/fenrirscreenreader/commands/onCursorChange/25000-word_echo_type.py index 40054798..6a05cdef 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/25000-word_echo_type.py +++ b/src/fenrirscreenreader/commands/onCursorChange/25000-word_echo_type.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils import string diff --git a/src/fenrirscreenreader/commands/onCursorChange/35000-spell_check.py b/src/fenrirscreenreader/commands/onCursorChange/35000-spell_check.py index 0898a391..6f9b433a 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/35000-spell_check.py +++ b/src/fenrirscreenreader/commands/onCursorChange/35000-spell_check.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils import os, string diff --git a/src/fenrirscreenreader/commands/onCursorChange/45000-char_delete_echo.py b/src/fenrirscreenreader/commands/onCursorChange/45000-char_delete_echo.py index 7d342703..41feec75 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/45000-char_delete_echo.py +++ b/src/fenrirscreenreader/commands/onCursorChange/45000-char_delete_echo.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py b/src/fenrirscreenreader/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py index 1fda1301..2a2f23a9 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py +++ b/src/fenrirscreenreader/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import char_utils class command(): diff --git a/src/fenrirscreenreader/commands/onCursorChange/55000-tab_completion.py b/src/fenrirscreenreader/commands/onCursorChange/55000-tab_completion.py index fd2b9353..b980c78e 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/55000-tab_completion.py +++ b/src/fenrirscreenreader/commands/onCursorChange/55000-tab_completion.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onCursorChange/60000-word_echo_navigation.py b/src/fenrirscreenreader/commands/onCursorChange/60000-word_echo_navigation.py index 9f52829d..d108c1cd 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/60000-word_echo_navigation.py +++ b/src/fenrirscreenreader/commands/onCursorChange/60000-word_echo_navigation.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import word_utils import string diff --git a/src/fenrirscreenreader/commands/onCursorChange/65000-present_line_if_cursor_change_vertical.py b/src/fenrirscreenreader/commands/onCursorChange/65000-present_line_if_cursor_change_vertical.py index baaf189d..057ffe27 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/65000-present_line_if_cursor_change_vertical.py +++ b/src/fenrirscreenreader/commands/onCursorChange/65000-present_line_if_cursor_change_vertical.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils from fenrirscreenreader.utils import word_utils diff --git a/src/fenrirscreenreader/commands/onCursorChange/68000-auto_identation_horizontal.py b/src/fenrirscreenreader/commands/onCursorChange/68000-auto_identation_horizontal.py index ea80ee0e..49d9e50c 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/68000-auto_identation_horizontal.py +++ b/src/fenrirscreenreader/commands/onCursorChange/68000-auto_identation_horizontal.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import line_utils from fenrirscreenreader.utils import word_utils diff --git a/src/fenrirscreenreader/commands/onCursorChange/85000-has_attribute.py b/src/fenrirscreenreader/commands/onCursorChange/85000-has_attribute.py index b7be5074..c7e9eed0 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/85000-has_attribute.py +++ b/src/fenrirscreenreader/commands/onCursorChange/85000-has_attribute.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug from fenrirscreenreader.utils import screen_utils class command(): diff --git a/src/fenrirscreenreader/commands/onCursorChange/95000-exit_review_mode.py b/src/fenrirscreenreader/commands/onCursorChange/95000-exit_review_mode.py index b9d095d9..bde418da 100644 --- a/src/fenrirscreenreader/commands/onCursorChange/95000-exit_review_mode.py +++ b/src/fenrirscreenreader/commands/onCursorChange/95000-exit_review_mode.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/45000-char_echo.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/45000-char_echo.py deleted file mode 100644 index 96ecc656..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/45000-char_echo.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - # big changes are no char (but the value is bigger than one maybe the differ needs longer than you can type, so a little strange random buffer for now) - xMove = abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x']) - if xMove > 1: - return - if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'charEcho'): - return - # detect deletion or chilling - if self.env['screen']['newCursor']['x'] <= self.env['screen']['oldCursor']['x']: - return - # is there any change? - if not self.env['runtime']['screenManager'].isDelta(): - return - - # filter unneded space on word begin - currDelta = self.env['screen']['newDelta'] - if len(currDelta.strip()) != len(currDelta) and \ - currDelta.strip() != '': - currDelta = currDelta.strip() - self.env['runtime']['outputManager'].presentText(currDelta, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/46000-tab_completion.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/46000-tab_completion.py deleted file mode 100644 index 46ecb33d..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/46000-tab_completion.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - # try to detect the tab completion by cursor change - xMove = abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x']) - if xMove == 1: - return - # is there any change? - if not self.env['runtime']['screenManager'].isDelta(): - return - if not( (xMove > 1) and xMove == len(self.env['screen']['newDelta'])): - return - # detect deletion or chilling - if self.env['screen']['newCursor']['x'] <= self.env['screen']['oldCursor']['x']: - return - - # filter unneded space on word begin - currDelta = self.env['screen']['newDelta'] - if len(currDelta.strip()) != len(currDelta) and \ - currDelta.strip() != '': - currDelta = currDelta.strip() - self.env['runtime']['outputManager'].presentText(currDelta, interrupt=True, announceCapital=True, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/50000-present_char_if_cursor_change_horizontal.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/50000-present_char_if_cursor_change_horizontal.py deleted file mode 100644 index 1fda1301..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/50000-present_char_if_cursor_change_horizontal.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import char_utils - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return '' - - def run(self): - if not self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'cursor'): - return - if self.env['runtime']['screenManager'].isScreenChange(): - return - # detect an change on the screen, we just want to cursor arround, so no change should appear - if self.env['runtime']['screenManager'].isDelta(): - return - if self.env['runtime']['screenManager'].isNegativeDelta(): - return - # is a vertical change? - if self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - # is it a horizontal change? - if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): - return - - # echo word insteed of char - if self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'wordEcho'): - if abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) != 1: - # get the word - newContent = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] - x, y, currWord, endOfScreen, lineBreak = \ - word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent) - if self.env['screen']['newCursor']['x'] == x: - return - x, y, currChar = char_utils.getCurrentChar(self.env['screen']['newCursor']['x'], self.env['screen']['newCursor']['y'], self.env['screen']['newContentText']) - if not currChar.isspace(): - self.env['runtime']['outputManager'].presentText(currChar, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False) - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/55000-present_line_if_cursor_change_vertical.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/55000-present_line_if_cursor_change_vertical.py deleted file mode 100644 index 7d0bb794..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/55000-present_line_if_cursor_change_vertical.py +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import line_utils -from fenrirscreenreader.utils import word_utils - -class command(): - def __init__(self): - self.lastIdent = -1 - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return '' - - def run(self): - if not self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'cursor'): - return - if self.env['runtime']['screenManager'].isScreenChange(): - self.lastIdent = 0 - return - # this leads to problems in vim -> status line change -> no announcement, so we do check the lengh as hack - if self.env['runtime']['screenManager'].isDelta(): - return - - # is a vertical change? - if not self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - - x, y, currLine = line_utils.getCurrentLine(self.env['screen']['newCursor']['x'], self.env['screen']['newCursor']['y'], self.env['screen']['newContentText']) - if currLine.isspace(): - self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True, flush=False) - else: - # ident - currIdent = len(currLine) - len(currLine.lstrip()) - if self.lastIdent == -1: - self.lastIdent = currIdent - doInterrupt = True - if self.env['runtime']['settingsManager'].getSettingAsBool('general', 'autoPresentIndent'): - if self.lastIdent != currIdent: - self.env['runtime']['outputManager'].presentText(_('indented ') + str(currIdent) + ' ', interrupt=doInterrupt, flush=False) - doInterrupt = False - # barrier - sayLine = currLine - if self.env['runtime']['settingsManager'].getSettingAsBool('barrier','enabled'): - isBarrier, barrierLine = self.env['runtime']['barrierManager'].handleLineBarrier(self.env['screen']['newContentText'].split('\n'), self.env['screen']['newCursor']['x'],self.env['screen']['newCursor']['y']) - if isBarrier: - sayLine = barrierLine - # output - self.env['runtime']['outputManager'].presentText(sayLine, interrupt=doInterrupt, flush=False) - self.lastIdent = currIdent - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/60000-word_echo_type.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/60000-word_echo_type.py deleted file mode 100644 index 40054798..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/60000-word_echo_type.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import word_utils -import string - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - # is it enabled? - if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'wordEcho'): - return - # is naviation? - if self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x'] != 1: - return - # just when cursor move worddetection is needed - if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): - return - # for now no new line - if self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - # currently writing - if self.env['runtime']['screenManager'].isDelta(): - return - - # get the word - newContent = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] - x, y, currWord, endOfScreen, lineBreak = \ - word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent) - - # is there a word? - if currWord == '': - return - # at the end of a word - if not newContent[self.env['screen']['newCursor']['x']].isspace(): - return - # at the end of a word - if (x + len(currWord) != self.env['screen']['newCursor']['x']) and \ - (x + len(currWord) != self.env['screen']['newCursor']['x']-1): - return - - self.env['runtime']['outputManager'].presentText(currWord, interrupt=True, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/61000-word_echo_navigation.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/61000-word_echo_navigation.py deleted file mode 100644 index 9f52829d..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/61000-word_echo_navigation.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import word_utils -import string - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - # is navigation? - if not abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) > 1: - return - - # just when cursor move worddetection is needed - if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): - return - # for now no new line - if self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - # currently writing - if self.env['runtime']['screenManager'].isDelta(): - return - - # get the word - newContent = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] - x, y, currWord, endOfScreen, lineBreak = \ - word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent) - - # is there a word? - if currWord == '': - return - - # at the start of a word - if (x + len(currWord) != self.env['screen']['newCursor']['x']) and \ - (self.env['screen']['newCursor']['x'] != x): - return - - self.env['runtime']['outputManager'].presentText(currWord, interrupt=True, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/62000-spell_check.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/62000-spell_check.py deleted file mode 100644 index 0898a391..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/62000-spell_check.py +++ /dev/null @@ -1,133 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import word_utils -import os, string - -initialized = False -try: - import enchant - initialized = True -except: - pass - -class command(): - def __init__(self): - self.language = '' - self.spellChecker = '' - def initialize(self, environment): - self.env = environment - self.updateSpellLanguage() - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def updateSpellLanguage(self): - if not initialized: - return - self.spellChecker = enchant.Dict(self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage')) - self.language = self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage') - - def run(self): - if not initialized: - return - if not self.env['runtime']['settingsManager'].getSettingAsBool('general', 'autoSpellCheck'): - return - if self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage') != self.language: - try: - self.updateSpellLanguage() - except: - return - - # just when horizontal cursor move worddetection is needed - if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): - return - - # for now no new line - if self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - # more than a keyecho? - if len(self.env['screen']['newDelta']) > 1: - return - # deletion - if self.env['runtime']['screenManager'].isNegativeDelta(): - return - # first place could not be the end of a word - if self.env['screen']['newCursor']['x'] == 0: - return - - # get the word (just for speedup only look at current line - newContent = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] - x, y, currWord, endOfScreen, lineBreak = word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent) - # was this a typed word? - if self.env['runtime']['screenManager'].isDelta(): - if not(newContent[self.env['screen']['oldCursor']['x']] in string.whitespace + '!"#$%&()*+,-./:;<=>?@[\\]^_{|}~' and x != self.env['screen']['oldCursor']['x']): - return - else: - currWord = currWord.strip(string.whitespace + '!"#$%&()*+,-./:;<=>?@[\\]^_{|}~') - else: - # or just arrow arround? - if not newContent[self.env['screen']['newCursor']['x']].isspace(): - return - if (x + len(currWord) != self.env['screen']['newCursor']['x']) and \ - (x + len(currWord) != self.env['screen']['newCursor']['x']-1): - return - - # just on end of word - if self.env['screen']['newCursor']['x'] > 0: - if not newContent[self.env['screen']['oldCursor']['x'] - 1].lower() in string.ascii_lowercase: - return - - # ignore bash buildins - if currWord in ['cd','fg','bg','alias','bind','dir','caller','buildin','command','declare','echo','enable','help','let','local','logout',\ - 'mapfile','printf','read','readarray','source','type','typeset','ulimit','unalias']: - return - # ignore the application name - if currWord.upper() == 'FENRIR': - return - if currWord[0] =='-': - return - if currWord[0] == '/': - return - if currWord[0] == '#': - return - if currWord.startswith('./'): - return - if '@' in currWord and '.' in currWord: - return - if currWord[0] == '@': - return - if currWord.isnumeric(): - return - if currWord.isdecimal(): - return - if currWord.isspace(): - return - - try: - if os.path.exists("/bin/"+currWord): - return - except: - pass - try: - if os.path.exists("/usr/bin/"+currWord): - return - except: - pass - try: - if os.path.exists("/sbin/"+currWord): - return - except: - pass - - if not self.spellChecker.check(currWord): - self.env['runtime']['outputManager'].presentText(_('misspelled'), soundIcon='mispell', interrupt=False, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/65000-char_delete_echo.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/65000-char_delete_echo.py deleted file mode 100644 index 7d342703..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/65000-char_delete_echo.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'charDeleteEcho'): - return - # detect typing or chilling - if self.env['screen']['newCursor']['x'] >= self.env['screen']['oldCursor']['x']: - return - - # More than just a deletion happend - if self.env['runtime']['screenManager'].isDelta(ignoreSpace=True): - return - - # no deletion - if not self.env['runtime']['screenManager'].isNegativeDelta(): - return - - # too much for a single backspace... - # word begin produce a diff wiht len == 2 |a | others with 1 |a| - if len(self.env['screen']['newNegativeDelta']) > 2: - return - - currNegativeDelta = self.env['screen']['newNegativeDelta'] - if len(currNegativeDelta.strip()) != len(currNegativeDelta) and \ - currNegativeDelta.strip() != '': - currNegativeDelta = currNegativeDelta.strip() - self.env['runtime']['outputManager'].presentText(currNegativeDelta, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False) - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/66000-exit_review_mode.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/66000-exit_review_mode.py deleted file mode 100644 index b9d095d9..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/66000-exit_review_mode.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return _('exits review mode') - - def run(self): - if not self.env['runtime']['settingsManager'].getSettingAsBool('review', 'leaveReviewOnCursorChange'): - return - if self.env['runtime']['cursorManager'].isReviewMode(): - self.env['runtime']['cursorManager'].clearReviewCursor() - - def setCallback(self, callback): - pass diff --git a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/77000-has_attribute.py b/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/77000-has_attribute.py deleted file mode 100644 index b7be5074..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/orig_sorting/77000-has_attribute.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import screen_utils - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return _('Reads attributes of current cursor position') - def run(self): - # is it enabled? - if not self.env['runtime']['settingsManager'].getSettingAsBool('general', 'hasAttributes'): - return - # is a vertical change? - if not (self.env['runtime']['cursorManager'].isCursorVerticalMove() or\ - self.env['runtime']['cursorManager'].isCursorHorizontalMove()): - return - - cursorPos = self.env['screen']['newCursor'] - - if not self.env['runtime']['attributeManager'].hasAttributes(cursorPos): - return - self.env['runtime']['outputManager'].presentText('has attribute', soundIcon='HasAttributes', interrupt=False) - def setCallback(self, callback): - pass diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/15000-char_echo.py b/src/fenrirscreenreader/commands/onCursorChange/resort/15000-char_echo.py deleted file mode 100644 index 96ecc656..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/15000-char_echo.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - # big changes are no char (but the value is bigger than one maybe the differ needs longer than you can type, so a little strange random buffer for now) - xMove = abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x']) - if xMove > 1: - return - if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'charEcho'): - return - # detect deletion or chilling - if self.env['screen']['newCursor']['x'] <= self.env['screen']['oldCursor']['x']: - return - # is there any change? - if not self.env['runtime']['screenManager'].isDelta(): - return - - # filter unneded space on word begin - currDelta = self.env['screen']['newDelta'] - if len(currDelta.strip()) != len(currDelta) and \ - currDelta.strip() != '': - currDelta = currDelta.strip() - self.env['runtime']['outputManager'].presentText(currDelta, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/25000-word_echo_type.py b/src/fenrirscreenreader/commands/onCursorChange/resort/25000-word_echo_type.py deleted file mode 100644 index 40054798..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/25000-word_echo_type.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import word_utils -import string - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - # is it enabled? - if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'wordEcho'): - return - # is naviation? - if self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x'] != 1: - return - # just when cursor move worddetection is needed - if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): - return - # for now no new line - if self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - # currently writing - if self.env['runtime']['screenManager'].isDelta(): - return - - # get the word - newContent = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] - x, y, currWord, endOfScreen, lineBreak = \ - word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent) - - # is there a word? - if currWord == '': - return - # at the end of a word - if not newContent[self.env['screen']['newCursor']['x']].isspace(): - return - # at the end of a word - if (x + len(currWord) != self.env['screen']['newCursor']['x']) and \ - (x + len(currWord) != self.env['screen']['newCursor']['x']-1): - return - - self.env['runtime']['outputManager'].presentText(currWord, interrupt=True, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/35000-spell_check.py b/src/fenrirscreenreader/commands/onCursorChange/resort/35000-spell_check.py deleted file mode 100644 index 0898a391..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/35000-spell_check.py +++ /dev/null @@ -1,133 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import word_utils -import os, string - -initialized = False -try: - import enchant - initialized = True -except: - pass - -class command(): - def __init__(self): - self.language = '' - self.spellChecker = '' - def initialize(self, environment): - self.env = environment - self.updateSpellLanguage() - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def updateSpellLanguage(self): - if not initialized: - return - self.spellChecker = enchant.Dict(self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage')) - self.language = self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage') - - def run(self): - if not initialized: - return - if not self.env['runtime']['settingsManager'].getSettingAsBool('general', 'autoSpellCheck'): - return - if self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage') != self.language: - try: - self.updateSpellLanguage() - except: - return - - # just when horizontal cursor move worddetection is needed - if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): - return - - # for now no new line - if self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - # more than a keyecho? - if len(self.env['screen']['newDelta']) > 1: - return - # deletion - if self.env['runtime']['screenManager'].isNegativeDelta(): - return - # first place could not be the end of a word - if self.env['screen']['newCursor']['x'] == 0: - return - - # get the word (just for speedup only look at current line - newContent = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] - x, y, currWord, endOfScreen, lineBreak = word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent) - # was this a typed word? - if self.env['runtime']['screenManager'].isDelta(): - if not(newContent[self.env['screen']['oldCursor']['x']] in string.whitespace + '!"#$%&()*+,-./:;<=>?@[\\]^_{|}~' and x != self.env['screen']['oldCursor']['x']): - return - else: - currWord = currWord.strip(string.whitespace + '!"#$%&()*+,-./:;<=>?@[\\]^_{|}~') - else: - # or just arrow arround? - if not newContent[self.env['screen']['newCursor']['x']].isspace(): - return - if (x + len(currWord) != self.env['screen']['newCursor']['x']) and \ - (x + len(currWord) != self.env['screen']['newCursor']['x']-1): - return - - # just on end of word - if self.env['screen']['newCursor']['x'] > 0: - if not newContent[self.env['screen']['oldCursor']['x'] - 1].lower() in string.ascii_lowercase: - return - - # ignore bash buildins - if currWord in ['cd','fg','bg','alias','bind','dir','caller','buildin','command','declare','echo','enable','help','let','local','logout',\ - 'mapfile','printf','read','readarray','source','type','typeset','ulimit','unalias']: - return - # ignore the application name - if currWord.upper() == 'FENRIR': - return - if currWord[0] =='-': - return - if currWord[0] == '/': - return - if currWord[0] == '#': - return - if currWord.startswith('./'): - return - if '@' in currWord and '.' in currWord: - return - if currWord[0] == '@': - return - if currWord.isnumeric(): - return - if currWord.isdecimal(): - return - if currWord.isspace(): - return - - try: - if os.path.exists("/bin/"+currWord): - return - except: - pass - try: - if os.path.exists("/usr/bin/"+currWord): - return - except: - pass - try: - if os.path.exists("/sbin/"+currWord): - return - except: - pass - - if not self.spellChecker.check(currWord): - self.env['runtime']['outputManager'].presentText(_('misspelled'), soundIcon='mispell', interrupt=False, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/45000-char_delete_echo.py b/src/fenrirscreenreader/commands/onCursorChange/resort/45000-char_delete_echo.py deleted file mode 100644 index 7d342703..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/45000-char_delete_echo.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'charDeleteEcho'): - return - # detect typing or chilling - if self.env['screen']['newCursor']['x'] >= self.env['screen']['oldCursor']['x']: - return - - # More than just a deletion happend - if self.env['runtime']['screenManager'].isDelta(ignoreSpace=True): - return - - # no deletion - if not self.env['runtime']['screenManager'].isNegativeDelta(): - return - - # too much for a single backspace... - # word begin produce a diff wiht len == 2 |a | others with 1 |a| - if len(self.env['screen']['newNegativeDelta']) > 2: - return - - currNegativeDelta = self.env['screen']['newNegativeDelta'] - if len(currNegativeDelta.strip()) != len(currNegativeDelta) and \ - currNegativeDelta.strip() != '': - currNegativeDelta = currNegativeDelta.strip() - self.env['runtime']['outputManager'].presentText(currNegativeDelta, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False) - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/50000-present_char_if_cursor_change_horizontal.py b/src/fenrirscreenreader/commands/onCursorChange/resort/50000-present_char_if_cursor_change_horizontal.py deleted file mode 100644 index 1fda1301..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/50000-present_char_if_cursor_change_horizontal.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import char_utils - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return '' - - def run(self): - if not self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'cursor'): - return - if self.env['runtime']['screenManager'].isScreenChange(): - return - # detect an change on the screen, we just want to cursor arround, so no change should appear - if self.env['runtime']['screenManager'].isDelta(): - return - if self.env['runtime']['screenManager'].isNegativeDelta(): - return - # is a vertical change? - if self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - # is it a horizontal change? - if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): - return - - # echo word insteed of char - if self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'wordEcho'): - if abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) != 1: - # get the word - newContent = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] - x, y, currWord, endOfScreen, lineBreak = \ - word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent) - if self.env['screen']['newCursor']['x'] == x: - return - x, y, currChar = char_utils.getCurrentChar(self.env['screen']['newCursor']['x'], self.env['screen']['newCursor']['y'], self.env['screen']['newContentText']) - if not currChar.isspace(): - self.env['runtime']['outputManager'].presentText(currChar, interrupt=True, ignorePunctuation=True, announceCapital=True, flush=False) - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/55000-tab_completion.py b/src/fenrirscreenreader/commands/onCursorChange/resort/55000-tab_completion.py deleted file mode 100644 index 46ecb33d..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/55000-tab_completion.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - # try to detect the tab completion by cursor change - xMove = abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x']) - if xMove == 1: - return - # is there any change? - if not self.env['runtime']['screenManager'].isDelta(): - return - if not( (xMove > 1) and xMove == len(self.env['screen']['newDelta'])): - return - # detect deletion or chilling - if self.env['screen']['newCursor']['x'] <= self.env['screen']['oldCursor']['x']: - return - - # filter unneded space on word begin - currDelta = self.env['screen']['newDelta'] - if len(currDelta.strip()) != len(currDelta) and \ - currDelta.strip() != '': - currDelta = currDelta.strip() - self.env['runtime']['outputManager'].presentText(currDelta, interrupt=True, announceCapital=True, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/60000-word_echo_navigation.py b/src/fenrirscreenreader/commands/onCursorChange/resort/60000-word_echo_navigation.py deleted file mode 100644 index 9f52829d..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/60000-word_echo_navigation.py +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import word_utils -import string - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - # is navigation? - if not abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) > 1: - return - - # just when cursor move worddetection is needed - if not self.env['runtime']['cursorManager'].isCursorHorizontalMove(): - return - # for now no new line - if self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - # currently writing - if self.env['runtime']['screenManager'].isDelta(): - return - - # get the word - newContent = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']] - x, y, currWord, endOfScreen, lineBreak = \ - word_utils.getCurrentWord(self.env['screen']['newCursor']['x'], 0, newContent) - - # is there a word? - if currWord == '': - return - - # at the start of a word - if (x + len(currWord) != self.env['screen']['newCursor']['x']) and \ - (self.env['screen']['newCursor']['x'] != x): - return - - self.env['runtime']['outputManager'].presentText(currWord, interrupt=True, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/65000-present_line_if_cursor_change_vertical.py b/src/fenrirscreenreader/commands/onCursorChange/resort/65000-present_line_if_cursor_change_vertical.py deleted file mode 100644 index 7d0bb794..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/65000-present_line_if_cursor_change_vertical.py +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import line_utils -from fenrirscreenreader.utils import word_utils - -class command(): - def __init__(self): - self.lastIdent = -1 - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return '' - - def run(self): - if not self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'cursor'): - return - if self.env['runtime']['screenManager'].isScreenChange(): - self.lastIdent = 0 - return - # this leads to problems in vim -> status line change -> no announcement, so we do check the lengh as hack - if self.env['runtime']['screenManager'].isDelta(): - return - - # is a vertical change? - if not self.env['runtime']['cursorManager'].isCursorVerticalMove(): - return - - x, y, currLine = line_utils.getCurrentLine(self.env['screen']['newCursor']['x'], self.env['screen']['newCursor']['y'], self.env['screen']['newContentText']) - if currLine.isspace(): - self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True, flush=False) - else: - # ident - currIdent = len(currLine) - len(currLine.lstrip()) - if self.lastIdent == -1: - self.lastIdent = currIdent - doInterrupt = True - if self.env['runtime']['settingsManager'].getSettingAsBool('general', 'autoPresentIndent'): - if self.lastIdent != currIdent: - self.env['runtime']['outputManager'].presentText(_('indented ') + str(currIdent) + ' ', interrupt=doInterrupt, flush=False) - doInterrupt = False - # barrier - sayLine = currLine - if self.env['runtime']['settingsManager'].getSettingAsBool('barrier','enabled'): - isBarrier, barrierLine = self.env['runtime']['barrierManager'].handleLineBarrier(self.env['screen']['newContentText'].split('\n'), self.env['screen']['newCursor']['x'],self.env['screen']['newCursor']['y']) - if isBarrier: - sayLine = barrierLine - # output - self.env['runtime']['outputManager'].presentText(sayLine, interrupt=doInterrupt, flush=False) - self.lastIdent = currIdent - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/85000-has_attribute.py b/src/fenrirscreenreader/commands/onCursorChange/resort/85000-has_attribute.py deleted file mode 100644 index b7be5074..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/85000-has_attribute.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -from fenrirscreenreader.utils import screen_utils - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return _('Reads attributes of current cursor position') - def run(self): - # is it enabled? - if not self.env['runtime']['settingsManager'].getSettingAsBool('general', 'hasAttributes'): - return - # is a vertical change? - if not (self.env['runtime']['cursorManager'].isCursorVerticalMove() or\ - self.env['runtime']['cursorManager'].isCursorHorizontalMove()): - return - - cursorPos = self.env['screen']['newCursor'] - - if not self.env['runtime']['attributeManager'].hasAttributes(cursorPos): - return - self.env['runtime']['outputManager'].presentText('has attribute', soundIcon='HasAttributes', interrupt=False) - def setCallback(self, callback): - pass diff --git a/src/fenrirscreenreader/commands/onCursorChange/resort/95000-exit_review_mode.py b/src/fenrirscreenreader/commands/onCursorChange/resort/95000-exit_review_mode.py deleted file mode 100644 index b9d095d9..00000000 --- a/src/fenrirscreenreader/commands/onCursorChange/resort/95000-exit_review_mode.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return _('exits review mode') - - def run(self): - if not self.env['runtime']['settingsManager'].getSettingAsBool('review', 'leaveReviewOnCursorChange'): - return - if self.env['runtime']['cursorManager'].isReviewMode(): - self.env['runtime']['cursorManager'].clearReviewCursor() - - def setCallback(self, callback): - pass diff --git a/src/fenrirscreenreader/commands/onHeartBeat/2000-GetSessionInfo.py b/src/fenrirscreenreader/commands/onHeartBeat/2000-GetSessionInfo.py index 2856db92..c986b0d9 100755 --- a/src/fenrirscreenreader/commands/onHeartBeat/2000-GetSessionInfo.py +++ b/src/fenrirscreenreader/commands/onHeartBeat/2000-GetSessionInfo.py @@ -5,7 +5,6 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import time import datetime diff --git a/src/fenrirscreenreader/commands/onHeartBeat/76000-time.py b/src/fenrirscreenreader/commands/onHeartBeat/76000-time.py index 6ed247b4..59537a44 100755 --- a/src/fenrirscreenreader/commands/onHeartBeat/76000-time.py +++ b/src/fenrirscreenreader/commands/onHeartBeat/76000-time.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import time import datetime diff --git a/src/fenrirscreenreader/commands/onHeartBeat/deactive/1.echo.py b/src/fenrirscreenreader/commands/onHeartBeat/deactive/1.echo.py deleted file mode 100755 index 95e6bbda..00000000 --- a/src/fenrirscreenreader/commands/onHeartBeat/deactive/1.echo.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python3 -import time -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug -import time - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - print(time.time()) - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onKeyInput/10000-shut_up.py b/src/fenrirscreenreader/commands/onKeyInput/10000-shut_up.py index 522ab94a..71f0b1b1 100644 --- a/src/fenrirscreenreader/commands/onKeyInput/10000-shut_up.py +++ b/src/fenrirscreenreader/commands/onKeyInput/10000-shut_up.py @@ -4,8 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug - class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/onKeyInput/15000-enable_temp_speech.py b/src/fenrirscreenreader/commands/onKeyInput/15000-enable_temp_speech.py index 29d37937..20e662d3 100644 --- a/src/fenrirscreenreader/commands/onKeyInput/15000-enable_temp_speech.py +++ b/src/fenrirscreenreader/commands/onKeyInput/15000-enable_temp_speech.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py b/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py index f3efeb69..6568b836 100644 --- a/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py +++ b/src/fenrirscreenreader/commands/onKeyInput/80000-capslock.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onKeyInput/80300-scrolllock.py b/src/fenrirscreenreader/commands/onKeyInput/80300-scrolllock.py index c3d64946..752110ba 100644 --- a/src/fenrirscreenreader/commands/onKeyInput/80300-scrolllock.py +++ b/src/fenrirscreenreader/commands/onKeyInput/80300-scrolllock.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onKeyInput/80500-numlock.py b/src/fenrirscreenreader/commands/onKeyInput/80500-numlock.py index 96e1348e..39b0fb92 100644 --- a/src/fenrirscreenreader/commands/onKeyInput/80500-numlock.py +++ b/src/fenrirscreenreader/commands/onKeyInput/80500-numlock.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onKeyInput/81000-key_echo.py b/src/fenrirscreenreader/commands/onKeyInput/81000-key_echo.py index fca7437a..a5df3c4c 100644 --- a/src/fenrirscreenreader/commands/onKeyInput/81000-key_echo.py +++ b/src/fenrirscreenreader/commands/onKeyInput/81000-key_echo.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onPlugInputDevice/50000-plugSound.py b/src/fenrirscreenreader/commands/onPlugInputDevice/50000-plugSound.py index 461eb2b5..853d36d4 100755 --- a/src/fenrirscreenreader/commands/onPlugInputDevice/50000-plugSound.py +++ b/src/fenrirscreenreader/commands/onPlugInputDevice/50000-plugSound.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import time class command(): diff --git a/src/fenrirscreenreader/commands/onScreenChanged/10000-shut_up.py b/src/fenrirscreenreader/commands/onScreenChanged/10000-shut_up.py index 82686368..e1e18141 100644 --- a/src/fenrirscreenreader/commands/onScreenChanged/10000-shut_up.py +++ b/src/fenrirscreenreader/commands/onScreenChanged/10000-shut_up.py @@ -4,8 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug - class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/onScreenChanged/20000-reset_last_cursor_attribute.py b/src/fenrirscreenreader/commands/onScreenChanged/20000-reset_last_cursor_attribute.py index 352191a0..945bbe5c 100644 --- a/src/fenrirscreenreader/commands/onScreenChanged/20000-reset_last_cursor_attribute.py +++ b/src/fenrirscreenreader/commands/onScreenChanged/20000-reset_last_cursor_attribute.py @@ -5,8 +5,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug - class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/onScreenChanged/21000-reset_barrier_change.py b/src/fenrirscreenreader/commands/onScreenChanged/21000-reset_barrier_change.py index 6d9e8b21..2f4d51e4 100644 --- a/src/fenrirscreenreader/commands/onScreenChanged/21000-reset_barrier_change.py +++ b/src/fenrirscreenreader/commands/onScreenChanged/21000-reset_barrier_change.py @@ -1,11 +1,9 @@ - #!/usr/bin/env python3 # -*- coding: utf-8 -*- # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onScreenChanged/70000-barrier_detect.py b/src/fenrirscreenreader/commands/onScreenChanged/70000-barrier_detect.py index ac5bf809..02a23b70 100644 --- a/src/fenrirscreenreader/commands/onScreenChanged/70000-barrier_detect.py +++ b/src/fenrirscreenreader/commands/onScreenChanged/70000-barrier_detect.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onScreenChanged/80000-screen_change_announcement.py b/src/fenrirscreenreader/commands/onScreenChanged/80000-screen_change_announcement.py index 6a8b4069..cbd60d48 100644 --- a/src/fenrirscreenreader/commands/onScreenChanged/80000-screen_change_announcement.py +++ b/src/fenrirscreenreader/commands/onScreenChanged/80000-screen_change_announcement.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onScreenChanged/85000-reset_marks.py b/src/fenrirscreenreader/commands/onScreenChanged/85000-reset_marks.py index 3c365a73..1cc55473 100644 --- a/src/fenrirscreenreader/commands/onScreenChanged/85000-reset_marks.py +++ b/src/fenrirscreenreader/commands/onScreenChanged/85000-reset_marks.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onScreenChanged/89000-leave_review_mode.py b/src/fenrirscreenreader/commands/onScreenChanged/89000-leave_review_mode.py index 51defaf6..505bbddf 100644 --- a/src/fenrirscreenreader/commands/onScreenChanged/89000-leave_review_mode.py +++ b/src/fenrirscreenreader/commands/onScreenChanged/89000-leave_review_mode.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/56000-highlight_tracking.py b/src/fenrirscreenreader/commands/onScreenUpdate/56000-highlight_tracking.py index b74acd31..5198ebd5 100644 --- a/src/fenrirscreenreader/commands/onScreenUpdate/56000-highlight_tracking.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/56000-highlight_tracking.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py b/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py index 6933b62f..fba8c870 100644 --- a/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py b/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py index 8ae69e2a..40ad22e3 100644 --- a/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/75000-incoming_promote.py b/src/fenrirscreenreader/commands/onScreenUpdate/75000-incoming_promote.py index b6639b24..23f2864b 100644 --- a/src/fenrirscreenreader/commands/onScreenUpdate/75000-incoming_promote.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/75000-incoming_promote.py @@ -5,7 +5,6 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/80000-barrier_detect.py b/src/fenrirscreenreader/commands/onScreenUpdate/80000-barrier_detect.py index f2411814..3b516f8f 100644 --- a/src/fenrirscreenreader/commands/onScreenUpdate/80000-barrier_detect.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/80000-barrier_detect.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onScreenUpdate/rework/70000-incoming.py b/src/fenrirscreenreader/commands/onScreenUpdate/rework/70000-incoming.py deleted file mode 100644 index a7ab0466..00000000 --- a/src/fenrirscreenreader/commands/onScreenUpdate/rework/70000-incoming.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No Description found' - - def run(self): - if not self.env['runtime']['settingsManager'].getSettingAsBool('speech', 'autoReadIncoming'): - return - # is there something to read? - if not self.env['runtime']['screenManager'].isDelta(ignoreSpace=True): - return - - # this must be a keyecho or something - #if len(self.env['screen']['newDelta'].strip(' \n\t')) <= 1: - xMove = abs(self.env['screen']['newCursor']['x'] - self.env['screen']['oldCursor']['x']) - yMove = abs(self.env['screen']['newCursor']['y'] - self.env['screen']['oldCursor']['y']) - #print('-----') - #print(self.env['screen']['newDelta']) - #print(xMove, yMove, len(self.env['screen']['newNegativeDelta']), self.env['screen']['newNegativeDelta']) - #print(xMove, yMove, len(self.env['screen']['newDelta']), self.env['screen']['newDelta']) - if (xMove >= 1) and abs(xMove) == len(self.env['screen']['newDelta']): - # if len(self.env['screen']['newDelta'].strip(' \n\t0123456789')) <= 2: - if not '\n' in self.env['screen']['newDelta']: - return - # shift line - if (xMove != 0) and len(self.env['screen']['newNegativeDelta']) == 0: - return - # filter out delete - if (xMove == 0) and (yMove == 0): - if len(self.env['screen']['newNegativeDelta']) - len(self.env['screen']['newDelta']) in [1,2,3]: - return - - self.env['runtime']['outputManager'].presentText(self.env['screen']['newDelta'], interrupt=False, flush=False) - - def setCallback(self, callback): - pass - diff --git a/src/fenrirscreenreader/commands/onSwitchApplicationProfile/default.py b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/default.py index b7680d59..764a2292 100644 --- a/src/fenrirscreenreader/commands/onSwitchApplicationProfile/default.py +++ b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/default.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/agetty.py b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/agetty.py deleted file mode 100644 index 63c92e3f..00000000 --- a/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/agetty.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No description found' - def load(self): - print('--------------') - print('agetty') - print('load new',self.env['screen']['newApplication']) - print('--------------') - - def unload(self): - print('--------------') - print('agetty') - print('unload old',self.env['screen']['oldApplication']) - print('--------------') - - def setCallback(self, callback): - pass diff --git a/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/bash.py b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/bash.py deleted file mode 100644 index d16a5ef9..00000000 --- a/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/bash.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No description found' - def load(self): - print('--------------') - print('bash') - print('load new',self.env['screen']['newApplication']) - print('--------------') - - def unload(self): - print('--------------') - print('bash') - print('unload old',self.env['screen']['oldApplication']) - print('--------------') - - def setCallback(self, callback): - pass diff --git a/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/vim.py b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/vim.py deleted file mode 100644 index 5f29e148..00000000 --- a/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/vim.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- - -# Fenrir TTY screen reader -# By Chrys, Storm Dragon, and contributers. - -from fenrirscreenreader.core import debug - -class command(): - def __init__(self): - pass - def initialize(self, environment): - self.env = environment - def shutdown(self): - pass - def getDescription(self): - return 'No description found' - def load(self): - print('--------------') - print('vim') - print('load new',self.env['screen']['newApplication']) - print('--------------') - - def unload(self): - print('--------------') - print('vim') - print('unload old',self.env['screen']['oldApplication']) - print('--------------') - - def setCallback(self, callback): - pass diff --git a/src/fenrirscreenreader/commands/quickMenu/current_quick_menu_entry.py b/src/fenrirscreenreader/commands/quickMenu/current_quick_menu_entry.py index 0b21ad3c..a89ce3ee 100644 --- a/src/fenrirscreenreader/commands/quickMenu/current_quick_menu_entry.py +++ b/src/fenrirscreenreader/commands/quickMenu/current_quick_menu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/quickMenu/current_quick_menu_value.py b/src/fenrirscreenreader/commands/quickMenu/current_quick_menu_value.py index b9da1e0e..6522e080 100644 --- a/src/fenrirscreenreader/commands/quickMenu/current_quick_menu_value.py +++ b/src/fenrirscreenreader/commands/quickMenu/current_quick_menu_value.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/quickMenu/next_quick_menu_entry.py b/src/fenrirscreenreader/commands/quickMenu/next_quick_menu_entry.py index e14fad03..1d2a5fb1 100644 --- a/src/fenrirscreenreader/commands/quickMenu/next_quick_menu_entry.py +++ b/src/fenrirscreenreader/commands/quickMenu/next_quick_menu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/quickMenu/next_quick_menu_value.py b/src/fenrirscreenreader/commands/quickMenu/next_quick_menu_value.py index ae15c51a..78a0f9ad 100644 --- a/src/fenrirscreenreader/commands/quickMenu/next_quick_menu_value.py +++ b/src/fenrirscreenreader/commands/quickMenu/next_quick_menu_value.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/quickMenu/prev_quick_menu_entry.py b/src/fenrirscreenreader/commands/quickMenu/prev_quick_menu_entry.py index 329438b1..87aef5df 100644 --- a/src/fenrirscreenreader/commands/quickMenu/prev_quick_menu_entry.py +++ b/src/fenrirscreenreader/commands/quickMenu/prev_quick_menu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/quickMenu/prev_quick_menu_value.py b/src/fenrirscreenreader/commands/quickMenu/prev_quick_menu_value.py index 64495c68..bfa7e8cb 100644 --- a/src/fenrirscreenreader/commands/quickMenu/prev_quick_menu_value.py +++ b/src/fenrirscreenreader/commands/quickMenu/prev_quick_menu_value.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/switchTrigger_template.py b/src/fenrirscreenreader/commands/switchTrigger_template.py index 4d1ee82d..f8c837ff 100644 --- a/src/fenrirscreenreader/commands/switchTrigger_template.py +++ b/src/fenrirscreenreader/commands/switchTrigger_template.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/curr_vmenu_entry.py b/src/fenrirscreenreader/commands/vmenu-navigation/curr_vmenu_entry.py index 22818bae..41787ef8 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/curr_vmenu_entry.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/curr_vmenu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/dec_level_vmenu.py b/src/fenrirscreenreader/commands/vmenu-navigation/dec_level_vmenu.py index 30996797..56fcd4ff 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/dec_level_vmenu.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/dec_level_vmenu.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/exec_vmenu_entry.py b/src/fenrirscreenreader/commands/vmenu-navigation/exec_vmenu_entry.py index cb5e65b4..6ec99f52 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/exec_vmenu_entry.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/exec_vmenu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/inc_level_vmenu.py b/src/fenrirscreenreader/commands/vmenu-navigation/inc_level_vmenu.py index e1d34c2f..f902dd00 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/inc_level_vmenu.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/inc_level_vmenu.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/next_vmenu_entry.py b/src/fenrirscreenreader/commands/vmenu-navigation/next_vmenu_entry.py index 1eda533c..8aa5b011 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/next_vmenu_entry.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/next_vmenu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/prev_vmenu_entry.py b/src/fenrirscreenreader/commands/vmenu-navigation/prev_vmenu_entry.py index 959ef702..32ee67c1 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/prev_vmenu_entry.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/prev_vmenu_entry.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_a.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_a.py index 5ff18daf..220f2fca 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_a.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_a.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_b.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_b.py index 49ce995d..44388bdb 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_b.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_b.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_c.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_c.py index 23073dfd..1d6bd162 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_c.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_c.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_d.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_d.py index 2a94e067..bc4156b4 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_d.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_d.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_e.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_e.py index e650afa5..5549f26a 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_e.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_e.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_f.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_f.py index 0d5e9059..be8f240a 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_f.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_f.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_g.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_g.py index bc093abf..495dfdb9 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_g.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_g.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_h.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_h.py index 675309d6..0260d6f9 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_h.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_h.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_i.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_i.py index f416633a..7d5a8e00 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_i.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_i.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_j.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_j.py index 07700fe7..2694c538 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_j.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_j.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_k.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_k.py index 297c5f5d..4a75b3b1 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_k.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_k.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_l.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_l.py index 65ea410a..eb488ef8 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_l.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_l.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_m.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_m.py index 3870ca0c..f6e03118 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_m.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_m.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_n.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_n.py index 4b2f0b90..75b63b61 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_n.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_n.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_o.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_o.py index 1b24411a..f9cf21d0 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_o.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_o.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_p.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_p.py index 2bee8e6b..aefe562d 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_p.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_p.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_q.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_q.py index 0424e888..fe2bab4e 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_q.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_q.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_r.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_r.py index a8beef51..72956f1a 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_r.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_r.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_s.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_s.py index 0b9a68c5..6bc5b78b 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_s.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_s.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_t.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_t.py index a6caf217..c4903343 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_t.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_t.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_u.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_u.py index b7cc8513..d4e65013 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_u.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_u.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_v.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_v.py index 6fd4aaf4..02f246fb 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_v.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_v.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_w.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_w.py index 5ff18daf..220f2fca 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_w.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_w.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_x.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_x.py index c5fc2ba4..3b7146aa 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_x.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_x.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_y.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_y.py index 4591bf83..fdb11b47 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_y.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_y.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-navigation/search_z.py b/src/fenrirscreenreader/commands/vmenu-navigation/search_z.py index 01b5d143..89ee505b 100644 --- a/src/fenrirscreenreader/commands/vmenu-navigation/search_z.py +++ b/src/fenrirscreenreader/commands/vmenu-navigation/search_z.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/file/open.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/file/open.py index e3bddc87..571f69c8 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/file/open.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/file/open.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/file/save.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/file/save.py index 0e9db029..d5d57e3c 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/file/save.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/file/save.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/replace.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/replace.py index f2f001db..08e1e27a 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/replace.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/replace.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/search.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/search.py index 6da6f437..6862f01b 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/search.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/search.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/test.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/test.py index 3275d2f0..7a95ca1c 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/test.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mc/search/test.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import datetime class command(): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/issue.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/issue.py index 2fd16a90..3329ab3e 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/issue.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/issue.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/open.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/open.py index 081decbc..a7d9ceab 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/open.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/open.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/save.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/save.py index 0e9db029..d5d57e3c 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/save.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/file/save.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/replace.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/replace.py index f2f001db..08e1e27a 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/replace.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/replace.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/search.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/search.py index 6da6f437..6862f01b 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/search.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/search.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/test.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/test.py index 3275d2f0..7a95ca1c 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/test.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/mutt/search/test.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import datetime class command(): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/Help/about_nano.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/Help/about_nano.py index a293a07e..f4e2bddb 100755 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/Help/about_nano.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/Help/about_nano.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -*- encoding: utf-8 -from fenrirscreenreader.core import debug class command(): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/file/open.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/file/open.py index e3bddc87..571f69c8 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/file/open.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/file/open.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/file/save.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/file/save.py index 8a2f9221..879f01b7 100755 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/file/save.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/file/save.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -*- encoding: utf-8 -from fenrirscreenreader.core import debug class command(): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/replace.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/replace.py index f2f001db..08e1e27a 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/replace.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/replace.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/search.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/search.py index 6da6f437..6862f01b 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/search.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/search.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/test.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/test.py index 3275d2f0..7a95ca1c 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/test.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/nano/search/test.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import datetime class command(): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/file/open.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/file/open.py index e3bddc87..571f69c8 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/file/open.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/file/open.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/file/save.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/file/save.py index 0e9db029..d5d57e3c 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/file/save.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/file/save.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/replace.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/replace.py index f2f001db..08e1e27a 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/replace.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/replace.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/search.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/search.py index 6da6f437..6862f01b 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/search.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/search.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/test.py b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/test.py index 3275d2f0..7a95ca1c 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/test.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/KEY/vim/search/test.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug import datetime class command(): diff --git a/src/fenrirscreenreader/commands/vmenu-profiles/template.py b/src/fenrirscreenreader/commands/vmenu-profiles/template.py index 0f645761..922d5cc1 100644 --- a/src/fenrirscreenreader/commands/vmenu-profiles/template.py +++ b/src/fenrirscreenreader/commands/vmenu-profiles/template.py @@ -4,7 +4,6 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrirscreenreader/core/fenrirManager.py b/src/fenrirscreenreader/core/fenrirManager.py index cd0131cf..6e68b64c 100644 --- a/src/fenrirscreenreader/core/fenrirManager.py +++ b/src/fenrirscreenreader/core/fenrirManager.py @@ -116,7 +116,7 @@ class fenrirManager(): self.environment['runtime']['remoteManager'].handleRemoteIncomming(event['Data']) def handleScreenChange(self, event): - self.environment['runtime']['screenManager'].hanldeScreenChange(event['Data']) + self.environment['runtime']['screenManager'].handleScreenChange(event['Data']) if self.environment['runtime']['vmenuManager'].getActive(): return self.environment['runtime']['commandManager'].executeDefaultTrigger('onScreenChanged') diff --git a/src/fenrirscreenreader/core/screenManager.py b/src/fenrirscreenreader/core/screenManager.py index 04f6418f..5a3abea4 100644 --- a/src/fenrirscreenreader/core/screenManager.py +++ b/src/fenrirscreenreader/core/screenManager.py @@ -52,7 +52,7 @@ class screenManager(): self.env['runtime']['settingsManager'].shutdownDriver('screenDriver') def isCurrScreenIgnoredChanged(self): return self.getCurrScreenIgnored() != self.getPrevScreenIgnored() - def hanldeScreenChange(self, eventData): + def handleScreenChange(self, eventData): self.getCurrScreen() self.getSessionInformation() self.updateScreenIgnored() diff --git a/src/fenrirscreenreader/core/speechDriver.py b/src/fenrirscreenreader/core/speechDriver.py index 82b62d8d..2f6f55ef 100644 --- a/src/fenrirscreenreader/core/speechDriver.py +++ b/src/fenrirscreenreader/core/speechDriver.py @@ -57,7 +57,7 @@ class speechDriver(): if not isinstance(pitch, float): return if pitch < 0.0: - retrun + return if pitch > 1.0: return self.pitch = pitch @@ -67,7 +67,7 @@ class speechDriver(): if not isinstance(rate, float): return if rate < 0.0: - retrun + return if rate > 1.0: return self.rate = rate @@ -96,7 +96,7 @@ class speechDriver(): if not isinstance(volume,float): return if volume < 0.0: - retrun + return if volume > 1.0: return self.volume = volume diff --git a/src/fenrirscreenreader/utils/line_utils.py b/src/fenrirscreenreader/utils/line_utils.py index 1c309ced..a18caaa7 100644 --- a/src/fenrirscreenreader/utils/line_utils.py +++ b/src/fenrirscreenreader/utils/line_utils.py @@ -5,7 +5,6 @@ # By Chrys, Storm Dragon, and contributers. from fenrirscreenreader.core import debug -from collections import Counter def getPrevLine(currX,currY, currText): endOfScreen = False diff --git a/src/fenrirscreenreader/utils/screen_utils.py b/src/fenrirscreenreader/utils/screen_utils.py index 0075d6c8..715fe65f 100644 --- a/src/fenrirscreenreader/utils/screen_utils.py +++ b/src/fenrirscreenreader/utils/screen_utils.py @@ -76,7 +76,7 @@ def getShell(): except: pass try: - if os.acess('/etc/passwd'): + if os.access('/etc/passwd', os.R_OK): with open('/etc/passwd') as f: users = f.readlines() for user in users: