storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix missing renames

Browse Source
This commit is contained in:
chrys 2018-06-18 00:22:16 +02:00
parent fa240a75f3
commit d926858aeb
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/settings/settings.conf.storm
View File

@ -120,7 +120,7 @@ timeFormat=%H:%M:%P
dateFormat="%A, %B %d, %Y" dateFormat="%A, %B %d, %Y"
autoSpellCheck=True autoSpellCheck=True
spellCheckLanguage=en_US spellCheckLanguage=en_US
scriptPath=/usr/share/fenrir/scripts scriptPath=/usr/share/fenrirscreenreader/scripts
# overload commands, and create new one without changing Fenrir default # overload commands, and create new one without changing Fenrir default
commandPath= commandPath=
#fenrirBGColor = the backgroundcolor #fenrirBGColor = the backgroundcolor

16
docu/fenrir.1
View File

@ -234,7 +234,7 @@ this installs Fenrir as the following
\f[C] \f[C]
*\ Application:\[aq]\[aq]/opt/fenrir\[aq]\[aq] *\ Application:\[aq]\[aq]/opt/fenrir\[aq]\[aq]
*\ Settings:\[aq]\[aq]/etc/fenrir\[aq]\[aq] *\ Settings:\[aq]\[aq]/etc/fenrir\[aq]\[aq]
*\ Sound\ Icons:\[aq]\[aq]/usr/share/fenrir/\[aq]\[aq] *\ Sound\ Icons:\[aq]\[aq]/usr/share/fenrirscreenreader/\[aq]\[aq]
\f[] \f[]
.fi .fi
.PP .PP
@ -2158,7 +2158,7 @@ theme=default By default we ship two sound packs.
1. 1.
\[aq]\[aq]default\[aq]\[aq] opus encoded, for newer Sox versions 2. \[aq]\[aq]default\[aq]\[aq] opus encoded, for newer Sox versions 2.
\[aq]\[aq]default\-wav\[aq]\[aq] wav encoded, just for compatibility \[aq]\[aq]default\-wav\[aq]\[aq] wav encoded, just for compatibility
Sound packs are located at /usr/share/sounds/fenrir/ Sound packs are located at /usr/share/sounds/fenrirscreenreader/
.PP .PP
Sound volume controls how loud the sounds for your selected sound pack Sound volume controls how loud the sounds for your selected sound pack
are. are.
@ -2514,11 +2514,11 @@ The use of the dictionary with spellcheck: spellCheckLanguage=en_US
Values: Text, see aspell dictionary\[aq]s. Values: Text, see aspell dictionary\[aq]s.
.PP .PP
Folder Path for your scripts "scriptKey" functionality: Folder Path for your scripts "scriptKey" functionality:
scriptPath=/usr/share/fenrir/scripts Values: Text, Existing path on file scriptPath=/usr/share/fenrirscreenreader/scripts Values: Text, Existing path on file
system. system.
.PP .PP
Override commands or create new ones without changing the Fenrir Override commands or create new ones without changing the Fenrir
defaults: commandPath=/usr/share/fenrir/commands Values: Text, Existing defaults: commandPath=/usr/share/fenrirscreenreader/commands Values: Text, Existing
path on file system. path on file system.
Subfolders in commandPath are: Subfolders in commandPath are:
.IP \[bu] 2 .IP \[bu] 2
@ -2602,7 +2602,7 @@ Customization
.SS Scripting .SS Scripting
.PP .PP
Scripts can be in any language, bash, python, sh or others. Scripts can be in any language, bash, python, sh or others.
Place your scripts in the directory /usr/share/fenrir/scripts/ (the path Place your scripts in the directory /usr/share/fenrirscreenreader/scripts/ (the path
is configurable in settings.conf). is configurable in settings.conf).
The script key is the applications key. The script key is the applications key.
Usually this key can be found on the keyboard located just left of the Usually this key can be found on the keyboard located just left of the
@ -2611,7 +2611,7 @@ When you name a script, the key name appears in the script seperated by
the sequence \f[B]\-\f[]. the sequence \f[B]\-\f[].
So, for example, if you have a python weather script you want assigned So, for example, if you have a python weather script you want assigned
to the script key plus the letter w you would name the script to the script key plus the letter w you would name the script
/usr/share/fenrir/scripts/weather__\-__key_w.py Then, to access the /usr/share/fenrirscreenreader/scripts/weather__\-__key_w.py Then, to access the
script, simply press the script key and the letter w. script, simply press the script key and the letter w.
Scripts must be executable. Scripts must be executable.
So, make sure to chmod 755 your script when you place it in the scripts So, make sure to chmod 755 your script when you place it in the scripts
@ -2639,11 +2639,11 @@ T}
.PP .PP
Script that just speaks the current username when pressing ScriptKey + Script that just speaks the current username when pressing ScriptKey +
H.\\ File: H.\\ File:
\[aq]\[aq]/usr/share/fenrir/scripts/helloWorld__\-__key_h.sh\[aq]\[aq]: \[aq]\[aq]/usr/share/fenrirscreenreader/scripts/helloWorld__\-__key_h.sh\[aq]\[aq]:
#!/bin/bash echo $1 #!/bin/bash echo $1
.SS Commands .SS Commands
.PP .PP
You can place your own commands in "/usr/share/fenrir/commands" (path is You can place your own commands in "/usr/share/fenrirscreenreader/commands" (path is
configurable in settings.conf). configurable in settings.conf).
Commands are python files with a special scheme. Commands are python files with a special scheme.
You can assign them to a shortcut using the filename without an You can assign them to a shortcut using the filename without an

