--- docu/user.md | 2 docu/user.txt | 2 play | 2 setup.py | 4 - src/fenrir/brailleDriver/brlapiDriver.py | 2 src/fenrir/brailleDriver/dummyDriver.py | 2 src/fenrir/commands/command_template.py | 2 src/fenrir/commands/commands/add_word_to_spell_check.py | 4 - src/fenrir/commands/commands/attribute_cursor.py | 4 - src/fenrir/commands/commands/bookmark_1.py | 6 - src/fenrir/commands/commands/bookmark_10.py | 6 - src/fenrir/commands/commands/bookmark_2.py | 6 - src/fenrir/commands/commands/bookmark_3.py | 6 - src/fenrir/commands/commands/bookmark_4.py | 6 - src/fenrir/commands/commands/bookmark_5.py | 6 - src/fenrir/commands/commands/bookmark_6.py | 6 - src/fenrir/commands/commands/bookmark_7.py | 6 - src/fenrir/commands/commands/bookmark_8.py | 6 - src/fenrir/commands/commands/bookmark_9.py | 6 - src/fenrir/commands/commands/braille_flush.py | 2 src/fenrir/commands/commands/braille_pan_left.py | 2 src/fenrir/commands/commands/braille_pan_right.py | 2 src/fenrir/commands/commands/braille_return_to_cursor.py | 2 src/fenrir/commands/commands/clear_bookmark_1.py | 2 src/fenrir/commands/commands/clear_bookmark_10.py | 2 src/fenrir/commands/commands/clear_bookmark_2.py | 2 src/fenrir/commands/commands/clear_bookmark_3.py | 2 src/fenrir/commands/commands/clear_bookmark_4.py | 2 src/fenrir/commands/commands/clear_bookmark_5.py | 2 src/fenrir/commands/commands/clear_bookmark_6.py | 2 src/fenrir/commands/commands/clear_bookmark_7.py | 2 src/fenrir/commands/commands/clear_bookmark_8.py | 2 src/fenrir/commands/commands/clear_bookmark_9.py | 2 src/fenrir/commands/commands/clear_clipboard.py | 2 src/fenrir/commands/commands/clear_window_application.py | 2 src/fenrir/commands/commands/copy_marked_to_clipboard.py | 4 - src/fenrir/commands/commands/curr_clipboard.py | 2 src/fenrir/commands/commands/curr_screen.py | 2 src/fenrir/commands/commands/curr_screen_after_cursor.py | 4 - src/fenrir/commands/commands/curr_screen_before_cursor.py | 4 - src/fenrir/commands/commands/cursor_column.py | 2 src/fenrir/commands/commands/cursor_lineno.py | 2 src/fenrir/commands/commands/cursor_position.py | 2 src/fenrir/commands/commands/cursor_read_to_end_of_line.py | 4 - src/fenrir/commands/commands/date.py | 2 src/fenrir/commands/commands/dec_alsa_volume.py | 2 src/fenrir/commands/commands/dec_sound_volume.py | 2 src/fenrir/commands/commands/dec_speech_pitch.py | 2 src/fenrir/commands/commands/dec_speech_rate.py | 2 src/fenrir/commands/commands/dec_speech_volume.py | 2 src/fenrir/commands/commands/exit_review.py | 2 src/fenrir/commands/commands/export_clipboard_to_file.py | 2 src/fenrir/commands/commands/export_clipboard_to_x.py | 2 src/fenrir/commands/commands/first_clipboard.py | 2 src/fenrir/commands/commands/forward_keypress.py | 2 src/fenrir/commands/commands/import_clipboard_from_file.py | 4 - src/fenrir/commands/commands/inc_alsa_volume.py | 2 src/fenrir/commands/commands/inc_sound_volume.py | 2 src/fenrir/commands/commands/inc_speech_pitch.py | 2 src/fenrir/commands/commands/inc_speech_rate.py | 2 src/fenrir/commands/commands/inc_speech_volume.py | 2 src/fenrir/commands/commands/indent_curr_line.py | 4 - src/fenrir/commands/commands/last_clipboard.py | 2 src/fenrir/commands/commands/last_incoming.py | 2 src/fenrir/commands/commands/marked_text.py | 4 - src/fenrir/commands/commands/next_clipboard.py | 2 src/fenrir/commands/commands/paste_clipboard.py | 2 src/fenrir/commands/commands/present_first_line.py | 4 - src/fenrir/commands/commands/present_last_line.py | 4 - src/fenrir/commands/commands/prev_clipboard.py | 2 src/fenrir/commands/commands/quit_fenrir.py | 2 src/fenrir/commands/commands/remove_marks.py | 2 src/fenrir/commands/commands/remove_word_from_spell_check.py | 4 - src/fenrir/commands/commands/review_bottom.py | 2 src/fenrir/commands/commands/review_curr_char.py | 4 - src/fenrir/commands/commands/review_curr_char_phonetic.py | 4 - src/fenrir/commands/commands/review_curr_line.py | 4 - src/fenrir/commands/commands/review_curr_word.py | 4 - src/fenrir/commands/commands/review_curr_word_phonetic.py | 6 - src/fenrir/commands/commands/review_down.py | 4 - src/fenrir/commands/commands/review_line_begin.py | 4 - src/fenrir/commands/commands/review_line_end.py | 4 - src/fenrir/commands/commands/review_line_first_char.py | 6 - src/fenrir/commands/commands/review_line_last_char.py | 4 - src/fenrir/commands/commands/review_next_char.py | 4 - src/fenrir/commands/commands/review_next_char_phonetic.py | 4 - src/fenrir/commands/commands/review_next_line.py | 4 - src/fenrir/commands/commands/review_next_word.py | 4 - src/fenrir/commands/commands/review_next_word_phonetic.py | 6 - src/fenrir/commands/commands/review_prev_char.py | 4 - src/fenrir/commands/commands/review_prev_char_phonetic.py | 4 - src/fenrir/commands/commands/review_prev_line.py | 4 - src/fenrir/commands/commands/review_prev_word.py | 4 - src/fenrir/commands/commands/review_prev_word_phonetic.py | 6 - src/fenrir/commands/commands/review_top.py | 4 - src/fenrir/commands/commands/review_up.py | 4 - src/fenrir/commands/commands/set_bookmark_1.py | 2 src/fenrir/commands/commands/set_bookmark_10.py | 2 src/fenrir/commands/commands/set_bookmark_2.py | 2 src/fenrir/commands/commands/set_bookmark_3.py | 2 src/fenrir/commands/commands/set_bookmark_4.py | 2 src/fenrir/commands/commands/set_bookmark_5.py | 2 src/fenrir/commands/commands/set_bookmark_6.py | 2 src/fenrir/commands/commands/set_bookmark_7.py | 2 src/fenrir/commands/commands/set_bookmark_8.py | 2 src/fenrir/commands/commands/set_bookmark_9.py | 2 src/fenrir/commands/commands/set_mark.py | 2 src/fenrir/commands/commands/set_window_application.py | 2 src/fenrir/commands/commands/shut_up.py | 2 src/fenrir/commands/commands/spell_check.py | 4 - src/fenrir/commands/commands/subprocess.py | 2 src/fenrir/commands/commands/temp_disable_speech.py | 2 src/fenrir/commands/commands/time.py | 2 src/fenrir/commands/commands/toggle_auto_read.py | 2 src/fenrir/commands/commands/toggle_auto_spell_check.py | 2 src/fenrir/commands/commands/toggle_auto_time.py | 2 src/fenrir/commands/commands/toggle_braille.py | 2 src/fenrir/commands/commands/toggle_emoticons.py | 2 src/fenrir/commands/commands/toggle_highlight_tracking.py | 2 src/fenrir/commands/commands/toggle_output.py | 2 src/fenrir/commands/commands/toggle_punctuation_level.py | 2 src/fenrir/commands/commands/toggle_sound.py | 2 src/fenrir/commands/commands/toggle_speech.py | 2 src/fenrir/commands/commands/toggle_tutorial_mode.py | 2 src/fenrir/commands/help/curr_help.py | 2 src/fenrir/commands/help/next_help.py | 2 src/fenrir/commands/help/prev_help.py | 2 src/fenrir/commands/onCursorChange/45000-char_echo.py | 2 src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py | 4 - src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py | 6 - src/fenrir/commands/onCursorChange/60000-word_echo_type.py | 4 - src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py | 4 - src/fenrir/commands/onCursorChange/62000-spell_check.py | 4 - src/fenrir/commands/onCursorChange/65000-char_delete_echo.py | 2 src/fenrir/commands/onCursorChange/66000-exit_review_mode.py | 2 src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py | 2 src/fenrir/commands/onHeartBeat/76000-time.py | 2 src/fenrir/commands/onHeartBeat/deactive/1.echo.py | 2 src/fenrir/commands/onInput/10000-shut_up.py | 2 src/fenrir/commands/onInput/15000-enable_temp_speech.py | 2 src/fenrir/commands/onInput/80000-capslock.py | 2 src/fenrir/commands/onInput/80300-scrolllock.py | 2 src/fenrir/commands/onInput/80500-numlock.py | 2 src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py | 2 src/fenrir/commands/onScreenChanged/10000-shut_up.py | 2 src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py | 2 src/fenrir/commands/onScreenChanged/85000-reset_marks.py | 2 src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py | 2 src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py | 2 src/fenrir/commands/onScreenUpdate/60000-history.py | 2 src/fenrir/commands/onScreenUpdate/70000-incoming.py | 2 src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py | 2 src/fenrir/commands/onSwitchApplicationProfile/default.py | 2 src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py | 2 src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py | 2 src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py | 2 src/fenrir/commands/switchTrigger_template.py | 2 src/fenrir/core/applicationManager.py | 2 src/fenrir/core/commandData.py | 2 src/fenrir/core/commandManager.py | 4 - src/fenrir/core/cursorManager.py | 2 src/fenrir/core/debugManager.py | 2 src/fenrir/core/environment.py | 18 ++--- src/fenrir/core/eventData.py | 2 src/fenrir/core/eventManager.py | 4 - src/fenrir/core/fenrirManager.py | 8 +- src/fenrir/core/generalData.py | 2 src/fenrir/core/helpManager.py | 2 src/fenrir/core/inputData.py | 2 src/fenrir/core/inputManager.py | 2 src/fenrir/core/outputData.py | 2 src/fenrir/core/outputManager.py | 4 - src/fenrir/core/processManager.py | 4 - src/fenrir/core/punctuationData.py | 2 src/fenrir/core/punctuationManager.py | 2 src/fenrir/core/runtimeData.py | 2 src/fenrir/core/screenData.py | 2 src/fenrir/core/screenManager.py | 2 src/fenrir/core/settingsData.py | 2 src/fenrir/core/settingsManager.py | 32 +++++----- src/fenrir/fenrir | 2 src/fenrir/fenrir-daemon | 2 src/fenrir/inputDriver/dummyDriver.py | 2 src/fenrir/inputDriver/evdevDriver.py | 6 - src/fenrir/screenDriver/vcsaDriver.py | 6 - src/fenrir/soundDriver/dummyDriver.py | 2 src/fenrir/soundDriver/genericDriver.py | 2 src/fenrir/soundDriver/gstreamerDriver.py | 2 src/fenrir/speechDriver/dummyDriver.py | 2 src/fenrir/speechDriver/emacspeakDriver.py | 2 src/fenrir/speechDriver/espeakDriver.py | 2 src/fenrir/speechDriver/genericDriver.py | 2 src/fenrir/speechDriver/speechdDriver.py | 2 src/fenrir/utils/char_utils.py | 2 src/fenrir/utils/line_utils.py | 2 src/fenrir/utils/mark_utils.py | 2 src/fenrir/utils/review_utils.py | 2 src/fenrir/utils/screen_utils.py | 2 src/fenrir/utils/word_utils.py | 2 199 files changed, 299 insertions(+), 299 deletions(-) --- a/setup.py +++ b/setup.py @@ -78,8 +78,8 @@ setup( author_email="chrysg@linux-a11y.org", # Packages - packages=find_packages('src/fenrir'), - package_dir={'': 'src/fenrir'}, + packages=find_packages('src'), + package_dir={'': 'src'}, scripts=['src/fenrir/fenrir','src/fenrir/fenrir-daemon'], # Include additional files into the package --- a/docu/user.md +++ b/docu/user.md @@ -1517,7 +1517,7 @@ Commands are python files with a special Good Examples: ["date.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py) (announce the Date), ["shut_up.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py) (interrupt output) the basic scheme for a command is as follows: - from core import debug + from fenrir.core import debug class command(): def __init__(self): --- a/docu/user.txt +++ b/docu/user.txt @@ -1273,7 +1273,7 @@ Commands are python files with a special Good Examples: [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py|"date.py"]] (announce the Date), [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py|"shut_up.py"]] (interrupt output) the basic scheme for a command is as follows: - from core import debug + from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/brailleDriver/brlapiDriver.py +++ b/src/fenrir/brailleDriver/brlapiDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class driver(): def __init__(self): --- a/src/fenrir/brailleDriver/dummyDriver.py +++ b/src/fenrir/brailleDriver/dummyDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class driver(): def __init__(self): --- a/src/fenrir/commands/command_template.py +++ b/src/fenrir/commands/command_template.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/add_word_to_spell_check.py +++ b/src/fenrir/commands/commands/add_word_to_spell_check.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import word_utils import string initialized = False try: --- a/src/fenrir/commands/commands/attribute_cursor.py +++ b/src/fenrir/commands/commands/attribute_cursor.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import screen_utils +from fenrir.core import debug +from fenrir.utils import screen_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_1.py +++ b/src/fenrir/commands/commands/bookmark_1.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_10.py +++ b/src/fenrir/commands/commands/bookmark_10.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_2.py +++ b/src/fenrir/commands/commands/bookmark_2.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_3.py +++ b/src/fenrir/commands/commands/bookmark_3.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_4.py +++ b/src/fenrir/commands/commands/bookmark_4.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_5.py +++ b/src/fenrir/commands/commands/bookmark_5.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_6.py +++ b/src/fenrir/commands/commands/bookmark_6.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_7.py +++ b/src/fenrir/commands/commands/bookmark_7.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_8.py +++ b/src/fenrir/commands/commands/bookmark_8.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/bookmark_9.py +++ b/src/fenrir/commands/commands/bookmark_9.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import mark_utils +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/braille_flush.py +++ b/src/fenrir/commands/commands/braille_flush.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/braille_pan_left.py +++ b/src/fenrir/commands/commands/braille_pan_left.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/braille_pan_right.py +++ b/src/fenrir/commands/commands/braille_pan_right.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/braille_return_to_cursor.py +++ b/src/fenrir/commands/commands/braille_return_to_cursor.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_1.py +++ b/src/fenrir/commands/commands/clear_bookmark_1.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_10.py +++ b/src/fenrir/commands/commands/clear_bookmark_10.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_2.py +++ b/src/fenrir/commands/commands/clear_bookmark_2.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_3.py +++ b/src/fenrir/commands/commands/clear_bookmark_3.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_4.py +++ b/src/fenrir/commands/commands/clear_bookmark_4.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_5.py +++ b/src/fenrir/commands/commands/clear_bookmark_5.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_6.py +++ b/src/fenrir/commands/commands/clear_bookmark_6.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_7.py +++ b/src/fenrir/commands/commands/clear_bookmark_7.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_8.py +++ b/src/fenrir/commands/commands/clear_bookmark_8.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_bookmark_9.py +++ b/src/fenrir/commands/commands/clear_bookmark_9.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_clipboard.py +++ b/src/fenrir/commands/commands/clear_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/clear_window_application.py +++ b/src/fenrir/commands/commands/clear_window_application.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/copy_marked_to_clipboard.py +++ b/src/fenrir/commands/commands/copy_marked_to_clipboard.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.utils import mark_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/curr_clipboard.py +++ b/src/fenrir/commands/commands/curr_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/curr_screen.py +++ b/src/fenrir/commands/commands/curr_screen.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/curr_screen_after_cursor.py +++ b/src/fenrir/commands/commands/curr_screen_after_cursor.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.utils import mark_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/curr_screen_before_cursor.py +++ b/src/fenrir/commands/commands/curr_screen_before_cursor.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.utils import mark_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/cursor_column.py +++ b/src/fenrir/commands/commands/cursor_column.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/cursor_lineno.py +++ b/src/fenrir/commands/commands/cursor_lineno.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/cursor_position.py +++ b/src/fenrir/commands/commands/cursor_position.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/cursor_read_to_end_of_line.py +++ b/src/fenrir/commands/commands/cursor_read_to_end_of_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/date.py +++ b/src/fenrir/commands/commands/date.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import datetime class command(): --- a/src/fenrir/commands/commands/dec_alsa_volume.py +++ b/src/fenrir/commands/commands/dec_alsa_volume.py @@ -11,7 +11,7 @@ try: except: pass -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/dec_sound_volume.py +++ b/src/fenrir/commands/commands/dec_sound_volume.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import math class command(): --- a/src/fenrir/commands/commands/dec_speech_pitch.py +++ b/src/fenrir/commands/commands/dec_speech_pitch.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import math class command(): --- a/src/fenrir/commands/commands/dec_speech_rate.py +++ b/src/fenrir/commands/commands/dec_speech_rate.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import math class command(): --- a/src/fenrir/commands/commands/dec_speech_volume.py +++ b/src/fenrir/commands/commands/dec_speech_volume.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import math class command(): --- a/src/fenrir/commands/commands/exit_review.py +++ b/src/fenrir/commands/commands/exit_review.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/export_clipboard_to_file.py +++ b/src/fenrir/commands/commands/export_clipboard_to_file.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import os class command(): --- a/src/fenrir/commands/commands/export_clipboard_to_x.py +++ b/src/fenrir/commands/commands/export_clipboard_to_x.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import subprocess, os from subprocess import Popen, PIPE import _thread --- a/src/fenrir/commands/commands/first_clipboard.py +++ b/src/fenrir/commands/commands/first_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/forward_keypress.py +++ b/src/fenrir/commands/commands/forward_keypress.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/import_clipboard_from_file.py +++ b/src/fenrir/commands/commands/import_clipboard_from_file.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.utils import mark_utils import os class command(): --- a/src/fenrir/commands/commands/inc_alsa_volume.py +++ b/src/fenrir/commands/commands/inc_alsa_volume.py @@ -11,7 +11,7 @@ try: except: pass -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/inc_sound_volume.py +++ b/src/fenrir/commands/commands/inc_sound_volume.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import math class command(): --- a/src/fenrir/commands/commands/inc_speech_pitch.py +++ b/src/fenrir/commands/commands/inc_speech_pitch.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import math class command(): --- a/src/fenrir/commands/commands/inc_speech_rate.py +++ b/src/fenrir/commands/commands/inc_speech_rate.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import math class command(): --- a/src/fenrir/commands/commands/inc_speech_volume.py +++ b/src/fenrir/commands/commands/inc_speech_volume.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import math class command(): --- a/src/fenrir/commands/commands/indent_curr_line.py +++ b/src/fenrir/commands/commands/indent_curr_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/last_clipboard.py +++ b/src/fenrir/commands/commands/last_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/last_incoming.py +++ b/src/fenrir/commands/commands/last_incoming.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/marked_text.py +++ b/src/fenrir/commands/commands/marked_text.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import mark_utils +from fenrir.core import debug +from fenrir.utils import mark_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/next_clipboard.py +++ b/src/fenrir/commands/commands/next_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/paste_clipboard.py +++ b/src/fenrir/commands/commands/paste_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import time class command(): --- a/src/fenrir/commands/commands/present_first_line.py +++ b/src/fenrir/commands/commands/present_first_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/present_last_line.py +++ b/src/fenrir/commands/commands/present_last_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/prev_clipboard.py +++ b/src/fenrir/commands/commands/prev_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/quit_fenrir.py +++ b/src/fenrir/commands/commands/quit_fenrir.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/remove_marks.py +++ b/src/fenrir/commands/commands/remove_marks.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/remove_word_from_spell_check.py +++ b/src/fenrir/commands/commands/remove_word_from_spell_check.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import word_utils import string initialized = False try: --- a/src/fenrir/commands/commands/review_bottom.py +++ b/src/fenrir/commands/commands/review_bottom.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_curr_char.py +++ b/src/fenrir/commands/commands/review_curr_char.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_curr_char_phonetic.py +++ b/src/fenrir/commands/commands/review_curr_char_phonetic.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_curr_line.py +++ b/src/fenrir/commands/commands/review_curr_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_curr_word.py +++ b/src/fenrir/commands/commands/review_curr_word.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import word_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_curr_word_phonetic.py +++ b/src/fenrir/commands/commands/review_curr_word_phonetic.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import word_utils +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_down.py +++ b/src/fenrir/commands/commands/review_down.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_line_begin.py +++ b/src/fenrir/commands/commands/review_line_begin.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_line_end.py +++ b/src/fenrir/commands/commands/review_line_end.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_line_first_char.py +++ b/src/fenrir/commands/commands/review_line_first_char.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import line_utils +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_line_last_char.py +++ b/src/fenrir/commands/commands/review_line_last_char.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_next_char.py +++ b/src/fenrir/commands/commands/review_next_char.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_next_char_phonetic.py +++ b/src/fenrir/commands/commands/review_next_char_phonetic.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_next_line.py +++ b/src/fenrir/commands/commands/review_next_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_next_word.py +++ b/src/fenrir/commands/commands/review_next_word.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import word_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_next_word_phonetic.py +++ b/src/fenrir/commands/commands/review_next_word_phonetic.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import word_utils +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_prev_char.py +++ b/src/fenrir/commands/commands/review_prev_char.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_prev_char_phonetic.py +++ b/src/fenrir/commands/commands/review_prev_char_phonetic.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_prev_line.py +++ b/src/fenrir/commands/commands/review_prev_line.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import line_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_prev_word.py +++ b/src/fenrir/commands/commands/review_prev_word.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import word_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_prev_word_phonetic.py +++ b/src/fenrir/commands/commands/review_prev_word_phonetic.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import word_utils +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_top.py +++ b/src/fenrir/commands/commands/review_top.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/review_up.py +++ b/src/fenrir/commands/commands/review_up.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_1.py +++ b/src/fenrir/commands/commands/set_bookmark_1.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_10.py +++ b/src/fenrir/commands/commands/set_bookmark_10.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_2.py +++ b/src/fenrir/commands/commands/set_bookmark_2.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_3.py +++ b/src/fenrir/commands/commands/set_bookmark_3.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_4.py +++ b/src/fenrir/commands/commands/set_bookmark_4.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_5.py +++ b/src/fenrir/commands/commands/set_bookmark_5.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_6.py +++ b/src/fenrir/commands/commands/set_bookmark_6.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_7.py +++ b/src/fenrir/commands/commands/set_bookmark_7.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_8.py +++ b/src/fenrir/commands/commands/set_bookmark_8.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_bookmark_9.py +++ b/src/fenrir/commands/commands/set_bookmark_9.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_mark.py +++ b/src/fenrir/commands/commands/set_mark.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/set_window_application.py +++ b/src/fenrir/commands/commands/set_window_application.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/shut_up.py +++ b/src/fenrir/commands/commands/shut_up.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/spell_check.py +++ b/src/fenrir/commands/commands/spell_check.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import word_utils initialized = False try: import enchant --- a/src/fenrir/commands/commands/subprocess.py +++ b/src/fenrir/commands/commands/subprocess.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import subprocess, os from subprocess import Popen, PIPE import _thread --- a/src/fenrir/commands/commands/temp_disable_speech.py +++ b/src/fenrir/commands/commands/temp_disable_speech.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/time.py +++ b/src/fenrir/commands/commands/time.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import datetime class command(): --- a/src/fenrir/commands/commands/toggle_auto_read.py +++ b/src/fenrir/commands/commands/toggle_auto_read.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): pass --- a/src/fenrir/commands/commands/toggle_auto_spell_check.py +++ b/src/fenrir/commands/commands/toggle_auto_spell_check.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/toggle_auto_time.py +++ b/src/fenrir/commands/commands/toggle_auto_time.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): pass --- a/src/fenrir/commands/commands/toggle_braille.py +++ b/src/fenrir/commands/commands/toggle_braille.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/toggle_emoticons.py +++ b/src/fenrir/commands/commands/toggle_emoticons.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): pass --- a/src/fenrir/commands/commands/toggle_highlight_tracking.py +++ b/src/fenrir/commands/commands/toggle_highlight_tracking.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): pass --- a/src/fenrir/commands/commands/toggle_output.py +++ b/src/fenrir/commands/commands/toggle_output.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/toggle_punctuation_level.py +++ b/src/fenrir/commands/commands/toggle_punctuation_level.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/toggle_sound.py +++ b/src/fenrir/commands/commands/toggle_sound.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/toggle_speech.py +++ b/src/fenrir/commands/commands/toggle_speech.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/commands/toggle_tutorial_mode.py +++ b/src/fenrir/commands/commands/toggle_tutorial_mode.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/help/curr_help.py +++ b/src/fenrir/commands/help/curr_help.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/help/next_help.py +++ b/src/fenrir/commands/help/next_help.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/help/prev_help.py +++ b/src/fenrir/commands/help/prev_help.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onCursorChange/45000-char_echo.py +++ b/src/fenrir/commands/onCursorChange/45000-char_echo.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py +++ b/src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import char_utils +from fenrir.core import debug +from fenrir.utils import char_utils class command(): def __init__(self): --- a/src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py +++ b/src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import line_utils +from fenrir.utils import word_utils class command(): def __init__(self): --- a/src/fenrir/commands/onCursorChange/60000-word_echo_type.py +++ b/src/fenrir/commands/onCursorChange/60000-word_echo_type.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import word_utils import string class command(): --- a/src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py +++ b/src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import word_utils import string class command(): --- a/src/fenrir/commands/onCursorChange/62000-spell_check.py +++ b/src/fenrir/commands/onCursorChange/62000-spell_check.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import word_utils +from fenrir.core import debug +from fenrir.utils import word_utils import os, string initialized = False --- a/src/fenrir/commands/onCursorChange/65000-char_delete_echo.py +++ b/src/fenrir/commands/onCursorChange/65000-char_delete_echo.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onCursorChange/66000-exit_review_mode.py +++ b/src/fenrir/commands/onCursorChange/66000-exit_review_mode.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py +++ b/src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py @@ -5,7 +5,7 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import time import datetime --- a/src/fenrir/commands/onHeartBeat/76000-time.py +++ b/src/fenrir/commands/onHeartBeat/76000-time.py @@ -5,7 +5,7 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import time import datetime --- a/src/fenrir/commands/onHeartBeat/deactive/1.echo.py +++ b/src/fenrir/commands/onHeartBeat/deactive/1.echo.py @@ -5,7 +5,7 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import time class command(): --- a/src/fenrir/commands/onInput/10000-shut_up.py +++ b/src/fenrir/commands/onInput/10000-shut_up.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onInput/15000-enable_temp_speech.py +++ b/src/fenrir/commands/onInput/15000-enable_temp_speech.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onInput/80000-capslock.py +++ b/src/fenrir/commands/onInput/80000-capslock.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onInput/80300-scrolllock.py +++ b/src/fenrir/commands/onInput/80300-scrolllock.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onInput/80500-numlock.py +++ b/src/fenrir/commands/onInput/80500-numlock.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py +++ b/src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onScreenChanged/10000-shut_up.py +++ b/src/fenrir/commands/onScreenChanged/10000-shut_up.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py +++ b/src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onScreenChanged/85000-reset_marks.py +++ b/src/fenrir/commands/onScreenChanged/85000-reset_marks.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py +++ b/src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py +++ b/src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): pass --- a/src/fenrir/commands/onScreenUpdate/60000-history.py +++ b/src/fenrir/commands/onScreenUpdate/60000-history.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onScreenUpdate/70000-incoming.py +++ b/src/fenrir/commands/onScreenUpdate/70000-incoming.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py +++ b/src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py @@ -5,7 +5,7 @@ import time # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onSwitchApplicationProfile/default.py +++ b/src/fenrir/commands/onSwitchApplicationProfile/default.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py +++ b/src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py +++ b/src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py +++ b/src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/commands/switchTrigger_template.py +++ b/src/fenrir/commands/switchTrigger_template.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class command(): def __init__(self): --- a/src/fenrir/core/applicationManager.py +++ b/src/fenrir/core/applicationManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class applicationManager(): def __init__(self): --- a/src/fenrir/core/commandData.py +++ b/src/fenrir/core/commandData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import time # used as shared memory between commands --- a/src/fenrir/core/commandManager.py +++ b/src/fenrir/core/commandManager.py @@ -8,8 +8,8 @@ import glob, os, time, inspect currentdir = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe())))) fenrirPath = os.path.dirname(currentdir) -from core import debug -from utils import module_utils +from fenrir.core import debug +from fenrir.utils import module_utils class commandManager(): def __init__(self): --- a/src/fenrir/core/cursorManager.py +++ b/src/fenrir/core/cursorManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class cursorManager(): def __init__(self): --- a/src/fenrir/core/debugManager.py +++ b/src/fenrir/core/debugManager.py @@ -1,7 +1,7 @@ #!/usr/bin/python # Debugger module for the Fenrir screen reader. -from core import debug +from fenrir.core import debug from datetime import datetime class debugManager(): --- a/src/fenrir/core/environment.py +++ b/src/fenrir/core/environment.py @@ -4,15 +4,15 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from core.settingsData import settingsData -from core.runtimeData import runtimeData -from core.screenData import screenData -from core.outputData import outputData -from core.generalData import generalData -from core import commandData -from core.inputData import inputData -from core.punctuationData import punctuationData +from fenrir.core import debug +from fenrir.core.settingsData import settingsData +from fenrir.core.runtimeData import runtimeData +from fenrir.core.screenData import screenData +from fenrir.core.outputData import outputData +from fenrir.core.generalData import generalData +from fenrir.core import commandData +from fenrir.core.inputData import inputData +from fenrir.core.punctuationData import punctuationData environment = { 'screen': screenData, --- a/src/fenrir/core/eventData.py +++ b/src/fenrir/core/eventData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug from enum import Enum class fenrirEventType(Enum): --- a/src/fenrir/core/eventManager.py +++ b/src/fenrir/core/eventManager.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from core.eventData import fenrirEventType +from fenrir.core import debug +from fenrir.core.eventData import fenrirEventType from queue import Empty import time from multiprocessing import Queue --- a/src/fenrir/core/fenrirManager.py +++ b/src/fenrir/core/fenrirManager.py @@ -6,10 +6,10 @@ import os, sys, signal, time -from core import i18n -from core import settingsManager -from core import debug -from core.eventData import fenrirEventType +from fenrir.core import i18n +from fenrir.core import settingsManager +from fenrir.core import debug +from fenrir.core.eventData import fenrirEventType import argparse class fenrirManager(): --- a/src/fenrir/core/generalData.py +++ b/src/fenrir/core/generalData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug generalData = { 'args': None, --- a/src/fenrir/core/helpManager.py +++ b/src/fenrir/core/helpManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class helpManager(): --- a/src/fenrir/core/inputData.py +++ b/src/fenrir/core/inputData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import time inputData = { --- a/src/fenrir/core/inputManager.py +++ b/src/fenrir/core/inputManager.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import time -from core import debug +from fenrir.core import debug class inputManager(): def __init__(self): --- a/src/fenrir/core/outputData.py +++ b/src/fenrir/core/outputData.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import time -from core import debug +from fenrir.core import debug outputData = { 'nextFlush': time.time(), --- a/src/fenrir/core/outputManager.py +++ b/src/fenrir/core/outputManager.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from utils import line_utils +from fenrir.core import debug +from fenrir.utils import line_utils import string, time class outputManager(): --- a/src/fenrir/core/processManager.py +++ b/src/fenrir/core/processManager.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from core.eventData import fenrirEventType +from fenrir.core import debug +from fenrir.core.eventData import fenrirEventType import time from threading import Thread from multiprocessing import Process --- a/src/fenrir/core/punctuationData.py +++ b/src/fenrir/core/punctuationData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import string punctuationData = { --- a/src/fenrir/core/punctuationManager.py +++ b/src/fenrir/core/punctuationManager.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import string -from core import debug +from fenrir.core import debug class punctuationManager(): def __init__(self): --- a/src/fenrir/core/runtimeData.py +++ b/src/fenrir/core/runtimeData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug runtimeData = { 'speechDriver': None, --- a/src/fenrir/core/screenData.py +++ b/src/fenrir/core/screenData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import time screenData = { --- a/src/fenrir/core/screenManager.py +++ b/src/fenrir/core/screenManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import time class screenManager(): --- a/src/fenrir/core/settingsData.py +++ b/src/fenrir/core/settingsData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug settingsData = { 'sound': { --- a/src/fenrir/core/settingsManager.py +++ b/src/fenrir/core/settingsManager.py @@ -9,22 +9,22 @@ currentdir = os.path.dirname(os.path.rea fenrirPath = os.path.dirname(currentdir) from configparser import ConfigParser -from core import debugManager -from core import processManager -from core import eventManager -from core import inputManager -from core import outputManager -from core import commandManager -from core import screenManager -from core import punctuationManager -from core import cursorManager -from core import applicationManager -from core import helpManager -from core import environment -from core import inputData -from core.settingsData import settingsData -from core import debug -from utils import module_utils +from fenrir.core import debugManager +from fenrir.core import processManager +from fenrir.core import eventManager +from fenrir.core import inputManager +from fenrir.core import outputManager +from fenrir.core import commandManager +from fenrir.core import screenManager +from fenrir.core import punctuationManager +from fenrir.core import cursorManager +from fenrir.core import applicationManager +from fenrir.core import helpManager +from fenrir.core import environment +from fenrir.core import inputData +from fenrir.core.settingsData import settingsData +from fenrir.core import debug +from fenrir.utils import module_utils class settingsManager(): def __init__(self): --- a/src/fenrir/fenrir +++ b/src/fenrir/fenrir @@ -10,7 +10,7 @@ fenrirPath = os.path.dirname(os.path.rea if not fenrirPath in sys.path: sys.path.append(fenrirPath) -from core import fenrirManager +from fenrir.core import fenrirManager def main(): app = fenrirManager.fenrirManager() --- a/src/fenrir/fenrir-daemon +++ b/src/fenrir/fenrir-daemon @@ -10,7 +10,7 @@ fenrirPath = os.path.dirname(os.path.rea if not fenrirPath in sys.path: sys.path.append(fenrirPath) -from core import fenrirManager +from fenrir.core import fenrirManager from daemonize import Daemonize pidFile = "/run/fenrir.pid" --- a/src/fenrir/inputDriver/dummyDriver.py +++ b/src/fenrir/inputDriver/dummyDriver.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import time -from core import debug +from fenrir.core import debug class driver(): def __init__(self): --- a/src/fenrir/inputDriver/evdevDriver.py +++ b/src/fenrir/inputDriver/evdevDriver.py @@ -27,9 +27,9 @@ import multiprocessing from multiprocessing.sharedctypes import Value from ctypes import c_bool -from core.eventData import fenrirEventType -from core import inputData -from core import debug +from fenrir.core.eventData import fenrirEventType +from fenrir.core import inputData +from fenrir.core import debug class driver(): --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrir/screenDriver/vcsaDriver.py @@ -23,11 +23,11 @@ import fcntl from array import array import errno import sys -from utils import screen_utils +from fenrir.utils import screen_utils from fcntl import ioctl from struct import unpack_from, unpack, pack -from core import debug -from core.eventData import fenrirEventType +from fenrir.core import debug +from fenrir.core.eventData import fenrirEventType class driver(): --- a/src/fenrir/soundDriver/dummyDriver.py +++ b/src/fenrir/soundDriver/dummyDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug class driver(): def __init__(self): --- a/src/fenrir/soundDriver/genericDriver.py +++ b/src/fenrir/soundDriver/genericDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import subprocess class driver(): --- a/src/fenrir/soundDriver/gstreamerDriver.py +++ b/src/fenrir/soundDriver/gstreamerDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import time, threading --- a/src/fenrir/speechDriver/dummyDriver.py +++ b/src/fenrir/speechDriver/dummyDriver.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. # generic driver -from core import debug +from fenrir.core import debug class driver(): def __init__(self): --- a/src/fenrir/speechDriver/emacspeakDriver.py +++ b/src/fenrir/speechDriver/emacspeakDriver.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. # generic driver -from core import debug +from fenrir.core import debug from subprocess import Popen, PIPE import pexpect import sys --- a/src/fenrir/speechDriver/espeakDriver.py +++ b/src/fenrir/speechDriver/espeakDriver.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. # Espeak driver -from core import debug +from fenrir.core import debug class driver(): def __init__(self): --- a/src/fenrir/speechDriver/genericDriver.py +++ b/src/fenrir/speechDriver/genericDriver.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. # generic driver -from core import debug +from fenrir.core import debug from threading import Thread, Lock from queue import Queue, Empty from subprocess import Popen --- a/src/fenrir/speechDriver/speechdDriver.py +++ b/src/fenrir/speechDriver/speechdDriver.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. # speech-dispatcher driver -from core import debug +from fenrir.core import debug class driver(): def __init__(self): --- a/src/fenrir/utils/char_utils.py +++ b/src/fenrir/utils/char_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug def getPrevChar(currX,currY, currText): lineBreak = False --- a/src/fenrir/utils/line_utils.py +++ b/src/fenrir/utils/line_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug from collections import Counter def getPrevLine(currX,currY, currText): --- a/src/fenrir/utils/mark_utils.py +++ b/src/fenrir/utils/mark_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug def getTextBetweenMarks(firstMark, secondMark, inText): if inText == None: --- a/src/fenrir/utils/review_utils.py +++ b/src/fenrir/utils/review_utils.py @@ -4,5 +4,5 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug --- a/src/fenrir/utils/screen_utils.py +++ b/src/fenrir/utils/screen_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug from collections import Counter import string from select import select --- a/src/fenrir/utils/word_utils.py +++ b/src/fenrir/utils/word_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrir.core import debug import string def getCurrentWord(currX,currY, currText):