Merge lp:~brendan-donegan/checkbox/bug937113_test_selection_views into lp:checkbox
- bug937113_test_selection_views
- Merge into trunk
Proposed by
Brendan Donegan
| Status: | Merged |
|---|---|
| Merged at revision: | 1278 |
| Proposed branch: | lp:~brendan-donegan/checkbox/bug937113_test_selection_views |
| Merge into: | lp:checkbox |
| Diff against target: |
665 lines (+256/-209) 2 files modified
debian/changelog (+1/-0) qt/frontend/qtfront.ui (+255/-209) |
| To merge this branch: | bzr merge lp:~brendan-donegan/checkbox/bug937113_test_selection_views |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Marc Tardif (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Description of the change
This branch increases the size of some of the views in Checkbox Qt. It also changes the color of the title pane to try and match the color used by the windows title bar.
To post a comment you must log in.
Revision history for this message
| Brendan Donegan (brendan-donegan) wrote : | # |
Yes, the intention is for the title bar to be a dark grey. This is supposed to be part of the design. I haven't really gotten the color right so if you want I can revert that particular aspect of the change.
Revision history for this message
| Marc Tardif (cr3) wrote : | # |
Following confirmation from Victor, looks good!
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'debian/changelog' | |||
| 2 | --- debian/changelog 2012-02-20 08:22:59 +0000 | |||
| 3 | +++ debian/changelog 2012-02-21 09:14:17 +0000 | |||
| 4 | @@ -8,6 +8,7 @@ | |||
| 5 | 8 | 8 | ||
| 6 | 9 | [Brendan Donegan] | 9 | [Brendan Donegan] |
| 7 | 10 | * Typo in command for for miscellanea/virtualization-check (LP: #934243) | 10 | * Typo in command for for miscellanea/virtualization-check (LP: #934243) |
| 8 | 11 | * Resized test selection views in checkbox-qt (LP: #937113) | ||
| 9 | 11 | 12 | ||
| 10 | 12 | -- Marc Tardif <marc@ubuntu.com> Thu, 16 Feb 2012 10:31:18 -0500 | 13 | -- Marc Tardif <marc@ubuntu.com> Thu, 16 Feb 2012 10:31:18 -0500 |
| 11 | 13 | 14 | ||
| 12 | 14 | 15 | ||
| 13 | === modified file 'qt/frontend/qtfront.ui' | |||
| 14 | --- qt/frontend/qtfront.ui 2012-02-15 19:52:52 +0000 | |||
| 15 | +++ qt/frontend/qtfront.ui 2012-02-21 09:14:17 +0000 | |||
| 16 | @@ -47,7 +47,7 @@ | |||
| 17 | 47 | <enum>QTabWidget::Rounded</enum> | 47 | <enum>QTabWidget::Rounded</enum> |
| 18 | 48 | </property> | 48 | </property> |
| 19 | 49 | <property name="currentIndex"> | 49 | <property name="currentIndex"> |
| 21 | 50 | <number>0</number> | 50 | <number>1</number> |
| 22 | 51 | </property> | 51 | </property> |
| 23 | 52 | <widget class="QWidget" name="tabWelcome"> | 52 | <widget class="QWidget" name="tabWelcome"> |
| 24 | 53 | <attribute name="title"> | 53 | <attribute name="title"> |
| 25 | @@ -159,9 +159,9 @@ | |||
| 26 | 159 | <property name="geometry"> | 159 | <property name="geometry"> |
| 27 | 160 | <rect> | 160 | <rect> |
| 28 | 161 | <x>30</x> | 161 | <x>30</x> |
| 30 | 162 | <y>40</y> | 162 | <y>10</y> |
| 31 | 163 | <width>571</width> | 163 | <width>571</width> |
| 33 | 164 | <height>181</height> | 164 | <height>261</height> |
| 34 | 165 | </rect> | 165 | </rect> |
| 35 | 166 | </property> | 166 | </property> |
| 36 | 167 | <property name="frameShape"> | 167 | <property name="frameShape"> |
| 37 | @@ -178,7 +178,7 @@ | |||
| 38 | 178 | <property name="geometry"> | 178 | <property name="geometry"> |
| 39 | 179 | <rect> | 179 | <rect> |
| 40 | 180 | <x>30</x> | 180 | <x>30</x> |
| 42 | 181 | <y>230</y> | 181 | <y>280</y> |
| 43 | 182 | <width>571</width> | 182 | <width>571</width> |
| 44 | 183 | <height>31</height> | 183 | <height>31</height> |
| 45 | 184 | </rect> | 184 | </rect> |
| 46 | @@ -189,14 +189,14 @@ | |||
| 47 | 189 | </font> | 189 | </font> |
| 48 | 190 | </property> | 190 | </property> |
| 49 | 191 | <property name="text"> | 191 | <property name="text"> |
| 51 | 192 | <string>Ok</string> | 192 | <string>OK</string> |
| 52 | 193 | </property> | 193 | </property> |
| 53 | 194 | </widget> | 194 | </widget> |
| 54 | 195 | <widget class="QCheckBox" name="checkBox"> | 195 | <widget class="QCheckBox" name="checkBox"> |
| 55 | 196 | <property name="geometry"> | 196 | <property name="geometry"> |
| 56 | 197 | <rect> | 197 | <rect> |
| 57 | 198 | <x>310</x> | 198 | <x>310</x> |
| 59 | 199 | <y>280</y> | 199 | <y>320</y> |
| 60 | 200 | <width>321</width> | 200 | <width>321</width> |
| 61 | 201 | <height>20</height> | 201 | <height>20</height> |
| 62 | 202 | </rect> | 202 | </rect> |
| 63 | @@ -246,8 +246,99 @@ | |||
| 64 | 246 | <height>89</height> | 246 | <height>89</height> |
| 65 | 247 | </size> | 247 | </size> |
| 66 | 248 | </property> | 248 | </property> |
| 67 | 249 | <property name="palette"> | ||
| 68 | 250 | <palette> | ||
| 69 | 251 | <active> | ||
| 70 | 252 | <colorrole role="Button"> | ||
| 71 | 253 | <brush brushstyle="SolidPattern"> | ||
| 72 | 254 | <color alpha="255"> | ||
| 73 | 255 | <red>73</red> | ||
| 74 | 256 | <green>73</green> | ||
| 75 | 257 | <blue>80</blue> | ||
| 76 | 258 | </color> | ||
| 77 | 259 | </brush> | ||
| 78 | 260 | </colorrole> | ||
| 79 | 261 | <colorrole role="Base"> | ||
| 80 | 262 | <brush brushstyle="SolidPattern"> | ||
| 81 | 263 | <color alpha="255"> | ||
| 82 | 264 | <red>73</red> | ||
| 83 | 265 | <green>73</green> | ||
| 84 | 266 | <blue>80</blue> | ||
| 85 | 267 | </color> | ||
| 86 | 268 | </brush> | ||
| 87 | 269 | </colorrole> | ||
| 88 | 270 | <colorrole role="Window"> | ||
| 89 | 271 | <brush brushstyle="SolidPattern"> | ||
| 90 | 272 | <color alpha="255"> | ||
| 91 | 273 | <red>73</red> | ||
| 92 | 274 | <green>73</green> | ||
| 93 | 275 | <blue>80</blue> | ||
| 94 | 276 | </color> | ||
| 95 | 277 | </brush> | ||
| 96 | 278 | </colorrole> | ||
| 97 | 279 | </active> | ||
| 98 | 280 | <inactive> | ||
| 99 | 281 | <colorrole role="Button"> | ||
| 100 | 282 | <brush brushstyle="SolidPattern"> | ||
| 101 | 283 | <color alpha="255"> | ||
| 102 | 284 | <red>73</red> | ||
| 103 | 285 | <green>73</green> | ||
| 104 | 286 | <blue>80</blue> | ||
| 105 | 287 | </color> | ||
| 106 | 288 | </brush> | ||
| 107 | 289 | </colorrole> | ||
| 108 | 290 | <colorrole role="Base"> | ||
| 109 | 291 | <brush brushstyle="SolidPattern"> | ||
| 110 | 292 | <color alpha="255"> | ||
| 111 | 293 | <red>73</red> | ||
| 112 | 294 | <green>73</green> | ||
| 113 | 295 | <blue>80</blue> | ||
| 114 | 296 | </color> | ||
| 115 | 297 | </brush> | ||
| 116 | 298 | </colorrole> | ||
| 117 | 299 | <colorrole role="Window"> | ||
| 118 | 300 | <brush brushstyle="SolidPattern"> | ||
| 119 | 301 | <color alpha="255"> | ||
| 120 | 302 | <red>73</red> | ||
| 121 | 303 | <green>73</green> | ||
| 122 | 304 | <blue>80</blue> | ||
| 123 | 305 | </color> | ||
| 124 | 306 | </brush> | ||
| 125 | 307 | </colorrole> | ||
| 126 | 308 | </inactive> | ||
| 127 | 309 | <disabled> | ||
| 128 | 310 | <colorrole role="Button"> | ||
| 129 | 311 | <brush brushstyle="SolidPattern"> | ||
| 130 | 312 | <color alpha="255"> | ||
| 131 | 313 | <red>73</red> | ||
| 132 | 314 | <green>73</green> | ||
| 133 | 315 | <blue>80</blue> | ||
| 134 | 316 | </color> | ||
| 135 | 317 | </brush> | ||
| 136 | 318 | </colorrole> | ||
| 137 | 319 | <colorrole role="Base"> | ||
| 138 | 320 | <brush brushstyle="SolidPattern"> | ||
| 139 | 321 | <color alpha="255"> | ||
| 140 | 322 | <red>73</red> | ||
| 141 | 323 | <green>73</green> | ||
| 142 | 324 | <blue>80</blue> | ||
| 143 | 325 | </color> | ||
| 144 | 326 | </brush> | ||
| 145 | 327 | </colorrole> | ||
| 146 | 328 | <colorrole role="Window"> | ||
| 147 | 329 | <brush brushstyle="SolidPattern"> | ||
| 148 | 330 | <color alpha="255"> | ||
| 149 | 331 | <red>73</red> | ||
| 150 | 332 | <green>73</green> | ||
| 151 | 333 | <blue>80</blue> | ||
| 152 | 334 | </color> | ||
| 153 | 335 | </brush> | ||
| 154 | 336 | </colorrole> | ||
| 155 | 337 | </disabled> | ||
| 156 | 338 | </palette> | ||
| 157 | 339 | </property> | ||
| 158 | 249 | <property name="styleSheet"> | 340 | <property name="styleSheet"> |
| 160 | 250 | <string notr="true">background-color: #C2C7CB;</string> | 341 | <string notr="true">background: #494950;</string> |
| 161 | 251 | </property> | 342 | </property> |
| 162 | 252 | <widget class="QLabel" name="progressLabel"> | 343 | <widget class="QLabel" name="progressLabel"> |
| 163 | 253 | <property name="geometry"> | 344 | <property name="geometry"> |
| 164 | @@ -270,6 +361,13 @@ | |||
| 165 | 270 | <pointsize>11</pointsize> | 361 | <pointsize>11</pointsize> |
| 166 | 271 | </font> | 362 | </font> |
| 167 | 272 | </property> | 363 | </property> |
| 168 | 364 | <property name="autoFillBackground"> | ||
| 169 | 365 | <bool>false</bool> | ||
| 170 | 366 | </property> | ||
| 171 | 367 | <property name="styleSheet"> | ||
| 172 | 368 | <string notr="true">color: "white"; | ||
| 173 | 369 | background: transparent;</string> | ||
| 174 | 370 | </property> | ||
| 175 | 273 | <property name="text"> | 371 | <property name="text"> |
| 176 | 274 | <string>10 tests completed out of 30 (30%)</string> | 372 | <string>10 tests completed out of 30 (30%)</string> |
| 177 | 275 | </property> | 373 | </property> |
| 178 | @@ -279,10 +377,13 @@ | |||
| 179 | 279 | <rect> | 377 | <rect> |
| 180 | 280 | <x>50</x> | 378 | <x>50</x> |
| 181 | 281 | <y>40</y> | 379 | <y>40</y> |
| 183 | 282 | <width>118</width> | 380 | <width>241</width> |
| 184 | 283 | <height>16</height> | 381 | <height>16</height> |
| 185 | 284 | </rect> | 382 | </rect> |
| 186 | 285 | </property> | 383 | </property> |
| 187 | 384 | <property name="styleSheet"> | ||
| 188 | 385 | <string notr="true"/> | ||
| 189 | 386 | </property> | ||
| 190 | 286 | <property name="minimum"> | 387 | <property name="minimum"> |
| 191 | 287 | <number>0</number> | 388 | <number>0</number> |
| 192 | 288 | </property> | 389 | </property> |
| 193 | @@ -326,7 +427,7 @@ | |||
| 194 | 326 | </property> | 427 | </property> |
| 195 | 327 | <property name="styleSheet"> | 428 | <property name="styleSheet"> |
| 196 | 328 | <string notr="true"> QTabWidget::pane#testsTab { /* The tab widget frame */ | 429 | <string notr="true"> QTabWidget::pane#testsTab { /* The tab widget frame */ |
| 198 | 329 | border-top: 15 solid #C2C7CB; | 430 | border-top: 15 solid #494950; |
| 199 | 330 | position: absolute; | 431 | position: absolute; |
| 200 | 331 | top: -1.7em; | 432 | top: -1.7em; |
| 201 | 332 | } | 433 | } |
| 202 | @@ -342,14 +443,12 @@ | |||
| 203 | 342 | min-width: 10ex; | 443 | min-width: 10ex; |
| 204 | 343 | min-height: 3ex; | 444 | min-height: 3ex; |
| 205 | 344 | padding: 0px; | 445 | padding: 0px; |
| 210 | 345 | border-top-left-radius: 4px; | 446 | border-radius: 4px; |
| 207 | 346 | border-top-right-radius: 4px; | ||
| 208 | 347 | border-bottom-left-radius: 4px; | ||
| 209 | 348 | border-bottom-right-radius: 4px; | ||
| 211 | 349 | } | 447 | } |
| 212 | 350 | 448 | ||
| 213 | 351 | QTabBar::tab:selected { | 449 | QTabBar::tab:selected { |
| 215 | 352 | background: #C2C7CB; | 450 | color: #FFFFFF; |
| 216 | 451 | background: #494950; | ||
| 217 | 353 | border-color: #000000; | 452 | border-color: #000000; |
| 218 | 354 | border-bottom-color: #000000; | 453 | border-bottom-color: #000000; |
| 219 | 355 | }</string> | 454 | }</string> |
| 220 | @@ -358,7 +457,7 @@ | |||
| 221 | 358 | <enum>QTabWidget::Rounded</enum> | 457 | <enum>QTabWidget::Rounded</enum> |
| 222 | 359 | </property> | 458 | </property> |
| 223 | 360 | <property name="currentIndex"> | 459 | <property name="currentIndex"> |
| 225 | 361 | <number>1</number> | 460 | <number>2</number> |
| 226 | 362 | </property> | 461 | </property> |
| 227 | 363 | <widget class="QWidget" name="welcome"> | 462 | <widget class="QWidget" name="welcome"> |
| 228 | 364 | <property name="font"> | 463 | <property name="font"> |
| 229 | @@ -395,10 +494,10 @@ | |||
| 230 | 395 | <widget class="Line" name="line"> | 494 | <widget class="Line" name="line"> |
| 231 | 396 | <property name="geometry"> | 495 | <property name="geometry"> |
| 232 | 397 | <rect> | 496 | <rect> |
| 234 | 398 | <x>40</x> | 497 | <x>10</x> |
| 235 | 399 | <y>60</y> | 498 | <y>60</y> |
| 238 | 400 | <width>571</width> | 499 | <width>601</width> |
| 239 | 401 | <height>16</height> | 500 | <height>20</height> |
| 240 | 402 | </rect> | 501 | </rect> |
| 241 | 403 | </property> | 502 | </property> |
| 242 | 404 | <property name="orientation"> | 503 | <property name="orientation"> |
| 243 | @@ -408,10 +507,10 @@ | |||
| 244 | 408 | <widget class="Line" name="line_2"> | 507 | <widget class="Line" name="line_2"> |
| 245 | 409 | <property name="geometry"> | 508 | <property name="geometry"> |
| 246 | 410 | <rect> | 509 | <rect> |
| 248 | 411 | <x>410</x> | 510 | <x>390</x> |
| 249 | 412 | <y>40</y> | 511 | <y>40</y> |
| 250 | 413 | <width>20</width> | 512 | <width>20</width> |
| 252 | 414 | <height>211</height> | 513 | <height>271</height> |
| 253 | 415 | </rect> | 514 | </rect> |
| 254 | 416 | </property> | 515 | </property> |
| 255 | 417 | <property name="orientation"> | 516 | <property name="orientation"> |
| 256 | @@ -421,7 +520,7 @@ | |||
| 257 | 421 | <widget class="QLabel" name="label_2"> | 520 | <widget class="QLabel" name="label_2"> |
| 258 | 422 | <property name="geometry"> | 521 | <property name="geometry"> |
| 259 | 423 | <rect> | 522 | <rect> |
| 261 | 424 | <x>50</x> | 523 | <x>10</x> |
| 262 | 425 | <y>50</y> | 524 | <y>50</y> |
| 263 | 426 | <width>101</width> | 525 | <width>101</width> |
| 264 | 427 | <height>17</height> | 526 | <height>17</height> |
| 265 | @@ -434,7 +533,7 @@ | |||
| 266 | 434 | <widget class="QLabel" name="label_3"> | 533 | <widget class="QLabel" name="label_3"> |
| 267 | 435 | <property name="geometry"> | 534 | <property name="geometry"> |
| 268 | 436 | <rect> | 535 | <rect> |
| 270 | 437 | <x>430</x> | 536 | <x>410</x> |
| 271 | 438 | <y>50</y> | 537 | <y>50</y> |
| 272 | 439 | <width>67</width> | 538 | <width>67</width> |
| 273 | 440 | <height>17</height> | 539 | <height>17</height> |
| 274 | @@ -450,10 +549,10 @@ | |||
| 275 | 450 | </property> | 549 | </property> |
| 276 | 451 | <property name="geometry"> | 550 | <property name="geometry"> |
| 277 | 452 | <rect> | 551 | <rect> |
| 279 | 453 | <x>430</x> | 552 | <x>410</x> |
| 280 | 454 | <y>80</y> | 553 | <y>80</y> |
| 283 | 455 | <width>181</width> | 554 | <width>201</width> |
| 284 | 456 | <height>171</height> | 555 | <height>231</height> |
| 285 | 457 | </rect> | 556 | </rect> |
| 286 | 458 | </property> | 557 | </property> |
| 287 | 459 | <property name="palette"> | 558 | <property name="palette"> |
| 288 | @@ -515,10 +614,10 @@ | |||
| 289 | 515 | <widget class="QTreeView" name="treeView"> | 614 | <widget class="QTreeView" name="treeView"> |
| 290 | 516 | <property name="geometry"> | 615 | <property name="geometry"> |
| 291 | 517 | <rect> | 616 | <rect> |
| 293 | 518 | <x>50</x> | 617 | <x>10</x> |
| 294 | 519 | <y>80</y> | 618 | <y>80</y> |
| 297 | 520 | <width>361</width> | 619 | <width>381</width> |
| 298 | 521 | <height>171</height> | 620 | <height>231</height> |
| 299 | 522 | </rect> | 621 | </rect> |
| 300 | 523 | </property> | 622 | </property> |
| 301 | 524 | <property name="frameShape"> | 623 | <property name="frameShape"> |
| 302 | @@ -543,9 +642,9 @@ | |||
| 303 | 543 | </property> | 642 | </property> |
| 304 | 544 | <property name="geometry"> | 643 | <property name="geometry"> |
| 305 | 545 | <rect> | 644 | <rect> |
| 309 | 546 | <x>430</x> | 645 | <x>410</x> |
| 310 | 547 | <y>260</y> | 646 | <y>320</y> |
| 311 | 548 | <width>181</width> | 647 | <width>201</width> |
| 312 | 549 | <height>27</height> | 648 | <height>27</height> |
| 313 | 550 | </rect> | 649 | </rect> |
| 314 | 551 | </property> | 650 | </property> |
| 315 | @@ -592,12 +691,12 @@ | |||
| 316 | 592 | <number>0</number> | 691 | <number>0</number> |
| 317 | 593 | </property> | 692 | </property> |
| 318 | 594 | <item> | 693 | <item> |
| 320 | 595 | <layout class="QVBoxLayout" name="verticalLayout_2"> | 694 | <layout class="QVBoxLayout" name="testVLayout"> |
| 321 | 596 | <property name="spacing"> | 695 | <property name="spacing"> |
| 322 | 597 | <number>0</number> | 696 | <number>0</number> |
| 323 | 598 | </property> | 697 | </property> |
| 324 | 599 | <item> | 698 | <item> |
| 326 | 600 | <widget class="QWidget" name="widget_2" native="true"> | 699 | <widget class="QFrame" name="titleFrame"> |
| 327 | 601 | <property name="sizePolicy"> | 700 | <property name="sizePolicy"> |
| 328 | 602 | <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> | 701 | <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> |
| 329 | 603 | <horstretch>0</horstretch> | 702 | <horstretch>0</horstretch> |
| 330 | @@ -613,31 +712,49 @@ | |||
| 331 | 613 | <widget class="QLabel" name="testTypeLabel"> | 712 | <widget class="QLabel" name="testTypeLabel"> |
| 332 | 614 | <property name="geometry"> | 713 | <property name="geometry"> |
| 333 | 615 | <rect> | 714 | <rect> |
| 338 | 616 | <x>20</x> | 715 | <x>10</x> |
| 339 | 617 | <y>6</y> | 716 | <y>0</y> |
| 340 | 618 | <width>291</width> | 717 | <width>611</width> |
| 341 | 619 | <height>31</height> | 718 | <height>25</height> |
| 342 | 620 | </rect> | 719 | </rect> |
| 343 | 621 | </property> | 720 | </property> |
| 344 | 721 | <property name="sizePolicy"> | ||
| 345 | 722 | <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> | ||
| 346 | 723 | <horstretch>0</horstretch> | ||
| 347 | 724 | <verstretch>0</verstretch> | ||
| 348 | 725 | </sizepolicy> | ||
| 349 | 726 | </property> | ||
| 350 | 622 | <property name="font"> | 727 | <property name="font"> |
| 351 | 623 | <font> | 728 | <font> |
| 352 | 624 | <family>Ubuntu</family> | 729 | <family>Ubuntu</family> |
| 354 | 625 | <pointsize>17</pointsize> | 730 | <pointsize>16</pointsize> |
| 355 | 626 | </font> | 731 | </font> |
| 356 | 627 | </property> | 732 | </property> |
| 357 | 628 | <property name="text"> | 733 | <property name="text"> |
| 358 | 629 | <string>TextLabel</string> | 734 | <string>TextLabel</string> |
| 359 | 630 | </property> | 735 | </property> |
| 360 | 736 | <property name="alignment"> | ||
| 361 | 737 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> | ||
| 362 | 738 | </property> | ||
| 363 | 739 | <property name="wordWrap"> | ||
| 364 | 740 | <bool>true</bool> | ||
| 365 | 741 | </property> | ||
| 366 | 631 | </widget> | 742 | </widget> |
| 367 | 632 | <widget class="QLabel" name="purposeLabel"> | 743 | <widget class="QLabel" name="purposeLabel"> |
| 368 | 633 | <property name="geometry"> | 744 | <property name="geometry"> |
| 369 | 634 | <rect> | 745 | <rect> |
| 373 | 635 | <x>30</x> | 746 | <x>10</x> |
| 374 | 636 | <y>35</y> | 747 | <y>30</y> |
| 375 | 637 | <width>591</width> | 748 | <width>611</width> |
| 376 | 638 | <height>21</height> | 749 | <height>21</height> |
| 377 | 639 | </rect> | 750 | </rect> |
| 378 | 640 | </property> | 751 | </property> |
| 379 | 752 | <property name="sizePolicy"> | ||
| 380 | 753 | <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> | ||
| 381 | 754 | <horstretch>0</horstretch> | ||
| 382 | 755 | <verstretch>0</verstretch> | ||
| 383 | 756 | </sizepolicy> | ||
| 384 | 757 | </property> | ||
| 385 | 641 | <property name="font"> | 758 | <property name="font"> |
| 386 | 642 | <font> | 759 | <font> |
| 387 | 643 | <family>Ubuntu</family> | 760 | <family>Ubuntu</family> |
| 388 | @@ -650,180 +767,109 @@ | |||
| 389 | 650 | <property name="text"> | 767 | <property name="text"> |
| 390 | 651 | <string>TextLabel</string> | 768 | <string>TextLabel</string> |
| 391 | 652 | </property> | 769 | </property> |
| 392 | 770 | <property name="alignment"> | ||
| 393 | 771 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> | ||
| 394 | 772 | </property> | ||
| 395 | 773 | <property name="wordWrap"> | ||
| 396 | 774 | <bool>true</bool> | ||
| 397 | 775 | </property> | ||
| 398 | 653 | </widget> | 776 | </widget> |
| 399 | 654 | </widget> | 777 | </widget> |
| 400 | 655 | </item> | 778 | </item> |
| 401 | 656 | <item> | 779 | <item> |
| 413 | 657 | <widget class="QWidget" name="widget_3" native="true"> | 780 | <widget class="QFrame" name="testFrame"> |
| 414 | 658 | <layout class="QHBoxLayout" name="horizontalLayout_6"> | 781 | <layout class="QHBoxLayout" name="horizontalLayout_3"> |
| 415 | 659 | <property name="spacing"> | 782 | <item> |
| 416 | 660 | <number>0</number> | 783 | <widget class="QFrame" name="stepsFrame"> |
| 417 | 661 | </property> | 784 | <property name="sizePolicy"> |
| 418 | 662 | <property name="margin"> | 785 | <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> |
| 419 | 663 | <number>0</number> | 786 | <horstretch>30</horstretch> |
| 420 | 664 | </property> | 787 | <verstretch>30</verstretch> |
| 421 | 665 | <item> | 788 | </sizepolicy> |
| 422 | 666 | <layout class="QHBoxLayout" name="horizontalLayout_3"> | 789 | </property> |
| 423 | 667 | <property name="spacing"> | 790 | <property name="minimumSize"> |
| 424 | 791 | <size> | ||
| 425 | 792 | <width>0</width> | ||
| 426 | 793 | <height>0</height> | ||
| 427 | 794 | </size> | ||
| 428 | 795 | </property> | ||
| 429 | 796 | <property name="sizeIncrement"> | ||
| 430 | 797 | <size> | ||
| 431 | 798 | <width>0</width> | ||
| 432 | 799 | <height>0</height> | ||
| 433 | 800 | </size> | ||
| 434 | 801 | </property> | ||
| 435 | 802 | <property name="autoFillBackground"> | ||
| 436 | 803 | <bool>false</bool> | ||
| 437 | 804 | </property> | ||
| 438 | 805 | <property name="frameShape"> | ||
| 439 | 806 | <enum>QFrame::Box</enum> | ||
| 440 | 807 | </property> | ||
| 441 | 808 | <property name="frameShadow"> | ||
| 442 | 809 | <enum>QFrame::Plain</enum> | ||
| 443 | 810 | </property> | ||
| 444 | 811 | <property name="lineWidth"> | ||
| 445 | 812 | <number>1</number> | ||
| 446 | 813 | </property> | ||
| 447 | 814 | </widget> | ||
| 448 | 815 | </item> | ||
| 449 | 816 | <item> | ||
| 450 | 817 | <widget class="QFrame" name="testButtonsFrame"> | ||
| 451 | 818 | <property name="sizePolicy"> | ||
| 452 | 819 | <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding"> | ||
| 453 | 820 | <horstretch>6</horstretch> | ||
| 454 | 821 | <verstretch>0</verstretch> | ||
| 455 | 822 | </sizepolicy> | ||
| 456 | 823 | </property> | ||
| 457 | 824 | <property name="frameShape"> | ||
| 458 | 825 | <enum>QFrame::NoFrame</enum> | ||
| 459 | 826 | </property> | ||
| 460 | 827 | <property name="frameShadow"> | ||
| 461 | 828 | <enum>QFrame::Plain</enum> | ||
| 462 | 829 | </property> | ||
| 463 | 830 | <property name="lineWidth"> | ||
| 464 | 668 | <number>0</number> | 831 | <number>0</number> |
| 465 | 669 | </property> | 832 | </property> |
| 623 | 670 | <item> | 833 | <widget class="QPushButton" name="yesTestButton"> |
| 624 | 671 | <widget class="QWidget" name="widget_5" native="true"> | 834 | <property name="geometry"> |
| 625 | 672 | <property name="sizePolicy"> | 835 | <rect> |
| 626 | 673 | <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | 836 | <x>10</x> |
| 627 | 674 | <horstretch>0</horstretch> | 837 | <y>0</y> |
| 628 | 675 | <verstretch>0</verstretch> | 838 | <width>85</width> |
| 629 | 676 | </sizepolicy> | 839 | <height>27</height> |
| 630 | 677 | </property> | 840 | </rect> |
| 631 | 678 | <layout class="QHBoxLayout" name="horizontalLayout_8"> | 841 | </property> |
| 632 | 679 | <property name="spacing"> | 842 | <property name="text"> |
| 633 | 680 | <number>0</number> | 843 | <string>Yes</string> |
| 634 | 681 | </property> | 844 | </property> |
| 635 | 682 | <property name="margin"> | 845 | </widget> |
| 636 | 683 | <number>0</number> | 846 | <widget class="QPushButton" name="testTestButton"> |
| 637 | 684 | </property> | 847 | <property name="geometry"> |
| 638 | 685 | <item> | 848 | <rect> |
| 639 | 686 | <widget class="QScrollArea" name="scrollArea"> | 849 | <x>10</x> |
| 640 | 687 | <property name="sizePolicy"> | 850 | <y>40</y> |
| 641 | 688 | <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | 851 | <width>85</width> |
| 642 | 689 | <horstretch>0</horstretch> | 852 | <height>27</height> |
| 643 | 690 | <verstretch>0</verstretch> | 853 | </rect> |
| 644 | 691 | </sizepolicy> | 854 | </property> |
| 645 | 692 | </property> | 855 | <property name="text"> |
| 646 | 693 | <property name="frameShape"> | 856 | <string>Test</string> |
| 647 | 694 | <enum>QFrame::NoFrame</enum> | 857 | </property> |
| 648 | 695 | </property> | 858 | </widget> |
| 649 | 696 | <property name="frameShadow"> | 859 | <widget class="QPushButton" name="noTestButton"> |
| 650 | 697 | <enum>QFrame::Plain</enum> | 860 | <property name="geometry"> |
| 651 | 698 | </property> | 861 | <rect> |
| 652 | 699 | <property name="lineWidth"> | 862 | <x>10</x> |
| 653 | 700 | <number>0</number> | 863 | <y>80</y> |
| 654 | 701 | </property> | 864 | <width>85</width> |
| 655 | 702 | <property name="verticalScrollBarPolicy"> | 865 | <height>27</height> |
| 656 | 703 | <enum>Qt::ScrollBarAsNeeded</enum> | 866 | </rect> |
| 657 | 704 | </property> | 867 | </property> |
| 658 | 705 | <property name="horizontalScrollBarPolicy"> | 868 | <property name="text"> |
| 659 | 706 | <enum>Qt::ScrollBarAsNeeded</enum> | 869 | <string>No</string> |
| 660 | 707 | </property> | 870 | </property> |
| 661 | 708 | <property name="widgetResizable"> | 871 | </widget> |
| 662 | 709 | <bool>true</bool> | 872 | </widget> |
| 506 | 710 | </property> | ||
| 507 | 711 | <widget class="QWidget" name="scrollAreaWidgetContents"> | ||
| 508 | 712 | <property name="geometry"> | ||
| 509 | 713 | <rect> | ||
| 510 | 714 | <x>0</x> | ||
| 511 | 715 | <y>0</y> | ||
| 512 | 716 | <width>85</width> | ||
| 513 | 717 | <height>178</height> | ||
| 514 | 718 | </rect> | ||
| 515 | 719 | </property> | ||
| 516 | 720 | <layout class="QVBoxLayout" name="verticalLayout_9"> | ||
| 517 | 721 | <property name="spacing"> | ||
| 518 | 722 | <number>0</number> | ||
| 519 | 723 | </property> | ||
| 520 | 724 | <property name="sizeConstraint"> | ||
| 521 | 725 | <enum>QLayout::SetDefaultConstraint</enum> | ||
| 522 | 726 | </property> | ||
| 523 | 727 | <property name="margin"> | ||
| 524 | 728 | <number>0</number> | ||
| 525 | 729 | </property> | ||
| 526 | 730 | <item> | ||
| 527 | 731 | <widget class="QFrame" name="stepsFrame"> | ||
| 528 | 732 | <property name="sizePolicy"> | ||
| 529 | 733 | <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> | ||
| 530 | 734 | <horstretch>0</horstretch> | ||
| 531 | 735 | <verstretch>0</verstretch> | ||
| 532 | 736 | </sizepolicy> | ||
| 533 | 737 | </property> | ||
| 534 | 738 | <property name="minimumSize"> | ||
| 535 | 739 | <size> | ||
| 536 | 740 | <width>0</width> | ||
| 537 | 741 | <height>178</height> | ||
| 538 | 742 | </size> | ||
| 539 | 743 | </property> | ||
| 540 | 744 | <property name="sizeIncrement"> | ||
| 541 | 745 | <size> | ||
| 542 | 746 | <width>0</width> | ||
| 543 | 747 | <height>0</height> | ||
| 544 | 748 | </size> | ||
| 545 | 749 | </property> | ||
| 546 | 750 | <property name="autoFillBackground"> | ||
| 547 | 751 | <bool>false</bool> | ||
| 548 | 752 | </property> | ||
| 549 | 753 | <property name="frameShape"> | ||
| 550 | 754 | <enum>QFrame::Box</enum> | ||
| 551 | 755 | </property> | ||
| 552 | 756 | <property name="frameShadow"> | ||
| 553 | 757 | <enum>QFrame::Plain</enum> | ||
| 554 | 758 | </property> | ||
| 555 | 759 | <property name="lineWidth"> | ||
| 556 | 760 | <number>1</number> | ||
| 557 | 761 | </property> | ||
| 558 | 762 | </widget> | ||
| 559 | 763 | </item> | ||
| 560 | 764 | </layout> | ||
| 561 | 765 | </widget> | ||
| 562 | 766 | </widget> | ||
| 563 | 767 | </item> | ||
| 564 | 768 | </layout> | ||
| 565 | 769 | </widget> | ||
| 566 | 770 | </item> | ||
| 567 | 771 | <item> | ||
| 568 | 772 | <widget class="QWidget" name="widget_4" native="true"> | ||
| 569 | 773 | <property name="sizePolicy"> | ||
| 570 | 774 | <sizepolicy hsizetype="Fixed" vsizetype="Preferred"> | ||
| 571 | 775 | <horstretch>0</horstretch> | ||
| 572 | 776 | <verstretch>0</verstretch> | ||
| 573 | 777 | </sizepolicy> | ||
| 574 | 778 | </property> | ||
| 575 | 779 | <property name="minimumSize"> | ||
| 576 | 780 | <size> | ||
| 577 | 781 | <width>150</width> | ||
| 578 | 782 | <height>0</height> | ||
| 579 | 783 | </size> | ||
| 580 | 784 | </property> | ||
| 581 | 785 | <widget class="QPushButton" name="testTestButton"> | ||
| 582 | 786 | <property name="geometry"> | ||
| 583 | 787 | <rect> | ||
| 584 | 788 | <x>30</x> | ||
| 585 | 789 | <y>70</y> | ||
| 586 | 790 | <width>80</width> | ||
| 587 | 791 | <height>25</height> | ||
| 588 | 792 | </rect> | ||
| 589 | 793 | </property> | ||
| 590 | 794 | <property name="text"> | ||
| 591 | 795 | <string>Test</string> | ||
| 592 | 796 | </property> | ||
| 593 | 797 | </widget> | ||
| 594 | 798 | <widget class="QPushButton" name="yesTestButton"> | ||
| 595 | 799 | <property name="geometry"> | ||
| 596 | 800 | <rect> | ||
| 597 | 801 | <x>30</x> | ||
| 598 | 802 | <y>110</y> | ||
| 599 | 803 | <width>80</width> | ||
| 600 | 804 | <height>25</height> | ||
| 601 | 805 | </rect> | ||
| 602 | 806 | </property> | ||
| 603 | 807 | <property name="text"> | ||
| 604 | 808 | <string>Yes</string> | ||
| 605 | 809 | </property> | ||
| 606 | 810 | </widget> | ||
| 607 | 811 | <widget class="QPushButton" name="noTestButton"> | ||
| 608 | 812 | <property name="geometry"> | ||
| 609 | 813 | <rect> | ||
| 610 | 814 | <x>30</x> | ||
| 611 | 815 | <y>150</y> | ||
| 612 | 816 | <width>80</width> | ||
| 613 | 817 | <height>25</height> | ||
| 614 | 818 | </rect> | ||
| 615 | 819 | </property> | ||
| 616 | 820 | <property name="text"> | ||
| 617 | 821 | <string>No</string> | ||
| 618 | 822 | </property> | ||
| 619 | 823 | </widget> | ||
| 620 | 824 | </widget> | ||
| 621 | 825 | </item> | ||
| 622 | 826 | </layout> | ||
| 663 | 827 | </item> | 873 | </item> |
| 664 | 828 | </layout> | 874 | </layout> |
| 665 | 829 | </widget> | 875 | </widget> |
The grey area at the top of the window seems to be darker in this branch:
http://
http://
Is this intentional?