|
60 | 60 | <property name="geometry">
|
61 | 61 | <rect>
|
62 | 62 | <x>0</x>
|
63 |
| - <y>-312</y> |
64 |
| - <width>314</width> |
65 |
| - <height>871</height> |
| 63 | + <y>-275</y> |
| 64 | + <width>316</width> |
| 65 | + <height>827</height> |
66 | 66 | </rect>
|
67 | 67 | </property>
|
68 | 68 | <layout class="QVBoxLayout" name="mainLayout">
|
|
333 | 333 | <string>SVG Parameters</string>
|
334 | 334 | </property>
|
335 | 335 | <layout class="QGridLayout" name="gridLayout_3">
|
| 336 | + <item row="0" column="2"> |
| 337 | + <spacer name="horizontalSpacer"> |
| 338 | + <property name="orientation"> |
| 339 | + <enum>Qt::Horizontal</enum> |
| 340 | + </property> |
| 341 | + <property name="sizeHint" stdset="0"> |
| 342 | + <size> |
| 343 | + <width>40</width> |
| 344 | + <height>20</height> |
| 345 | + </size> |
| 346 | + </property> |
| 347 | + </spacer> |
| 348 | + </item> |
336 | 349 | <item row="2" column="1">
|
337 | 350 | <widget class="QgsDoubleSpinBox" name="mOutlineWidthSpinBox">
|
338 | 351 | <property name="sizePolicy">
|
|
361 | 374 | </property>
|
362 | 375 | </widget>
|
363 | 376 | </item>
|
364 |
| - <item row="1" column="1"> |
365 |
| - <widget class="QgsColorButton" name="mOutlineColorButton"> |
| 377 | + <item row="0" column="3"> |
| 378 | + <widget class="QgsDataDefinedButtonV2" name="mFillColorDDBtn"> |
| 379 | + <property name="text"> |
| 380 | + <string>...</string> |
| 381 | + </property> |
| 382 | + </widget> |
| 383 | + </item> |
| 384 | + <item row="1" column="0"> |
| 385 | + <widget class="QLabel" name="mBorderColorLabel"> |
| 386 | + <property name="sizePolicy"> |
| 387 | + <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
| 388 | + <horstretch>0</horstretch> |
| 389 | + <verstretch>0</verstretch> |
| 390 | + </sizepolicy> |
| 391 | + </property> |
| 392 | + <property name="text"> |
| 393 | + <string>Outline color</string> |
| 394 | + </property> |
| 395 | + </widget> |
| 396 | + </item> |
| 397 | + <item row="0" column="1"> |
| 398 | + <widget class="QgsColorButton" name="mFillColorButton"> |
366 | 399 | <property name="minimumSize">
|
367 | 400 | <size>
|
368 | 401 | <width>120</width>
|
|
380 | 413 | </property>
|
381 | 414 | </widget>
|
382 | 415 | </item>
|
383 |
| - <item row="0" column="1"> |
384 |
| - <widget class="QgsColorButton" name="mFillColorButton"> |
| 416 | + <item row="2" column="0"> |
| 417 | + <widget class="QLabel" name="mBorderWidthLabel"> |
| 418 | + <property name="text"> |
| 419 | + <string>Outline width</string> |
| 420 | + </property> |
| 421 | + </widget> |
| 422 | + </item> |
| 423 | + <item row="1" column="1"> |
| 424 | + <widget class="QgsColorButton" name="mOutlineColorButton"> |
385 | 425 | <property name="minimumSize">
|
386 | 426 | <size>
|
387 | 427 | <width>120</width>
|
|
399 | 439 | </property>
|
400 | 440 | </widget>
|
401 | 441 | </item>
|
402 |
| - <item row="1" column="0"> |
403 |
| - <widget class="QLabel" name="mBorderColorLabel"> |
| 442 | + <item row="0" column="0"> |
| 443 | + <widget class="QLabel" name="label_6"> |
404 | 444 | <property name="sizePolicy">
|
405 | 445 | <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
|
406 | 446 | <horstretch>0</horstretch>
|
407 | 447 | <verstretch>0</verstretch>
|
408 | 448 | </sizepolicy>
|
409 | 449 | </property>
|
410 | 450 | <property name="text">
|
411 |
| - <string>Outline color</string> |
| 451 | + <string>Fill color</string> |
412 | 452 | </property>
|
413 | 453 | </widget>
|
414 | 454 | </item>
|
415 |
| - <item row="2" column="0"> |
416 |
| - <widget class="QLabel" name="mBorderWidthLabel"> |
| 455 | + <item row="1" column="3"> |
| 456 | + <widget class="QgsDataDefinedButtonV2" name="mOutlineColorDDBtn"> |
417 | 457 | <property name="text">
|
418 |
| - <string>Outline width</string> |
| 458 | + <string>...</string> |
419 | 459 | </property>
|
420 | 460 | </widget>
|
421 | 461 | </item>
|
422 |
| - <item row="0" column="0"> |
423 |
| - <widget class="QLabel" name="label_6"> |
424 |
| - <property name="sizePolicy"> |
425 |
| - <sizepolicy hsizetype="Maximum" vsizetype="Preferred"> |
426 |
| - <horstretch>0</horstretch> |
427 |
| - <verstretch>0</verstretch> |
428 |
| - </sizepolicy> |
429 |
| - </property> |
| 462 | + <item row="2" column="3"> |
| 463 | + <widget class="QgsDataDefinedButtonV2" name="mOutlineWidthDDBtn"> |
430 | 464 | <property name="text">
|
431 |
| - <string>Fill color</string> |
| 465 | + <string>...</string> |
432 | 466 | </property>
|
433 | 467 | </widget>
|
434 | 468 | </item>
|
435 |
| - <item row="0" column="2"> |
436 |
| - <spacer name="horizontalSpacer"> |
437 |
| - <property name="orientation"> |
438 |
| - <enum>Qt::Horizontal</enum> |
439 |
| - </property> |
440 |
| - <property name="sizeHint" stdset="0"> |
441 |
| - <size> |
442 |
| - <width>40</width> |
443 |
| - <height>20</height> |
444 |
| - </size> |
445 |
| - </property> |
446 |
| - </spacer> |
447 |
| - </item> |
448 | 469 | </layout>
|
449 | 470 | </widget>
|
450 | 471 | </item>
|
|
527 | 548 | </widget>
|
528 | 549 | <layoutdefault spacing="6" margin="11"/>
|
529 | 550 | <customwidgets>
|
530 |
| - <customwidget> |
531 |
| - <class>QgsCollapsibleGroupBoxBasic</class> |
532 |
| - <extends>QGroupBox</extends> |
533 |
| - <header location="global">qgscollapsiblegroupbox.h</header> |
534 |
| - <container>1</container> |
535 |
| - </customwidget> |
536 | 551 | <customwidget>
|
537 | 552 | <class>QgsColorButton</class>
|
538 | 553 | <extends>QToolButton</extends>
|
539 | 554 | <header>qgscolorbutton.h</header>
|
540 | 555 | <container>1</container>
|
541 | 556 | </customwidget>
|
| 557 | + <customwidget> |
| 558 | + <class>QgsDataDefinedButtonV2</class> |
| 559 | + <extends>QToolButton</extends> |
| 560 | + <header>qgsdatadefinedbuttonv2.h</header> |
| 561 | + </customwidget> |
542 | 562 | <customwidget>
|
543 | 563 | <class>QgsDoubleSpinBox</class>
|
544 | 564 | <extends>QDoubleSpinBox</extends>
|
545 | 565 | <header>qgsdoublespinbox.h</header>
|
546 | 566 | </customwidget>
|
547 | 567 | <customwidget>
|
548 |
| - <class>QgsDataDefinedButtonV2</class> |
549 |
| - <extends>QToolButton</extends> |
550 |
| - <header>qgsdatadefinedbuttonv2.h</header> |
| 568 | + <class>QgsCollapsibleGroupBoxBasic</class> |
| 569 | + <extends>QGroupBox</extends> |
| 570 | + <header location="global">qgscollapsiblegroupbox.h</header> |
| 571 | + <container>1</container> |
551 | 572 | </customwidget>
|
552 | 573 | <customwidget>
|
553 | 574 | <class>QgsComposerItemComboBox</class>
|
|
569 | 590 | <tabstop>mRemoveDirectoryButton</tabstop>
|
570 | 591 | <tabstop>mAddDirectoryButton</tabstop>
|
571 | 592 | <tabstop>mFillColorButton</tabstop>
|
| 593 | + <tabstop>mFillColorDDBtn</tabstop> |
572 | 594 | <tabstop>mOutlineColorButton</tabstop>
|
| 595 | + <tabstop>mOutlineColorDDBtn</tabstop> |
573 | 596 | <tabstop>mOutlineWidthSpinBox</tabstop>
|
| 597 | + <tabstop>mOutlineWidthDDBtn</tabstop> |
574 | 598 | <tabstop>mRotationGroupBox</tabstop>
|
575 | 599 | <tabstop>mPictureRotationSpinBox</tabstop>
|
576 | 600 | <tabstop>mRotationFromComposerMapCheckBox</tabstop>
|
577 | 601 | <tabstop>mComposerMapComboBox</tabstop>
|
| 602 | + <tabstop>mNorthTypeComboBox</tabstop> |
| 603 | + <tabstop>mPictureRotationOffsetSpinBox</tabstop> |
578 | 604 | </tabstops>
|
579 | 605 | <resources/>
|
580 | 606 | <connections/>
|
|
0 commit comments