fix merge

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' {} \;
+

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

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

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

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

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
+install -m755 -d /opt/fenrirscreenreader
-cp -af src/fenrir/* /opt/fenrir
+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/fenrirscreenreader/fenrir-daemon /usr/bin/fenrir-daemon
-ln -fs /opt/fenrir/fenrir /usr/bin/fenrir
+ln -fs /opt/fenrirscreenreader/fenrir /usr/bin/fenrir
 # tools
-install -m755 -d /usr/share/fenrir/tools
+install -m755 -d /usr/share/fenrirscreenreader/tools
-cp -af tools/* /usr/share/fenrir/tools
+cp -af tools/* /usr/share/fenrirscreenreader/tools
 
 # scripts
-install -m755 -d /usr/share/fenrir/scripts
+install -m755 -d /usr/share/fenrirscreenreader/scripts
-cp -af "config/scripts/wlan__-__key_y.sh" /usr/share/fenrir/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/desktop.conf" /etc/fenrirscreenreader/keyboard/desktop.conf
-install -m644 -D "config/keyboard/laptop.conf" /etc/fenrir/keyboard/laptop.conf
+install -m644 -D "config/keyboard/laptop.conf" /etc/fenrirscreenreader/keyboard/laptop.conf
 
 # punctuation
-install -m755 -d /etc/fenrir/punctuation 
+install -m755 -d /etc/fenrirscreenreader/punctuation 
-cp -af config/punctuation/* /etc/fenrir/punctuation 
+cp -af config/punctuation/* /etc/fenrirscreenreader/punctuation 
 
 # sound
-install -d /usr/share/sounds/fenrir
+install -d /usr/share/sounds/fenrirscreenreader
-cp -af config/sound/default /usr/share/sounds/fenrir/default
+cp -af config/sound/default /usr/share/sounds/fenrirscreenreader/default
-cp -af config/sound/default-wav /usr/share/sounds/fenrir/default-wav
+cp -af config/sound/default-wav /usr/share/sounds/fenrirscreenreader/default-wav
-cp -af config/sound/template /usr/share/sounds/fenrir/template
+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
+install path:/opt/fenrirscreenreader
-settings path:/etc/fenrir
+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

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

setup.py

@@ -6,8 +6,8 @@ from shutil import copyfile
 from setuptools import find_packages
 from setuptools import setup
 
-fenrirVersion = '1.5'
+fenrirVersion = '1.7'
-packageVersion = 'post11'
+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'),
+    packages=find_packages('src/'),
-    package_dir={'': 'src/fenrir'},
+    package_dir={'': 'src/'},
-    scripts=['src/fenrir/fenrir','src/fenrir/fenrir-daemon'],
+    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')
+            copyfile('/etc/fenrirscreenreader/settings/settings.conf.example', '/etc/fenrirscreenreader/settings/settings.conf')
-            print('create settings file in /etc/fenrir/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')

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()

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"

src/fenrir/core/environment.py

@@ -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': {},
-}

src/fenrirscreenreader/brailleDriver/brlapiDriver.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from core import debug
+from fenrirscreenreader.core import debug
-from core.brailleDriver import brailleDriver
+from fenrirscreenreader.core.brailleDriver import brailleDriver
 
 class driver(brailleDriver):
     def __init__(self):

src/fenrirscreenreader/brailleDriver/debugDriver.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from core import debug
+from fenrirscreenreader.core import debug
-from core.brailleDriver import brailleDriver
+from fenrirscreenreader.core.brailleDriver import brailleDriver
 
 class driver(brailleDriver):
     def __init__(self):

src/fenrirscreenreader/brailleDriver/dummyDriver.py

@@ -4,8 +4,8 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from core import debug
+from fenrirscreenreader.core import debug
-from core.brailleDriver import brailleDriver
+from fenrirscreenreader.core.brailleDriver import brailleDriver
 
 class driver(brailleDriver):
     def __init__(self):

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):

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

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 fenrirscreenreader.core import debug
-from utils import word_utils
+from fenrirscreenreader.utils import word_utils
 import string
 initialized = False
 try:

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 fenrirscreenreader.core import debug
-from utils import screen_utils
+from fenrirscreenreader.utils import screen_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
 
 class command():
     def __init__(self):

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):

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):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
 
 class command():
     def __init__(self):

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):

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):

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):

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 fenrirscreenreader.core import debug
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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():

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):

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():

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():

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():

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():

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):

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():

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

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):

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):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
 import os
 
 class command():

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):

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():

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():

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():

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():

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 fenrirscreenreader.core import debug
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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):

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):

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 fenrirscreenreader.core import debug
-from utils import mark_utils
+from fenrirscreenreader.utils import mark_utils
 
 class command():
     def __init__(self):

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):

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():

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 fenrirscreenreader.core import debug
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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):

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):

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):

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 fenrirscreenreader.core import debug
-from utils import word_utils
+from fenrirscreenreader.utils import word_utils
 import string
 initialized = False
 try:

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):

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 fenrirscreenreader.core import debug
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import word_utils
+from fenrirscreenreader.utils import word_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import word_utils
+from fenrirscreenreader.utils import word_utils
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import line_utils
+from fenrirscreenreader.utils import line_utils
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):

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 fenrirscreenreader.core import debug
-from utils import char_utils
+from fenrirscreenreader.utils import char_utils
 
 class command():
     def __init__(self):