diff options
| author | Martin Kaistra | 2017-05-25 18:43:21 +0200 |
|---|---|---|
| committer | Martin Kaistra | 2017-05-25 18:43:21 +0200 |
| commit | 5487319dc10c42728ecc0d8f67abe55278348509 (patch) | |
| tree | a744c6557a4a33fe9c9b3cc4c08e9156dde2e68e /main.ui | |
| parent | c622f2908ed1e1fed165d3433d7e6932f06c7a22 (diff) | |
| parent | 624ec8dca2872813789cf2d5fa32c523f4359d86 (diff) | |
Merge branch 'tassaron2-master'
Diffstat (limited to 'main.ui')
| -rw-r--r-- | main.ui | 100 |
1 files changed, 98 insertions, 2 deletions
@@ -336,7 +336,7 @@ <item> <layout class="QHBoxLayout" name="horizontalLayout_6"> <item> - <widget class="QLabel" name="label_title"> + <widget class="QLabel" name="label_colorOptions"> <property name="minimumSize"> <size> <width>200</width> @@ -364,12 +364,108 @@ </widget> </item> <item> - <widget class="QLineEdit" name="lineEdit_title"/> + <widget class="QLabel" name="label_textColor"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_textColor"> + <property name="maximumSize"> + <size> + <width>32</width> + <height>32</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="MaximumSize" stdset="0"> + <size> + <width>32</width> + <height>32</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_textColor"/> + </item> + <item> + <widget class="QLabel" name="label_visColor"> + <property name="text"> + <string/> + </property> + <property name="alignment"> + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_visColor"> + <property name="maximumSize"> + <size> + <width>32</width> + <height>32</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="MaximumSize" stdset="0"> + <size> + <width>32</width> + <height>32</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_visColor"/> </item> </layout> </item> </layout> </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_7"> + <item> + <widget class="QLabel" name="label_title"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>200</width> + <height>16777215</height> + </size> + </property> + <property name="baseSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit_title"/> + </item> + </layout> + </item> </layout> </widget> </item> |