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

add more stuff

Browse Source
This commit is contained in:
chrys 2019-02-04 00:19:21 +01:00
parent d65a3fc596
commit dd84da9849
9 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fenrirscreenreader/commands/commands/toggle_vmenu_mode.py
View File

@ -18,6 +18,9 @@ class command():
return _('Exiting v menu mode.') return _('Exiting v menu mode.')
def run(self): def run(self):
self.env['runtime']['vmenuManager'].togglelVMenuMode() self.env['runtime']['vmenuManager'].togglelVMenuMode()
self.env['runtime']['outputManager'].presentText( _('Entering v menu.'), interrupt=True) if self.env['runtime']['vmenuManager'].getActive():
self.env['runtime']['outputManager'].presentText( _('Entering v menu.'), interrupt=True)
else:
self.env['runtime']['outputManager'].presentText( _('Leaving v menu.'), interrupt=True)
def setCallback(self, callback): def setCallback(self, callback):
pass pass

3
src/fenrirscreenreader/commands/vmenu-navigation/curr_vmenu_entry.py
View File

@ -16,7 +16,8 @@ class command():
def getDescription(self): def getDescription(self):
return _('get current v menu entry') return _('get current v menu entry')
def run(self): def run(self):
print('CURR MENU')
text = self.env['runtime']['vmenuManager'].getCurrentEntry() text = self.env['runtime']['vmenuManager'].getCurrentEntry()
self.env['runtime']['outputManager'].presentText(text, interrupt=True) self.env['runtime']['outputManager'].presentText(text, interrupt=True)
def setCallback(self, callback): def setCallback(self, callback):
pass pass

1
src/fenrirscreenreader/commands/vmenu-navigation/dec_level_vmenu.py
View File

@ -16,6 +16,7 @@ class command():
def getDescription(self): def getDescription(self):
return _('leave v menu submenu') return _('leave v menu submenu')
def run(self): def run(self):
print('DEC LEVEL')
self.env['runtime']['vmenuManager'].decLevel() self.env['runtime']['vmenuManager'].decLevel()
text = self.env['runtime']['vmenuManager'].getCurrentEntry() text = self.env['runtime']['vmenuManager'].getCurrentEntry()
self.env['runtime']['outputManager'].presentText(text, interrupt=True) self.env['runtime']['outputManager'].presentText(text, interrupt=True)

2
src/fenrirscreenreader/commands/vmenu-navigation/exec_vmenu_entry.py
View File

@ -16,6 +16,8 @@ class command():
def getDescription(self): def getDescription(self):
return _('execute v menu entry') return _('execute v menu entry')
def run(self): def run(self):
print('EXEC ENTRY')
self.env['runtime']['vmenuManager'].executeMenu() self.env['runtime']['vmenuManager'].executeMenu()
def setCallback(self, callback): def setCallback(self, callback):
pass pass

2
src/fenrirscreenreader/commands/vmenu-navigation/inc_level_vmenu.py
View File

@ -16,6 +16,8 @@ class command():
def getDescription(self): def getDescription(self):
return _('enter v menu submenu') return _('enter v menu submenu')
def run(self): def run(self):
print('INC LEVEL')
self.env['runtime']['vmenuManager'].incLevel() self.env['runtime']['vmenuManager'].incLevel()
text = self.env['runtime']['vmenuManager'].getCurrentEntry() text = self.env['runtime']['vmenuManager'].getCurrentEntry()
self.env['runtime']['outputManager'].presentText(text, interrupt=True) self.env['runtime']['outputManager'].presentText(text, interrupt=True)

1
src/fenrirscreenreader/commands/vmenu-navigation/next_vmenu_entry.py
View File

@ -16,6 +16,7 @@ class command():
def getDescription(self): def getDescription(self):
return _('get next v menu entry') return _('get next v menu entry')
def run(self): def run(self):
print('NEXT MENU')
self.env['runtime']['vmenuManager'].nextIndex() self.env['runtime']['vmenuManager'].nextIndex()
text = self.env['runtime']['vmenuManager'].getCurrentEntry() text = self.env['runtime']['vmenuManager'].getCurrentEntry()
self.env['runtime']['outputManager'].presentText(text, interrupt=True) self.env['runtime']['outputManager'].presentText(text, interrupt=True)

2
src/fenrirscreenreader/commands/vmenu-navigation/prev_vmenu_entry.py
View File

@ -16,6 +16,8 @@ class command():
def getDescription(self): def getDescription(self):
return _('get prev v menu entry') return _('get prev v menu entry')
def run(self): def run(self):
print('PREV MENU')
self.env['runtime']['vmenuManager'].prevIndex() self.env['runtime']['vmenuManager'].prevIndex()
text = self.env['runtime']['vmenuManager'].getCurrentEntry() text = self.env['runtime']['vmenuManager'].getCurrentEntry()
self.env['runtime']['outputManager'].presentText(text, interrupt=True) self.env['runtime']['outputManager'].presentText(text, interrupt=True)

23
src/fenrirscreenreader/commands/vmenu-navigation/toggle_vmenu_mode.py
View File

