diff --git a/TODO v2.0 b/TODO v2.0 index df827060..156e74ba 100644 --- a/TODO v2.0 +++ b/TODO v2.0 @@ -16,7 +16,6 @@ Cleanups: [] runtimeData.py [] screenData.py [] settingsData -> defaultSettings.py - [] find . -iname "*.py" -exec sed 's/from \(core.*\) import/from fenrir-screenreader.\1 import/g' {} \; General (Easy for contribution) [] wrapper script for running Fenrir to check if pypy3 exists, use python3 as fallback. [w] make fenrir runnable without root permissions @@ -146,3 +145,5 @@ Fixes: - handle thread and process shutdown more gracefully - cleanup - a lot more fixes +[X] (not conflict with other applications) find . -iname "*.py" -exec sed 's/from \(core.*\) import/from fenrir-screenreader.\1 import/g' {} \; + diff --git a/config/settings/espeak.settings.conf b/config/settings/espeak.settings.conf index e94a9d8b..eda382a0 100644 --- a/config/settings/espeak.settings.conf +++ b/config/settings/espeak.settings.conf @@ -8,7 +8,7 @@ driver=genericDriver # Sound themes. These are the pack of sounds used for sound alerts. # Sound packs may be located at /usr/share/sounds -# For system wide availability, or ~/.local/share/fenrir/sounds +# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds # For the current user. theme=default-wav @@ -132,7 +132,7 @@ device=ALL # gives Fenrir exclusive access to the keyboard and let consume keystrokes. grabDevices=True ignoreShortcuts=False -# the current shortcut layout located in /etc/fenrir/keyboard +# the current shortcut layout located in /etc/fenrirscreenreader/keyboard keyboardLayout=desktop # echo chars while typing. charEcho=True @@ -166,7 +166,7 @@ timeFormat=%H:%M:%P dateFormat=%A, %B %d, %Y autoSpellCheck=True spellCheckLanguage=en_US -scriptPath=/usr/share/fenrir/scripts +scriptPath=/usr/share/fenrirscreenreader/scripts commandPath= #fenrirBGColor = the backgroundcolor #fenrirFGColor = the foregroundcolor diff --git a/config/settings/settings.conf b/config/settings/settings.conf index 1e4d5a0d..90ba7510 100644 --- a/config/settings/settings.conf +++ b/config/settings/settings.conf @@ -9,7 +9,7 @@ driver=genericDriver # Sound themes. These are the pack of sounds used for sound alerts. # Sound packs may be located at /usr/share/sounds -# For system wide availability, or ~/.local/share/fenrir/sounds +# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds # For the current user. theme=default-wav @@ -134,7 +134,7 @@ device=ALL # gives Fenrir exclusive access to the keyboard and lets it control keystrokes. grabDevices=True ignoreShortcuts=False -# the current shortcut layout located in /etc/fenrir/keyboard +# the current shortcut layout located in /etc/fenrirscreenreader/keyboard keyboardLayout=desktop # echo chars while typing. charEcho=False @@ -173,7 +173,7 @@ dateFormat=%A, %B %d, %Y autoSpellCheck=True spellCheckLanguage=en_US # path for your scripts "scriptKey" functionality -scriptPath=/usr/share/fenrir/scripts +scriptPath=/usr/share/fenrirscreenreader/scripts # overload commands, and create new one without changing Fenrir default commandPath= #fenrirBGColor = the backgroundcolor diff --git a/config/settings/settings.conf.example b/config/settings/settings.conf.example index 1e4dd243..319cc541 100644 --- a/config/settings/settings.conf.example +++ b/config/settings/settings.conf.example @@ -9,7 +9,7 @@ driver=genericDriver # Sound themes. These are the pack of sounds used for sound alerts. # Sound packs may be located at /usr/share/sounds -# For system wide availability, or ~/.local/share/fenrir/sounds +# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds # For the current user. theme=default-wav @@ -135,7 +135,7 @@ device=ALL # gives Fenrir exclusive access to the keyboard and lets it control keystrokes. grabDevices=True ignoreShortcuts=False -# the current shortcut layout located in /etc/fenrir/keyboard +# the current shortcut layout located in /etc/fenrirscreenreader/keyboard keyboardLayout=desktop # echo chars while typing. charEcho=False @@ -174,7 +174,7 @@ dateFormat=%A, %B %d, %Y autoSpellCheck=True spellCheckLanguage=en_US # path for your scripts "scriptKey" functionality -scriptPath=/usr/share/fenrir/scripts +scriptPath=/usr/share/fenrirscreenreader/scripts # overload commands, and create new one without changing Fenrir default commandPath= #fenrirBGColor = the backgroundcolor diff --git a/config/settings/speech-dispatcher.settings.conf b/config/settings/speech-dispatcher.settings.conf index a6ead851..63b20cef 100644 --- a/config/settings/speech-dispatcher.settings.conf +++ b/config/settings/speech-dispatcher.settings.conf @@ -9,7 +9,7 @@ driver=genericDriver # Sound themes. These are the pack of sounds used for sound alerts. # Sound packs may be located at /usr/share/sounds -# For system wide availability, or ~/.local/share/fenrir/sounds +# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds # For the current user. theme=default-wav @@ -134,7 +134,7 @@ device=ALL # gives Fenrir exclusive access to the keyboard and lets it control keystrokes. grabDevices=True ignoreShortcuts=False -# the current shortcut layout located in /etc/fenrir/keyboard +# the current shortcut layout located in /etc/fenrirscreenreader/keyboard keyboardLayout=desktop # echo chars while typing. charEcho=False @@ -173,7 +173,7 @@ dateFormat=%A, %B %d, %Y autoSpellCheck=True spellCheckLanguage=en_US # path for your scripts "scriptKey" functionality -scriptPath=/usr/share/fenrir/scripts +scriptPath=/usr/share/fenrirscreenreader/scripts # overload commands, and create new one without changing Fenrir default commandPath= #fenrirBGColor = the backgroundcolor diff --git a/install.sh b/install.sh index 1f0d59f3..38b6e3a9 100755 --- a/install.sh +++ b/install.sh @@ -3,54 +3,54 @@ read -p "This will install Fenrir. Press ctrl+C to cancel, or enter to continue." continue # Fenrir main application -install -m755 -d /opt/fenrir -cp -af src/fenrir/* /opt/fenrir +install -m755 -d /opt/fenrirscreenreader +cp -af src/* /opt/fenrirscreenreader install -m644 -D "autostart/systemd/fenrir.service" /usr/lib/systemd/system/fenrir.service -ln -fs /opt/fenrir/fenrir-daemon /usr/bin/fenrir-daemon -ln -fs /opt/fenrir/fenrir /usr/bin/fenrir +ln -fs /opt/fenrirscreenreader/fenrir-daemon /usr/bin/fenrir-daemon +ln -fs /opt/fenrirscreenreader/fenrir /usr/bin/fenrir # tools -install -m755 -d /usr/share/fenrir/tools -cp -af tools/* /usr/share/fenrir/tools +install -m755 -d /usr/share/fenrirscreenreader/tools +cp -af tools/* /usr/share/fenrirscreenreader/tools # scripts -install -m755 -d /usr/share/fenrir/scripts -cp -af "config/scripts/wlan__-__key_y.sh" /usr/share/fenrir/scripts/ +install -m755 -d /usr/share/fenrirscreenreader/scripts +cp -af "config/scripts/wlan__-__key_y.sh" /usr/share/fenrirscreenreader/scripts/ # keyboard -install -m644 -D "config/keyboard/desktop.conf" /etc/fenrir/keyboard/desktop.conf -install -m644 -D "config/keyboard/laptop.conf" /etc/fenrir/keyboard/laptop.conf +install -m644 -D "config/keyboard/desktop.conf" /etc/fenrirscreenreader/keyboard/desktop.conf +install -m644 -D "config/keyboard/laptop.conf" /etc/fenrirscreenreader/keyboard/laptop.conf # punctuation -install -m755 -d /etc/fenrir/punctuation -cp -af config/punctuation/* /etc/fenrir/punctuation +install -m755 -d /etc/fenrirscreenreader/punctuation +cp -af config/punctuation/* /etc/fenrirscreenreader/punctuation # sound -install -d /usr/share/sounds/fenrir -cp -af config/sound/default /usr/share/sounds/fenrir/default -cp -af config/sound/default-wav /usr/share/sounds/fenrir/default-wav -cp -af config/sound/template /usr/share/sounds/fenrir/template +install -d /usr/share/sounds/fenrirscreenreader +cp -af config/sound/default /usr/share/sounds/fenrirscreenreader/default +cp -af config/sound/default-wav /usr/share/sounds/fenrirscreenreader/default-wav +cp -af config/sound/template /usr/share/sounds/fenrirscreenreader/template # config -if [ -f "/etc/fenrir/settings/settings.conf" ]; then +if [ -f "/etc/fenrirscreenreader/settings/settings.conf" ]; then echo "Do you want to overwrite your current global settings? (y/n)" read yn if [ $yn = "Y" -o $yn = "y" ]; then - mv /etc/fenrir/settings/settings.conf /etc/fenrir/settings/settings.conf.bak + mv /etc/fenrirscreenreader/settings/settings.conf /etc/fenrirscreenreader/settings/settings.conf.bak echo "Your old settings.conf has been backed up to settings.conf.bak." - install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf + install -m644 -D "config/settings/settings.conf" /etc/fenrirscreenreader/settings/settings.conf else - install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf.current + install -m644 -D "config/settings/settings.conf" /etc/fenrirscreenreader/settings/settings.conf.current fi else - install -m644 -D "config/settings/settings.conf" /etc/fenrir/settings/settings.conf + install -m644 -D "config/settings/settings.conf" /etc/fenrirscreenreader/settings/settings.conf fi # end message cat << EOF Installation complete. -install path:/opt/fenrir -settings path:/etc/fenrir +install path:/opt/fenrirscreenreader +settings path:/etc/fenrirscreenreader To test Fenrir sudo systemctl start fenrir @@ -58,6 +58,6 @@ To have Fenrir start on system boot: sudo systemctl enable fenrir Pulseaudio users may want to run -/usr/share/fenrir/tools/configure_pulse.sh +/usr/share/fenrirscreenreader/tools/configure_pulse.sh once from their user account, then once from the root. EOF diff --git a/play zone/wrapWord.py b/play zone/wrapWord.py index 566816a9..27dbc466 100755 --- a/play zone/wrapWord.py +++ b/play zone/wrapWord.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -#from core import debug +#from fenrirscreenreader.core import debug import string # X Y Word END BREAK # -1, -1, '', True False diff --git a/setup.py b/setup.py index ee28bf24..eb07d454 100755 --- a/setup.py +++ b/setup.py @@ -6,8 +6,8 @@ from shutil import copyfile from setuptools import find_packages from setuptools import setup -fenrirVersion = '1.5' -packageVersion = 'post11' +fenrirVersion = '1.7' +packageVersion = 'post1' # handle flags for package manager like yaourt and pacaur. forceSettings = False @@ -21,32 +21,32 @@ for directory in directories: files = glob.glob(directory+'/*') destDir = '' if 'config/punctuation' in directory : - destDir = '/etc/fenrir/punctuation' + destDir = '/etc/fenrirscreenreader/punctuation' elif 'config/keyboard' in directory: - destDir = '/etc/fenrir/keyboard' + destDir = '/etc/fenrirscreenreader/keyboard' elif 'config/settings' in directory: - destDir = '/etc/fenrir/settings' + destDir = '/etc/fenrirscreenreader/settings' if not forceSettings: try: del(files[files.index('config/settings/settings.conf')]) except: pass elif 'config/scripts' in directory: - destDir = '/usr/share/fenrir/scripts' + destDir = '/usr/share/fenrirscreenreader/scripts' if destDir != '': data_files.append((destDir, files)) files = glob.glob('config/sound/default-wav/*') -destDir = '/usr/share/sounds/fenrir/default-wav' +destDir = '/usr/share/sounds/fenrirscreenreader/default-wav' data_files.append((destDir, files)) files = glob.glob('config/sound/default/*') -destDir = '/usr/share/sounds/fenrir/default' +destDir = '/usr/share/sounds/fenrirscreenreader/default' data_files.append((destDir, files)) files = glob.glob('config/sound//template/*') -destDir = '/usr/share/sounds/fenrir/template' +destDir = '/usr/share/sounds/fenrirscreenreader/template' data_files.append((destDir, files)) files = glob.glob('tools/*') -data_files.append(('/usr/share/fenrir/tools', files)) +data_files.append(('/usr/share/fenrirscreenreader/tools', files)) data_files.append(('/usr/lib/systemd/system', ['autostart/systemd/fenrir.service'])) data_files.append(('/usr/share/man/man1', ['docu/fenrir.1'])) @@ -78,9 +78,9 @@ setup( author_email="chrysg@linux-a11y.org", # Packages - packages=find_packages('src/fenrir'), - package_dir={'': 'src/fenrir'}, - scripts=['src/fenrir/fenrir','src/fenrir/fenrir-daemon'], + packages=find_packages('src/'), + package_dir={'': 'src/'}, + scripts=['src/fenrir','src/fenrir-daemon'], # Include additional files into the package include_package_data=True, @@ -105,10 +105,10 @@ setup( if not forceSettings: print('') # create settings file from example if not exist - if not os.path.isfile('/etc/fenrir/settings/settings.conf'): + if not os.path.isfile('/etc/fenrirscreenreader/settings/settings.conf'): try: - copyfile('/etc/fenrir/settings/settings.conf.example', '/etc/fenrir/settings/settings.conf') - print('create settings file in /etc/fenrir/settings/settings.conf') + copyfile('/etc/fenrirscreenreader/settings/settings.conf.example', '/etc/fenrirscreenreader/settings/settings.conf') + print('create settings file in /etc/fenrirscreenreader/settings/settings.conf') except: pass else: @@ -118,7 +118,7 @@ print('') print('To have Fenrir start at boot:') print('sudo systemctl enable fenrir') print('Pulseaudio users may want to run:') -print('/usr/share/fenrir/tools/configure_pulse.sh') +print('/usr/share/fenrirscreenreader/tools/configure_pulse.sh') print('once as their user account and once as root to configure Pulseaudio.') print('Please install the following packages manually:') print('- Speech-dispatcher: for the default speech driver') diff --git a/src/fenrir/fenrir b/src/fenrir similarity index 89% rename from src/fenrir/fenrir rename to src/fenrir index d8107dfe..735e09e6 100755 --- a/src/fenrir/fenrir +++ b/src/fenrir @@ -10,7 +10,7 @@ fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(in if not fenrirPath in sys.path: sys.path.append(fenrirPath) -from core import fenrirManager +from fenrirscreenreader.core import fenrirManager def main(): app = fenrirManager.fenrirManager() diff --git a/src/fenrir/fenrir-daemon b/src/fenrir-daemon similarity index 93% rename from src/fenrir/fenrir-daemon rename to src/fenrir-daemon index eefc5054..80a618a5 100755 --- a/src/fenrir/fenrir-daemon +++ b/src/fenrir-daemon @@ -10,7 +10,7 @@ fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(in if not fenrirPath in sys.path: sys.path.append(fenrirPath) -from core import fenrirManager +from fenrirscreenreader.core import fenrirManager from daemonize import Daemonize pidFile = "/run/fenrir.pid" diff --git a/src/fenrir/core/environment.py b/src/fenrir/core/environment.py deleted file mode 100644 index b8838e15..00000000 --- a/src/fenrir/core/environment.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/python -# -*- coding: utf-8 -*- - -# 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 - -environment = { -'screen': screenData, -'runtime': runtimeData, -'general': generalData, -'settings': settingsData, -'commandInfo': commandData.commandInfo, -'commandBuffer': commandData.commandBuffer, -'input': inputData, -'punctuation': punctuationData, -'output': outputData, -'soundIcons': {}, -'bindings': {}, -} diff --git a/src/fenrir/__init__.py b/src/fenrirscreenreader/__init__.py similarity index 100% rename from src/fenrir/__init__.py rename to src/fenrirscreenreader/__init__.py diff --git a/src/fenrir/brailleDriver/__init__.py b/src/fenrirscreenreader/brailleDriver/__init__.py similarity index 100% rename from src/fenrir/brailleDriver/__init__.py rename to src/fenrirscreenreader/brailleDriver/__init__.py diff --git a/src/fenrir/brailleDriver/brlapiDriver.py b/src/fenrirscreenreader/brailleDriver/brlapiDriver.py similarity index 91% rename from src/fenrir/brailleDriver/brlapiDriver.py rename to src/fenrirscreenreader/brailleDriver/brlapiDriver.py index f7e63b83..0958fa9b 100644 --- a/src/fenrir/brailleDriver/brlapiDriver.py +++ b/src/fenrirscreenreader/brailleDriver/brlapiDriver.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from core.brailleDriver import brailleDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.brailleDriver import brailleDriver class driver(brailleDriver): def __init__(self): diff --git a/src/fenrir/brailleDriver/debugDriver.py b/src/fenrirscreenreader/brailleDriver/debugDriver.py similarity index 92% rename from src/fenrir/brailleDriver/debugDriver.py rename to src/fenrirscreenreader/brailleDriver/debugDriver.py index ca22bd60..116cd7d3 100644 --- a/src/fenrir/brailleDriver/debugDriver.py +++ b/src/fenrirscreenreader/brailleDriver/debugDriver.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from core.brailleDriver import brailleDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.brailleDriver import brailleDriver class driver(brailleDriver): def __init__(self): diff --git a/src/fenrir/brailleDriver/dummyDriver.py b/src/fenrirscreenreader/brailleDriver/dummyDriver.py similarity index 65% rename from src/fenrir/brailleDriver/dummyDriver.py rename to src/fenrirscreenreader/brailleDriver/dummyDriver.py index be13dd4d..d8f69e56 100644 --- a/src/fenrir/brailleDriver/dummyDriver.py +++ b/src/fenrirscreenreader/brailleDriver/dummyDriver.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from core.brailleDriver import brailleDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.brailleDriver import brailleDriver class driver(brailleDriver): def __init__(self): diff --git a/src/fenrir/commands/__init__.py b/src/fenrirscreenreader/commands/__init__.py similarity index 100% rename from src/fenrir/commands/__init__.py rename to src/fenrirscreenreader/commands/__init__.py diff --git a/src/fenrir/commands/command_template.py b/src/fenrirscreenreader/commands/command_template.py similarity index 87% rename from src/fenrir/commands/command_template.py rename to src/fenrirscreenreader/commands/command_template.py index 25b6b1a8..f1101b9f 100644 --- a/src/fenrir/commands/command_template.py +++ b/src/fenrirscreenreader/commands/command_template.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/00_init_commands.py b/src/fenrirscreenreader/commands/commands/00_init_commands.py similarity index 91% rename from src/fenrir/commands/commands/00_init_commands.py rename to src/fenrirscreenreader/commands/commands/00_init_commands.py index 4a573ca0..1383be41 100644 --- a/src/fenrir/commands/commands/00_init_commands.py +++ b/src/fenrirscreenreader/commands/commands/00_init_commands.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug # this command is just to initialize stuff. # like init index lists in memoryManager diff --git a/src/fenrir/commands/commands/__init__.py b/src/fenrirscreenreader/commands/commands/__init__.py similarity index 100% rename from src/fenrir/commands/commands/__init__.py rename to src/fenrirscreenreader/commands/commands/__init__.py diff --git a/src/fenrir/commands/commands/add_word_to_spell_check.py b/src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py similarity index 96% rename from src/fenrir/commands/commands/add_word_to_spell_check.py rename to src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py index 2eb5c579..24c24cd9 100644 --- a/src/fenrir/commands/commands/add_word_to_spell_check.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils import string initialized = False try: diff --git a/src/fenrir/commands/commands/attribute_cursor.py b/src/fenrirscreenreader/commands/commands/attribute_cursor.py similarity index 89% rename from src/fenrir/commands/commands/attribute_cursor.py rename to src/fenrirscreenreader/commands/commands/attribute_cursor.py index 86285b1f..9cdca590 100644 --- a/src/fenrir/commands/commands/attribute_cursor.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import screen_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_1.py b/src/fenrirscreenreader/commands/commands/bookmark_1.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_1.py rename to src/fenrirscreenreader/commands/commands/bookmark_1.py index 28923622..ce56fc38 100644 --- a/src/fenrir/commands/commands/bookmark_1.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_10.py b/src/fenrirscreenreader/commands/commands/bookmark_10.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_10.py rename to src/fenrirscreenreader/commands/commands/bookmark_10.py index d85dcf27..b8a1c097 100644 --- a/src/fenrir/commands/commands/bookmark_10.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_2.py b/src/fenrirscreenreader/commands/commands/bookmark_2.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_2.py rename to src/fenrirscreenreader/commands/commands/bookmark_2.py index e25c59c2..bfc42ae3 100644 --- a/src/fenrir/commands/commands/bookmark_2.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_3.py b/src/fenrirscreenreader/commands/commands/bookmark_3.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_3.py rename to src/fenrirscreenreader/commands/commands/bookmark_3.py index 490e49b7..7f5afc31 100644 --- a/src/fenrir/commands/commands/bookmark_3.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_4.py b/src/fenrirscreenreader/commands/commands/bookmark_4.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_4.py rename to src/fenrirscreenreader/commands/commands/bookmark_4.py index 09543ea6..bba45d29 100644 --- a/src/fenrir/commands/commands/bookmark_4.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_5.py b/src/fenrirscreenreader/commands/commands/bookmark_5.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_5.py rename to src/fenrirscreenreader/commands/commands/bookmark_5.py index 4df87ac9..6ef60817 100644 --- a/src/fenrir/commands/commands/bookmark_5.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_6.py b/src/fenrirscreenreader/commands/commands/bookmark_6.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_6.py rename to src/fenrirscreenreader/commands/commands/bookmark_6.py index 0073e40a..e5c6b466 100644 --- a/src/fenrir/commands/commands/bookmark_6.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_7.py b/src/fenrirscreenreader/commands/commands/bookmark_7.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_7.py rename to src/fenrirscreenreader/commands/commands/bookmark_7.py index 8275698d..0254c63c 100644 --- a/src/fenrir/commands/commands/bookmark_7.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_8.py b/src/fenrirscreenreader/commands/commands/bookmark_8.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_8.py rename to src/fenrirscreenreader/commands/commands/bookmark_8.py index 6a5f2e42..f0831dbc 100644 --- a/src/fenrir/commands/commands/bookmark_8.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/bookmark_9.py b/src/fenrirscreenreader/commands/commands/bookmark_9.py similarity index 93% rename from src/fenrir/commands/commands/bookmark_9.py rename to src/fenrirscreenreader/commands/commands/bookmark_9.py index a86fcd1c..5127617e 100644 --- a/src/fenrir/commands/commands/bookmark_9.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/braille_flush.py b/src/fenrirscreenreader/commands/commands/braille_flush.py similarity index 88% rename from src/fenrir/commands/commands/braille_flush.py rename to src/fenrirscreenreader/commands/commands/braille_flush.py index 3c0ece33..5a6bb6ba 100644 --- a/src/fenrir/commands/commands/braille_flush.py +++ b/src/fenrirscreenreader/commands/commands/braille_flush.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/braille_pan_left.py b/src/fenrirscreenreader/commands/commands/braille_pan_left.py similarity index 88% rename from src/fenrir/commands/commands/braille_pan_left.py rename to src/fenrirscreenreader/commands/commands/braille_pan_left.py index 284dacc7..ffc94375 100644 --- a/src/fenrir/commands/commands/braille_pan_left.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/braille_pan_right.py b/src/fenrirscreenreader/commands/commands/braille_pan_right.py similarity index 88% rename from src/fenrir/commands/commands/braille_pan_right.py rename to src/fenrirscreenreader/commands/commands/braille_pan_right.py index c0272fba..144befa9 100644 --- a/src/fenrir/commands/commands/braille_pan_right.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/braille_return_to_cursor.py b/src/fenrirscreenreader/commands/commands/braille_return_to_cursor.py similarity index 88% rename from src/fenrir/commands/commands/braille_return_to_cursor.py rename to src/fenrirscreenreader/commands/commands/braille_return_to_cursor.py index 01cecbbe..65863d71 100644 --- a/src/fenrir/commands/commands/braille_return_to_cursor.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_1.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_1.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_1.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_1.py index d543a97e..62c47741 100644 --- a/src/fenrir/commands/commands/clear_bookmark_1.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_10.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_10.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_10.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_10.py index 5e77a224..47c63d72 100644 --- a/src/fenrir/commands/commands/clear_bookmark_10.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_2.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_2.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_2.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_2.py index baa3daea..93b49ba4 100644 --- a/src/fenrir/commands/commands/clear_bookmark_2.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_3.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_3.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_3.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_3.py index 924ed7d7..ce8bce1a 100644 --- a/src/fenrir/commands/commands/clear_bookmark_3.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_4.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_4.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_4.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_4.py index 781d8aa0..089f4ccc 100644 --- a/src/fenrir/commands/commands/clear_bookmark_4.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_5.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_5.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_5.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_5.py index 54a06923..f4376d50 100644 --- a/src/fenrir/commands/commands/clear_bookmark_5.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_6.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_6.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_6.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_6.py index a79267fc..d397e7cd 100644 --- a/src/fenrir/commands/commands/clear_bookmark_6.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_7.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_7.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_7.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_7.py index 39cb1435..9003dd2a 100644 --- a/src/fenrir/commands/commands/clear_bookmark_7.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_8.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_8.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_8.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_8.py index b5e22414..e39cfafe 100644 --- a/src/fenrir/commands/commands/clear_bookmark_8.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_bookmark_9.py b/src/fenrirscreenreader/commands/commands/clear_bookmark_9.py similarity index 94% rename from src/fenrir/commands/commands/clear_bookmark_9.py rename to src/fenrirscreenreader/commands/commands/clear_bookmark_9.py index a9fd30a4..4371cc29 100644 --- a/src/fenrir/commands/commands/clear_bookmark_9.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_clipboard.py b/src/fenrirscreenreader/commands/commands/clear_clipboard.py similarity index 90% rename from src/fenrir/commands/commands/clear_clipboard.py rename to src/fenrirscreenreader/commands/commands/clear_clipboard.py index 781e6acf..6c237347 100644 --- a/src/fenrir/commands/commands/clear_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/clear_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/clear_window_application.py b/src/fenrirscreenreader/commands/commands/clear_window_application.py similarity index 95% rename from src/fenrir/commands/commands/clear_window_application.py rename to src/fenrirscreenreader/commands/commands/clear_window_application.py index 11af3045..50cc9800 100644 --- a/src/fenrir/commands/commands/clear_window_application.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/copy_last_echo_to_clipboard.py b/src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py similarity index 88% rename from src/fenrir/commands/commands/copy_last_echo_to_clipboard.py rename to src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py index 061f4bc9..d6918a4a 100644 --- a/src/fenrir/commands/commands/copy_last_echo_to_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/copy_last_echo_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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/copy_marked_to_clipboard.py b/src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py similarity index 93% rename from src/fenrir/commands/commands/copy_marked_to_clipboard.py rename to src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py index c83fdeb0..8d6c8c4e 100644 --- a/src/fenrir/commands/commands/copy_marked_to_clipboard.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/curr_clipboard.py b/src/fenrirscreenreader/commands/commands/curr_clipboard.py similarity index 92% rename from src/fenrir/commands/commands/curr_clipboard.py rename to src/fenrirscreenreader/commands/commands/curr_clipboard.py index 9c2baf3e..29ef97f0 100644 --- a/src/fenrir/commands/commands/curr_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/curr_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/curr_screen.py b/src/fenrirscreenreader/commands/commands/curr_screen.py similarity index 91% rename from src/fenrir/commands/commands/curr_screen.py rename to src/fenrirscreenreader/commands/commands/curr_screen.py index 2de39736..8543d078 100644 --- a/src/fenrir/commands/commands/curr_screen.py +++ b/src/fenrirscreenreader/commands/commands/curr_screen.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/curr_screen_after_cursor.py b/src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py similarity index 91% rename from src/fenrir/commands/commands/curr_screen_after_cursor.py rename to src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py index 1e059cc9..792bfaf0 100644 --- a/src/fenrir/commands/commands/curr_screen_after_cursor.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/curr_screen_before_cursor.py b/src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py similarity index 92% rename from src/fenrir/commands/commands/curr_screen_before_cursor.py rename to src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py index 8fd0a851..6571480d 100644 --- a/src/fenrir/commands/commands/curr_screen_before_cursor.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/cursor_column.py b/src/fenrirscreenreader/commands/commands/cursor_column.py similarity index 92% rename from src/fenrir/commands/commands/cursor_column.py rename to src/fenrirscreenreader/commands/commands/cursor_column.py index d3c119a6..9b738626 100644 --- a/src/fenrir/commands/commands/cursor_column.py +++ b/src/fenrirscreenreader/commands/commands/cursor_column.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/cursor_lineno.py b/src/fenrirscreenreader/commands/commands/cursor_lineno.py similarity index 92% rename from src/fenrir/commands/commands/cursor_lineno.py rename to src/fenrirscreenreader/commands/commands/cursor_lineno.py index a8b39ce6..cf926dd0 100644 --- a/src/fenrir/commands/commands/cursor_lineno.py +++ b/src/fenrirscreenreader/commands/commands/cursor_lineno.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/cursor_position.py b/src/fenrirscreenreader/commands/commands/cursor_position.py similarity index 94% rename from src/fenrir/commands/commands/cursor_position.py rename to src/fenrirscreenreader/commands/commands/cursor_position.py index 99b13fab..bbb1208f 100644 --- a/src/fenrir/commands/commands/cursor_position.py +++ b/src/fenrirscreenreader/commands/commands/cursor_position.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/cursor_read_to_end_of_line.py b/src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py similarity index 92% rename from src/fenrir/commands/commands/cursor_read_to_end_of_line.py rename to src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py index 93e8a8a0..3e72819b 100644 --- a/src/fenrir/commands/commands/cursor_read_to_end_of_line.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/date.py b/src/fenrirscreenreader/commands/commands/date.py similarity index 92% rename from src/fenrir/commands/commands/date.py rename to src/fenrirscreenreader/commands/commands/date.py index 39fc28ef..e754a03f 100644 --- a/src/fenrir/commands/commands/date.py +++ b/src/fenrirscreenreader/commands/commands/date.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import datetime class command(): diff --git a/src/fenrir/commands/commands/dec_alsa_volume.py b/src/fenrirscreenreader/commands/commands/dec_alsa_volume.py similarity index 95% rename from src/fenrir/commands/commands/dec_alsa_volume.py rename to src/fenrirscreenreader/commands/commands/dec_alsa_volume.py index cd2aee07..0dea50e7 100644 --- a/src/fenrir/commands/commands/dec_alsa_volume.py +++ b/src/fenrirscreenreader/commands/commands/dec_alsa_volume.py @@ -11,7 +11,7 @@ try: except: pass -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/dec_sound_volume.py b/src/fenrirscreenreader/commands/commands/dec_sound_volume.py similarity index 92% rename from src/fenrir/commands/commands/dec_sound_volume.py rename to src/fenrirscreenreader/commands/commands/dec_sound_volume.py index c97414ce..435c2c62 100644 --- a/src/fenrir/commands/commands/dec_sound_volume.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrir/commands/commands/dec_speech_pitch.py b/src/fenrirscreenreader/commands/commands/dec_speech_pitch.py similarity index 92% rename from src/fenrir/commands/commands/dec_speech_pitch.py rename to src/fenrirscreenreader/commands/commands/dec_speech_pitch.py index 09e53b7c..e7e6fe06 100644 --- a/src/fenrir/commands/commands/dec_speech_pitch.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrir/commands/commands/dec_speech_rate.py b/src/fenrirscreenreader/commands/commands/dec_speech_rate.py similarity index 92% rename from src/fenrir/commands/commands/dec_speech_rate.py rename to src/fenrirscreenreader/commands/commands/dec_speech_rate.py index a0248662..f42d4e95 100644 --- a/src/fenrir/commands/commands/dec_speech_rate.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrir/commands/commands/dec_speech_volume.py b/src/fenrirscreenreader/commands/commands/dec_speech_volume.py similarity index 92% rename from src/fenrir/commands/commands/dec_speech_volume.py rename to src/fenrirscreenreader/commands/commands/dec_speech_volume.py index 946803cb..5c5f60c5 100644 --- a/src/fenrir/commands/commands/dec_speech_volume.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrir/commands/commands/exit_review.py b/src/fenrirscreenreader/commands/commands/exit_review.py similarity index 91% rename from src/fenrir/commands/commands/exit_review.py rename to src/fenrirscreenreader/commands/commands/exit_review.py index 9c0369c4..0ac3854b 100644 --- a/src/fenrir/commands/commands/exit_review.py +++ b/src/fenrirscreenreader/commands/commands/exit_review.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/export_clipboard_to_file.py b/src/fenrirscreenreader/commands/commands/export_clipboard_to_file.py similarity index 95% rename from src/fenrir/commands/commands/export_clipboard_to_file.py rename to src/fenrirscreenreader/commands/commands/export_clipboard_to_file.py index 0e1078ac..25095051 100644 --- a/src/fenrir/commands/commands/export_clipboard_to_file.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import os class command(): diff --git a/src/fenrir/commands/commands/export_clipboard_to_x.py b/src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py similarity index 96% rename from src/fenrir/commands/commands/export_clipboard_to_x.py rename to src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py index 25175c1f..ce4844cf 100644 --- a/src/fenrir/commands/commands/export_clipboard_to_x.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import subprocess, os from subprocess import Popen, PIPE import _thread diff --git a/src/fenrir/commands/commands/first_clipboard.py b/src/fenrirscreenreader/commands/commands/first_clipboard.py similarity index 92% rename from src/fenrir/commands/commands/first_clipboard.py rename to src/fenrirscreenreader/commands/commands/first_clipboard.py index a4d98c87..a15a56bc 100644 --- a/src/fenrir/commands/commands/first_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/first_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/forward_keypress.py b/src/fenrirscreenreader/commands/commands/forward_keypress.py similarity index 90% rename from src/fenrir/commands/commands/forward_keypress.py rename to src/fenrirscreenreader/commands/commands/forward_keypress.py index c3e718fe..79d0d367 100644 --- a/src/fenrir/commands/commands/forward_keypress.py +++ b/src/fenrirscreenreader/commands/commands/forward_keypress.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/import_clipboard_from_file.py b/src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py similarity index 94% rename from src/fenrir/commands/commands/import_clipboard_from_file.py rename to src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py index 67b4f398..4e68c6ee 100644 --- a/src/fenrir/commands/commands/import_clipboard_from_file.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils import os class command(): diff --git a/src/fenrir/commands/commands/inc_alsa_volume.py b/src/fenrirscreenreader/commands/commands/inc_alsa_volume.py similarity index 95% rename from src/fenrir/commands/commands/inc_alsa_volume.py rename to src/fenrirscreenreader/commands/commands/inc_alsa_volume.py index 51f38c79..45950a25 100644 --- a/src/fenrir/commands/commands/inc_alsa_volume.py +++ b/src/fenrirscreenreader/commands/commands/inc_alsa_volume.py @@ -11,7 +11,7 @@ try: except: pass -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/inc_sound_volume.py b/src/fenrirscreenreader/commands/commands/inc_sound_volume.py similarity index 92% rename from src/fenrir/commands/commands/inc_sound_volume.py rename to src/fenrirscreenreader/commands/commands/inc_sound_volume.py index 78eee847..19438366 100644 --- a/src/fenrir/commands/commands/inc_sound_volume.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrir/commands/commands/inc_speech_pitch.py b/src/fenrirscreenreader/commands/commands/inc_speech_pitch.py similarity index 92% rename from src/fenrir/commands/commands/inc_speech_pitch.py rename to src/fenrirscreenreader/commands/commands/inc_speech_pitch.py index cb267b66..db213648 100644 --- a/src/fenrir/commands/commands/inc_speech_pitch.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrir/commands/commands/inc_speech_rate.py b/src/fenrirscreenreader/commands/commands/inc_speech_rate.py similarity index 92% rename from src/fenrir/commands/commands/inc_speech_rate.py rename to src/fenrirscreenreader/commands/commands/inc_speech_rate.py index 4db1763d..a65666b2 100644 --- a/src/fenrir/commands/commands/inc_speech_rate.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrir/commands/commands/inc_speech_volume.py b/src/fenrirscreenreader/commands/commands/inc_speech_volume.py similarity index 92% rename from src/fenrir/commands/commands/inc_speech_volume.py rename to src/fenrirscreenreader/commands/commands/inc_speech_volume.py index 1c6716e6..490dfc88 100644 --- a/src/fenrir/commands/commands/inc_speech_volume.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import math class command(): diff --git a/src/fenrir/commands/commands/indent_curr_line.py b/src/fenrirscreenreader/commands/commands/indent_curr_line.py similarity index 92% rename from src/fenrir/commands/commands/indent_curr_line.py rename to src/fenrirscreenreader/commands/commands/indent_curr_line.py index 09907691..ece9c6e0 100644 --- a/src/fenrir/commands/commands/indent_curr_line.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/last_clipboard.py b/src/fenrirscreenreader/commands/commands/last_clipboard.py similarity index 92% rename from src/fenrir/commands/commands/last_clipboard.py rename to src/fenrirscreenreader/commands/commands/last_clipboard.py index 2cf2f0bd..d8de0dd9 100644 --- a/src/fenrir/commands/commands/last_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/last_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/last_incoming.py b/src/fenrirscreenreader/commands/commands/last_incoming.py similarity index 89% rename from src/fenrir/commands/commands/last_incoming.py rename to src/fenrirscreenreader/commands/commands/last_incoming.py index effb7f37..907144c0 100644 --- a/src/fenrir/commands/commands/last_incoming.py +++ b/src/fenrirscreenreader/commands/commands/last_incoming.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/marked_text.py b/src/fenrirscreenreader/commands/commands/marked_text.py similarity index 93% rename from src/fenrir/commands/commands/marked_text.py rename to src/fenrirscreenreader/commands/commands/marked_text.py index 9341382a..63a34861 100644 --- a/src/fenrir/commands/commands/marked_text.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import mark_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/next_clipboard.py b/src/fenrirscreenreader/commands/commands/next_clipboard.py similarity index 94% rename from src/fenrir/commands/commands/next_clipboard.py rename to src/fenrirscreenreader/commands/commands/next_clipboard.py index 01d5607a..6564f54c 100644 --- a/src/fenrir/commands/commands/next_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/next_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/paste_clipboard.py b/src/fenrirscreenreader/commands/commands/paste_clipboard.py similarity index 94% rename from src/fenrir/commands/commands/paste_clipboard.py rename to src/fenrirscreenreader/commands/commands/paste_clipboard.py index 1223a54b..caee0c2f 100644 --- a/src/fenrir/commands/commands/paste_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/paste_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import time class command(): diff --git a/src/fenrir/commands/commands/present_first_line.py b/src/fenrirscreenreader/commands/commands/present_first_line.py similarity index 89% rename from src/fenrir/commands/commands/present_first_line.py rename to src/fenrirscreenreader/commands/commands/present_first_line.py index 9d54e879..6d833ef1 100644 --- a/src/fenrir/commands/commands/present_first_line.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/present_last_line.py b/src/fenrirscreenreader/commands/commands/present_last_line.py similarity index 89% rename from src/fenrir/commands/commands/present_last_line.py rename to src/fenrirscreenreader/commands/commands/present_last_line.py index 25316f4c..5b4c12fa 100644 --- a/src/fenrir/commands/commands/present_last_line.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/prev_clipboard.py b/src/fenrirscreenreader/commands/commands/prev_clipboard.py similarity index 94% rename from src/fenrir/commands/commands/prev_clipboard.py rename to src/fenrirscreenreader/commands/commands/prev_clipboard.py index 9fa6c575..7156f24d 100644 --- a/src/fenrir/commands/commands/prev_clipboard.py +++ b/src/fenrirscreenreader/commands/commands/prev_clipboard.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/quit_fenrir.py b/src/fenrirscreenreader/commands/commands/quit_fenrir.py similarity index 88% rename from src/fenrir/commands/commands/quit_fenrir.py rename to src/fenrirscreenreader/commands/commands/quit_fenrir.py index ea633658..80cba02e 100644 --- a/src/fenrir/commands/commands/quit_fenrir.py +++ b/src/fenrirscreenreader/commands/commands/quit_fenrir.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/remove_marks.py b/src/fenrirscreenreader/commands/commands/remove_marks.py similarity index 93% rename from src/fenrir/commands/commands/remove_marks.py rename to src/fenrirscreenreader/commands/commands/remove_marks.py index 0c2547e4..7c351415 100644 --- a/src/fenrir/commands/commands/remove_marks.py +++ b/src/fenrirscreenreader/commands/commands/remove_marks.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/remove_word_from_spell_check.py b/src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py similarity index 96% rename from src/fenrir/commands/commands/remove_word_from_spell_check.py rename to src/fenrirscreenreader/commands/commands/remove_word_from_spell_check.py index f212ee27..01cf863f 100644 --- a/src/fenrir/commands/commands/remove_word_from_spell_check.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils import string initialized = False try: diff --git a/src/fenrir/commands/commands/review_bottom.py b/src/fenrirscreenreader/commands/commands/review_bottom.py similarity index 93% rename from src/fenrir/commands/commands/review_bottom.py rename to src/fenrirscreenreader/commands/commands/review_bottom.py index 07a431f4..5e5271b3 100644 --- a/src/fenrir/commands/commands/review_bottom.py +++ b/src/fenrirscreenreader/commands/commands/review_bottom.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_char.py b/src/fenrirscreenreader/commands/commands/review_curr_char.py similarity index 91% rename from src/fenrir/commands/commands/review_curr_char.py rename to src/fenrirscreenreader/commands/commands/review_curr_char.py index 6784ba5f..33ba9534 100644 --- a/src/fenrir/commands/commands/review_curr_char.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_char_phonetic.py b/src/fenrirscreenreader/commands/commands/review_curr_char_phonetic.py similarity index 92% rename from src/fenrir/commands/commands/review_curr_char_phonetic.py rename to src/fenrirscreenreader/commands/commands/review_curr_char_phonetic.py index 061eec43..e4aee550 100644 --- a/src/fenrir/commands/commands/review_curr_char_phonetic.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_line.py b/src/fenrirscreenreader/commands/commands/review_curr_line.py similarity index 89% rename from src/fenrir/commands/commands/review_curr_line.py rename to src/fenrirscreenreader/commands/commands/review_curr_line.py index af1de983..2e8d9e00 100644 --- a/src/fenrir/commands/commands/review_curr_line.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_word.py b/src/fenrirscreenreader/commands/commands/review_curr_word.py similarity index 92% rename from src/fenrir/commands/commands/review_curr_word.py rename to src/fenrirscreenreader/commands/commands/review_curr_word.py index 4436cd03..e2dacf45 100644 --- a/src/fenrir/commands/commands/review_curr_word.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_curr_word_phonetic.py b/src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py similarity index 90% rename from src/fenrir/commands/commands/review_curr_word_phonetic.py rename to src/fenrirscreenreader/commands/commands/review_curr_word_phonetic.py index c58568cb..7321023f 100644 --- a/src/fenrir/commands/commands/review_curr_word_phonetic.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_down.py b/src/fenrirscreenreader/commands/commands/review_down.py similarity index 93% rename from src/fenrir/commands/commands/review_down.py rename to src/fenrirscreenreader/commands/commands/review_down.py index 2428083e..58112b43 100644 --- a/src/fenrir/commands/commands/review_down.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_line_begin.py b/src/fenrirscreenreader/commands/commands/review_line_begin.py similarity index 93% rename from src/fenrir/commands/commands/review_line_begin.py rename to src/fenrirscreenreader/commands/commands/review_line_begin.py index c788a5ca..7c416eee 100644 --- a/src/fenrir/commands/commands/review_line_begin.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_line_end.py b/src/fenrirscreenreader/commands/commands/review_line_end.py similarity index 92% rename from src/fenrir/commands/commands/review_line_end.py rename to src/fenrirscreenreader/commands/commands/review_line_end.py index 1af5b558..cc446543 100644 --- a/src/fenrir/commands/commands/review_line_end.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_line_first_char.py b/src/fenrirscreenreader/commands/commands/review_line_first_char.py similarity index 91% rename from src/fenrir/commands/commands/review_line_first_char.py rename to src/fenrirscreenreader/commands/commands/review_line_first_char.py index 82f687a8..7d18692c 100644 --- a/src/fenrir/commands/commands/review_line_first_char.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_line_last_char.py b/src/fenrirscreenreader/commands/commands/review_line_last_char.py similarity index 92% rename from src/fenrir/commands/commands/review_line_last_char.py rename to src/fenrirscreenreader/commands/commands/review_line_last_char.py index f30265ee..54854b39 100644 --- a/src/fenrir/commands/commands/review_line_last_char.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_char.py b/src/fenrirscreenreader/commands/commands/review_next_char.py similarity index 94% rename from src/fenrir/commands/commands/review_next_char.py rename to src/fenrirscreenreader/commands/commands/review_next_char.py index e3c0a2ee..e9983370 100644 --- a/src/fenrir/commands/commands/review_next_char.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_char_phonetic.py b/src/fenrirscreenreader/commands/commands/review_next_char_phonetic.py similarity index 94% rename from src/fenrir/commands/commands/review_next_char_phonetic.py rename to src/fenrirscreenreader/commands/commands/review_next_char_phonetic.py index f4ae4aa3..8cf4cd95 100644 --- a/src/fenrir/commands/commands/review_next_char_phonetic.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_line.py b/src/fenrirscreenreader/commands/commands/review_next_line.py similarity index 92% rename from src/fenrir/commands/commands/review_next_line.py rename to src/fenrirscreenreader/commands/commands/review_next_line.py index a41550c1..8cf4a4c3 100644 --- a/src/fenrir/commands/commands/review_next_line.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_word.py b/src/fenrirscreenreader/commands/commands/review_next_word.py similarity index 93% rename from src/fenrir/commands/commands/review_next_word.py rename to src/fenrirscreenreader/commands/commands/review_next_word.py index c05ca59a..a37a5e06 100644 --- a/src/fenrir/commands/commands/review_next_word.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_next_word_phonetic.py b/src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py similarity index 90% rename from src/fenrir/commands/commands/review_next_word_phonetic.py rename to src/fenrirscreenreader/commands/commands/review_next_word_phonetic.py index f0e9f90e..d558b403 100644 --- a/src/fenrir/commands/commands/review_next_word_phonetic.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_char.py b/src/fenrirscreenreader/commands/commands/review_prev_char.py similarity index 94% rename from src/fenrir/commands/commands/review_prev_char.py rename to src/fenrirscreenreader/commands/commands/review_prev_char.py index 444eb32a..c4038b72 100644 --- a/src/fenrir/commands/commands/review_prev_char.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_char_phonetic.py b/src/fenrirscreenreader/commands/commands/review_prev_char_phonetic.py similarity index 94% rename from src/fenrir/commands/commands/review_prev_char_phonetic.py rename to src/fenrirscreenreader/commands/commands/review_prev_char_phonetic.py index e66e0883..4beabe51 100644 --- a/src/fenrir/commands/commands/review_prev_char_phonetic.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_line.py b/src/fenrirscreenreader/commands/commands/review_prev_line.py similarity index 91% rename from src/fenrir/commands/commands/review_prev_line.py rename to src/fenrirscreenreader/commands/commands/review_prev_line.py index c3601955..480e4bae 100644 --- a/src/fenrir/commands/commands/review_prev_line.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_word.py b/src/fenrirscreenreader/commands/commands/review_prev_word.py similarity index 92% rename from src/fenrir/commands/commands/review_prev_word.py rename to src/fenrirscreenreader/commands/commands/review_prev_word.py index b36f3038..10ea680b 100644 --- a/src/fenrir/commands/commands/review_prev_word.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_prev_word_phonetic.py b/src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py similarity index 90% rename from src/fenrir/commands/commands/review_prev_word_phonetic.py rename to src/fenrirscreenreader/commands/commands/review_prev_word_phonetic.py index eeddfd3e..3076e9d3 100644 --- a/src/fenrir/commands/commands/review_prev_word_phonetic.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_top.py b/src/fenrirscreenreader/commands/commands/review_top.py similarity index 86% rename from src/fenrir/commands/commands/review_top.py rename to src/fenrirscreenreader/commands/commands/review_top.py index aaaed438..15e4ee3f 100644 --- a/src/fenrir/commands/commands/review_top.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/review_up.py b/src/fenrirscreenreader/commands/commands/review_up.py similarity index 94% rename from src/fenrir/commands/commands/review_up.py rename to src/fenrirscreenreader/commands/commands/review_up.py index 1867e878..2affc0da 100644 --- a/src/fenrir/commands/commands/review_up.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_1.py b/src/fenrirscreenreader/commands/commands/set_bookmark_1.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_1.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_1.py index 6a59ec79..3a1bdcbe 100644 --- a/src/fenrir/commands/commands/set_bookmark_1.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_10.py b/src/fenrirscreenreader/commands/commands/set_bookmark_10.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_10.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_10.py index 4a565c2f..5dfeea05 100644 --- a/src/fenrir/commands/commands/set_bookmark_10.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_2.py b/src/fenrirscreenreader/commands/commands/set_bookmark_2.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_2.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_2.py index 26d02637..9268e21d 100644 --- a/src/fenrir/commands/commands/set_bookmark_2.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_3.py b/src/fenrirscreenreader/commands/commands/set_bookmark_3.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_3.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_3.py index 8645ee3c..5231b3ac 100644 --- a/src/fenrir/commands/commands/set_bookmark_3.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_4.py b/src/fenrirscreenreader/commands/commands/set_bookmark_4.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_4.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_4.py index b098a50d..41a2b825 100644 --- a/src/fenrir/commands/commands/set_bookmark_4.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_5.py b/src/fenrirscreenreader/commands/commands/set_bookmark_5.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_5.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_5.py index 6c082f91..7d82fcf7 100644 --- a/src/fenrir/commands/commands/set_bookmark_5.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_6.py b/src/fenrirscreenreader/commands/commands/set_bookmark_6.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_6.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_6.py index a309d089..806664f5 100644 --- a/src/fenrir/commands/commands/set_bookmark_6.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_7.py b/src/fenrirscreenreader/commands/commands/set_bookmark_7.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_7.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_7.py index 4803487f..6f7c73bc 100644 --- a/src/fenrir/commands/commands/set_bookmark_7.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_8.py b/src/fenrirscreenreader/commands/commands/set_bookmark_8.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_8.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_8.py index 362f61c9..df203fac 100644 --- a/src/fenrir/commands/commands/set_bookmark_8.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_bookmark_9.py b/src/fenrirscreenreader/commands/commands/set_bookmark_9.py similarity index 97% rename from src/fenrir/commands/commands/set_bookmark_9.py rename to src/fenrirscreenreader/commands/commands/set_bookmark_9.py index ef53c390..7dec75ea 100644 --- a/src/fenrir/commands/commands/set_bookmark_9.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_mark.py b/src/fenrirscreenreader/commands/commands/set_mark.py similarity index 95% rename from src/fenrir/commands/commands/set_mark.py rename to src/fenrirscreenreader/commands/commands/set_mark.py index 82e1f90c..65e64bb8 100644 --- a/src/fenrir/commands/commands/set_mark.py +++ b/src/fenrirscreenreader/commands/commands/set_mark.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/set_window_application.py b/src/fenrirscreenreader/commands/commands/set_window_application.py similarity index 95% rename from src/fenrir/commands/commands/set_window_application.py rename to src/fenrirscreenreader/commands/commands/set_window_application.py index 9413fcd5..c9247d3b 100644 --- a/src/fenrir/commands/commands/set_window_application.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/shut_up.py b/src/fenrirscreenreader/commands/commands/shut_up.py similarity index 90% rename from src/fenrir/commands/commands/shut_up.py rename to src/fenrirscreenreader/commands/commands/shut_up.py index aad7226b..8bdaf78d 100644 --- a/src/fenrir/commands/commands/shut_up.py +++ b/src/fenrirscreenreader/commands/commands/shut_up.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/spell_check.py b/src/fenrirscreenreader/commands/commands/spell_check.py similarity index 95% rename from src/fenrir/commands/commands/spell_check.py rename to src/fenrirscreenreader/commands/commands/spell_check.py index c251ca02..326ed866 100644 --- a/src/fenrir/commands/commands/spell_check.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils initialized = False try: import enchant diff --git a/src/fenrir/commands/commands/subprocess.py b/src/fenrirscreenreader/commands/commands/subprocess.py similarity index 95% rename from src/fenrir/commands/commands/subprocess.py rename to src/fenrirscreenreader/commands/commands/subprocess.py index ac53e8d8..ddb3a952 100644 --- a/src/fenrir/commands/commands/subprocess.py +++ b/src/fenrirscreenreader/commands/commands/subprocess.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import subprocess, os from subprocess import Popen, PIPE import _thread diff --git a/src/fenrir/commands/commands/temp_disable_speech.py b/src/fenrirscreenreader/commands/commands/temp_disable_speech.py similarity index 93% rename from src/fenrir/commands/commands/temp_disable_speech.py rename to src/fenrirscreenreader/commands/commands/temp_disable_speech.py index c560e780..da1701ab 100644 --- a/src/fenrir/commands/commands/temp_disable_speech.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/time.py b/src/fenrirscreenreader/commands/commands/time.py similarity index 92% rename from src/fenrir/commands/commands/time.py rename to src/fenrirscreenreader/commands/commands/time.py index 4c6aa9d8..ffa97760 100644 --- a/src/fenrir/commands/commands/time.py +++ b/src/fenrirscreenreader/commands/commands/time.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import datetime class command(): diff --git a/src/fenrir/commands/commands/toggle_auto_read.py b/src/fenrirscreenreader/commands/commands/toggle_auto_read.py similarity index 93% rename from src/fenrir/commands/commands/toggle_auto_read.py rename to src/fenrirscreenreader/commands/commands/toggle_auto_read.py index d60e9da8..a94cc3e1 100644 --- a/src/fenrir/commands/commands/toggle_auto_read.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/commands/toggle_auto_spell_check.py b/src/fenrirscreenreader/commands/commands/toggle_auto_spell_check.py similarity index 93% rename from src/fenrir/commands/commands/toggle_auto_spell_check.py rename to src/fenrirscreenreader/commands/commands/toggle_auto_spell_check.py index 19d1e06d..1664e70e 100644 --- a/src/fenrir/commands/commands/toggle_auto_spell_check.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_auto_time.py b/src/fenrirscreenreader/commands/commands/toggle_auto_time.py similarity index 93% rename from src/fenrir/commands/commands/toggle_auto_time.py rename to src/fenrirscreenreader/commands/commands/toggle_auto_time.py index 831cca44..bec62b5d 100644 --- a/src/fenrir/commands/commands/toggle_auto_time.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/commands/toggle_braille.py b/src/fenrirscreenreader/commands/commands/toggle_braille.py similarity index 93% rename from src/fenrir/commands/commands/toggle_braille.py rename to src/fenrirscreenreader/commands/commands/toggle_braille.py index 0929d489..04943655 100644 --- a/src/fenrir/commands/commands/toggle_braille.py +++ b/src/fenrirscreenreader/commands/commands/toggle_braille.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_emoticons.py b/src/fenrirscreenreader/commands/commands/toggle_emoticons.py similarity index 93% rename from src/fenrir/commands/commands/toggle_emoticons.py rename to src/fenrirscreenreader/commands/commands/toggle_emoticons.py index e44e6da3..9a223817 100644 --- a/src/fenrir/commands/commands/toggle_emoticons.py +++ b/src/fenrirscreenreader/commands/commands/toggle_emoticons.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/commands/toggle_highlight_tracking.py b/src/fenrirscreenreader/commands/commands/toggle_highlight_tracking.py similarity index 94% rename from src/fenrir/commands/commands/toggle_highlight_tracking.py rename to src/fenrirscreenreader/commands/commands/toggle_highlight_tracking.py index bc2f5107..eb0bbec2 100644 --- a/src/fenrir/commands/commands/toggle_highlight_tracking.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/commands/toggle_output.py b/src/fenrirscreenreader/commands/commands/toggle_output.py similarity index 97% rename from src/fenrir/commands/commands/toggle_output.py rename to src/fenrirscreenreader/commands/commands/toggle_output.py index a1b29cec..7e40e682 100644 --- a/src/fenrir/commands/commands/toggle_output.py +++ b/src/fenrirscreenreader/commands/commands/toggle_output.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_punctuation_level.py b/src/fenrirscreenreader/commands/commands/toggle_punctuation_level.py similarity index 95% rename from src/fenrir/commands/commands/toggle_punctuation_level.py rename to src/fenrirscreenreader/commands/commands/toggle_punctuation_level.py index 257ff0f6..57ca6c6b 100644 --- a/src/fenrir/commands/commands/toggle_punctuation_level.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_sound.py b/src/fenrirscreenreader/commands/commands/toggle_sound.py similarity index 93% rename from src/fenrir/commands/commands/toggle_sound.py rename to src/fenrirscreenreader/commands/commands/toggle_sound.py index 8febec81..e599f668 100644 --- a/src/fenrir/commands/commands/toggle_sound.py +++ b/src/fenrirscreenreader/commands/commands/toggle_sound.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_speech.py b/src/fenrirscreenreader/commands/commands/toggle_speech.py similarity index 93% rename from src/fenrir/commands/commands/toggle_speech.py rename to src/fenrirscreenreader/commands/commands/toggle_speech.py index 83675c0e..94348750 100644 --- a/src/fenrir/commands/commands/toggle_speech.py +++ b/src/fenrirscreenreader/commands/commands/toggle_speech.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/commands/toggle_tutorial_mode.py b/src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py similarity index 96% rename from src/fenrir/commands/commands/toggle_tutorial_mode.py rename to src/fenrirscreenreader/commands/commands/toggle_tutorial_mode.py index 8c89f957..f09f70f1 100644 --- a/src/fenrir/commands/commands/toggle_tutorial_mode.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/help/Readme.txt b/src/fenrirscreenreader/commands/help/Readme.txt similarity index 100% rename from src/fenrir/commands/help/Readme.txt rename to src/fenrirscreenreader/commands/help/Readme.txt diff --git a/src/fenrir/commands/help/__init__.py b/src/fenrirscreenreader/commands/help/__init__.py similarity index 100% rename from src/fenrir/commands/help/__init__.py rename to src/fenrirscreenreader/commands/help/__init__.py diff --git a/src/fenrir/commands/help/curr_help.py b/src/fenrirscreenreader/commands/help/curr_help.py similarity index 93% rename from src/fenrir/commands/help/curr_help.py rename to src/fenrirscreenreader/commands/help/curr_help.py index 1de0abc5..4f0ebf31 100644 --- a/src/fenrir/commands/help/curr_help.py +++ b/src/fenrirscreenreader/commands/help/curr_help.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/help/next_help.py b/src/fenrirscreenreader/commands/help/next_help.py similarity index 94% rename from src/fenrir/commands/help/next_help.py rename to src/fenrirscreenreader/commands/help/next_help.py index 0f268aa8..7ef3993e 100644 --- a/src/fenrir/commands/help/next_help.py +++ b/src/fenrirscreenreader/commands/help/next_help.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/help/prev_help.py b/src/fenrirscreenreader/commands/help/prev_help.py similarity index 94% rename from src/fenrir/commands/help/prev_help.py rename to src/fenrirscreenreader/commands/help/prev_help.py index 31eccbb6..3060ecc2 100644 --- a/src/fenrir/commands/help/prev_help.py +++ b/src/fenrirscreenreader/commands/help/prev_help.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onApplicationChange/__init__.py b/src/fenrirscreenreader/commands/onApplicationChange/__init__.py similarity index 100% rename from src/fenrir/commands/onApplicationChange/__init__.py rename to src/fenrirscreenreader/commands/onApplicationChange/__init__.py diff --git a/src/fenrir/commands/onApplicationChange/inactive/test.py b/src/fenrirscreenreader/commands/onApplicationChange/inactive/test.py similarity index 100% rename from src/fenrir/commands/onApplicationChange/inactive/test.py rename to src/fenrirscreenreader/commands/onApplicationChange/inactive/test.py diff --git a/src/fenrir/commands/onCursorChange/45000-char_echo.py b/src/fenrirscreenreader/commands/onCursorChange/45000-char_echo.py similarity index 94% rename from src/fenrir/commands/onCursorChange/45000-char_echo.py rename to src/fenrirscreenreader/commands/onCursorChange/45000-char_echo.py index fbf086dc..926d8ebd 100644 --- a/src/fenrir/commands/onCursorChange/45000-char_echo.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/46000-tab_completion.py b/src/fenrirscreenreader/commands/onCursorChange/46000-tab_completion.py similarity index 94% rename from src/fenrir/commands/onCursorChange/46000-tab_completion.py rename to src/fenrirscreenreader/commands/onCursorChange/46000-tab_completion.py index a90c07f5..43b91159 100644 --- a/src/fenrir/commands/onCursorChange/46000-tab_completion.py +++ b/src/fenrirscreenreader/commands/onCursorChange/46000-tab_completion.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py b/src/fenrirscreenreader/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py similarity index 93% rename from src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py rename to src/fenrirscreenreader/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py index ab09adaa..ecd32a40 100644 --- a/src/fenrir/commands/onCursorChange/50000-present_char_if_cursor_change_horizontal.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import char_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py b/src/fenrirscreenreader/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py similarity index 88% rename from src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py rename to src/fenrirscreenreader/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py index fb0bd721..6d387c56 100644 --- a/src/fenrir/commands/onCursorChange/55000-present_line_if_cursor_change_vertical.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils +from fenrirscreenreader.utils import word_utils class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/60000-word_echo_type.py b/src/fenrirscreenreader/commands/onCursorChange/60000-word_echo_type.py similarity index 92% rename from src/fenrir/commands/onCursorChange/60000-word_echo_type.py rename to src/fenrirscreenreader/commands/onCursorChange/60000-word_echo_type.py index 995dd85f..57a530fd 100644 --- a/src/fenrir/commands/onCursorChange/60000-word_echo_type.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils import string class command(): diff --git a/src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py b/src/fenrirscreenreader/commands/onCursorChange/61000-word_echo_navigation.py similarity index 92% rename from src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py rename to src/fenrirscreenreader/commands/onCursorChange/61000-word_echo_navigation.py index 69963a15..08778cee 100644 --- a/src/fenrir/commands/onCursorChange/61000-word_echo_navigation.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils import string class command(): diff --git a/src/fenrir/commands/onCursorChange/62000-spell_check.py b/src/fenrirscreenreader/commands/onCursorChange/62000-spell_check.py similarity index 98% rename from src/fenrir/commands/onCursorChange/62000-spell_check.py rename to src/fenrirscreenreader/commands/onCursorChange/62000-spell_check.py index 2894d274..332e5f12 100644 --- a/src/fenrir/commands/onCursorChange/62000-spell_check.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import word_utils import os, string initialized = False diff --git a/src/fenrir/commands/onCursorChange/65000-char_delete_echo.py b/src/fenrirscreenreader/commands/onCursorChange/65000-char_delete_echo.py similarity index 94% rename from src/fenrir/commands/onCursorChange/65000-char_delete_echo.py rename to src/fenrirscreenreader/commands/onCursorChange/65000-char_delete_echo.py index 51310877..41281316 100644 --- a/src/fenrir/commands/onCursorChange/65000-char_delete_echo.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/66000-exit_review_mode.py b/src/fenrirscreenreader/commands/onCursorChange/66000-exit_review_mode.py similarity index 91% rename from src/fenrir/commands/onCursorChange/66000-exit_review_mode.py rename to src/fenrirscreenreader/commands/onCursorChange/66000-exit_review_mode.py index 2f7a8cfa..d934fb1c 100644 --- a/src/fenrir/commands/onCursorChange/66000-exit_review_mode.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onCursorChange/__init__.py b/src/fenrirscreenreader/commands/onCursorChange/__init__.py similarity index 100% rename from src/fenrir/commands/onCursorChange/__init__.py rename to src/fenrirscreenreader/commands/onCursorChange/__init__.py diff --git a/src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py b/src/fenrirscreenreader/commands/onHeartBeat/2000-GetSessionInfo.py similarity index 90% rename from src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py rename to src/fenrirscreenreader/commands/onHeartBeat/2000-GetSessionInfo.py index b4d822a3..10a5c141 100755 --- a/src/fenrir/commands/onHeartBeat/2000-GetSessionInfo.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import time import datetime diff --git a/src/fenrir/commands/onHeartBeat/76000-time.py b/src/fenrirscreenreader/commands/onHeartBeat/76000-time.py similarity index 96% rename from src/fenrir/commands/onHeartBeat/76000-time.py rename to src/fenrirscreenreader/commands/onHeartBeat/76000-time.py index 3b9b55b6..b1bcdeff 100755 --- a/src/fenrir/commands/onHeartBeat/76000-time.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import time import datetime diff --git a/src/fenrir/commands/onHeartBeat/__init__.py b/src/fenrirscreenreader/commands/onHeartBeat/__init__.py similarity index 100% rename from src/fenrir/commands/onHeartBeat/__init__.py rename to src/fenrirscreenreader/commands/onHeartBeat/__init__.py diff --git a/src/fenrir/commands/onHeartBeat/deactive/1.echo.py b/src/fenrirscreenreader/commands/onHeartBeat/deactive/1.echo.py similarity index 87% rename from src/fenrir/commands/onHeartBeat/deactive/1.echo.py rename to src/fenrirscreenreader/commands/onHeartBeat/deactive/1.echo.py index 678dc9cd..4290b6c7 100755 --- a/src/fenrir/commands/onHeartBeat/deactive/1.echo.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug import time class command(): diff --git a/src/fenrir/commands/onInput/10000-shut_up.py b/src/fenrirscreenreader/commands/onInput/10000-shut_up.py similarity index 94% rename from src/fenrir/commands/onInput/10000-shut_up.py rename to src/fenrirscreenreader/commands/onInput/10000-shut_up.py index b3a2dea7..a22bc341 100644 --- a/src/fenrir/commands/onInput/10000-shut_up.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onInput/15000-enable_temp_speech.py b/src/fenrirscreenreader/commands/onInput/15000-enable_temp_speech.py similarity index 93% rename from src/fenrir/commands/onInput/15000-enable_temp_speech.py rename to src/fenrirscreenreader/commands/onInput/15000-enable_temp_speech.py index a6de077e..48836fb8 100644 --- a/src/fenrir/commands/onInput/15000-enable_temp_speech.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onInput/80000-capslock.py b/src/fenrirscreenreader/commands/onInput/80000-capslock.py similarity index 91% rename from src/fenrir/commands/onInput/80000-capslock.py rename to src/fenrirscreenreader/commands/onInput/80000-capslock.py index 84819bc5..10db97e1 100644 --- a/src/fenrir/commands/onInput/80000-capslock.py +++ b/src/fenrirscreenreader/commands/onInput/80000-capslock.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onInput/80300-scrolllock.py b/src/fenrirscreenreader/commands/onInput/80300-scrolllock.py similarity index 91% rename from src/fenrir/commands/onInput/80300-scrolllock.py rename to src/fenrirscreenreader/commands/onInput/80300-scrolllock.py index f159a4a0..526e67f3 100644 --- a/src/fenrir/commands/onInput/80300-scrolllock.py +++ b/src/fenrirscreenreader/commands/onInput/80300-scrolllock.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onInput/80500-numlock.py b/src/fenrirscreenreader/commands/onInput/80500-numlock.py similarity index 91% rename from src/fenrir/commands/onInput/80500-numlock.py rename to src/fenrirscreenreader/commands/onInput/80500-numlock.py index 86ab5341..e49356a0 100644 --- a/src/fenrir/commands/onInput/80500-numlock.py +++ b/src/fenrirscreenreader/commands/onInput/80500-numlock.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onInput/__init__.py b/src/fenrirscreenreader/commands/onInput/__init__.py similarity index 100% rename from src/fenrir/commands/onInput/__init__.py rename to src/fenrirscreenreader/commands/onInput/__init__.py diff --git a/src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py b/src/fenrirscreenreader/commands/onPlugInputDevice/50000-UpdateDevices.py similarity index 88% rename from src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py rename to src/fenrirscreenreader/commands/onPlugInputDevice/50000-UpdateDevices.py index 37a392ed..fa2d364a 100755 --- a/src/fenrir/commands/onPlugInputDevice/50000-UpdateDevices.py +++ b/src/fenrirscreenreader/commands/onPlugInputDevice/50000-UpdateDevices.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onPlugInputDevice/__init__.py b/src/fenrirscreenreader/commands/onPlugInputDevice/__init__.py similarity index 100% rename from src/fenrir/commands/onPlugInputDevice/__init__.py rename to src/fenrirscreenreader/commands/onPlugInputDevice/__init__.py diff --git a/src/fenrir/commands/onScreenChanged/10000-shut_up.py b/src/fenrirscreenreader/commands/onScreenChanged/10000-shut_up.py similarity index 87% rename from src/fenrir/commands/onScreenChanged/10000-shut_up.py rename to src/fenrirscreenreader/commands/onScreenChanged/10000-shut_up.py index 884c4264..c35f154d 100644 --- a/src/fenrir/commands/onScreenChanged/10000-shut_up.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py b/src/fenrirscreenreader/commands/onScreenChanged/80000-screen_change_announcement.py similarity index 91% rename from src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py rename to src/fenrirscreenreader/commands/onScreenChanged/80000-screen_change_announcement.py index b59b8631..334a87ee 100644 --- a/src/fenrir/commands/onScreenChanged/80000-screen_change_announcement.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenChanged/85000-reset_marks.py b/src/fenrirscreenreader/commands/onScreenChanged/85000-reset_marks.py similarity index 91% rename from src/fenrir/commands/onScreenChanged/85000-reset_marks.py rename to src/fenrirscreenreader/commands/onScreenChanged/85000-reset_marks.py index 501f7ad0..8a3265ad 100644 --- a/src/fenrir/commands/onScreenChanged/85000-reset_marks.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py b/src/fenrirscreenreader/commands/onScreenChanged/89000-leave_review_mode.py similarity index 93% rename from src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py rename to src/fenrirscreenreader/commands/onScreenChanged/89000-leave_review_mode.py index 84240ebe..f13337b7 100644 --- a/src/fenrir/commands/onScreenChanged/89000-leave_review_mode.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenChanged/__init__.py b/src/fenrirscreenreader/commands/onScreenChanged/__init__.py similarity index 100% rename from src/fenrir/commands/onScreenChanged/__init__.py rename to src/fenrirscreenreader/commands/onScreenChanged/__init__.py diff --git a/src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py b/src/fenrirscreenreader/commands/onScreenUpdate/56000-highlight_tracking.py similarity index 91% rename from src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py rename to src/fenrirscreenreader/commands/onScreenUpdate/56000-highlight_tracking.py index 419966f8..48be708b 100644 --- a/src/fenrir/commands/onScreenUpdate/56000-highlight_tracking.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): pass diff --git a/src/fenrir/commands/onScreenUpdate/60000-history.py b/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py similarity index 95% rename from src/fenrir/commands/onScreenUpdate/60000-history.py rename to src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py index 0ecea111..e6366659 100644 --- a/src/fenrir/commands/onScreenUpdate/60000-history.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/60000-history.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenUpdate/70000-incoming.py b/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py similarity index 96% rename from src/fenrir/commands/onScreenUpdate/70000-incoming.py rename to src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py index 58f37b94..dd29baf1 100644 --- a/src/fenrir/commands/onScreenUpdate/70000-incoming.py +++ b/src/fenrirscreenreader/commands/onScreenUpdate/70000-incoming.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py b/src/fenrirscreenreader/commands/onScreenUpdate/75000-incoming_promote.py similarity index 94% rename from src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py rename to src/fenrirscreenreader/commands/onScreenUpdate/75000-incoming_promote.py index 63cb2c82..ed3027d9 100644 --- a/src/fenrir/commands/onScreenUpdate/75000-incoming_promote.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onScreenUpdate/__init__.py b/src/fenrirscreenreader/commands/onScreenUpdate/__init__.py similarity index 100% rename from src/fenrir/commands/onScreenUpdate/__init__.py rename to src/fenrirscreenreader/commands/onScreenUpdate/__init__.py diff --git a/src/fenrir/commands/onSwitchApplicationProfile/__init__.py b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/__init__.py similarity index 100% rename from src/fenrir/commands/onSwitchApplicationProfile/__init__.py rename to src/fenrirscreenreader/commands/onSwitchApplicationProfile/__init__.py diff --git a/src/fenrir/commands/onSwitchApplicationProfile/default.py b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/default.py similarity index 91% rename from src/fenrir/commands/onSwitchApplicationProfile/default.py rename to src/fenrirscreenreader/commands/onSwitchApplicationProfile/default.py index 04558ae3..2c088db4 100644 --- a/src/fenrir/commands/onSwitchApplicationProfile/default.py +++ b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/default.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/agetty.py similarity index 91% rename from src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py rename to src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/agetty.py index 1fb59c8d..92e0c45e 100644 --- a/src/fenrir/commands/onSwitchApplicationProfile/inactive/agetty.py +++ b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/agetty.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/bash.py similarity index 91% rename from src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py rename to src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/bash.py index 7a5d7540..2089274f 100644 --- a/src/fenrir/commands/onSwitchApplicationProfile/inactive/bash.py +++ b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/bash.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/vim.py similarity index 91% rename from src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py rename to src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/vim.py index 78f02af9..e743a1af 100644 --- a/src/fenrir/commands/onSwitchApplicationProfile/inactive/vim.py +++ b/src/fenrirscreenreader/commands/onSwitchApplicationProfile/inactive/vim.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/commands/switchTrigger_template.py b/src/fenrirscreenreader/commands/switchTrigger_template.py similarity index 91% rename from src/fenrir/commands/switchTrigger_template.py rename to src/fenrirscreenreader/commands/switchTrigger_template.py index 8efbea56..a12ea75d 100644 --- a/src/fenrir/commands/switchTrigger_template.py +++ b/src/fenrirscreenreader/commands/switchTrigger_template.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class command(): def __init__(self): diff --git a/src/fenrir/core/__init__.py b/src/fenrirscreenreader/core/__init__.py similarity index 100% rename from src/fenrir/core/__init__.py rename to src/fenrirscreenreader/core/__init__.py diff --git a/src/fenrir/core/applicationManager.py b/src/fenrirscreenreader/core/applicationManager.py similarity index 95% rename from src/fenrir/core/applicationManager.py rename to src/fenrirscreenreader/core/applicationManager.py index 202e6e35..bd91fb27 100644 --- a/src/fenrir/core/applicationManager.py +++ b/src/fenrirscreenreader/core/applicationManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class applicationManager(): def __init__(self): diff --git a/src/fenrir/core/brailleDriver.py b/src/fenrirscreenreader/core/brailleDriver.py similarity index 95% rename from src/fenrir/core/brailleDriver.py rename to src/fenrirscreenreader/core/brailleDriver.py index a3504cec..f66ef054 100644 --- a/src/fenrir/core/brailleDriver.py +++ b/src/fenrirscreenreader/core/brailleDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class brailleDriver(): def __init__(self): diff --git a/src/fenrir/core/commandData.py b/src/fenrirscreenreader/core/commandData.py similarity index 91% rename from src/fenrir/core/commandData.py rename to src/fenrirscreenreader/core/commandData.py index e653de30..56dcfff3 100644 --- a/src/fenrir/core/commandData.py +++ b/src/fenrirscreenreader/core/commandData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import time # used as shared memory between commands diff --git a/src/fenrir/core/commandManager.py b/src/fenrirscreenreader/core/commandManager.py similarity index 99% rename from src/fenrir/core/commandManager.py rename to src/fenrirscreenreader/core/commandManager.py index fd10c13c..657a28d3 100644 --- a/src/fenrir/core/commandManager.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import module_utils class commandManager(): def __init__(self): diff --git a/src/fenrir/core/cursorManager.py b/src/fenrirscreenreader/core/cursorManager.py similarity index 99% rename from src/fenrir/core/cursorManager.py rename to src/fenrirscreenreader/core/cursorManager.py index 2a3191e1..5d44d458 100644 --- a/src/fenrir/core/cursorManager.py +++ b/src/fenrirscreenreader/core/cursorManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class cursorManager(): def __init__(self): diff --git a/src/fenrir/core/debug.py b/src/fenrirscreenreader/core/debug.py similarity index 100% rename from src/fenrir/core/debug.py rename to src/fenrirscreenreader/core/debug.py diff --git a/src/fenrir/core/debugManager.py b/src/fenrirscreenreader/core/debugManager.py similarity index 98% rename from src/fenrir/core/debugManager.py rename to src/fenrirscreenreader/core/debugManager.py index 304ebbd7..ed148be7 100644 --- a/src/fenrir/core/debugManager.py +++ b/src/fenrirscreenreader/core/debugManager.py @@ -1,7 +1,7 @@ #!/usr/bin/python # Debugger module for the Fenrir screen reader. -from core import debug +from fenrirscreenreader.core import debug from datetime import datetime class debugManager(): diff --git a/src/fenrirscreenreader/core/environment.py b/src/fenrirscreenreader/core/environment.py new file mode 100644 index 00000000..7b864a28 --- /dev/null +++ b/src/fenrirscreenreader/core/environment.py @@ -0,0 +1,29 @@ +#!/bin/python +# -*- coding: utf-8 -*- + +# Fenrir TTY screen reader +# By Chrys, Storm Dragon, and contributers. + +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.settingsData import settingsData +from fenrirscreenreader.core.runtimeData import runtimeData +from fenrirscreenreader.core.screenData import screenData +from fenrirscreenreader.core.outputData import outputData +from fenrirscreenreader.core.generalData import generalData +from fenrirscreenreader.core import commandData +from fenrirscreenreader.core.inputData import inputData +from fenrirscreenreader.core.punctuationData import punctuationData + +environment = { +'screen': screenData, +'runtime': runtimeData, +'general': generalData, +'settings': settingsData, +'commandInfo': commandData.commandInfo, +'commandBuffer': commandData.commandBuffer, +'input': inputData, +'punctuation': punctuationData, +'output': outputData, +'soundIcons': {}, +'bindings': {}, +} diff --git a/src/fenrir/core/eventData.py b/src/fenrirscreenreader/core/eventData.py similarity index 92% rename from src/fenrir/core/eventData.py rename to src/fenrirscreenreader/core/eventData.py index be5db45a..7fb97d96 100644 --- a/src/fenrir/core/eventData.py +++ b/src/fenrirscreenreader/core/eventData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug from enum import Enum class fenrirEventType(Enum): diff --git a/src/fenrir/core/eventManager.py b/src/fenrirscreenreader/core/eventManager.py similarity index 96% rename from src/fenrir/core/eventManager.py rename to src/fenrirscreenreader/core/eventManager.py index d34ac94e..f6b49958 100644 --- a/src/fenrir/core/eventManager.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.core.eventData import fenrirEventType from queue import Empty import time from multiprocessing import Queue diff --git a/src/fenrir/core/fenrirManager.py b/src/fenrirscreenreader/core/fenrirManager.py similarity index 98% rename from src/fenrir/core/fenrirManager.py rename to src/fenrirscreenreader/core/fenrirManager.py index 92afa4f2..1b0abc44 100644 --- a/src/fenrir/core/fenrirManager.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import i18n +from fenrirscreenreader.core import settingsManager +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.eventData import fenrirEventType import argparse class fenrirManager(): diff --git a/src/fenrir/core/generalData.py b/src/fenrirscreenreader/core/generalData.py similarity index 93% rename from src/fenrir/core/generalData.py rename to src/fenrirscreenreader/core/generalData.py index 98404ccf..d66d2496 100644 --- a/src/fenrir/core/generalData.py +++ b/src/fenrirscreenreader/core/generalData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug generalData = { 'args': None, diff --git a/src/fenrir/core/headLineManager.py b/src/fenrirscreenreader/core/headLineManager.py similarity index 98% rename from src/fenrir/core/headLineManager.py rename to src/fenrirscreenreader/core/headLineManager.py index 54ed1bb3..c9a081c5 100644 --- a/src/fenrir/core/headLineManager.py +++ b/src/fenrirscreenreader/core/headLineManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import re, string class headLineManager(): diff --git a/src/fenrir/core/helpManager.py b/src/fenrirscreenreader/core/helpManager.py similarity index 98% rename from src/fenrir/core/helpManager.py rename to src/fenrirscreenreader/core/helpManager.py index 0370ed70..6ec5030c 100755 --- a/src/fenrir/core/helpManager.py +++ b/src/fenrirscreenreader/core/helpManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class helpManager(): diff --git a/src/fenrir/core/i18n.py b/src/fenrirscreenreader/core/i18n.py similarity index 100% rename from src/fenrir/core/i18n.py rename to src/fenrirscreenreader/core/i18n.py diff --git a/src/fenrir/core/inputData.py b/src/fenrirscreenreader/core/inputData.py similarity index 99% rename from src/fenrir/core/inputData.py rename to src/fenrirscreenreader/core/inputData.py index 6b2fdf95..4eb4fce8 100644 --- a/src/fenrir/core/inputData.py +++ b/src/fenrirscreenreader/core/inputData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import time inputData = { diff --git a/src/fenrir/core/inputDriver.py b/src/fenrirscreenreader/core/inputDriver.py similarity index 97% rename from src/fenrir/core/inputDriver.py rename to src/fenrirscreenreader/core/inputDriver.py index f4d19e46..15a9e63e 100644 --- a/src/fenrir/core/inputDriver.py +++ b/src/fenrirscreenreader/core/inputDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class inputDriver(): def __init__(self): diff --git a/src/fenrir/core/inputManager.py b/src/fenrirscreenreader/core/inputManager.py similarity index 99% rename from src/fenrir/core/inputManager.py rename to src/fenrirscreenreader/core/inputManager.py index 43195074..d08280d8 100644 --- a/src/fenrir/core/inputManager.py +++ b/src/fenrirscreenreader/core/inputManager.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import time -from core import debug +from fenrirscreenreader.core import debug class inputManager(): def __init__(self): diff --git a/src/fenrir/core/memoryManager.py b/src/fenrirscreenreader/core/memoryManager.py similarity index 99% rename from src/fenrir/core/memoryManager.py rename to src/fenrirscreenreader/core/memoryManager.py index 797d4e71..50940ead 100644 --- a/src/fenrir/core/memoryManager.py +++ b/src/fenrirscreenreader/core/memoryManager.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import time -from core import debug +from fenrirscreenreader.core import debug class memoryManager(): def __init__(self): diff --git a/src/fenrir/core/outputData.py b/src/fenrirscreenreader/core/outputData.py similarity index 84% rename from src/fenrir/core/outputData.py rename to src/fenrirscreenreader/core/outputData.py index 684acd60..bf926f24 100644 --- a/src/fenrir/core/outputData.py +++ b/src/fenrirscreenreader/core/outputData.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import time -from core import debug +from fenrirscreenreader.core import debug outputData = { 'nextFlush': time.time(), diff --git a/src/fenrir/core/outputManager.py b/src/fenrirscreenreader/core/outputManager.py similarity index 99% rename from src/fenrir/core/outputManager.py rename to src/fenrirscreenreader/core/outputManager.py index ff59ed02..2e9e125d 100644 --- a/src/fenrir/core/outputManager.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.utils import line_utils import string, time, re class outputManager(): diff --git a/src/fenrir/core/processManager.py b/src/fenrirscreenreader/core/processManager.py similarity index 97% rename from src/fenrir/core/processManager.py rename to src/fenrirscreenreader/core/processManager.py index 0f29837a..4617cdcb 100644 --- a/src/fenrir/core/processManager.py +++ b/src/fenrirscreenreader/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 fenrirscreenreader.core import debug +from fenrirscreenreader.core.eventData import fenrirEventType import time from threading import Thread from multiprocessing import Process diff --git a/src/fenrir/core/punctuationData.py b/src/fenrirscreenreader/core/punctuationData.py similarity index 95% rename from src/fenrir/core/punctuationData.py rename to src/fenrirscreenreader/core/punctuationData.py index 1ba130bd..2d55c951 100644 --- a/src/fenrir/core/punctuationData.py +++ b/src/fenrirscreenreader/core/punctuationData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import string punctuationData = { diff --git a/src/fenrir/core/punctuationManager.py b/src/fenrirscreenreader/core/punctuationManager.py similarity index 98% rename from src/fenrir/core/punctuationManager.py rename to src/fenrirscreenreader/core/punctuationManager.py index 3038ebe8..90c4d02a 100644 --- a/src/fenrir/core/punctuationManager.py +++ b/src/fenrirscreenreader/core/punctuationManager.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import string -from core import debug +from fenrirscreenreader.core import debug class punctuationManager(): def __init__(self): diff --git a/src/fenrir/core/runtimeData.py b/src/fenrirscreenreader/core/runtimeData.py similarity index 89% rename from src/fenrir/core/runtimeData.py rename to src/fenrirscreenreader/core/runtimeData.py index 1041d4ee..e0384619 100644 --- a/src/fenrir/core/runtimeData.py +++ b/src/fenrirscreenreader/core/runtimeData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug runtimeData = { 'speechDriver': None, diff --git a/src/fenrir/core/screenData.py b/src/fenrirscreenreader/core/screenData.py similarity index 96% rename from src/fenrir/core/screenData.py rename to src/fenrirscreenreader/core/screenData.py index 9f4d0a61..a21469ad 100644 --- a/src/fenrir/core/screenData.py +++ b/src/fenrirscreenreader/core/screenData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import time screenData = { diff --git a/src/fenrir/core/screenDriver.py b/src/fenrirscreenreader/core/screenDriver.py similarity index 97% rename from src/fenrir/core/screenDriver.py rename to src/fenrirscreenreader/core/screenDriver.py index 418a67f0..e16108a9 100644 --- a/src/fenrir/core/screenDriver.py +++ b/src/fenrirscreenreader/core/screenDriver.py @@ -11,7 +11,7 @@ #bold = 1 if attr & 16 else 0 -from core import debug +from fenrirscreenreader.core import debug class screenDriver(): def __init__(self): diff --git a/src/fenrir/core/screenManager.py b/src/fenrirscreenreader/core/screenManager.py similarity index 99% rename from src/fenrir/core/screenManager.py rename to src/fenrirscreenreader/core/screenManager.py index a052ce17..a56f505d 100644 --- a/src/fenrir/core/screenManager.py +++ b/src/fenrirscreenreader/core/screenManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import time, os class screenManager(): diff --git a/src/fenrir/core/settingsData.py b/src/fenrirscreenreader/core/settingsData.py similarity index 98% rename from src/fenrir/core/settingsData.py rename to src/fenrirscreenreader/core/settingsData.py index cb99ac10..109d38ae 100644 --- a/src/fenrir/core/settingsData.py +++ b/src/fenrirscreenreader/core/settingsData.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug settingsData = { 'sound': { diff --git a/src/fenrir/core/settingsManager.py b/src/fenrirscreenreader/core/settingsManager.py similarity index 94% rename from src/fenrir/core/settingsManager.py rename to src/fenrirscreenreader/core/settingsManager.py index 0811de29..c38be038 100644 --- a/src/fenrir/core/settingsManager.py +++ b/src/fenrirscreenreader/core/settingsManager.py @@ -9,25 +9,25 @@ currentdir = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(in fenrirPath = os.path.dirname(currentdir) from configparser import ConfigParser -from core import debugManager -from core import memoryManager -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 headLineManager -from core import tableManager -from core import environment -from core import inputData -from core.settingsData import settingsData -from core import debug -from utils import module_utils +from fenrirscreenreader.core import debugManager +from fenrirscreenreader.core import memoryManager +from fenrirscreenreader.core import processManager +from fenrirscreenreader.core import eventManager +from fenrirscreenreader.core import inputManager +from fenrirscreenreader.core import outputManager +from fenrirscreenreader.core import commandManager +from fenrirscreenreader.core import screenManager +from fenrirscreenreader.core import punctuationManager +from fenrirscreenreader.core import cursorManager +from fenrirscreenreader.core import applicationManager +from fenrirscreenreader.core import helpManager +from fenrirscreenreader.core import headLineManager +from fenrirscreenreader.core import tableManager +from fenrirscreenreader.core import environment +from fenrirscreenreader.core import inputData +from fenrirscreenreader.core.settingsData import settingsData +from fenrirscreenreader.core import debug +from fenrirscreenreader.utils import module_utils class settingsManager(): def __init__(self): @@ -257,9 +257,9 @@ class settingsManager(): self.setOptionArgDict(section, option, value) def initFenrirConfig(self, cliArgs, fenrirManager = None, environment = environment.environment): - settingsRoot = '/etc/fenrir/' + settingsRoot = '/etc/fenrirscreenreader/' settingsFile = cliArgs.setting - soundRoot = '/usr/share/sounds/fenrir/' + soundRoot = '/usr/share/sounds/fenrirscreenreader/' environment['runtime']['debug'] = debugManager.debugManager() environment['runtime']['debug'].initialize(environment) # get fenrir settings root diff --git a/src/fenrir/core/soundDriver.py b/src/fenrirscreenreader/core/soundDriver.py similarity index 96% rename from src/fenrir/core/soundDriver.py rename to src/fenrirscreenreader/core/soundDriver.py index 0f2d4ab7..1c94ba1d 100644 --- a/src/fenrir/core/soundDriver.py +++ b/src/fenrirscreenreader/core/soundDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class soundDriver(): def __init__(self): diff --git a/src/fenrir/core/speechDriver.py b/src/fenrirscreenreader/core/speechDriver.py similarity index 98% rename from src/fenrir/core/speechDriver.py rename to src/fenrirscreenreader/core/speechDriver.py index 539412f3..ca4df1d4 100644 --- a/src/fenrir/core/speechDriver.py +++ b/src/fenrirscreenreader/core/speechDriver.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug class speechDriver(): def __init__(self): diff --git a/src/fenrir/core/tableManager.py b/src/fenrirscreenreader/core/tableManager.py similarity index 96% rename from src/fenrir/core/tableManager.py rename to src/fenrirscreenreader/core/tableManager.py index 60a31cf4..6580ce8b 100644 --- a/src/fenrir/core/tableManager.py +++ b/src/fenrirscreenreader/core/tableManager.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import re class tableManager(): diff --git a/src/fenrir/fenrirVersion.py b/src/fenrirscreenreader/fenrirVersion.py similarity index 100% rename from src/fenrir/fenrirVersion.py rename to src/fenrirscreenreader/fenrirVersion.py diff --git a/src/fenrir/inputDriver/__init__.py b/src/fenrirscreenreader/inputDriver/__init__.py similarity index 100% rename from src/fenrir/inputDriver/__init__.py rename to src/fenrirscreenreader/inputDriver/__init__.py diff --git a/src/fenrir/inputDriver/debugDriver.py b/src/fenrirscreenreader/inputDriver/debugDriver.py similarity index 95% rename from src/fenrir/inputDriver/debugDriver.py rename to src/fenrirscreenreader/inputDriver/debugDriver.py index 90e4c4ce..abea3c66 100644 --- a/src/fenrir/inputDriver/debugDriver.py +++ b/src/fenrirscreenreader/inputDriver/debugDriver.py @@ -5,8 +5,8 @@ # By Chrys, Storm Dragon, and contributers. import time -from core import debug -from core.inputDriver import inputDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.inputDriver import inputDriver class driver(inputDriver): def __init__(self): diff --git a/src/fenrir/inputDriver/dummyDriver.py b/src/fenrirscreenreader/inputDriver/dummyDriver.py similarity index 67% rename from src/fenrir/inputDriver/dummyDriver.py rename to src/fenrirscreenreader/inputDriver/dummyDriver.py index 917ee1f7..22175126 100644 --- a/src/fenrir/inputDriver/dummyDriver.py +++ b/src/fenrirscreenreader/inputDriver/dummyDriver.py @@ -5,8 +5,8 @@ # By Chrys, Storm Dragon, and contributers. import time -from core import debug -from core.inputDriver import inputDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.inputDriver import inputDriver class driver(inputDriver): def __init__(self): diff --git a/src/fenrir/inputDriver/evdevDriver.py b/src/fenrirscreenreader/inputDriver/evdevDriver.py similarity index 98% rename from src/fenrir/inputDriver/evdevDriver.py rename to src/fenrirscreenreader/inputDriver/evdevDriver.py index 06a5f355..b847a301 100644 --- a/src/fenrir/inputDriver/evdevDriver.py +++ b/src/fenrirscreenreader/inputDriver/evdevDriver.py @@ -28,10 +28,10 @@ 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 core.inputDriver import inputDriver +from fenrirscreenreader.core.eventData import fenrirEventType +from fenrirscreenreader.core import inputData +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.inputDriver import inputDriver class driver(inputDriver): def __init__(self): diff --git a/src/fenrir/screenDriver/BAKvcsaDriver.py b/src/fenrirscreenreader/screenDriver/BAKvcsaDriver.py similarity index 98% rename from src/fenrir/screenDriver/BAKvcsaDriver.py rename to src/fenrirscreenreader/screenDriver/BAKvcsaDriver.py index d7a31cb2..dfe10737 100644 --- a/src/fenrir/screenDriver/BAKvcsaDriver.py +++ b/src/fenrirscreenreader/screenDriver/BAKvcsaDriver.py @@ -23,12 +23,12 @@ import fcntl from array import array import errno import sys -from utils import screen_utils +from fenrirscreenreader.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 core.screenDriver import screenDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.eventData import fenrirEventType +from fenrirscreenreader.core.screenDriver import screenDriver class driver(screenDriver): def __init__(self): diff --git a/src/fenrir/screenDriver/__init__.py b/src/fenrirscreenreader/screenDriver/__init__.py similarity index 100% rename from src/fenrir/screenDriver/__init__.py rename to src/fenrirscreenreader/screenDriver/__init__.py diff --git a/src/fenrir/screenDriver/dummyDriver.py b/src/fenrirscreenreader/screenDriver/dummyDriver.py similarity index 65% rename from src/fenrir/screenDriver/dummyDriver.py rename to src/fenrirscreenreader/screenDriver/dummyDriver.py index 6318b734..60cb2d6b 100644 --- a/src/fenrir/screenDriver/dummyDriver.py +++ b/src/fenrirscreenreader/screenDriver/dummyDriver.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from core.screenDriver import screenDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.screenDriver import screenDriver class driver(screenDriver): def __init__(self): diff --git a/src/fenrir/screenDriver/ptyDriver.py b/src/fenrirscreenreader/screenDriver/ptyDriver.py similarity index 98% rename from src/fenrir/screenDriver/ptyDriver.py rename to src/fenrirscreenreader/screenDriver/ptyDriver.py index 10b1c180..585c6d8c 100644 --- a/src/fenrir/screenDriver/ptyDriver.py +++ b/src/fenrirscreenreader/screenDriver/ptyDriver.py @@ -23,12 +23,12 @@ import fcntl from array import array import errno import sys -from utils import screen_utils +from fenrirscreenreader.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 core.screenDriver import screenDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.eventData import fenrirEventType +from fenrirscreenreader.core.screenDriver import screenDriver class driver(screenDriver): def __init__(self): diff --git a/src/fenrir/screenDriver/vcsaDriver.py b/src/fenrirscreenreader/screenDriver/vcsaDriver.py similarity index 98% rename from src/fenrir/screenDriver/vcsaDriver.py rename to src/fenrirscreenreader/screenDriver/vcsaDriver.py index efb0c152..e6932a80 100644 --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrirscreenreader/screenDriver/vcsaDriver.py @@ -23,12 +23,12 @@ import fcntl from array import array import errno import sys -from utils import screen_utils +from fenrirscreenreader.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 core.screenDriver import screenDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.eventData import fenrirEventType +from fenrirscreenreader.core.screenDriver import screenDriver class driver(screenDriver): def __init__(self): diff --git a/src/fenrir/soundDriver/__init__.py b/src/fenrirscreenreader/soundDriver/__init__.py similarity index 100% rename from src/fenrir/soundDriver/__init__.py rename to src/fenrirscreenreader/soundDriver/__init__.py diff --git a/src/fenrir/soundDriver/debugDriver.py b/src/fenrirscreenreader/soundDriver/debugDriver.py similarity index 94% rename from src/fenrir/soundDriver/debugDriver.py rename to src/fenrirscreenreader/soundDriver/debugDriver.py index e782dbde..33c17481 100644 --- a/src/fenrir/soundDriver/debugDriver.py +++ b/src/fenrirscreenreader/soundDriver/debugDriver.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from core.soundDriver import soundDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.soundDriver import soundDriver class driver(soundDriver): def __init__(self): diff --git a/src/fenrir/soundDriver/dummyDriver.py b/src/fenrirscreenreader/soundDriver/dummyDriver.py similarity index 66% rename from src/fenrir/soundDriver/dummyDriver.py rename to src/fenrirscreenreader/soundDriver/dummyDriver.py index 87e8a6a1..5f296755 100644 --- a/src/fenrir/soundDriver/dummyDriver.py +++ b/src/fenrirscreenreader/soundDriver/dummyDriver.py @@ -4,8 +4,8 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug -from core.soundDriver import soundDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.soundDriver import soundDriver class driver(soundDriver): def __init__(self): diff --git a/src/fenrir/soundDriver/genericDriver.py b/src/fenrirscreenreader/soundDriver/genericDriver.py similarity index 96% rename from src/fenrir/soundDriver/genericDriver.py rename to src/fenrirscreenreader/soundDriver/genericDriver.py index f982bfd1..d3eec5f6 100644 --- a/src/fenrir/soundDriver/genericDriver.py +++ b/src/fenrirscreenreader/soundDriver/genericDriver.py @@ -4,10 +4,10 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import subprocess import shlex -from core.soundDriver import soundDriver +from fenrirscreenreader.core.soundDriver import soundDriver class driver(soundDriver): def __init__(self): diff --git a/src/fenrir/soundDriver/gstreamerDriver.py b/src/fenrirscreenreader/soundDriver/gstreamerDriver.py similarity index 97% rename from src/fenrir/soundDriver/gstreamerDriver.py rename to src/fenrirscreenreader/soundDriver/gstreamerDriver.py index 33565d53..9f441cd6 100644 --- a/src/fenrir/soundDriver/gstreamerDriver.py +++ b/src/fenrirscreenreader/soundDriver/gstreamerDriver.py @@ -4,9 +4,9 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import time, threading -from core.soundDriver import soundDriver +from fenrirscreenreader.core.soundDriver import soundDriver _gstreamerAvailable = False try: diff --git a/src/fenrir/speechDriver/Readme.md b/src/fenrirscreenreader/speechDriver/Readme.md similarity index 100% rename from src/fenrir/speechDriver/Readme.md rename to src/fenrirscreenreader/speechDriver/Readme.md diff --git a/src/fenrir/speechDriver/__init__.py b/src/fenrirscreenreader/speechDriver/__init__.py similarity index 100% rename from src/fenrir/speechDriver/__init__.py rename to src/fenrirscreenreader/speechDriver/__init__.py diff --git a/src/fenrir/speechDriver/debugDriver.py b/src/fenrirscreenreader/speechDriver/debugDriver.py similarity index 95% rename from src/fenrir/speechDriver/debugDriver.py rename to src/fenrirscreenreader/speechDriver/debugDriver.py index c3ab9118..47bea182 100644 --- a/src/fenrir/speechDriver/debugDriver.py +++ b/src/fenrirscreenreader/speechDriver/debugDriver.py @@ -5,8 +5,8 @@ # By Chrys, Storm Dragon, and contributers. # generic driver -from core import debug -from core.speechDriver import speechDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.speechDriver import speechDriver class driver(speechDriver): def __init__(self): diff --git a/src/fenrir/speechDriver/dummyDriver.py b/src/fenrirscreenreader/speechDriver/dummyDriver.py similarity index 68% rename from src/fenrir/speechDriver/dummyDriver.py rename to src/fenrirscreenreader/speechDriver/dummyDriver.py index c8ea4faa..32e893d4 100644 --- a/src/fenrir/speechDriver/dummyDriver.py +++ b/src/fenrirscreenreader/speechDriver/dummyDriver.py @@ -5,8 +5,8 @@ # By Chrys, Storm Dragon, and contributers. # generic driver -from core import debug -from core.speechDriver import speechDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.speechDriver import speechDriver class driver(speechDriver): def __init__(self): diff --git a/src/fenrir/speechDriver/emacspeakDriver.py b/src/fenrirscreenreader/speechDriver/emacspeakDriver.py similarity index 96% rename from src/fenrir/speechDriver/emacspeakDriver.py rename to src/fenrirscreenreader/speechDriver/emacspeakDriver.py index d9d91818..414d225f 100644 --- a/src/fenrir/speechDriver/emacspeakDriver.py +++ b/src/fenrirscreenreader/speechDriver/emacspeakDriver.py @@ -11,8 +11,8 @@ import ptyprocess import shlex import sys import time -from core import debug -from core.speechDriver import speechDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.speechDriver import speechDriver class driver(speechDriver): def __init__(self): diff --git a/src/fenrir/speechDriver/espeakDriver.py b/src/fenrirscreenreader/speechDriver/espeakDriver.py similarity index 94% rename from src/fenrir/speechDriver/espeakDriver.py rename to src/fenrirscreenreader/speechDriver/espeakDriver.py index 7cf8fcac..4a85f060 100644 --- a/src/fenrir/speechDriver/espeakDriver.py +++ b/src/fenrirscreenreader/speechDriver/espeakDriver.py @@ -5,8 +5,8 @@ # By Chrys, Storm Dragon, and contributers. # Espeak driver -from core import debug -from core.speechDriver import speechDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.speechDriver import speechDriver class driver(speechDriver): def __init__(self): diff --git a/src/fenrir/speechDriver/genericDriver.py b/src/fenrirscreenreader/speechDriver/genericDriver.py similarity index 98% rename from src/fenrir/speechDriver/genericDriver.py rename to src/fenrirscreenreader/speechDriver/genericDriver.py index 2f2286fc..31f16db9 100644 --- a/src/fenrir/speechDriver/genericDriver.py +++ b/src/fenrirscreenreader/speechDriver/genericDriver.py @@ -5,12 +5,12 @@ # By Chrys, Storm Dragon, and contributers. # generic driver -from core import debug +from fenrirscreenreader.core import debug from threading import Thread, Lock from queue import Queue, Empty import shlex from subprocess import Popen -from core.speechDriver import speechDriver +from fenrirscreenreader.core.speechDriver import speechDriver class speakQueue(Queue): def clear(self): diff --git a/src/fenrir/speechDriver/pyttsxDriver.py b/src/fenrirscreenreader/speechDriver/pyttsxDriver.py similarity index 96% rename from src/fenrir/speechDriver/pyttsxDriver.py rename to src/fenrirscreenreader/speechDriver/pyttsxDriver.py index 1ea98e29..e9635f7a 100644 --- a/src/fenrir/speechDriver/pyttsxDriver.py +++ b/src/fenrirscreenreader/speechDriver/pyttsxDriver.py @@ -6,8 +6,8 @@ # Espeak driver from threading import Thread, Lock -from core import debug -from core.speechDriver import speechDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.speechDriver import speechDriver class driver(speechDriver): def __init__(self): diff --git a/src/fenrir/speechDriver/speechdDriver.py b/src/fenrirscreenreader/speechDriver/speechdDriver.py similarity index 97% rename from src/fenrir/speechDriver/speechdDriver.py rename to src/fenrirscreenreader/speechDriver/speechdDriver.py index 99293a8f..b8181a95 100644 --- a/src/fenrir/speechDriver/speechdDriver.py +++ b/src/fenrirscreenreader/speechDriver/speechdDriver.py @@ -5,8 +5,8 @@ # By Chrys, Storm Dragon, and contributers. # speech-dispatcher driver -from core import debug -from core.speechDriver import speechDriver +from fenrirscreenreader.core import debug +from fenrirscreenreader.core.speechDriver import speechDriver class driver(speechDriver): def __init__(self): diff --git a/src/fenrir/utils/__init__.py b/src/fenrirscreenreader/utils/__init__.py similarity index 100% rename from src/fenrir/utils/__init__.py rename to src/fenrirscreenreader/utils/__init__.py diff --git a/src/fenrir/utils/char_utils.py b/src/fenrirscreenreader/utils/char_utils.py similarity index 98% rename from src/fenrir/utils/char_utils.py rename to src/fenrirscreenreader/utils/char_utils.py index 1dc9d266..a41163c8 100644 --- a/src/fenrir/utils/char_utils.py +++ b/src/fenrirscreenreader/utils/char_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug def getPrevChar(currX,currY, currText): lineBreak = False diff --git a/src/fenrir/utils/fenrir-config.py b/src/fenrirscreenreader/utils/fenrir-config.py similarity index 100% rename from src/fenrir/utils/fenrir-config.py rename to src/fenrirscreenreader/utils/fenrir-config.py diff --git a/src/fenrir/utils/line_utils.py b/src/fenrirscreenreader/utils/line_utils.py similarity index 96% rename from src/fenrir/utils/line_utils.py rename to src/fenrirscreenreader/utils/line_utils.py index 7e6340f0..51fa3f37 100644 --- a/src/fenrir/utils/line_utils.py +++ b/src/fenrirscreenreader/utils/line_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug from collections import Counter def getPrevLine(currX,currY, currText): diff --git a/src/fenrir/utils/mark_utils.py b/src/fenrirscreenreader/utils/mark_utils.py similarity index 97% rename from src/fenrir/utils/mark_utils.py rename to src/fenrirscreenreader/utils/mark_utils.py index d52b53f1..3a341b48 100644 --- a/src/fenrir/utils/mark_utils.py +++ b/src/fenrirscreenreader/utils/mark_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug def getTextBetweenMarks(firstMark, secondMark, inText): if inText == None: diff --git a/src/fenrir/utils/module_utils.py b/src/fenrirscreenreader/utils/module_utils.py similarity index 100% rename from src/fenrir/utils/module_utils.py rename to src/fenrirscreenreader/utils/module_utils.py diff --git a/src/fenrir/utils/review_utils.py b/src/fenrirscreenreader/utils/review_utils.py similarity index 72% rename from src/fenrir/utils/review_utils.py rename to src/fenrirscreenreader/utils/review_utils.py index 1bca1526..61a21325 100644 --- a/src/fenrir/utils/review_utils.py +++ b/src/fenrirscreenreader/utils/review_utils.py @@ -4,5 +4,5 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug diff --git a/src/fenrir/utils/screen_utils.py b/src/fenrirscreenreader/utils/screen_utils.py similarity index 98% rename from src/fenrir/utils/screen_utils.py rename to src/fenrirscreenreader/utils/screen_utils.py index 6a3db6ec..f8c87b38 100644 --- a/src/fenrir/utils/screen_utils.py +++ b/src/fenrirscreenreader/utils/screen_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug from collections import Counter import string from select import select diff --git a/src/fenrir/utils/word_utils.py b/src/fenrirscreenreader/utils/word_utils.py similarity index 98% rename from src/fenrir/utils/word_utils.py rename to src/fenrirscreenreader/utils/word_utils.py index 349b172a..dd712ea0 100644 --- a/src/fenrir/utils/word_utils.py +++ b/src/fenrirscreenreader/utils/word_utils.py @@ -4,7 +4,7 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -from core import debug +from fenrirscreenreader.core import debug import string def getCurrentWord(currX,currY, currText): diff --git a/uninstall.sh b/uninstall.sh index 8b820fec..17a8724f 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -11,10 +11,10 @@ read -p "This will remove Fenrir and its settings from your system,, press ctrl+ # do it unlink /usr/bin/fenrir unlink /usr/bin/fenrir-daemon -rm -rf /opt/fenrir -rm -rf /usr/share/fenrir -rm -rf /etc/fenrir -rm -rf /usr/share/sounds/fenrir +rm -rf /opt/fenrirscreenreader +rm -rf /usr/share/fenrirscreenreader +rm -rf /etc/fenrirscreenreader +rm -rf /usr/share/sounds/fenrirscreenreader rm -f /usr/lib/systemd/system/fenrir.service # success message