relativeWidgets might as well be a list

8 files changed, 106 insertions, 131 deletions

diff --git a/src/component.py b/src/component.py
index 5dfe2ab..c5bc44b 100644
--- a/src/component.py
+++ b/src/component.py
@@ -304,10 +304,7 @@ class Component(QtCore.QObject, metaclass=ComponentMetaclass):
 
             elif attr in self._relativeWidgets:
                 # Relative widgets: number scales to fit export resolution
-                if self._relativeWidgets[attr] == 'x':
-                    dimension = self.width
-                else:
-                    dimension = self.height
+                dimension = self.width
                 try:
                     oldUserValue = getattr(self, attr)
                 except AttributeError:
diff --git a/src/components/color.py b/src/components/color.py
index f5d618e..5d1233e 100644
--- a/src/components/color.py
+++ b/src/components/color.py
@@ -37,41 +37,34 @@ class Component(Component):
             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,
-                'color1': self.page.lineEdit_color1,
-                'color2': self.page.lineEdit_color2,
-            }, presetNames={
-                'sizeWidth': 'width',
-                'sizeHeight': 'height',
-            }, colorWidgets={
-                'color1': self.page.pushButton_color1,
-                'color2': self.page.pushButton_color2,
-            }, relativeWidgets={
-                'x': 'x',
-                'y': 'y',
-                'sizeWidth': 'x',
-                'sizeHeight': 'y',
-                'RG_start': 'x',
-                'LG_start': 'x',
-                'RG_end': 'x',
-                'LG_end': 'x',
-                'RG_centre': 'x',
-            },
-        )
+        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,
+            'color1': self.page.lineEdit_color1,
+            'color2': self.page.lineEdit_color2,
+        }, presetNames={
+            'sizeWidth': 'width',
+            'sizeHeight': 'height',
+        }, colorWidgets={
+            'color1': self.page.pushButton_color1,
+            'color2': self.page.pushButton_color2,
+        }, relativeWidgets=[
+            'x', 'y',
+            'sizeWidth', 'sizeHeight',
+            'LG_start', 'LG_end',
+            'RG_start', 'RG_end', 'RG_centre',
+        ])
 
     def update(self):
         fillType = self.page.comboBox_fill.currentIndex()
diff --git a/src/components/image.py b/src/components/image.py
index 2ffa5a1..19c4796 100644
--- a/src/components/image.py
+++ b/src/components/image.py
@@ -13,26 +13,22 @@ class Component(Component):
     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',
-            }, relativeWidgets={
-                'xPosition': 'x',
-                'yPosition': 'y',
-            },
-        )
+        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,
+        }, presetNames={
+            'mirror': self.page.checkBox_mirror,
+            'imagePath': 'image',
+            'xPosition': 'x',
+            'yPosition': 'y',
+        }, relativeWidgets=[
+            'xPosition', 'yPosition',
+        ])
 
     def previewRender(self):
         return self.drawFrame(self.width, self.height)
diff --git a/src/components/original.py b/src/components/original.py
index 67e3239..f886374 100644
--- a/src/components/original.py
+++ b/src/components/original.py
@@ -40,9 +40,9 @@ class Component(Component):
             'y': self.page.spinBox_y,
         }, colorWidgets={
             'visColor': self.page.pushButton_visColor,
-        }, relativeWidgets={
-            'y': 'y',
-        })
+        }, relativeWidgets=[
+            'y',
+        ])
 
     def previewRender(self):
         spectrum = numpy.fromfunction(
diff --git a/src/components/spectrum.py b/src/components/spectrum.py
index 9a0c59a..666e20a 100644
--- a/src/components/spectrum.py
+++ b/src/components/spectrum.py
@@ -30,31 +30,28 @@ class Component(Component):
                 self.update
             )
 
