components auto-connect & track widgets, less autosave spam

importing toolkit from live interpreter now works

6 files changed, 165 insertions, 337 deletions

diff --git a/src/components/color.py b/src/components/color.py
index 03371e7..8257ed9 100644
--- a/src/components/color.py
+++ b/src/components/color.py
@@ -13,18 +13,15 @@ class Component(Component):
     name = 'Color'
     version = '1.0.0'
 
-    def widget(self, parent):
-        self.parent = parent
-        self.settings = parent.settings
-        page = self.loadUi('color.ui')
-
+    def widget(self, *args):
         self.color1 = (0, 0, 0)
         self.color2 = (133, 133, 133)
         self.x = 0
         self.y = 0
+        super().widget(*args)
 
-        page.lineEdit_color1.setText('%s,%s,%s' % self.color1)
-        page.lineEdit_color2.setText('%s,%s,%s' % self.color2)
+        self.page.lineEdit_color1.setText('%s,%s,%s' % self.color1)
+        self.page.lineEdit_color2.setText('%s,%s,%s' % self.color2)
 
         btnStyle1 = "QPushButton { background-color : %s; outline: none; }" \
             % QColor(*self.color1).name()
@@ -32,68 +29,55 @@ class Component(Component):
         btnStyle2 = "QPushButton { background-color : %s; outline: none; }" \
             % QColor(*self.color2).name()
 
-        page.pushButton_color1.setStyleSheet(btnStyle1)
-        page.pushButton_color2.setStyleSheet(btnStyle2)
-        page.pushButton_color1.clicked.connect(lambda: self.pickColor(1))
-        page.pushButton_color2.clicked.connect(lambda: self.pickColor(2))
+        self.page.pushButton_color1.setStyleSheet(btnStyle1)
+        self.page.pushButton_color2.setStyleSheet(btnStyle2)
+        self.page.pushButton_color1.clicked.connect(lambda: self.pickColor(1))
+        self.page.pushButton_color2.clicked.connect(lambda: self.pickColor(2))
 
         # disable color #2 until non-default 'fill' option gets changed
