1 files changed, 51 insertions, 33 deletions
diff --git a/src/toolkit.py b/src/toolkit/common.py
index 5493f37..251a2c1 100644
--- a/src/toolkit.py
+++ b/src/toolkit/common.py
@@ -1,6 +1,7 @@
 '''
     Common functions
 '''
+from PyQt5 import QtWidgets
 import string
 import os
 import sys
@@ -58,42 +59,59 @@ def openPipe(commandList, **kwargs):
 
 
 def disableWhenEncoding(func):
-    ''' Blocks calls to a function while the video is being exported
-        in MainWindow.
-    '''
-    def decorator(*args, **kwargs):
-        if args[0].encoding:
+    def decorator(self, *args, **kwargs):
+        if self.encoding:
             return
         else:
-            return func(*args, **kwargs)
+            return func(self, *args, **kwargs)
     return decorator
 
 
-def LoadDefaultSettings(self):
-    ''' Runs once at each program start-up. Fills in default settings
-        for any settings not found in settings.ini
+def disableWhenOpeningProject(func):
+    def decorator(self, *args, **kwargs):
+        if self.core.openingProject:
+            return
+        else:
+            return func(self, *args, **kwargs)
+    return decorator
+
+
+def pickColor():
+    '''
+        Use color picker to get color input from the user,
+        and return this as an RGB string and QPushButton stylesheet.
+        In a subclass apply stylesheet to any color selection widgets
     '''
-    self.resolutions = [
-        '1920x1080',
-        '1280x720',
-        '854x480'
-    ]
-
-    default = {
-        "outputWidth": 1280,
-        "outputHeight": 720,
-        "outputFrameRate": 30,
-        "outputAudioCodec": "AAC",
-        "outputAudioBitrate": "192",
-        "outputVideoCodec": "H264",
-        "outputVideoBitrate": "2500",
-        "outputVideoFormat": "yuv420p",
-        "outputPreset": "medium",
-        "outputFormat": "mp4",
-        "outputContainer": "MP4",
-        "projectDir": os.path.join(self.dataDir, 'projects'),
-    }
-
-    for parm, value in default.items():
-        if self.settings.value(parm) is None:
-            self.settings.setValue(parm, value)
+    dialog = QtWidgets.QColorDialog()
+    dialog.setOption(QtWidgets.QColorDialog.ShowAlphaChannel, True)
+    color = dialog.getColor()
+    if color.isValid():
+        RGBstring = '%s,%s,%s' % (
+            str(color.red()), str(color.green()), str(color.blue()))
+        btnStyle = "QPushButton{background-color: %s; outline: none;}" \
+            % color.name()
+        return RGBstring, btnStyle
+    else:
+        return None, None
+
+
+def rgbFromString(string):
+    '''Turns an RGB string like "255, 255, 255" into a tuple'''
+    try:
+        tup = tuple([int(i) for i in string.split(',')])
+        if len(tup) != 3:
+            raise ValueError
+        for i in tup:
+            if i > 255 or i < 0:
+                raise ValueError
+        return tup
+    except:
+        return (255, 255, 255)
+
+
+def formatTraceback(tb=None):
+    import traceback
+    if tb is None:
+        import sys
+        tb = sys.exc_info()[2]
+    return 'Traceback:\n%s' % "\n".join(traceback.format_tb(tb))