-        self.trackWidgets(
-            {
-                'filterType': self.page.comboBox_filterType,
-                'window': self.page.comboBox_window,
-                'mode': self.page.comboBox_mode,
-                'amplitude': self.page.comboBox_amplitude0,
-                'amplitude1': self.page.comboBox_amplitude1,
-                'amplitude2': self.page.comboBox_amplitude2,
-                'display': self.page.comboBox_display,
-                'zoom': self.page.spinBox_zoom,
-                'tc': self.page.spinBox_tc,
-                'x': self.page.spinBox_x,
-                'y': self.page.spinBox_y,
-                'mirror': self.page.checkBox_mirror,
-                'draw': self.page.checkBox_draw,
-                'scale': self.page.spinBox_scale,
-                'color': self.page.comboBox_color,
-                'compress': self.page.checkBox_compress,
-                'mono': self.page.checkBox_mono,
-                'hue': self.page.spinBox_hue,
-            }, relativeWidgets={
-                'x': 'x',
-                'y': 'y',
-            }
-        )
+        self.trackWidgets({
+            'filterType': self.page.comboBox_filterType,
+            'window': self.page.comboBox_window,
+            'mode': self.page.comboBox_mode,
+            'amplitude': self.page.comboBox_amplitude0,
+            'amplitude1': self.page.comboBox_amplitude1,
+            'amplitude2': self.page.comboBox_amplitude2,
+            'display': self.page.comboBox_display,
+            'zoom': self.page.spinBox_zoom,
+            'tc': self.page.spinBox_tc,
+            'x': self.page.spinBox_x,
+            'y': self.page.spinBox_y,
+            'mirror': self.page.checkBox_mirror,
+            'draw': self.page.checkBox_draw,
+            'scale': self.page.spinBox_scale,
+            'color': self.page.comboBox_color,
+            'compress': self.page.checkBox_compress,
+            'mono': self.page.checkBox_mono,
+            'hue': self.page.spinBox_hue,
+        }, relativeWidgets=[
+            'x', 'y',
+        ])
         for widget in self._trackedWidgets.values():
             connectWidget(widget, lambda: self.changed())
 
diff --git a/src/components/text.py b/src/components/text.py
index 2a5d433..b7c244e 100644
--- a/src/components/text.py
+++ b/src/components/text.py
@@ -48,11 +48,9 @@ class Component(Component):
             'yPosition': self.page.spinBox_yTextAlign,
         }, colorWidgets={
             'textColor': self.page.pushButton_textColor,
-        }, relativeWidgets={
-            'xPosition': 'x',
-            'yPosition': 'y',
-            'fontSize': 'y',
-        })
+        }, relativeWidgets=[
+            'xPosition', 'yPosition', 'fontSize',
+        ])
 
     def update(self):
         self.titleFont = self.page.fontComboBox_titleFont.currentFont()
diff --git a/src/components/video.py b/src/components/video.py
index 2cd67c6..b6bdd52 100644
--- a/src/components/video.py
+++ b/src/components/video.py
@@ -23,26 +23,23 @@ class Component(Component):
         super().widget(*args)
         self._image = BlankFrame(self.width, self.height)
         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',
-            }, relativeWidgets={
-                'xPosition': 'x',
-                'yPosition': 'y',
-            }
-        )
+        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',
+        }, relativeWidgets=[
+            'xPosition', 'yPosition',
+        ])
 
     def update(self):
         if self.page.checkBox_useAudio.isChecked():
diff --git a/src/components/waveform.py b/src/components/waveform.py
index 526e6fb..71cbcac 100644
--- a/src/components/waveform.py
+++ b/src/components/waveform.py
@@ -28,25 +28,22 @@ class Component(Component):
                 self.update
             )
 
-        self.trackWidgets(
-            {
-                'color': self.page.lineEdit_color,
-                'mode': self.page.comboBox_mode,
-                'amplitude': self.page.comboBox_amplitude,
-                'x': self.page.spinBox_x,
-                'y': self.page.spinBox_y,
-                'mirror': self.page.checkBox_mirror,
-                'scale': self.page.spinBox_scale,
-                'opacity': self.page.spinBox_opacity,
-                'compress': self.page.checkBox_compress,
-                'mono': self.page.checkBox_mono,
-            }, colorWidgets={
-                'color': self.page.pushButton_color,
-            }, relativeWidgets={
-                'x': 'x',
-                'y': 'y',
-            }
-        )
+        self.trackWidgets({
+            'color': self.page.lineEdit_color,
+            'mode': self.page.comboBox_mode,
+            'amplitude': self.page.comboBox_amplitude,
+            'x': self.page.spinBox_x,
+            'y': self.page.spinBox_y,
+            'mirror': self.page.checkBox_mirror,
+            'scale': self.page.spinBox_scale,
+            'opacity': self.page.spinBox_opacity,
+            'compress': self.page.checkBox_compress,
+            'mono': self.page.checkBox_mono,
+        }, colorWidgets={
+            'color': self.page.pushButton_color,
+        }, relativeWidgets=[
+            'x', 'y',
+        ])
 
     def previewRender(self):
         self.updateChunksize()