-        page.lineEdit_color2.setDisabled(True)
-        page.pushButton_color2.setDisabled(True)
-        page.spinBox_x.valueChanged.connect(self.update)
-        page.spinBox_y.valueChanged.connect(self.update)
-        page.spinBox_width.setValue(
+        self.page.lineEdit_color2.setDisabled(True)
+        self.page.pushButton_color2.setDisabled(True)
+        self.page.spinBox_width.setValue(
             int(self.settings.value("outputWidth")))
-        page.spinBox_height.setValue(
+        self.page.spinBox_height.setValue(
             int(self.settings.value("outputHeight")))
 
-        page.lineEdit_color1.textChanged.connect(self.update)
-        page.lineEdit_color2.textChanged.connect(self.update)
-        page.spinBox_x.valueChanged.connect(self.update)
-        page.spinBox_y.valueChanged.connect(self.update)
-        page.spinBox_width.valueChanged.connect(self.update)
-        page.spinBox_height.valueChanged.connect(self.update)
-        page.checkBox_trans.stateChanged.connect(self.update)
-
         self.fillLabels = [
             'Solid',
             'Linear Gradient',
             'Radial Gradient',
         ]
         for label in self.fillLabels:
-            page.comboBox_fill.addItem(label)
-        page.comboBox_fill.setCurrentIndex(0)
-        page.comboBox_fill.currentIndexChanged.connect(self.update)
-        page.comboBox_spread.currentIndexChanged.connect(self.update)
-        page.spinBox_radialGradient_end.valueChanged.connect(self.update)
-        page.spinBox_radialGradient_start.valueChanged.connect(self.update)
-        page.spinBox_radialGradient_spread.valueChanged.connect(self.update)
-        page.spinBox_linearGradient_end.valueChanged.connect(self.update)
-        page.spinBox_linearGradient_start.valueChanged.connect(self.update)
-        page.checkBox_stretch.stateChanged.connect(self.update)
-
-        self.page = page
-        return page
+            self.page.comboBox_fill.addItem(label)
+        self.page.comboBox_fill.setCurrentIndex(0)
+
+        self.trackWidgets(
+            {
+                'x': self.page.spinBox_x,
+                'y': self.page.spinBox_y,
+                'sizeWidth': self.page.spinBox_width,
+                'sizeHeight': self.page.spinBox_height,
+                'trans': self.page.checkBox_trans,
+                'spread': self.page.comboBox_spread,
+                'stretch': self.page.checkBox_stretch,
+                'RG_start': self.page.spinBox_radialGradient_start,
+                'LG_start': self.page.spinBox_linearGradient_start,
+                'RG_end': self.page.spinBox_radialGradient_end,
+                'LG_end': self.page.spinBox_linearGradient_end,
+                'RG_centre': self.page.spinBox_radialGradient_spread,
+                'fillType': self.page.comboBox_fill,
+            }, presetNames={
+                'sizeWidth': 'width',
+                'sizeHeight': 'height',
+            }
+        )
 
     def update(self):
         self.color1 = rgbFromString(self.page.lineEdit_color1.text())
         self.color2 = rgbFromString(self.page.lineEdit_color2.text())
-        self.x = self.page.spinBox_x.value()
-        self.y = self.page.spinBox_y.value()
-        self.sizeWidth = self.page.spinBox_width.value()
-        self.sizeHeight = self.page.spinBox_height.value()
-        self.trans = self.page.checkBox_trans.isChecked()
-        self.spread = self.page.comboBox_spread.currentIndex()
-
-        self.RG_start = self.page.spinBox_radialGradient_start.value()
-        self.RG_end = self.page.spinBox_radialGradient_end.value()
-        self.RG_centre = self.page.spinBox_radialGradient_spread.value()
-        self.stretch = self.page.checkBox_stretch.isChecked()
-        self.LG_start = self.page.spinBox_linearGradient_start.value()
-        self.LG_end = self.page.spinBox_linearGradient_end.value()
-
-        self.fillType = self.page.comboBox_fill.currentIndex()
-        if self.fillType == 0:
+
+        fillType = self.page.comboBox_fill.currentIndex()
+        if fillType == 0:
             self.page.lineEdit_color2.setEnabled(False)
             self.page.pushButton_color2.setEnabled(False)
             self.page.checkBox_trans.setEnabled(False)
@@ -105,10 +89,10 @@ class Component(Component):
             self.page.checkBox_trans.setEnabled(True)
             self.page.checkBox_stretch.setEnabled(True)
             self.page.comboBox_spread.setEnabled(True)
-        if self.trans:
+        if self.page.checkBox_trans.isChecked():
             self.page.lineEdit_color2.setEnabled(False)
             self.page.pushButton_color2.setEnabled(False)
-        self.page.fillWidget.setCurrentIndex(self.fillType)
+        self.page.fillWidget.setCurrentIndex(fillType)
 
         super().update()
 
@@ -181,25 +165,11 @@ class Component(Component):
 
         return image.finalize()
 
-    def loadPreset(self, pr, presetName=None):
-        super().loadPreset(pr, presetName)
+    def loadPreset(self, pr, *args):
+        super().loadPreset(pr, *args)
 
-        self.page.comboBox_fill.setCurrentIndex(pr['fillType'])
         self.page.lineEdit_color1.setText('%s,%s,%s' % pr['color1'])
         self.page.lineEdit_color2.setText('%s,%s,%s' % pr['color2'])
-        self.page.spinBox_x.setValue(pr['x'])
-        self.page.spinBox_y.setValue(pr['y'])
-        self.page.spinBox_width.setValue(pr['width'])
-        self.page.spinBox_height.setValue(pr['height'])
-        self.page.checkBox_trans.setChecked(pr['trans'])
-
-        self.page.spinBox_radialGradient_start.setValue(pr['RG_start'])
-        self.page.spinBox_radialGradient_end.setValue(pr['RG_end'])
-        self.page.spinBox_radialGradient_spread.setValue(pr['RG_centre'])
-        self.page.spinBox_linearGradient_start.setValue(pr['LG_start'])
-        self.page.spinBox_linearGradient_end.setValue(pr['LG_end'])
-        self.page.checkBox_stretch.setChecked(pr['stretch'])
-        self.page.comboBox_spread.setCurrentIndex(pr['spread'])
 
         btnStyle1 = "QPushButton { background-color : %s; outline: none; }" \
             % QColor(*pr['color1']).name()
@@ -209,23 +179,10 @@ class Component(Component):
         self.page.pushButton_color2.setStyleSheet(btnStyle2)
 
     def savePreset(self):
-        return {
-            'color1': self.color1,
-            'color2': self.color2,
-            'x': self.x,
-            'y': self.y,
-            'fillType': self.fillType,
-            'width': self.sizeWidth,
-            'height': self.sizeHeight,
-            'trans': self.trans,
-            'stretch': self.stretch,
-            'spread': self.spread,
-            'RG_start': self.RG_start,
-            'RG_end': self.RG_end,
-            'RG_centre': self.RG_centre,
-            'LG_start': self.LG_start,
-            'LG_end': self.LG_end,
-        }
+        saveValueStore = super().savePreset()
+        saveValueStore['color1'] = self.color1
+        saveValueStore['color2'] = self.color2
+        return saveValueStore
 
     def pickColor(self, num):
         RGBstring, btnStyle = pickColor()
@@ -242,7 +199,7 @@ class Component(Component):
         print('Specify a color:\n    color=255,255,255')
 
     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_color1.setText(arg)
diff --git a/src/components/image.py b/src/components/image.py
index 591e03e..a705904 100644
--- a/src/components/image.py
+++ b/src/components/image.py
@@ -2,7 +2,6 @@ from PIL import Image, ImageDraw, ImageEnhance
 from PyQt5 import QtGui, QtCore, QtWidgets
 import os
 
-from core import Core
 from component import Component
 from toolkit.frame import BlankFrame
 
@@ -11,35 +10,26 @@ class Component(Component):
     name = 'Image'
     version = '1.0.0'
 
-    def widget(self, parent):
-        self.parent = parent
-        self.settings = parent.settings
-        page = self.loadUi('image.ui')
-
-        page.lineEdit_image.textChanged.connect(self.update)
-        page.pushButton_image.clicked.connect(self.pickImage)
-        page.spinBox_scale.valueChanged.connect(self.update)
-        page.spinBox_rotate.valueChanged.connect(self.update)
-        page.spinBox_color.valueChanged.connect(self.update)
-        page.checkBox_stretch.stateChanged.connect(self.update)
-        page.checkBox_mirror.stateChanged.connect(self.update)
-        page.spinBox_x.valueChanged.connect(self.update)
-        page.spinBox_y.valueChanged.connect(self.update)
-
-        self.page = page
-        return page
-
-    def update(self):
-        self.imagePath = self.page.lineEdit_image.text()
-        self.scale = self.page.spinBox_scale.value()
-        self.rotate = self.page.spinBox_rotate.value()
-        self.color = self.page.spinBox_color.value()
-        self.xPosition = self.page.spinBox_x.value()
-        self.yPosition = self.page.spinBox_y.value()
-        self.stretched = self.page.checkBox_stretch.isChecked()
-        self.mirror = self.page.checkBox_mirror.isChecked()
-
-        super().update()
+    def widget(self, *args):
+        super().widget(*args)
+        self.page.pushButton_image.clicked.connect(self.pickImage)
+        self.trackWidgets(
+            {
+                'imagePath': self.page.lineEdit_image,
+                'scale': self.page.spinBox_scale,
+                'rotate': self.page.spinBox_rotate,
+                'color': self.page.spinBox_color,
+                'xPosition': self.page.spinBox_x,
+                'yPosition': self.page.spinBox_y,
+                'stretched': self.page.checkBox_stretch,
+                'mirror': self.page.checkBox_mirror,
+            },
+            presetNames={
+                'imagePath': 'image',
+                'xPosition': 'x',
+                'yPosition': 'y',
+            },
+        )
 
     def previewRender(self, previewWorker):
         width = int(self.settings.value('outputWidth'))
@@ -89,41 +79,18 @@ class Component(Component):
 
         return frame
 
-    def loadPreset(self, pr, presetName=None):
-        super().loadPreset(pr, presetName)
-        self.page.lineEdit_image.setText(pr['image'])
-        self.page.spinBox_scale.setValue(pr['scale'])
-        self.page.spinBox_color.setValue(pr['color'])
-        self.page.spinBox_rotate.setValue(pr['rotate'])
-        self.page.spinBox_x.setValue(pr['x'])
-        self.page.spinBox_y.setValue(pr['y'])
-        self.page.checkBox_stretch.setChecked(pr['stretched'])
-        self.page.checkBox_mirror.setChecked(pr['mirror'])
-
-    def savePreset(self):
-        return {
-            'image': self.imagePath,
-            'scale': self.scale,
-            'color': self.color,
-            'rotate': self.rotate,
-            'stretched': self.stretched,
-            'mirror': self.mirror,
-            'x': self.xPosition,
-            'y': self.yPosition,
-        }
-
     def pickImage(self):
         imgDir = self.settings.value("componentDir", os.path.expanduser("~"))
         filename, _ = QtWidgets.QFileDialog.getOpenFileName(
             self.page, "Choose Image", imgDir,
-            "Image Files (%s)" % " ".join(Core.imageFormats))
+            "Image Files (%s)" % " ".join(self.core.imageFormats))
         if filename:
             self.settings.setValue("componentDir", os.path.dirname(filename))
             self.page.lineEdit_image.setText(filename)
             self.update()
 
     def command(self, arg):
-        if not arg.startswith('preset=') and '=' in arg:
+        if '=' in arg:
             key, arg = arg.split('=', 1)
             if key == 'path' and os.path.exists(arg):
                 try:
diff --git a/src/components/original.py b/src/components/original.py
index ae40df3..2bda878 100644
--- a/src/components/original.py
+++ b/src/components/original.py
@@ -18,59 +18,46 @@ class Component(Component):
     def names():
         return ['Original Audio Visualization']
 
-    def widget(self, parent):
-        self.parent = parent
-        self.settings = parent.settings
+    def widget(self, *args):
         self.visColor = (255, 255, 255)
         self.scale = 20
         self.y = 0
-        self.canceled = False
-
-        page = self.loadUi('original.ui')
-        page.comboBox_visLayout.addItem("Classic")
-        page.comboBox_visLayout.addItem("Split")
-        page.comboBox_visLayout.addItem("Bottom")
-        page.comboBox_visLayout.addItem("Top")
-        page.comboBox_visLayout.setCurrentIndex(0)
-        page.comboBox_visLayout.currentIndexChanged.connect(self.update)
-        page.lineEdit_visColor.setText('%s,%s,%s' % self.visColor)
-        page.pushButton_visColor.clicked.connect(lambda: self.pickColor())
+        super().widget(*args)
+
+        self.page.comboBox_visLayout.addItem("Classic")
+        self.page.comboBox_visLayout.addItem("Split")
+        self.page.comboBox_visLayout.addItem("Bottom")
+        self.page.comboBox_visLayout.addItem("Top")
+        self.page.comboBox_visLayout.setCurrentIndex(0)
+
+        self.page.lineEdit_visColor.setText('%s,%s,%s' % self.visColor)
+        self.page.pushButton_visColor.clicked.connect(lambda: self.pickColor())
         btnStyle = "QPushButton { background-color : %s; outline: none; }" \
             % QColor(*self.visColor).name()
-        page.pushButton_visColor.setStyleSheet(btnStyle)
-        page.lineEdit_visColor.textChanged.connect(self.update)
-        page.spinBox_scale.valueChanged.connect(self.update)
-        page.spinBox_y.valueChanged.connect(self.update)
+        self.page.pushButton_visColor.setStyleSheet(btnStyle)
 
-        self.page = page
-        return page
+        self.trackWidgets({
+            'layout': self.page.comboBox_visLayout,
+            'scale': self.page.spinBox_scale,
+            'y': self.page.spinBox_y,
+        })
 
     def update(self):
-        self.layout = self.page.comboBox_visLayout.currentIndex()
         self.visColor = rgbFromString(self.page.lineEdit_visColor.text())
-        self.scale = self.page.spinBox_scale.value()
-        self.y = self.page.spinBox_y.value()
-
         super().update()
 
-    def loadPreset(self, pr, presetName=None):
-        super().loadPreset(pr, presetName)
+    def loadPreset(self, pr, *args):
+        super().loadPreset(pr, *args)
 
         self.page.lineEdit_visColor.setText('%s,%s,%s' % pr['visColor'])
         btnStyle = "QPushButton { background-color : %s; outline: none; }" \
             % QColor(*pr['visColor']).name()
         self.page.pushButton_visColor.setStyleSheet(btnStyle)
-        self.page.comboBox_visLayout.setCurrentIndex(pr['layout'])
-        self.page.spinBox_scale.setValue(pr['scale'])
-        self.page.spinBox_y.setValue(pr['y'])
 
     def savePreset(self):
-        return {
-            'layout': self.layout,
-            'visColor': self.visColor,
-            'scale': self.scale,
-            'y': self.y,
-        }
+        saveValueStore = super().savePreset()
+        saveValueStore['visColor'] = self.visColor
+        return saveValueStore
 
     def previewRender(self, previewWorker):
         spectrum = numpy.fromfunction(
@@ -206,7 +193,7 @@ class Component(Component):
         return im
 
     def command(self, arg):
-        if not arg.startswith('preset=') and '=' in arg:
+        if '=' in arg:
             key, arg = arg.split('=', 1)
             try:
                 if key == 'color':
diff --git a/src/components/sound.py b/src/components/sound.py
index 677a22f..dd3cbab 100644
--- a/src/components/sound.py
+++ b/src/components/sound.py
@@ -10,26 +10,15 @@ class Component(Component):
     name = 'Sound'
     version = '1.0.0'
 
-    def widget(self, parent):
-        self.parent = parent
-        self.settings = parent.settings
-        page = self.loadUi('sound.ui')
-
-        page.lineEdit_sound.textChanged.connect(self.update)
-        page.pushButton_sound.clicked.connect(self.pickSound)
-        page.checkBox_chorus.stateChanged.connect(self.update)
-        page.spinBox_delay.valueChanged.connect(self.update)
-        page.spinBox_volume.valueChanged.connect(self.update)
-
-        self.page = page
-        return page
-
-    def update(self):
-        self.sound = self.page.lineEdit_sound.text()
-        self.delay = self.page.spinBox_delay.value()
-        self.volume = self.page.spinBox_volume.value()
-        self.chorus = self.page.checkBox_chorus.isChecked()
-        super().update()
+    def widget(self, *args):
+        super().widget(*args)
+        self.page.pushButton_sound.clicked.connect(self.pickSound)
+        self.trackWidgets({
+            'sound': self.page.lineEdit_sound,
+            'chorus': self.page.checkBox_chorus,
+            'delay': self.page.spinBox_delay,
+            'volume': self.page.spinBox_volume,
+        })
 
     def previewRender(self, previewWorker):
         width = int(self.settings.value('outputWidth'))
@@ -67,7 +56,7 @@ class Component(Component):
         sndDir = self.settings.value("componentDir", os.path.expanduser("~"))
         filename, _ = QtWidgets.QFileDialog.getOpenFileName(
             self.page, "Choose Sound", sndDir,
-            "Audio Files (%s)" % " ".join(Core.audioFormats))
+            "Audio Files (%s)" % " ".join(self.core.audioFormats))
         if filename:
             self.settings.setValue("componentDir", os.path.dirname(filename))
             self.page.lineEdit_sound.setText(filename)
@@ -78,30 +67,15 @@ class Component(Component):
         height = int(self.settings.value('outputHeight'))
         return BlankFrame(width, height)
 
-    def loadPreset(self, pr, presetName=None):
-        super().loadPreset(pr, presetName)
-        self.page.lineEdit_sound.setText(pr['sound'])
-        self.page.checkBox_chorus.setChecked(pr['chorus'])
-        self.page.spinBox_delay.setValue(pr['delay'])
-        self.page.spinBox_volume.setValue(pr['volume'])
-
-    def savePreset(self):
-        return {
-            'sound': self.sound,
-            'chorus': self.chorus,
-            'delay': self.delay,
-            'volume': self.volume,
-        }
-
     def commandHelp(self):
         print('Path to audio file:\n    path=/filepath/to/sound.ogg')
 
     def command(self, arg):
-        if not arg.startswith('preset=') and '=' in arg:
+        if '=' in arg:
             key, arg = arg.split('=', 1)
             if key == 'path':
                 if '*%s' % os.path.splitext(arg)[1] \
-                        not in Core.audioFormats:
+                        not in self.core.audioFormats:
                     print("Not a supported audio format")
                     quit(1)
                 self.page.lineEdit_sound.setText(arg)
diff --git a/src/components/text.py b/src/components/text.py
index d511f22..1d64617 100644
--- a/src/components/text.py
+++ b/src/components/text.py
@@ -16,12 +16,10 @@ class Component(Component):
         super().__init__(*args)
         self.titleFont = QFont()
 
-    def widget(self, parent):
-        self.parent = parent
-        self.settings = parent.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,40 +28,35 @@ 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 = rgbFromString(
             self.page.lineEdit_textColor.text())
         btnStyle = "QPushButton { background-color : %s; outline: none; }" \
@@ -87,32 +80,22 @@ 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 {
-            'title': self.title,
-            'titleFont': self.titleFont.toString(),
-            'alignment': self.alignment,
-            'fontSize': self.fontSize,
-            'xPosition': self.xPosition,
-            'yPosition': self.yPosition,
-            'textColor': self.textColor
-        }
+        saveValueStore = super().savePreset()
+        saveValueStore['titleFont'] = self.titleFont.toString()
+        saveValueStore['textColor'] = self.textColor
+        return saveValueStore
 
     def previewRender(self, previewWorker):
         width = int(self.settings.value('outputWidth'))
@@ -158,7 +141,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)
diff --git a/src/components/video.py b/src/components/video.py
index 8758b12..677e3ee 100644
--- a/src/components/video.py
+++ b/src/components/video.py
@@ -9,6 +9,7 @@ from queue import PriorityQueue
 from core import Core
 from component import Component, BadComponentInit
 from toolkit.frame import BlankFrame