16
docu/user.md
View File

@ -224,7 +224,7 @@ this installs Fenrir as the following
* Application:''/opt/fenrir'' * Application:''/opt/fenrir''
* Settings:''/etc/fenrir'' * Settings:''/etc/fenrir''
* Sound Icons:''/usr/share/fenrir/'' * Sound Icons:''/usr/share/fenrirscreenreader/''
to remove Fenrir just run uninstall.sh as root to remove Fenrir just run uninstall.sh as root
@ -1044,7 +1044,7 @@ These are the pack of sounds used for sound icons.
By default we ship two sound packs. By default we ship two sound packs.
1. ''default'' opus encoded, for newer Sox versions 1. ''default'' opus encoded, for newer Sox versions
2. ''default-wav'' wav encoded, just for compatibility 2. ''default-wav'' wav encoded, just for compatibility
Sound packs are located at /usr/share/sounds/fenrir/ Sound packs are located at /usr/share/sounds/fenrirscreenreader/
Sound volume controls how loud the sounds for your selected sound pack are. Sound volume controls how loud the sounds for your selected sound pack are.
volume=1.0 volume=1.0
@ -1391,11 +1391,11 @@ The use of the dictionary with spellcheck:
Values: Text, see aspell dictionary's. Values: Text, see aspell dictionary's.
Folder Path for your scripts "scriptKey" functionality: Folder Path for your scripts "scriptKey" functionality:
scriptPath=/usr/share/fenrir/scripts scriptPath=/usr/share/fenrirscreenreader/scripts
Values: Text, Existing path on file system. Values: Text, Existing path on file system.
Override commands or create new ones without changing the Fenrir defaults: Override commands or create new ones without changing the Fenrir defaults:
commandPath=/usr/share/fenrir/commands commandPath=/usr/share/fenrirscreenreader/commands
Values: Text, Existing path on file system. Values: Text, Existing path on file system.
Subfolders in commandPath are: Subfolders in commandPath are:
@ -1489,9 +1489,9 @@ Values: on=''True'', off=''False''
# Customization # Customization
## Scripting ## Scripting
Scripts can be in any language, bash, python, sh or others. Place your scripts in the directory /usr/share/fenrir/scripts/ (the path is configurable in settings.conf). Scripts can be in any language, bash, python, sh or others. Place your scripts in the directory /usr/share/fenrirscreenreader/scripts/ (the path is configurable in settings.conf).
The script key is the applications key. Usually this key can be found on the keyboard located just left of the right most control key. The script key is the applications key. Usually this key can be found on the keyboard located just left of the right most control key.
When you name a script, the key name appears in the script seperated by the sequence __-__. So, for example, if you have a python weather script you want assigned to the script key plus the letter w you would name the script /usr/share/fenrir/scripts/weather__-__key_w.py When you name a script, the key name appears in the script seperated by the sequence __-__. So, for example, if you have a python weather script you want assigned to the script key plus the letter w you would name the script /usr/share/fenrirscreenreader/scripts/weather__-__key_w.py
Then, to access the script, simply press the script key and the letter w. Then, to access the script, simply press the script key and the letter w.
Scripts must be executable. So, make sure to chmod 755 your script when you place it in the scripts directory. Scripts must be executable. So, make sure to chmod 755 your script when you place it in the scripts directory.
The script gets some parameters from fenrir when it is executed. So that information is available in your script then. The script gets some parameters from fenrir when it is executed. So that information is available in your script then.
@ -1505,14 +1505,14 @@ The script gets some parameters from fenrir when it is executed. So that informa
### Examples ### Examples
Script that just speaks the current username when pressing ScriptKey + H.\\ Script that just speaks the current username when pressing ScriptKey + H.\\
File: ''/usr/share/fenrir/scripts/helloWorld__-__key_h.sh'': File: ''/usr/share/fenrirscreenreader/scripts/helloWorld__-__key_h.sh'':
#!/bin/bash #!/bin/bash
echo $1 echo $1
## Commands ## Commands
You can place your own commands in "/usr/share/fenrir/commands" (path is configurable in settings.conf). You can place your own commands in "/usr/share/fenrirscreenreader/commands" (path is configurable in settings.conf).
Commands are python files with a special scheme. You can assign them to a shortcut using the filename without an extension or place them in a hook trigger like OnInput or OnScreenChange. For further information see developer guide. Commands are python files with a special scheme. You can assign them to a shortcut using the filename without an extension or place them in a hook trigger like OnInput or OnScreenChange. For further information see developer guide.
Good Examples: ["date.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py) (announce the Date), ["shut_up.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py) (interrupt output) Good Examples: ["date.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py) (announce the Date), ["shut_up.py"](https///github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py) (interrupt output)
the basic scheme for a command is as follows: the basic scheme for a command is as follows:

16
docu/user.txt
View File

@ -177,7 +177,7 @@ For Arch there are PKGBUILDs in the AUR:
this installs Fenrir as the following this installs Fenrir as the following
* Application:''/opt/fenrir'' * Application:''/opt/fenrir''
* Settings:''/etc/fenrir'' * Settings:''/etc/fenrir''
* Sound Icons:''/usr/share/fenrir/'' * Sound Icons:''/usr/share/fenrirscreenreader/''
to remove Fenrir just run uninstall.sh as root to remove Fenrir just run uninstall.sh as root
@ -857,7 +857,7 @@ These are the pack of sounds used for sound icons.
By default we ship two sound packs. By default we ship two sound packs.
- ''default'' opus encoded, for newer Sox versions - ''default'' opus encoded, for newer Sox versions
- ''default-wav'' wav encoded, just for compatibility - ''default-wav'' wav encoded, just for compatibility
Sound packs are located at /usr/share/sounds/fenrir/ Sound packs are located at /usr/share/sounds/fenrirscreenreader/
Sound volume controls how loud the sounds for your selected sound pack are. Sound volume controls how loud the sounds for your selected sound pack are.
volume=1.0 volume=1.0
@ -1160,11 +1160,11 @@ The use of the dictionary with spellcheck:
Values: Text, see aspell dictionary's. Values: Text, see aspell dictionary's.
Folder Path for your scripts "scriptKey" functionality: Folder Path for your scripts "scriptKey" functionality:
scriptPath=/usr/share/fenrir/scripts scriptPath=/usr/share/fenrirscreenreader/scripts
Values: Text, Existing path on file system. Values: Text, Existing path on file system.
Override commands or create new ones without changing the Fenrir defaults: Override commands or create new ones without changing the Fenrir defaults:
commandPath=/usr/share/fenrir/commands commandPath=/usr/share/fenrirscreenreader/commands
Values: Text, Existing path on file system. Values: Text, Existing path on file system.
Subfolders in commandPath are: Subfolders in commandPath are:
* ''commands'' = to create shortcut commands * ''commands'' = to create shortcut commands
@ -1249,9 +1249,9 @@ Interrupt current speech for time announcement:
Values: on=''True'', off=''False'' Values: on=''True'', off=''False''
====== Customization ====== ====== Customization ======
===== Scripting ===== ===== Scripting =====
Scripts can be in any language, bash, python, sh or others. Place your scripts in the directory /usr/share/fenrir/scripts/ (the path is configurable in settings.conf). Scripts can be in any language, bash, python, sh or others. Place your scripts in the directory /usr/share/fenrirscreenreader/scripts/ (the path is configurable in settings.conf).
The script key is the applications key. Usually this key can be found on the keyboard located just left of the right most control key. The script key is the applications key. Usually this key can be found on the keyboard located just left of the right most control key.
When you name a script, the key name appears in the script seperated by the sequence __-__. So, for example, if you have a python weather script you want assigned to the script key plus the letter w you would name the script /usr/share/fenrir/scripts/weather__-__key_w.py When you name a script, the key name appears in the script seperated by the sequence __-__. So, for example, if you have a python weather script you want assigned to the script key plus the letter w you would name the script /usr/share/fenrirscreenreader/scripts/weather__-__key_w.py
Then, to access the script, simply press the script key and the letter w. Then, to access the script, simply press the script key and the letter w.
Scripts must be executable. So, make sure to chmod 755 your script when you place it in the scripts directory. Scripts must be executable. So, make sure to chmod 755 your script when you place it in the scripts directory.
The script gets some parameters from fenrir when it is executed. So that information is available in your script then. The script gets some parameters from fenrir when it is executed. So that information is available in your script then.
@ -1262,13 +1262,13 @@ The script gets some parameters from fenrir when it is executed. So that informa
==== Examples ==== ==== Examples ====
Script that just speaks the current username when pressing ScriptKey + H.\\ Script that just speaks the current username when pressing ScriptKey + H.\\
File: ''/usr/share/fenrir/scripts/helloWorld__-__key_h.sh'': File: ''/usr/share/fenrirscreenreader/scripts/helloWorld__-__key_h.sh'':
#!/bin/bash #!/bin/bash
echo $1 echo $1
===== Commands ===== ===== Commands =====
You can place your own commands in "/usr/share/fenrir/commands" (path is configurable in settings.conf). You can place your own commands in "/usr/share/fenrirscreenreader/commands" (path is configurable in settings.conf).
Commands are python files with a special scheme. You can assign them to a shortcut using the filename without an extension or place them in a hook trigger like OnInput or OnScreenChange. For further information see developer guide. Commands are python files with a special scheme. You can assign them to a shortcut using the filename without an extension or place them in a hook trigger like OnInput or OnScreenChange. For further information see developer guide.
Good Examples: [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py|"date.py"]] (announce the Date), [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py|"shut_up.py"]] (interrupt output) Good Examples: [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/date.py|"date.py"]] (announce the Date), [[https://github.com/chrys87/fenrir/blob/master/src/fenrir/commands/commands/shut_up.py|"shut_up.py"]] (interrupt output)
the basic scheme for a command is as follows: the basic scheme for a command is as follows:

4
src/fenrirscreenreader/core/settingsData.py
View File

@ -70,8 +70,8 @@ settingsData = {
'dateFormat': '%A, %B %d, %Y', 'dateFormat': '%A, %B %d, %Y',
'autoSpellCheck': False, 'autoSpellCheck': False,
'spellCheckLanguage': 'en_US', 'spellCheckLanguage': 'en_US',
'scriptPath': '/usr/share/fenrir/scripts', 'scriptPath': '/usr/share/fenrirscreenreader/scripts',
'commandPath': '/usr/share/fenrir/commands', 'commandPath': '/usr/share/fenrirscreenreader/commands',
'attributeFormatString': 'Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize', 'attributeFormatString': 'Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize',
'autoPresentIndent': False, 'autoPresentIndent': False,
'hasAttributes': True, 'hasAttributes': True,

2
tools/fenrir-conf
View File

@ -176,7 +176,7 @@ timeFormat=%H:%M:%P
dateFormat=%A, %B %d, %Y dateFormat=%A, %B %d, %Y
autoSpellCheck=True autoSpellCheck=True
spellCheckLanguage=en_US spellCheckLanguage=en_US
scriptPath=/usr/share/fenrir/scripts scriptPath=/usr/share/fenrirscreenreader/scripts
[focus] [focus]
#follow the text cursor #follow the text cursor