From b1713d38fa91e39f142b0c234b6405229aa149e1 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Mon, 17 Jul 2017 22:07:33 -0400
Subject: combined toolkit.py & frame.py into toolkit package

---
 src/components/color.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/components/color.py')

diff --git a/src/components/color.py b/src/components/color.py
index ef4dd95..8d2526d 100644
--- a/src/components/color.py
+++ b/src/components/color.py
@@ -5,7 +5,8 @@ from PIL.ImageQt import ImageQt
 import os
 
 from component import Component
-from frame import BlankFrame, FloodFrame, FramePainter, PaintColor
+from toolkit.frame import BlankFrame, FloodFrame, FramePainter, PaintColor
+from toolkit import rgbFromString, pickColor
 
 
 class Component(Component):
@@ -76,8 +77,8 @@ class Component(Component):
         return page
 
     def update(self):
-        self.color1 = self.RGBFromString(self.page.lineEdit_color1.text())
-        self.color2 = self.RGBFromString(self.page.lineEdit_color2.text())
+        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()
@@ -229,7 +230,7 @@ class Component(Component):
         }
 
     def pickColor(self, num):
-        RGBstring, btnStyle = super().pickColor()
+        RGBstring, btnStyle = pickColor()
         if not RGBstring:
             return
         if num == 1:
-- 
cgit v1.2.3