diff options
| author | DH4 | 2017-06-06 02:07:13 -0500 |
|---|---|---|
| committer | DH4 | 2017-06-06 02:07:13 -0500 |
| commit | 4920fcc0341c499da1826b5aaa05888755ba5ac1 (patch) | |
| tree | abef1e360207c862b72c56cad80b7ac9fd8189ea /components/text.py | |
| parent | 0a8a2fdf71aeff8ea22905cdf00b6c315cbb29ee (diff) | |
| parent | 7946e98f222784e25ea9c6dc00713f431e238609 (diff) | |
Merge branch 'component-backgrounds' of github.com:IamDH4/audio-visualizer-python into feature-newgui
Diffstat (limited to 'components/text.py')
| -rw-r--r-- | components/text.py | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/components/text.py b/components/text.py index 7b2289d..d2bd684 100644 --- a/components/text.py +++ b/components/text.py @@ -18,7 +18,6 @@ class Component(__base__.Component): self.parent = parent self.textColor = (255,255,255) self.title = 'Text' - self.titleFont = None self.alignment = 1 self.fontSize = height / 13.5 self.xPosition = width / 2 @@ -35,8 +34,6 @@ class Component(__base__.Component): page.pushButton_textColor.setStyleSheet(btnStyle) page.lineEdit_title.setText(self.title) - #if self.titleFont: - # page.fontComboBox_titleFont.setCurrentFont(QFont(self.titleFont)) page.comboBox_textAlign.setCurrentIndex(int(self.alignment)) page.spinBox_fontSize.setValue(int(self.fontSize)) page.spinBox_xTextAlign.setValue(int(self.xPosition)) @@ -109,7 +106,7 @@ class Component(__base__.Component): super().preFrameRender(**kwargs) return ['static'] - def frameRender(self, moduleNo, frameNo): + def frameRender(self, moduleNo, arrayNo, frameNo): width = int(self.worker.core.settings.value('outputWidth')) height = int(self.worker.core.settings.value('outputHeight')) return self.addText(width, height) @@ -142,9 +139,3 @@ class Component(__base__.Component): return self.page.lineEdit_textColor.setText(RGBstring) self.page.pushButton_textColor.setStyleSheet(btnStyle) - - def cancel(self): - self.canceled = True - - def reset(self): - self.canceled = False |