From 8469fe1b8ac4bdf8784b47e1ab17f5a0aaa24adf Mon Sep 17 00:00:00 2001 From: June Tate-Gans Date: Sun, 2 May 2021 12:45:48 -0500 Subject: [PATCH] g13gui: Use properties and setup init properly --- g13gui/g13gui/model/bindingprofile.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/g13gui/g13gui/model/bindingprofile.py b/g13gui/g13gui/model/bindingprofile.py index dc5c0bb..82a0b35 100644 --- a/g13gui/g13gui/model/bindingprofile.py +++ b/g13gui/g13gui/model/bindingprofile.py @@ -1,6 +1,4 @@ -#!/usr/bin/python - -import g13gui.model.bindings as bindings +from builtins import property from g13gui.observer import Subject from g13gui.observer import ChangeType @@ -8,6 +6,7 @@ from g13gui.observer import ChangeType class BindingProfile(Subject): def __init__(self, dict=None): + Subject.__init__(self) self.initDefaults() if dict: self.loadFromDict(dict) @@ -19,9 +18,11 @@ class BindingProfile(Subject): self._keyBindings = bindings.DEFAULT_KEY_BINDINGS.copy() self._lcdColor = bindings.DEFAULT_LCD_COLOR + @property def lcdColor(self): return self._lcdColor + @property def stickMode(self): return self._stickMode @@ -41,10 +42,10 @@ class BindingProfile(Subject): return [] def _setLCDColor(self, red, green, blue): - self._lcdColor = (red, green, blue) - self.addChange(ChangeType.MODIFY, 'lcdcolor', self._lcdColor) + self.setProperty('lcdColor', (red, green, blue), notify=False) - def setLCDColor(self, red, green, blue): + @lcdColor.setter + def lcdColor(self, red, green, blue): self._setLCDColor(red, green, blue) self.notifyChanged() @@ -67,7 +68,8 @@ class BindingProfile(Subject): self._stickMode = stickmode self.addChange(ChangeType.MODIFY, 'stickmode', stickmode) - def setStickMode(self, stickmode): + @stickMode.setter + def stickMode(self, stickmode): self._setStickMode(stickmode) self.notifyChanged()