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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
F@&VP+XL<kt

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