Merge pull request #49 from djfun/toolkit

Code reorganization, more readable component code, better error messages

1 files changed, 43 insertions, 66 deletions

diff --git a/src/components/text.py b/src/components/text.py
index 19460e5..8a302ff 100644
--- a/src/components/text.py
+++ b/src/components/text.py
@@ -4,24 +4,22 @@ from PyQt5 import QtGui, QtCore, QtWidgets
 import os
 
 from component import Component
-from frame import FramePainter
+from toolkit.frame import FramePainter
+from toolkit import rgbFromString, pickColor
 
 
 class Component(Component):
-    '''Title Text'''
-
-    modified = QtCore.pyqtSignal(int, dict)
+    name = 'Title Text'
+    version = '1.0.0'
 
     def __init__(self, *args):
         super().__init__(*args)
         self.titleFont = QFont()
 
-    def widget(self, parent):
-        self.parent = parent
-        self.settings = self.parent.core.settings
+    def widget(self, *args):
+        super().widget(*args)
         height = int(self.settings.value('outputHeight'))
         width = int(self.settings.value('outputWidth'))
-
         self.textColor = (255, 255, 255)
         self.title = 'Text'
         self.alignment = 1
@@ -30,41 +28,36 @@ class Component(Component):
         self.xPosition = width / 2 - fm.width(self.title)/2
         self.yPosition = height / 2 * 1.036
 
-        page = self.loadUi('text.ui')
-        page.comboBox_textAlign.addItem("Left")
-        page.comboBox_textAlign.addItem("Middle")
-        page.comboBox_textAlign.addItem("Right")
+        self.page.comboBox_textAlign.addItem("Left")
+        self.page.comboBox_textAlign.addItem("Middle")
+        self.page.comboBox_textAlign.addItem("Right")
 
-        page.lineEdit_textColor.setText('%s,%s,%s' % self.textColor)
-        page.pushButton_textColor.clicked.connect(self.pickColor)
+        self.page.lineEdit_textColor.setText('%s,%s,%s' % self.textColor)
+        self.page.pushButton_textColor.clicked.connect(self.pickColor)
         btnStyle = "QPushButton { background-color : %s; outline: none; }" \
             % QColor(*self.textColor).name()
-        page.pushButton_textColor.setStyleSheet(btnStyle)
-
-        page.lineEdit_title.setText(self.title)
-        page.comboBox_textAlign.setCurrentIndex(int(self.alignment))
-        page.spinBox_fontSize.setValue(int(self.fontSize))
-        page.spinBox_xTextAlign.setValue(int(self.xPosition))
-        page.spinBox_yTextAlign.setValue(int(self.yPosition))
-
-        page.fontComboBox_titleFont.currentFontChanged.connect(self.update)
-        page.lineEdit_title.textChanged.connect(self.update)
-        page.comboBox_textAlign.currentIndexChanged.connect(self.update)
-        page.spinBox_xTextAlign.valueChanged.connect(self.update)
-        page.spinBox_yTextAlign.valueChanged.connect(self.update)
-        page.spinBox_fontSize.valueChanged.connect(self.update)
-        page.lineEdit_textColor.textChanged.connect(self.update)
-        self.page = page
-        return page
+        self.page.pushButton_textColor.setStyleSheet(btnStyle)
+
+        self.page.lineEdit_title.setText(self.title)
+        self.page.comboBox_textAlign.setCurrentIndex(int(self.alignment))
+        self.page.spinBox_fontSize.setValue(int(self.fontSize))
+        self.page.spinBox_xTextAlign.setValue(int(self.xPosition))
+        self.page.spinBox_yTextAlign.setValue(int(self.yPosition))
+
+        self.page.fontComboBox_titleFont.currentFontChanged.connect(
+            self.update
+        )
+        self.trackWidgets({
+            'title': self.page.lineEdit_title,
+            'alignment': self.page.comboBox_textAlign,
+            'fontSize': self.page.spinBox_fontSize,
+            'xPosition': self.page.spinBox_xTextAlign,
+            'yPosition': self.page.spinBox_yTextAlign,
+        })
 
     def update(self):
