3 files changed, 35 insertions, 0 deletions
diff --git a/src/toolkit/__init__.py b/src/toolkit/__init__.py
new file mode 100644
index 0000000..3fca275
--- /dev/null
+++ b/src/toolkit/__init__.py
@@ -0,0 +1 @@
+from toolkit.common import *
diff --git a/src/toolkit.py b/src/toolkit/common.py
index 5493f37..e3a1649 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
@@ -69,6 +70,39 @@ def disableWhenEncoding(func):
     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
+    '''
+    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 LoadDefaultSettings(self):
     ''' Runs once at each program start-up. Fills in default settings
         for any settings not found in settings.ini
diff --git a/src/frame.py b/src/toolkit/frame.py
index cddb611..cddb611 100644
--- a/src/frame.py
+++ b/src/toolkit/frame.py