diff options
| author | tassaron | 2017-07-17 22:07:33 -0400 |
|---|---|---|
| committer | tassaron | 2017-07-17 22:07:33 -0400 |
| commit | b1713d38fa91e39f142b0c234b6405229aa149e1 (patch) | |
| tree | 3c47e147512cd75deccf07b2591fbb26693ffcb6 /src/components/text.py | |
| parent | aa464632c64725201dc7584ebf6bf2c3d06b47b6 (diff) | |
combined toolkit.py & frame.py into toolkit package
Diffstat (limited to 'src/components/text.py')
| -rw-r--r-- | src/components/text.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/components/text.py b/src/components/text.py index 19460e5..fc3ef5f 100644 --- a/src/components/text.py +++ b/src/components/text.py @@ -4,7 +4,8 @@ from PyQt5 import QtGui, QtCore, QtWidgets import os from component import Component -from frame import FramePainter +from toolkit.frame import FramePainter +from toolkit import rgbFromString, pickColor class Component(Component): @@ -64,7 +65,7 @@ class Component(Component): self.fontSize = self.page.spinBox_fontSize.value() self.xPosition = self.page.spinBox_xTextAlign.value() self.yPosition = self.page.spinBox_yTextAlign.value() - self.textColor = self.RGBFromString( + self.textColor = rgbFromString( self.page.lineEdit_textColor.text()) btnStyle = "QPushButton { background-color : %s; outline: none; }" \ % QColor(*self.textColor).name() @@ -146,7 +147,7 @@ class Component(Component): return image.finalize() def pickColor(self): - RGBstring, btnStyle = super().pickColor() + RGBstring, btnStyle = pickColor() if not RGBstring: return self.page.lineEdit_textColor.setText(RGBstring) |