From c6aefc55bb10a17c475966a6f678c8dd5a2546d6 Mon Sep 17 00:00:00 2001
From: chrys87 <chrys87@web.de>
Date: Thu, 24 May 2018 11:38:05 +0200
Subject: [PATCH] Update screenManager.py

---
 src/fenrirscreenreader/core/screenManager.py | 110 +------------------
 1 file changed, 2 insertions(+), 108 deletions(-)

diff --git a/src/fenrirscreenreader/core/screenManager.py b/src/fenrirscreenreader/core/screenManager.py
index 75dbfe35..fce2d402 100644
--- a/src/fenrirscreenreader/core/screenManager.py
+++ b/src/fenrirscreenreader/core/screenManager.py
@@ -46,7 +46,8 @@ class screenManager():
         self.getSessionInformation()  
               
         if self.isScreenChange():                 
-            self.changeBrailleScreen()              
+            self.changeBrailleScreen() 
+
         if not self.isSuspendingScreen(self.env['screen']['newTTY']):       
             self.update(eventData, 'onScreenChange')
             self.env['screen']['lastScreenUpdate'] = time.time()
@@ -162,113 +163,6 @@ class screenManager():
         except Exception as e:
             self.env['runtime']['debug'].writeDebugOut('screenManager:update:highlight: ' + str(e),debug.debugLevel.ERROR) 
 
-    def formatAttributes(self, attribute, attributeFormatString = None):
-        # "black",
-        # "red",
-        # "green",
-        # "brown",
-        # "blue",
-        # "magenta",
-        # "cyan",
-        # "white",
-        # "default" # white.
-        # _order_
-        # "fg",
-        # "bg",
-        # "bold",
-        # "italics",
-        # "underscore",
-        # "strikethrough",
-        # "reverse",  
-        # "blink"   
-        # "fontsieze"
-        # "fontfamily" 
-        if not attributeFormatString:
-            attributeFormatString = self.env['runtime']['settingsManager'].getSetting('general', 'attributeFormatString')
-        print('call')
-        if not attributeFormatString:
-            return ''
-        if attributeFormatString == '':
-            return ''
-        if not attribute:
-            return ''
-        if len(attribute) != 10:
-            print('out',len(attribute),attribute)
-            return ''
-        # 0 FG color (name)
-        try:
-            attributeFormatString = attributeFormatString.replace('fenrirFGColor', _(attribute[0]))
-        except Exception as e:
-            attributeFormatString = attributeFormatString.replace('fenrirFGColor', '')
-        # 1 BG color (name)
-        try:
-            attributeFormatString = attributeFormatString.replace('fenrirBGColor', _(attribute[1]))
-        except Exception as e:
-            attributeFormatString = attributeFormatString.replace('fenrirBGColor', '')
-        # 2 bold (True/ False)
-        try:
-            if attribute[2]:
-                attributeFormatString = attributeFormatString.replace('fenrirBold', _('bold'))    
-        except Exception as e:
-            pass
-        attributeFormatString = attributeFormatString.replace('fenrirBold', '')
-        # 3 italics (True/ False)                                       
-        try:
-            if attribute[3]:        
-                attributeFormatString = attributeFormatString.replace('fenrirItalics', _('italic'))
-        except Exception as e:
-            pass
-        attributeFormatString = attributeFormatString.replace('fenrirItalics', '')
-        # 4 underline (True/ False)
-        try:
-            if attribute[4]:
-                attributeFormatString = attributeFormatString.replace('fenrirUnderline', _('underline'))
-        except Exception as e:
-            pass
-        attributeFormatString = attributeFormatString.replace('fenrirUnderline', '')
-        # 5 strikethrough (True/ False)
-        try:
-            if attribute[5]:
-                attributeFormatString = attributeFormatString.replace('fenrirStrikethrough', _('strikethrough'))
-        except Exception as e:
-            pass
-        attributeFormatString = attributeFormatString.replace('fenrirStrikethrough', '')
-        # 6 reverse (True/ False)
-        try:
-            if attribute[6]:        
-                attributeFormatString = attributeFormatString.replace('fenrirReverse', _('reverse'))
-        except Exception as e:
-            pass
-        attributeFormatString = attributeFormatString.replace('fenrirReverse', '')
-        # 7 blink (True/ False)     
-        try:
-            if attribute[7]:        
-                attributeFormatString = attributeFormatString.replace('fenrirBlink', _('blink'))
-        except Exception as e:
-            pass
-        attributeFormatString = attributeFormatString.replace('fenrirBlink', '')
-        # 8 font size (int/ string)
-        try:
-            try:
-                attributeFormatString = attributeFormatString.replace('fenrirFontSize', int(attribute[8]))
-            except:
-                pass
-            try:
-                attributeFormatString = attributeFormatString.replace('fenrirFontSize', str(attribute[8]))
-            except:
-                pass 
-        except Exception as e:
-            pass
-        attributeFormatString = attributeFormatString.replace('fenrirFontSize', _('default'))
-        # 9 font family (string)
-        try:
-            attributeFormatString = attributeFormatString.replace('fenrirFont', attribute[9])   
-        except Exception as e:
-            pass
-        attributeFormatString = attributeFormatString.replace('fenrirFont', _('default'))
-        print(attributeFormatString)                 
-        return attributeFormatString
-    
     def isSuspendingScreen(self, screen = None):
         if screen == None:
             screen = self.env['screen']['newTTY']