1.1 --- a/branchpropwindow.ui Tue Jan 23 11:50:53 2007 +0000
1.2 +++ b/branchpropwindow.ui Sat Mar 31 09:28:27 2007 +0000
1.3 @@ -5,12 +5,12 @@
1.4 <rect>
1.5 <x>0</x>
1.6 <y>0</y>
1.7 - <width>343</width>
1.8 - <height>208</height>
1.9 + <width>395</width>
1.10 + <height>282</height>
1.11 </rect>
1.12 </property>
1.13 <property name="windowTitle" >
1.14 - <string>Form</string>
1.15 + <string>Branch Property Editor</string>
1.16 </property>
1.17 <layout class="QVBoxLayout" >
1.18 <property name="margin" >
1.19 @@ -28,31 +28,133 @@
1.20 <attribute name="title" >
1.21 <string>Frame</string>
1.22 </attribute>
1.23 - <widget class="QComboBox" name="frameTypeCombo" >
1.24 - <property name="geometry" >
1.25 - <rect>
1.26 - <x>10</x>
1.27 - <y>10</y>
1.28 - <width>301</width>
1.29 - <height>22</height>
1.30 - </rect>
1.31 + <layout class="QVBoxLayout" >
1.32 + <property name="margin" >
1.33 + <number>9</number>
1.34 + </property>
1.35 + <property name="spacing" >
1.36 + <number>6</number>
1.37 </property>
1.38 <item>
1.39 - <property name="text" >
1.40 - <string>No Frame</string>
1.41 - </property>
1.42 + <layout class="QVBoxLayout" >
1.43 + <property name="margin" >
1.44 + <number>0</number>
1.45 + </property>
1.46 + <property name="spacing" >
1.47 + <number>6</number>
1.48 + </property>
1.49 + <item>
1.50 + <widget class="QComboBox" name="frameTypeCombo" >
1.51 + <item>
1.52 + <property name="text" >
1.53 + <string>No Frame</string>
1.54 + </property>
1.55 + </item>
1.56 + <item>
1.57 + <property name="text" >
1.58 + <string>Rectangle</string>
1.59 + </property>
1.60 + </item>
1.61 + <item>
1.62 + <property name="text" >
1.63 + <string>Ellipse</string>
1.64 + </property>
1.65 + </item>
1.66 + </widget>
1.67 + </item>
1.68 + <item>
1.69 + <widget class="QGroupBox" name="colorGroupBox" >
1.70 + <property name="sizePolicy" >
1.71 + <sizepolicy>
1.72 + <hsizetype>7</hsizetype>
1.73 + <vsizetype>5</vsizetype>
1.74 + <horstretch>0</horstretch>
1.75 + <verstretch>0</verstretch>
1.76 + </sizepolicy>
1.77 + </property>
1.78 + <property name="title" >
1.79 + <string>Colors</string>
1.80 + </property>
1.81 + <layout class="QGridLayout" >
1.82 + <property name="margin" >
1.83 + <number>7</number>
1.84 + </property>
1.85 + <property name="spacing" >
1.86 + <number>6</number>
1.87 + </property>
1.88 + <item row="0" column="0" >
1.89 + <widget class="QPushButton" name="framePenColorButton" >
1.90 + <property name="maximumSize" >
1.91 + <size>
1.92 + <width>20</width>
1.93 + <height>16777215</height>
1.94 + </size>
1.95 + </property>
1.96 + <property name="text" >
1.97 + <string/>
1.98 + </property>
1.99 + </widget>
1.100 + </item>
1.101 + <item row="0" column="1" >
1.102 + <widget class="QLabel" name="penColorLabelDesc" >
1.103 + <property name="sizePolicy" >
1.104 + <sizepolicy>
1.105 + <hsizetype>7</hsizetype>
1.106 + <vsizetype>5</vsizetype>
1.107 + <horstretch>0</horstretch>
1.108 + <verstretch>0</verstretch>
1.109 + </sizepolicy>
1.110 + </property>
1.111 + <property name="text" >
1.112 + <string>Borderline color</string>
1.113 + </property>
1.114 + <property name="buddy" >
1.115 + <cstring>framePenColorButton</cstring>
1.116 + </property>
1.117 + </widget>
1.118 + </item>
1.119 + <item row="1" column="0" >
1.120 + <widget class="QPushButton" name="frameBrushColorButton" >
1.121 + <property name="maximumSize" >
1.122 + <size>
1.123 + <width>20</width>
1.124 + <height>16777215</height>
1.125 + </size>
1.126 + </property>
1.127 + <property name="text" >
1.128 + <string/>
1.129 + </property>
1.130 + </widget>
1.131 + </item>
1.132 + <item row="1" column="1" >
1.133 + <widget class="QLabel" name="brushColorLabelDesc" >
1.134 + <property name="text" >
1.135 + <string>Background color</string>
1.136 + </property>
1.137 + <property name="buddy" >
1.138 + <cstring>frameBrushColorButton</cstring>
1.139 + </property>
1.140 + </widget>
1.141 + </item>
1.142 + <item row="0" column="2" >
1.143 + <spacer>
1.144 + <property name="orientation" >
1.145 + <enum>Qt::Horizontal</enum>
1.146 + </property>
1.147 + <property name="sizeHint" >
1.148 + <size>
1.149 + <width>40</width>
1.150 + <height>20</height>
1.151 + </size>
1.152 + </property>
1.153 + </spacer>
1.154 + </item>
1.155 + </layout>
1.156 + </widget>
1.157 + </item>
1.158 + </layout>
1.159 </item>
1.160 - <item>
1.161 - <property name="text" >
1.162 - <string>Rectangle</string>
1.163 - </property>
1.164 - </item>
1.165 - <item>
1.166 - <property name="text" >
1.167 - <string>Ellipse</string>
1.168 - </property>
1.169 - </item>
1.170 - </widget>
1.171 + </layout>
1.172 </widget>
1.173 <widget class="QWidget" name="tab_2" >
1.174 <attribute name="title" >
1.175 @@ -75,6 +177,19 @@
1.176 </widget>
1.177 </item>
1.178 <item>
1.179 + <spacer>
1.180 + <property name="orientation" >
1.181 + <enum>Qt::Vertical</enum>
1.182 + </property>
1.183 + <property name="sizeHint" >
1.184 + <size>
1.185 + <width>20</width>
1.186 + <height>71</height>
1.187 + </size>
1.188 + </property>
1.189 + </spacer>
1.190 + </item>
1.191 + <item>
1.192 <layout class="QHBoxLayout" >
1.193 <property name="margin" >
1.194 <number>0</number>
1.195 @@ -89,8 +204,8 @@
1.196 </property>
1.197 <property name="sizeHint" >
1.198 <size>
1.199 - <width>251</width>
1.200 - <height>20</height>
1.201 + <width>41</width>
1.202 + <height>31</height>
1.203 </size>
1.204 </property>
1.205 </spacer>