diff options
| author | tassaron | 2017-08-15 22:20:25 -0400 |
|---|---|---|
| committer | tassaron | 2017-08-15 22:20:25 -0400 |
| commit | a1d7cbb984f2a6c2ea976daa8914a2c9845ee21c (patch) | |
| tree | d1129d435b0548f4538bf0099cd82013c2fc1f7d /src/components | |
| parent | 733c005eeaf5d3ff15e0f60d320f5c03472bad60 (diff) | |
undoable edits for normal component settings; TODO: merge small edits
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/color.py | 3 | ||||
| -rw-r--r-- | src/components/color.ui | 6 | ||||
| -rw-r--r-- | src/components/text.py | 4 | ||||
| -rw-r--r-- | src/components/text.ui | 6 |
4 files changed, 12 insertions, 7 deletions
diff --git a/src/components/color.py b/src/components/color.py index 5d1233e..d09cee8 100644 --- a/src/components/color.py +++ b/src/components/color.py @@ -17,9 +17,6 @@ class Component(Component): self.y = 0 super().widget(*args) - self.page.lineEdit_color1.setText('0,0,0') - self.page.lineEdit_color2.setText('133,133,133') - # disable color #2 until non-default 'fill' option gets changed self.page.lineEdit_color2.setDisabled(True) self.page.pushButton_color2.setDisabled(True) diff --git a/src/components/color.ui b/src/components/color.ui index a9dacea..1865e60 100644 --- a/src/components/color.ui +++ b/src/components/color.ui @@ -73,6 +73,9 @@ <height>0</height> </size> </property> + <property name="text"> + <string>0,0,0</string> + </property> <property name="maxLength"> <number>12</number> </property> @@ -146,6 +149,9 @@ <height>0</height> </size> </property> + <property name="text"> + <string>133,133,133</string> + </property> <property name="maxLength"> <number>12</number> </property> diff --git a/src/components/text.py b/src/components/text.py index 4d4f5d3..d3afd5c 100644 --- a/src/components/text.py +++ b/src/components/text.py @@ -13,8 +13,6 @@ class Component(Component): def widget(self, *args): super().widget(*args) - self.textColor = (255, 255, 255) - self.strokeColor = (0, 0, 0) self.title = 'Text' self.alignment = 1 self.titleFont = QFont() @@ -25,8 +23,6 @@ class Component(Component): self.page.comboBox_textAlign.addItem("Right") self.page.comboBox_textAlign.setCurrentIndex(int(self.alignment)) - self.page.lineEdit_textColor.setText('%s,%s,%s' % self.textColor) - self.page.lineEdit_strokeColor.setText('%s,%s,%s' % self.strokeColor) self.page.spinBox_fontSize.setValue(int(self.fontSize)) self.page.lineEdit_title.setText(self.title) diff --git a/src/components/text.ui b/src/components/text.ui index 13d3467..b62e0ed 100644 --- a/src/components/text.ui +++ b/src/components/text.ui @@ -427,6 +427,9 @@ <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> + <property name="text"> + <string>255,255,255</string> + </property> </widget> </item> <item> @@ -485,6 +488,9 @@ <property name="focusPolicy"> <enum>Qt::NoFocus</enum> </property> + <property name="text"> + <string>0,0,0</string> + </property> </widget> </item> <item> |