-        self.title = self.page.lineEdit_title.text()
-        self.alignment = self.page.comboBox_textAlign.currentIndex()
         self.titleFont = self.page.fontComboBox_titleFont.currentFont()
-        self.fontSize = self.page.spinBox_fontSize.value()
-        self.xPosition = self.page.spinBox_xTextAlign.value()
-        self.yPosition = self.page.spinBox_yTextAlign.value()
-        self.textColor = self.RGBFromString(
+        self.textColor = rgbFromString(
             self.page.lineEdit_textColor.text())
         btnStyle = "QPushButton { background-color : %s; outline: none; }" \
             % QColor(*self.textColor).name()
@@ -87,38 +80,25 @@ class Component(Component):
             x = self.xPosition - offset
         return x, self.yPosition
 
-    def loadPreset(self, pr, presetName=None):
-        super().loadPreset(pr, presetName)
+    def loadPreset(self, pr, *args):
+        super().loadPreset(pr, *args)
 
-        self.page.lineEdit_title.setText(pr['title'])
         font = QFont()
         font.fromString(pr['titleFont'])
         self.page.fontComboBox_titleFont.setCurrentFont(font)
-        self.page.spinBox_fontSize.setValue(pr['fontSize'])
-        self.page.comboBox_textAlign.setCurrentIndex(pr['alignment'])
-        self.page.spinBox_xTextAlign.setValue(pr['xPosition'])
-        self.page.spinBox_yTextAlign.setValue(pr['yPosition'])
         self.page.lineEdit_textColor.setText('%s,%s,%s' % pr['textColor'])
         btnStyle = "QPushButton { background-color : %s; outline: none; }" \
             % QColor(*pr['textColor']).name()
         self.page.pushButton_textColor.setStyleSheet(btnStyle)
 
     def savePreset(self):
-        return {
-            'preset': self.currentPreset,
-            'title': self.title,
-            'titleFont': self.titleFont.toString(),
-            'alignment': self.alignment,
-            'fontSize': self.fontSize,
-            'xPosition': self.xPosition,
-            'yPosition': self.yPosition,
-            'textColor': self.textColor
-        }
-
-    def previewRender(self, previewWorker):
-        width = int(self.settings.value('outputWidth'))
-        height = int(self.settings.value('outputHeight'))
-        return self.addText(width, height)
+        saveValueStore = super().savePreset()
+        saveValueStore['titleFont'] = self.titleFont.toString()
+        saveValueStore['textColor'] = self.textColor
+        return saveValueStore
+
+    def previewRender(self):
+        return self.addText(self.width, self.height)
 
     def properties(self):
         props = ['static']
@@ -129,13 +109,10 @@ class Component(Component):
     def error(self):
         return "No text provided."
 
-    def frameRender(self, layerNo, frameNo):
-        width = int(self.settings.value('outputWidth'))
-        height = int(self.settings.value('outputHeight'))
-        return self.addText(width, height)
+    def frameRender(self, frameNo):
+        return self.addText(self.width, self.height)
 
     def addText(self, width, height):
-
         image = FramePainter(width, height)
         self.titleFont.setPixelSize(self.fontSize)
         image.setFont(self.titleFont)
@@ -146,7 +123,7 @@ class Component(Component):
         return image.finalize()
 
     def pickColor(self):
-        RGBstring, btnStyle = super().pickColor()
+        RGBstring, btnStyle = pickColor()
         if not RGBstring:
             return
         self.page.lineEdit_textColor.setText(RGBstring)
@@ -159,7 +136,7 @@ class Component(Component):
         print('Set custom x, y position:\n    x=500 y=500')
 
     def command(self, arg):
-        if not arg.startswith('preset=') and '=' in arg:
+        if '=' in arg:
             key, arg = arg.split('=', 1)
             if key == 'color':
                 self.page.lineEdit_textColor.setText(arg)