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/src/fenrirscreenreader/core/settingsManager.py b/src/fenrirscreenreader/core/settingsManager.py index 99ae8fb9..a7970fc2 100644 --- a/src/fenrirscreenreader/core/settingsManager.py +++ b/src/fenrirscreenreader/core/settingsManager.py @@ -257,7 +257,7 @@ 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/' environment['runtime']['debug'] = debugManager.debugManager()