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

Merge branch 'processing' of https://github.com/chrys87/fenrir into processing

Browse Source
This commit is contained in:
Storm Dragon 2017-08-13 17:17:29 -04:00
commit 407db42721
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fenrir/commands/commands/attribute_cursor.py
View File

@ -19,7 +19,7 @@ class command():
cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor() cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
attributes = self.env['screen']['newContentAttrib'][cursorPos['x']][cursorPos['y']] attributes = self.env['screen']['newContentAttrib'][cursorPos['x']][cursorPos['y']]
attributeFormatString = self.env['runtime']['settingsManager'].getSetting('general', 'attributeFormatString') attributeFormatString = self.env['runtime']['settingsManager'].getSetting('general', 'attributeFormatString')
attributeFormatString = self.env['runtime']['screenManager'].formatAttributes(attributeFormatString) attributeFormatString = self.env['runtime']['screenManager'].formatAttributes(attributes, attributeFormatString)
self.env['runtime']['outputManager'].presentText(attributeFormatString, soundIcon='', interrupt=True) self.env['runtime']['outputManager'].presentText(attributeFormatString, soundIcon='', interrupt=True)
def setCallback(self, callback): def setCallback(self, callback):
pass pass

16
src/fenrir/screenDriver/vcsaDriver.py
View File

@ -243,27 +243,27 @@ class driver():
return self.colorNames[attribute[1]] return self.colorNames[attribute[1]]
except: except:
return '' return ''
def getFenrirFGColor(attribute): def getFenrirFGColor(self, attribute):
try: try:
return self.colorNames[attribute[0]] return self.colorNames[attribute[0]]
except: except:
return '' return ''
def getFenrirUnderline(attribute): def getFenrirUnderline(self, attribute):
if attribute[4] == 1: if attribute[4] == 1:
return _('underlined') return _('underlined')
return '' return ''
def getFenrirBold(attribute): def getFenrirBold(self, attribute):
if attribute[3] == 1: if attribute[3] == 1:
return _('bold') return _('bold')
return '' return ''
def getFenrirBlink(attribute): def getFenrirBlink(self, attribute):
if attribute[2] == 1: if attribute[2] == 1:
return _('blink') return _('blink')
return '' return ''
def getFenrirFont(attribute): def getFenrirFont(self, attribute):
return 'System Font' return _('System Font')
def getFenrirFontSize(attribute): def getFenrirFontSize(self, attribute):
return 'System Font Size' return _('System Font Size')
def update(self, trigger='onUpdate'): def update(self, trigger='onUpdate'):
if trigger == 'onInput': # no need for an update on input for VCSA if trigger == 'onInput': # no need for an update on input for VCSA
return return