1.1 --- a/branchpropwindow.ui Sat Mar 31 09:28:27 2007 +0000
1.2 +++ b/branchpropwindow.ui Wed Apr 25 16:02:54 2007 +0000
1.3 @@ -5,20 +5,14 @@
1.4 <rect>
1.5 <x>0</x>
1.6 <y>0</y>
1.7 - <width>395</width>
1.8 - <height>282</height>
1.9 + <width>255</width>
1.10 + <height>327</height>
1.11 </rect>
1.12 </property>
1.13 <property name="windowTitle" >
1.14 <string>Branch Property Editor</string>
1.15 </property>
1.16 <layout class="QVBoxLayout" >
1.17 - <property name="margin" >
1.18 - <number>9</number>
1.19 - </property>
1.20 - <property name="spacing" >
1.21 - <number>6</number>
1.22 - </property>
1.23 <item>
1.24 <widget class="QTabWidget" name="tabWidget" >
1.25 <property name="currentIndex" >
1.26 @@ -29,45 +23,120 @@
1.27 <string>Frame</string>
1.28 </attribute>
1.29 <layout class="QVBoxLayout" >
1.30 - <property name="margin" >
1.31 - <number>9</number>
1.32 - </property>
1.33 <property name="spacing" >
1.34 <number>6</number>
1.35 </property>
1.36 + <property name="leftMargin" >
1.37 + <number>9</number>
1.38 + </property>
1.39 + <property name="topMargin" >
1.40 + <number>9</number>
1.41 + </property>
1.42 + <property name="rightMargin" >
1.43 + <number>9</number>
1.44 + </property>
1.45 + <property name="bottomMargin" >
1.46 + <number>9</number>
1.47 + </property>
1.48 + <item>
1.49 + <widget class="QGroupBox" name="groupBox" >
1.50 + <property name="title" >
1.51 + <string>Geometry</string>
1.52 + </property>
1.53 + <layout class="QGridLayout" >
1.54 + <item row="0" column="0" colspan="4" >
1.55 + <widget class="QComboBox" name="frameTypeCombo" >
1.56 + <property name="sizePolicy" >
1.57 + <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
1.58 + <horstretch>0</horstretch>
1.59 + <verstretch>0</verstretch>
1.60 + </sizepolicy>
1.61 + </property>
1.62 + <item>
1.63 + <property name="text" >
1.64 + <string>No Frame</string>
1.65 + </property>
1.66 + </item>
1.67 + <item>
1.68 + <property name="text" >
1.69 + <string>Rectangle</string>
1.70 + </property>
1.71 + </item>
1.72 + <item>
1.73 + <property name="text" >
1.74 + <string>Ellipse</string>
1.75 + </property>
1.76 + </item>
1.77 + </widget>
1.78 + </item>
1.79 + <item row="1" column="3" >
1.80 + <spacer>
1.81 + <property name="orientation" >
1.82 + <enum>Qt::Horizontal</enum>
1.83 + </property>
1.84 + <property name="sizeHint" >
1.85 + <size>
1.86 + <width>40</width>
1.87 + <height>20</height>
1.88 + </size>
1.89 + </property>
1.90 + </spacer>
1.91 + </item>
1.92 + <item row="1" column="1" colspan="2" >
1.93 + <widget class="QLabel" name="label_3" >
1.94 + <property name="text" >
1.95 + <string>Padding</string>
1.96 + </property>
1.97 + </widget>
1.98 + </item>
1.99 + <item row="2" column="1" colspan="2" >
1.100 + <widget class="QLabel" name="label_4" >
1.101 + <property name="text" >
1.102 + <string>Borderline width</string>
1.103 + </property>
1.104 + </widget>
1.105 + </item>
1.106 + <item row="1" column="0" >
1.107 + <widget class="QSpinBox" name="framePaddingSpinBox" >
1.108 + <property name="maximum" >
1.109 + <number>50</number>
1.110 + </property>
1.111 + </widget>
1.112 + </item>
1.113 + <item row="2" column="0" >
1.114 + <widget class="QSpinBox" name="frameWidthSpinBox" >
1.115 + <property name="minimum" >
1.116 + <number>1</number>
1.117 + </property>
1.118 + <property name="maximum" >
1.119 + <number>20</number>
1.120 + </property>
1.121 + </widget>
1.122 + </item>
1.123 + </layout>
1.124 + </widget>
1.125 + </item>
1.126 <item>
1.127 <layout class="QVBoxLayout" >
1.128 - <property name="margin" >
1.129 - <number>0</number>
1.130 - </property>
1.131 <property name="spacing" >
1.132 <number>6</number>
1.133 </property>
1.134 - <item>
1.135 - <widget class="QComboBox" name="frameTypeCombo" >
1.136 - <item>
1.137 - <property name="text" >
1.138 - <string>No Frame</string>
1.139 - </property>
1.140 - </item>
1.141 - <item>
1.142 - <property name="text" >
1.143 - <string>Rectangle</string>
1.144 - </property>
1.145 - </item>
1.146 - <item>
1.147 - <property name="text" >
1.148 - <string>Ellipse</string>
1.149 - </property>
1.150 - </item>
1.151 - </widget>
1.152 - </item>
1.153 + <property name="leftMargin" >
1.154 + <number>0</number>
1.155 + </property>
1.156 + <property name="topMargin" >
1.157 + <number>0</number>
1.158 + </property>
1.159 + <property name="rightMargin" >
1.160 + <number>0</number>
1.161 + </property>
1.162 + <property name="bottomMargin" >
1.163 + <number>0</number>
1.164 + </property>
1.165 <item>
1.166 <widget class="QGroupBox" name="colorGroupBox" >
1.167 <property name="sizePolicy" >
1.168 - <sizepolicy>
1.169 - <hsizetype>7</hsizetype>
1.170 - <vsizetype>5</vsizetype>
1.171 + <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
1.172 <horstretch>0</horstretch>
1.173 <verstretch>0</verstretch>
1.174 </sizepolicy>
1.175 @@ -76,10 +145,22 @@
1.176 <string>Colors</string>
1.177 </property>
1.178 <layout class="QGridLayout" >
1.179 - <property name="margin" >
1.180 + <property name="leftMargin" >
1.181 <number>7</number>
1.182 </property>
1.183 - <property name="spacing" >
1.184 + <property name="topMargin" >
1.185 + <number>7</number>
1.186 + </property>
1.187 + <property name="rightMargin" >
1.188 + <number>7</number>
1.189 + </property>
1.190 + <property name="bottomMargin" >
1.191 + <number>7</number>
1.192 + </property>
1.193 + <property name="horizontalSpacing" >
1.194 + <number>6</number>
1.195 + </property>
1.196 + <property name="verticalSpacing" >
1.197 <number>6</number>
1.198 </property>
1.199 <item row="0" column="0" >
1.200 @@ -98,9 +179,7 @@
1.201 <item row="0" column="1" >
1.202 <widget class="QLabel" name="penColorLabelDesc" >
1.203 <property name="sizePolicy" >
1.204 - <sizepolicy>
1.205 - <hsizetype>7</hsizetype>
1.206 - <vsizetype>5</vsizetype>
1.207 + <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
1.208 <horstretch>0</horstretch>
1.209 <verstretch>0</verstretch>
1.210 </sizepolicy>
1.211 @@ -156,23 +235,70 @@
1.212 </item>
1.213 </layout>
1.214 </widget>
1.215 + <widget class="QWidget" name="Layout" >
1.216 + <attribute name="title" >
1.217 + <string>Layout</string>
1.218 + </attribute>
1.219 + <layout class="QVBoxLayout" >
1.220 + <item>
1.221 + <layout class="QVBoxLayout" >
1.222 + <item>
1.223 + <widget class="QCheckBox" name="incImgHor" >
1.224 + <property name="text" >
1.225 + <string>Include images horizontally</string>
1.226 + </property>
1.227 + </widget>
1.228 + </item>
1.229 + <item>
1.230 + <widget class="QCheckBox" name="incImgVer" >
1.231 + <property name="text" >
1.232 + <string>Include images vertically</string>
1.233 + </property>
1.234 + </widget>
1.235 + </item>
1.236 + </layout>
1.237 + </item>
1.238 + <item>
1.239 + <spacer>
1.240 + <property name="orientation" >
1.241 + <enum>Qt::Vertical</enum>
1.242 + </property>
1.243 + <property name="sizeHint" >
1.244 + <size>
1.245 + <width>20</width>
1.246 + <height>40</height>
1.247 + </size>
1.248 + </property>
1.249 + </spacer>
1.250 + </item>
1.251 + </layout>
1.252 + </widget>
1.253 <widget class="QWidget" name="tab_2" >
1.254 <attribute name="title" >
1.255 <string>Link</string>
1.256 </attribute>
1.257 - <widget class="QCheckBox" name="hideLinkIfUnselected" >
1.258 - <property name="geometry" >
1.259 - <rect>
1.260 - <x>20</x>
1.261 - <y>10</y>
1.262 - <width>231</width>
1.263 - <height>21</height>
1.264 - </rect>
1.265 - </property>
1.266 - <property name="text" >
1.267 - <string>Hide link if unselected</string>
1.268 - </property>
1.269 - </widget>
1.270 + <layout class="QVBoxLayout" >
1.271 + <item>
1.272 + <widget class="QCheckBox" name="hideLinkIfUnselected" >
1.273 + <property name="text" >
1.274 + <string>Hide link if unselected</string>
1.275 + </property>
1.276 + </widget>
1.277 + </item>
1.278 + <item>
1.279 + <spacer>
1.280 + <property name="orientation" >
1.281 + <enum>Qt::Vertical</enum>
1.282 + </property>
1.283 + <property name="sizeHint" >
1.284 + <size>
1.285 + <width>20</width>
1.286 + <height>40</height>
1.287 + </size>
1.288 + </property>
1.289 + </spacer>
1.290 + </item>
1.291 + </layout>
1.292 </widget>
1.293 </widget>
1.294 </item>
1.295 @@ -191,11 +317,20 @@
1.296 </item>
1.297 <item>
1.298 <layout class="QHBoxLayout" >
1.299 - <property name="margin" >
1.300 + <property name="spacing" >
1.301 + <number>6</number>
1.302 + </property>
1.303 + <property name="leftMargin" >
1.304 <number>0</number>
1.305 </property>
1.306 - <property name="spacing" >
1.307 - <number>6</number>
1.308 + <property name="topMargin" >
1.309 + <number>0</number>
1.310 + </property>
1.311 + <property name="rightMargin" >
1.312 + <number>0</number>
1.313 + </property>
1.314 + <property name="bottomMargin" >
1.315 + <number>0</number>
1.316 </property>
1.317 <item>
1.318 <spacer>