more work

src/fenrirscreenreader/commands/vmenu/navigation/curr_vmenu_entry.py

@@ -14,9 +14,9 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('get current help message')
+        return _('get current v menu entry')
     def run(self):
-        text = self.env['runtime']['helpManager'].getHelpForCurrentIndex()            
-        self.env['runtime']['outputManager'].presentText(text,  interrupt=True)                             
+        text = self.env['runtime']['vmenuManager'].getCurrentEntry()
+        self.env['runtime']['outputManager'].presentText(text, interrupt=True)                             
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu/navigation/dec_level_vmenu.py

@@ -14,10 +14,10 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('get prev help message')
+        return _('leave v menu submenu')
     def run(self):
-        self.env['runtime']['helpManager'].prevIndex()
-        text = self.env['runtime']['helpManager'].getHelpForCurrentIndex()            
-        self.env['runtime']['outputManager'].presentText(text,  interrupt=True)                             
+        self.env['runtime']['vmenuManager'].decLevel()
+        text = self.env['runtime']['vmenuManager'].getCurrentEntry()
+        self.env['runtime']['outputManager'].presentText(text, interrupt=True)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu/navigation/exec_vmenu_entry.py

@@ -14,10 +14,8 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('get prev help message')
+        return _('execute v menu entry')
     def run(self):
-        self.env['runtime']['helpManager'].prevIndex()
-        text = self.env['runtime']['helpManager'].getHelpForCurrentIndex()            
-        self.env['runtime']['outputManager'].presentText(text,  interrupt=True)                             
+        self.env['runtime']['vmenuManager'].executeMenu()
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu/navigation/inc_level_vmenu.py

@@ -14,10 +14,10 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('get prev help message')
+        return _('enter v menu submenu')
     def run(self):
-        self.env['runtime']['helpManager'].prevIndex()
-        text = self.env['runtime']['helpManager'].getHelpForCurrentIndex()            
-        self.env['runtime']['outputManager'].presentText(text,  interrupt=True)                             
+        self.env['runtime']['vmenuManager'].incLevel()
+        text = self.env['runtime']['vmenuManager'].getCurrentEntry()
+        self.env['runtime']['outputManager'].presentText(text, interrupt=True)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu/navigation/next_vmenu_entry.py

@@ -14,10 +14,10 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('get next help message')
+        return _('get next v menu entry')
     def run(self):
-        self.env['runtime']['helpManager'].nextIndex()
-        text = self.env['runtime']['helpManager'].getHelpForCurrentIndex()            
-        self.env['runtime']['outputManager'].presentText(text,  interrupt=True)                             
+        self.env['runtime']['vmenuManager'].nextIndex()
+        text = self.env['runtime']['vmenuManager'].getCurrentEntry()
+        self.env['runtime']['outputManager'].presentText(text, interrupt=True)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu/navigation/prev_vmenu_entry.py

@@ -14,10 +14,10 @@ class command():
     def shutdown(self):
         pass 
     def getDescription(self):
-        return _('get prev help message')
+        return _('get prev v menu entry')
     def run(self):
-        self.env['runtime']['helpManager'].prevIndex()
-        text = self.env['runtime']['helpManager'].getHelpForCurrentIndex()            
-        self.env['runtime']['outputManager'].presentText(text,  interrupt=True)                             
+        self.env['runtime']['vmenuManager'].prevIndex()
+        text = self.env['runtime']['vmenuManager'].getCurrentEntry()
+        self.env['runtime']['outputManager'].presentText(text, interrupt=True)
     def setCallback(self, callback):
         pass

src/fenrirscreenreader/commands/vmenu/navigation/toggle_vmenu_mode.py

@@ -0,0 +1,23 @@
+#!/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