summaryrefslogtreecommitdiffstats
path: root/qt-ui/templateedit.ui
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-15 05:22:07 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-08-15 05:22:07 -0700
commit2455a5dec70d1baa2d0009e602db6b4f19941b56 (patch)
tree49a74aed6f2186fbdf5c9b301fa353e764da3a07 /qt-ui/templateedit.ui
parent0aafa2556e6abefc54469bc7fa3e258c2ce10b51 (diff)
parentf3c5699714e43e91c8ff8f66119da454b314264d (diff)
downloadsubsurface-2455a5dec70d1baa2d0009e602db6b4f19941b56.tar.gz
Merge branch 'custom-print' of github.com:neolit123/subsurface
Diffstat (limited to 'qt-ui/templateedit.ui')
-rw-r--r--qt-ui/templateedit.ui60
1 files changed, 50 insertions, 10 deletions
diff --git a/qt-ui/templateedit.ui b/qt-ui/templateedit.ui
index 238e69290..322193cc6 100644
--- a/qt-ui/templateedit.ui
+++ b/qt-ui/templateedit.ui
@@ -317,7 +317,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Table cells</string>
+ <string>Table cells 1</string>
</property>
</widget>
</item>
@@ -347,9 +347,9 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <layout class="QHBoxLayout" name="horizontalLayout_13">
<item>
- <widget class="QLabel" name="label_7">
+ <widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -357,7 +357,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Text 1</string>
+ <string>Table cells 2</string>
</property>
</widget>
</item>
@@ -387,9 +387,9 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
- <widget class="QLabel" name="label_11">
+ <widget class="QLabel" name="label_7">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -397,7 +397,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Text 2</string>
+ <string>Text 1</string>
</property>
</widget>
</item>
@@ -427,9 +427,9 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
- <widget class="QLabel" name="label_4">
+ <widget class="QLabel" name="label_11">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -437,7 +437,7 @@
</sizepolicy>
</property>
<property name="text">
- <string>Borders</string>
+ <string>Text 2</string>
</property>
</widget>
</item>
@@ -467,6 +467,46 @@
</layout>
</item>
<item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Borders</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="colorLable6">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>color6</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="editButton6">
+ <property name="text">
+ <string>Edit</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>