@ -1,23 +0,0 @@
#!/bin/python
# -*- coding: utf-8 -*-
# Fenrir TTY screen reader
# By Chrys, Storm Dragon, and contributers.
from fenrirscreenreader.core import debug
class command():
def __init__(self):
pass
def initialize(self, environment):
self.env = environment
def shutdown(self):
pass
def getDescription(self):
self.env['runtime']['vmenuManager'].togglelVMenuMode()
return _('Exiting v menu mode.')
def run(self):
self.env['runtime']['vmenuManager'].togglelVMenuMode()
self.env['runtime']['outputManager'].presentText( _('Entering v menu.'), interrupt=True)
def setCallback(self, callback):
pass

46
src/fenrirscreenreader/core/vmenuManager.py
View File

@ -35,43 +35,51 @@ class vmenuManager():
self.setActive(not self.getActive()) self.setActive(not self.getActive())
def setActive(self, active): def setActive(self, active):
self.active = active self.active = active
if active: print('drin')
if self.active:
#try:
self.createMenuTree() self.createMenuTree()
self.env['bindings'][str([1, ['KEY_ESC']])] = 'TOGGLE_VMENU_MODE' #except Exception as e:
self.env['bindings'][str([1, ['KEY_UP']])] = 'PREV_VMENU_ENTRY' # print(e)
self.env['bindings'][str([1, ['KEY_DOWN']])] = 'NEXT_VMENU_ENTRY' try:
self.env['bindings'][str([1, ['KEY_SPACE']])] = 'CURR_VMENU_ENTRY' self.env['bindings'][str([1, ['KEY_ESC']])] = 'TOGGLE_VMENU_MODE'
self.env['bindings'][str([1, ['KEY_LEFT']])] = 'DEC_LEVEL_VMENU' self.env['bindings'][str([1, ['KEY_UP']])] = 'PREV_VMENU_ENTRY'
self.env['bindings'][str([1, ['KEY_RIGHT']])] = 'INC_LEVEL_VMENU' self.env['bindings'][str([1, ['KEY_DOWN']])] = 'NEXT_VMENU_ENTRY'
self.env['bindings'][str([1, ['KEY_ENTER']])] = 'EXEC_VMENU_ENTRY' self.env['bindings'][str([1, ['KEY_SPACE']])] = 'CURR_VMENU_ENTRY'
self.env['bindings'][str([1, ['KEY_LEFT']])] = 'DEC_LEVEL_VMENU'
self.env['bindings'][str([1, ['KEY_RIGHT']])] = 'INC_LEVEL_VMENU'
self.env['bindings'][str([1, ['KEY_ENTER']])] = 'EXEC_VMENU_ENTRY'
except Exception as e:
print(e)
else: else:
try: try:
self.menuDict = {} self.menuDict = {}
self.currIndex = None self.currIndex = None
self.currMenu = '' self.currMenu = ''
self.active = False
del(self.env['bindings'][str([1, ['KEY_ESC']])]) del(self.env['bindings'][str([1, ['KEY_ESC']])])
del(self.env['bindings'][str([1, ['KEY_UP']])]) del(self.env['bindings'][str([1, ['KEY_UP']])])
del(self.env['bindings'][str([1, ['KEY_DOWN']])]) del(self.env['bindings'][str([1, ['KEY_DOWN']])])
del(self.env['bindings'][str([1, ['KEY_SPACE']])]) del(self.env['bindings'][str([1, ['KEY_SPACE']])])
del(self.env['bindings'][str([1, ['KEY_LEFT']])]) del(self.env['bindings'][str([1, ['KEY_LEFT']])])
del(self.env['bindings'][str([1, ['KEY_RIGHT']])]) del(self.env['bindings'][str([1, ['KEY_RIGHT']])])
del(self.env['bindings'][str([1, ['KEY_ENTER']])]) del(self.env['bindings'][str([1, ['KEY_ENTER']])])
except: except:
pass pass
print(self.env['bindings'])
def createMenuTree(self): def createMenuTree(self):
self.currIndex = None self.currIndex = None
self.menuDict = fs_tree_to_dict( '/home/chrys/Projekte/fenrir/src/fenrirscreenreader/commands/vmenu/KEY') menu = self.fs_tree_to_dict( '/home/chrys/Projekte/fenrir/src/fenrirscreenreader/commands/vmenu-profiles/KEY')
if len(self.menuDict) > 0: if menu:
self.currIndex = [0] self.menuDict = menu
if len(self.menuDict) > 0:
self.currIndex = [0]
def executeMenu(self): def executeMenu(self):
if self.currIndex == None: if self.currIndex == None:
return return
def incLevel(self): def incLevel(self):
if self.currIndex == None: if self.currIndex == None:
return return
try: try:
r = self.getValueByPath(self.menuDict, self.currIndex +[0]) r = self.getValueByPath(self.menuDict, self.currIndex +[0])
if not r: if not r:
@ -107,7 +115,7 @@ class vmenuManager():
return self.getKeysByPath(self.menuDict, self.currIndex)[self.currIndex[-1]] return self.getKeysByPath(self.menuDict, self.currIndex)[self.currIndex[-1]]
def fs_tree_to_dict(self, path_): def fs_tree_to_dict(self, path_):
for root, dirs, files in os.walk(path_): for root, dirs, files in os.walk(path_):
tree = {d: fs_tree_to_dict(os.path.join(root, d)) for d in dirs} tree = {d: self.fs_tree_to_dict(os.path.join(root, d)) for d in dirs}
tree.update({f: root + '/' + f for f in files}) tree.update({f: root + '/' + f for f in files})
return tree # note we discontinue iteration trough os.walk return tree # note we discontinue iteration trough os.walk