+from toolkit.ffmpeg import testAudioStream
 from toolkit import openPipe, checkOutput
 
 
@@ -16,7 +17,7 @@ class Video:
     '''Video Component Frame-Fetcher'''
     def __init__(self, **kwargs):
         mandatoryArgs = [
-            'ffmpeg',     # path to ffmpeg, usually Core.FFMPEG_BIN
+            'ffmpeg',     # path to ffmpeg, usually self.core.FFMPEG_BIN
             'videoPath',
             'width',
             'height',
@@ -110,47 +111,40 @@ class Component(Component):
     name = 'Video'
     version = '1.0.0'
 
-    def widget(self, parent):
-        self.parent = parent
-        self.settings = parent.settings
-        page = self.loadUi('video.ui')
+    def widget(self, *args):
         self.videoPath = ''
         self.badVideo = False
         self.badAudio = False
         self.x = 0
         self.y = 0
         self.loopVideo = False
-
-        page.lineEdit_video.textChanged.connect(self.update)
-        page.pushButton_video.clicked.connect(self.pickVideo)
-        page.checkBox_loop.stateChanged.connect(self.update)
-        page.checkBox_distort.stateChanged.connect(self.update)
-        page.checkBox_useAudio.stateChanged.connect(self.update)
-        page.spinBox_scale.valueChanged.connect(self.update)
-        page.spinBox_volume.valueChanged.connect(self.update)
-        page.spinBox_x.valueChanged.connect(self.update)
-        page.spinBox_y.valueChanged.connect(self.update)
-
-        self.page = page
-        return page
+        super().widget(*args)
+        self.page.pushButton_video.clicked.connect(self.pickVideo)
+        self.trackWidgets(
+            {
+                'videoPath': self.page.lineEdit_video,
+                'loopVideo': self.page.checkBox_loop,
+                'useAudio': self.page.checkBox_useAudio,
+                'distort': self.page.checkBox_distort,
+                'scale': self.page.spinBox_scale,
+                'volume': self.page.spinBox_volume,
+                'xPosition': self.page.spinBox_x,
+                'yPosition': self.page.spinBox_y,
+            }, presetNames={
+                'videoPath': 'video',
+                'loopVideo': 'loop',
+                'xPosition': 'x',
+                'yPosition': 'y',
+            }
+        )
 
     def update(self):
-        self.videoPath = self.page.lineEdit_video.text()
-        self.loopVideo = self.page.checkBox_loop.isChecked()
-        self.useAudio = self.page.checkBox_useAudio.isChecked()
-        self.distort = self.page.checkBox_distort.isChecked()
-        self.scale = self.page.spinBox_scale.value()
-        self.volume = self.page.spinBox_volume.value()
-        self.xPosition = self.page.spinBox_x.value()
-        self.yPosition = self.page.spinBox_y.value()
-
-        if self.useAudio:
+        if self.page.checkBox_useAudio.isChecked():
             self.page.label_volume.setEnabled(True)
             self.page.spinBox_volume.setEnabled(True)
         else:
             self.page.label_volume.setEnabled(False)
             self.page.spinBox_volume.setEnabled(False)
-
         super().update()
 
     def previewRender(self, previewWorker):
@@ -188,18 +182,7 @@ class Component(Component):
             return "The video selected is corrupt!"
 
     def testAudioStream(self):
-        # test if an audio stream really exists
-        audioTestCommand = [
-            Core.FFMPEG_BIN,
-            '-i', self.videoPath,
-            '-vn', '-f', 'null', '-'
-        ]
-        try:
-            checkOutput(audioTestCommand, stderr=subprocess.DEVNULL)
-        except subprocess.CalledProcessError:
-            self.badAudio = True
-        else:
-            self.badAudio = False
+        self.badAudio = testAudioStream(self.videoPath)
 
     def audio(self):
         params = {}
@@ -214,7 +197,7 @@ class Component(Component):
         self.blankFrame_ = BlankFrame(width, height)
         self.updateChunksize(width, height)
         self.video = Video(
-            ffmpeg=Core.FFMPEG_BIN, videoPath=self.videoPath,
+            ffmpeg=self.core.FFMPEG_BIN, videoPath=self.videoPath,
             width=width, height=height, chunkSize=self.chunkSize,
             frameRate=int(self.settings.value("outputFrameRate")),
             parent=self.parent, loopVideo=self.loopVideo,
@@ -227,34 +210,11 @@ class Component(Component):
         else:
             return self.blankFrame_
 
-    def loadPreset(self, pr, presetName=None):
-        super().loadPreset(pr, presetName)
-        self.page.lineEdit_video.setText(pr['video'])
-        self.page.checkBox_loop.setChecked(pr['loop'])
-        self.page.checkBox_useAudio.setChecked(pr['useAudio'])
-        self.page.checkBox_distort.setChecked(pr['distort'])
-        self.page.spinBox_scale.setValue(pr['scale'])
-        self.page.spinBox_volume.setValue(pr['volume'])
-        self.page.spinBox_x.setValue(pr['x'])
-        self.page.spinBox_y.setValue(pr['y'])
-
-    def savePreset(self):
-        return {
-            'video': self.videoPath,
-            'loop': self.loopVideo,
-            'useAudio': self.useAudio,
-            'distort': self.distort,
-            'scale': self.scale,
-            'volume': self.volume,
-            'x': self.xPosition,
-            'y': self.yPosition,
-        }
-
     def pickVideo(self):
         imgDir = self.settings.value("componentDir", os.path.expanduser("~"))
         filename, _ = QtWidgets.QFileDialog.getOpenFileName(
             self.page, "Choose Video",
-            imgDir, "Video Files (%s)" % " ".join(Core.videoFormats)
+            imgDir, "Video Files (%s)" % " ".join(self.core.videoFormats)
         )
         if filename:
             self.settings.setValue("componentDir", os.path.dirname(filename))
@@ -266,7 +226,7 @@ class Component(Component):
             return
 
         command = [
-            self.parent.core.FFMPEG_BIN,
+            self.core.FFMPEG_BIN,
             '-thread_queue_size', '512',
             '-i', self.videoPath,
             '-f', 'image2pipe',
@@ -294,10 +254,10 @@ class Component(Component):
         self.chunkSize = 4*width*height
 
     def command(self, arg):
-        if not arg.startswith('preset=') and '=' in arg:
+        if '=' in arg:
             key, arg = arg.split('=', 1)
             if key == 'path' and os.path.exists(arg):
-                if '*%s' % os.path.splitext(arg)[1] in Core.videoFormats:
+                if '*%s' % os.path.splitext(arg)[1] in self.core.videoFormats:
                     self.page.lineEdit_video.setText(arg)
                     self.page.spinBox_scale.setValue(100)
                     self.page.checkBox_loop.setChecked(True)