From 39684dea75c0a79e66918553359d881c82588b25 Mon Sep 17 00:00:00 2001
From: chrys <chrys@linux-a11y.org>
Date: Tue, 22 Jan 2019 00:37:07 +0100
Subject: [PATCH] cleanup

---
 .gitignore                                    |   2 +
 .../core/.vmenuManager.py.kate-swp            | Bin 6220 -> 0 bytes
 src/fenrirscreenreader/core/vmenuManager.py   |  76 +++++++-----------
 3 files changed, 32 insertions(+), 46 deletions(-)
 delete mode 100644 src/fenrirscreenreader/core/.vmenuManager.py.kate-swp

diff --git a/.gitignore b/.gitignore
index 44dcf257..eff77b75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ fenrir.egg-info/
 fenrir_screenreader.egg-info/
 dist/
 build/
+*.kate-swp
+.directory
diff --git a/src/fenrirscreenreader/core/.vmenuManager.py.kate-swp b/src/fenrirscreenreader/core/.vmenuManager.py.kate-swp
deleted file mode 100644
index ba64aada704668f8d841f72420223042154c6c63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6220
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

diff --git a/src/fenrirscreenreader/core/vmenuManager.py b/src/fenrirscreenreader/core/vmenuManager.py
index d2a638c0..fb488552 100755
--- a/src/fenrirscreenreader/core/vmenuManager.py
+++ b/src/fenrirscreenreader/core/vmenuManager.py
@@ -9,17 +9,22 @@ from fenrirscreenreader.core import debug
 
 class vmenuManager():
     def __init__(self):
-        self.helpDict = {}
-        self.tutorialListIndex = None          
+        self.menuDict = {}
+        self.currMenu = {}
+        self.currIndex = None
+        self.currLevel = None
+        self.active = False
     def initialize(self, environment):
         self.env = environment
     def shutdown(self):
-        pass      
-    def toggleTutorialMode(self):
-        self.setTutorialMode(not self.env['general']['tutorialMode'])
-    def setTutorialMode(self, newTutorialMode):
-        self.env['general']['tutorialMode'] = newTutorialMode        
-        if newTutorialMode:
+        pass
+    def getActive(self):
+        return self.active
+    def togglelMode(self):
+        self.setActive(not self.getActive())
+    def setActive(self, active):
+        self.active = active
+        if active:
             self.createHelpDict()        
             self.env['bindings'][str([1, ['KEY_ESC']])] = 'TOGGLE_TUTORIAL_MODE'
             self.env['bindings'][str([1, ['KEY_UP']])] = 'PREV_HELP'
@@ -33,49 +38,28 @@ class vmenuManager():
                 del(self.env['bindings'][str([1, ['KEY_SPACE']])])
             except:
                 pass                     
-    def isTutorialMode(self):
-        return self.env['general']['tutorialMode']        
-    def getCommandHelpText(self, command, section = 'commands'):
-        commandName = command.lower()
-        commandName = commandName.split('__-__')[0]       
-        commandName = commandName.replace('_',' ')        
-        commandName = commandName.replace('_',' ')
-        if command == 'TOGGLE_TUTORIAL_MODE':
-            commandDescription = _('toggles the tutorial mode')
-        else:
-            commandDescription = self.env['runtime']['commandManager'].getCommandDescription( command, section = 'commands')
-        if commandDescription == '':
-            commandDescription = 'no Description available'
-        commandShortcut = self.env['runtime']['commandManager'].getShortcutForCommand( command)
-        commandShortcut = commandShortcut.replace('KEY_',' ')
-        commandShortcut = commandShortcut.replace('[','')        
-        commandShortcut = commandShortcut.replace(']','')        
-        commandShortcut = commandShortcut.replace("'",'')        
-        if commandShortcut == '':
-            commandShortcut = 'unbound'
-        helptext = commandName + ', Shortcut ' + commandShortcut + ', Description ' + commandDescription
-        return helptext
+
     def createHelpDict(self, section = 'commands'):
-        self.helpDict = {}        
-        for command in sorted(self.env['commands'][section].keys()):
-            self.helpDict[len(self.helpDict)] = self.getCommandHelpText(command, section)            
-        if len(self.helpDict) > 0:
-            self.tutorialListIndex = 0
+        self.menuDict = {}        
+        #for command in sorted(self.env['commands'][section].keys()):
+        #    self.menuDict[len(self.menuDict)] = self.getCommandHelpText(command, section)            
+        if len(self.menuDict) > 0:
+            self.currIndex = 0
         else:
-            self.tutorialListIndex = None        
+            self.currIndex = None        
     def getHelpForCurrentIndex(self):            
-        if self.tutorialListIndex == None:
+        if self.currIndex == None:
             return '' 
-        return self.helpDict[self.tutorialListIndex]
+        return self.menuDict[self.currIndex]
     def nextIndex(self):
-        if self.tutorialListIndex == None:
+        if self.currIndex == None:
             return    
-        self.tutorialListIndex += 1
-        if self.tutorialListIndex >= len(self.helpDict):
-           self.tutorialListIndex = 0 
+        self.currIndex += 1
+        if self.currIndex >= len(self.menuDict):
+           self.currIndex = 0 
     def prevIndex(self):
-        if self.tutorialListIndex == None:
+        if self.currIndex == None:
             return    
-        self.tutorialListIndex -= 1
-        if self.tutorialListIndex < 0:
-           self.tutorialListIndex = len(self.helpDict) - 1                                                
+        self.currIndex -= 1
+        if self.currIndex < 0:
+           self.currIndex = len(self.menuDict) - 1