From 0c3238d47a98fa9bc8995516fd4b8f31afb0602c Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 13 Aug 2017 23:14:13 +0200 Subject: [PATCH 1/2] add missing parameter --- src/fenrir/commands/commands/attribute_cursor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/commands/commands/attribute_cursor.py b/src/fenrir/commands/commands/attribute_cursor.py index a843e4c0..6b8614f4 100644 --- a/src/fenrir/commands/commands/attribute_cursor.py +++ b/src/fenrir/commands/commands/attribute_cursor.py @@ -19,7 +19,7 @@ class command(): cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor() attributes = self.env['screen']['newContentAttrib'][cursorPos['x']][cursorPos['y']] 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) def setCallback(self, callback): pass From de51ad9c470b495b65393fc1ccba17dbebda47c7 Mon Sep 17 00:00:00 2001 From: chrys Date: Sun, 13 Aug 2017 23:15:23 +0200 Subject: [PATCH 2/2] add self parameter --- src/fenrir/screenDriver/vcsaDriver.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/fenrir/screenDriver/vcsaDriver.py b/src/fenrir/screenDriver/vcsaDriver.py index f9e4595f..0b0b4113 100644 --- a/src/fenrir/screenDriver/vcsaDriver.py +++ b/src/fenrir/screenDriver/vcsaDriver.py @@ -243,27 +243,27 @@ class driver(): return self.colorNames[attribute[1]] except: return '' - def getFenrirFGColor(attribute): + def getFenrirFGColor(self, attribute): try: return self.colorNames[attribute[0]] except: return '' - def getFenrirUnderline(attribute): + def getFenrirUnderline(self, attribute): if attribute[4] == 1: return _('underlined') return '' - def getFenrirBold(attribute): + def getFenrirBold(self, attribute): if attribute[3] == 1: return _('bold') return '' - def getFenrirBlink(attribute): + def getFenrirBlink(self, attribute): if attribute[2] == 1: return _('blink') return '' - def getFenrirFont(attribute): - return 'System Font' - def getFenrirFontSize(attribute): - return 'System Font Size' + def getFenrirFont(self, attribute): + return _('System Font') + def getFenrirFontSize(self, attribute): + return _('System Font Size') def update(self, trigger='onUpdate'): if trigger == 'onInput': # no need for an update on input for VCSA return