Skip to content

Commit 4e62dde

Browse files
nyalldawsonnyalldawson
committed
[composer] Reduce height of map grid list (fix #10881)
1 parent 8be42a0 commit 4e62dde

File tree

1 file changed

+107
-98
lines changed

1 file changed

+107
-98
lines changed

‎src/ui/qgscomposermapwidgetbase.ui

+107-98
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<property name="geometry">
5555
<rect>
5656
<x>0</x>
57-
<y>-629</y>
57+
<y>-387</y>
5858
<width>439</width>
59-
<height>2058</height>
59+
<height>1944</height>
6060
</rect>
6161
</property>
6262
<property name="sizePolicy">
@@ -355,13 +355,13 @@
355355
</property>
356356
</widget>
357357
</item>
358-
<item row="0" column="0">
359-
<widget class="QRadioButton" name="mAtlasMarginRadio">
360-
<property name="enabled">
361-
<bool>false</bool>
358+
<item row="1" column="0">
359+
<widget class="QRadioButton" name="mAtlasPredefinedScaleRadio">
360+
<property name="toolTip">
361+
<string>Use one of the predefined scales of the project where the atlas feature best fits.</string>
362362
</property>
363363
<property name="text">
364-
<string>Margin around feature</string>
364+
<string>Predefined scale (best fit)</string>
365365
</property>
366366
</widget>
367367
</item>
@@ -375,13 +375,13 @@
375375
</property>
376376
</widget>
377377
</item>
378-
<item row="1" column="0">
379-
<widget class="QRadioButton" name="mAtlasPredefinedScaleRadio">
380-
<property name="toolTip">
381-
<string>Use one of the predefined scales of the project where the atlas feature best fits.</string>
378+
<item row="0" column="0">
379+
<widget class="QRadioButton" name="mAtlasMarginRadio">
380+
<property name="enabled">
381+
<bool>false</bool>
382382
</property>
383383
<property name="text">
384-
<string>Predefined scale (best fit)</string>
384+
<string>Margin around feature</string>
385385
</property>
386386
</widget>
387387
</item>
@@ -391,16 +391,19 @@
391391
<item>
392392
<widget class="QgsCollapsibleGroupBoxBasic" name="mGridGroupBox">
393393
<property name="title">
394-
<string>Grid</string>
394+
<string>Grids</string>
395395
</property>
396396
<property name="collapsed" stdset="0">
397397
<bool>true</bool>
398398
</property>
399-
<layout class="QGridLayout" name="gridLayout_3">
400-
<item row="0" column="0">
399+
<layout class="QVBoxLayout" name="verticalLayout_3">
400+
<item>
401401
<layout class="QHBoxLayout" name="horizontalLayout_8">
402402
<item>
403403
<widget class="QPushButton" name="mAddGridPushButton">
404+
<property name="toolTip">
405+
<string>Add a new grid</string>
406+
</property>
404407
<property name="text">
405408
<string/>
406409
</property>
@@ -412,6 +415,9 @@
412415
</item>
413416
<item>
414417
<widget class="QPushButton" name="mRemoveGridPushButton">
418+
<property name="toolTip">
419+
<string>Remove selected grid</string>
420+
</property>
415421
<property name="text">
416422
<string/>
417423
</property>
@@ -423,6 +429,9 @@
423429
</item>
424430
<item>
425431
<widget class="QPushButton" name="mGridUpButton">
432+
<property name="toolTip">
433+
<string>Move selected grid up</string>
434+
</property>
426435
<property name="text">
427436
<string/>
428437
</property>
@@ -434,6 +443,9 @@
434443
</item>
435444
<item>
436445
<widget class="QPushButton" name="mGridDownButton">
446+
<property name="toolTip">
447+
<string>Move selected grid down</string>
448+
</property>
437449
<property name="text">
438450
<string/>
439451
</property>
@@ -445,17 +457,23 @@
445457
</item>
446458
</layout>
447459
</item>
448-
<item row="1" column="0">
460+
<item>
449461
<widget class="QListWidget" name="mGridListWidget">
450462
<property name="sizePolicy">
451463
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
452464
<horstretch>0</horstretch>
453465
<verstretch>0</verstretch>
454466
</sizepolicy>
455467
</property>
468+
<property name="maximumSize">
469+
<size>
470+
<width>16777215</width>
471+
<height>90</height>
472+
</size>
473+
</property>
456474
</widget>
457475
</item>
458-
<item row="2" column="0">
476+
<item>
459477
<widget class="QGroupBox" name="mGridCheckBox">
460478
<property name="title">
461479
<string>Draw grid</string>
@@ -597,7 +615,7 @@
597615
</property>
598616
</widget>
599617
</item>
600-
<item row="5" column="0">
618+
<item row="4" column="0">
601619
<widget class="QLabel" name="mLineStyleLabel_2">
602620
<property name="text">
603621
<string>Line style</string>
@@ -607,35 +625,45 @@
607625
</property>
608626
</widget>
609627
</item>
610-
<item row="5" column="1">
628+
<item row="4" column="1">
611629
<widget class="QPushButton" name="mGridLineStyleButton">
612630
<property name="text">
613631
<string>change...</string>
614632
</property>
615633
</widget>
616634
</item>
617-
<item row="8" column="0">
635+
<item row="5" column="0">
636+
<widget class="QLabel" name="mGridBlendLabel">
637+
<property name="text">
638+
<string>Blend mode</string>
639+
</property>
640+
</widget>
641+
</item>
642+
<item row="5" column="1">
643+
<widget class="QgsBlendModeComboBox" name="mGridBlendComboBox"/>
644+
</item>
645+
<item row="6" column="0">
618646
<widget class="QLabel" name="mMapGridCRSLabel">
619647
<property name="text">
620648
<string>CRS</string>
621649
</property>
622650
</widget>
623651
</item>
624-
<item row="8" column="1">
652+
<item row="6" column="1">
625653
<widget class="QPushButton" name="mMapGridCRSButton">
626654
<property name="text">
627655
<string>change...</string>
628656
</property>
629657
</widget>
630658
</item>
631-
<item row="9" column="0">
659+
<item row="7" column="0">
632660
<widget class="QLabel" name="mMapGridUnitLabel">
633661
<property name="text">
634662
<string>Unit</string>
635663
</property>
636664
</widget>
637665
</item>
638-
<item row="9" column="1">
666+
<item row="7" column="1">
639667
<widget class="QComboBox" name="mMapGridUnitComboBox">
640668
<item>
641669
<property name="text">
@@ -654,16 +682,6 @@
654682
</item>
655683
</widget>
656684
</item>
657-
<item row="7" column="1">
658-
<widget class="QgsBlendModeComboBox" name="mGridBlendComboBox"/>
659-
</item>
660-
<item row="7" column="0">
661-
<widget class="QLabel" name="mGridBlendLabel">
662-
<property name="text">
663-
<string>Blend mode</string>
664-
</property>
665-
</widget>
666-
</item>
667685
</layout>
668686
</item>
669687
<item>
@@ -672,43 +690,6 @@
672690
<string>Grid frame</string>
673691
</property>
674692
<layout class="QGridLayout" name="gridLayout_4">
675-
<item row="3" column="0">
676-
<widget class="QLabel" name="mFrameWidthLabel">
677-
<property name="text">
678-
<string>Frame size</string>
679-
</property>
680-
<property name="wordWrap">
681-
<bool>false</bool>
682-
</property>
683-
</widget>
684-
</item>
685-
<item row="4" column="1">
686-
<widget class="QDoubleSpinBox" name="mGridFramePenSizeSpinBox">
687-
<property name="suffix">
688-
<string> mm</string>
689-
</property>
690-
</widget>
691-
</item>
692-
<item row="0" column="0">
693-
<widget class="QLabel" name="mFrameStyleLabel_2">
694-
<property name="text">
695-
<string>Frame style</string>
696-
</property>
697-
<property name="wordWrap">
698-
<bool>false</bool>
699-
</property>
700-
</widget>
701-
</item>
702-
<item row="3" column="1" colspan="2">
703-
<widget class="QDoubleSpinBox" name="mFrameWidthSpinBox"/>
704-
</item>
705-
<item row="4" column="0">
706-
<widget class="QLabel" name="mFramePenLabel">
707-
<property name="text">
708-
<string>Frame line thickness</string>
709-
</property>
710-
</widget>
711-
</item>
712693
<item row="0" column="1" colspan="2">
713694
<widget class="QComboBox" name="mFrameStyleComboBox">
714695
<item>
@@ -723,34 +704,71 @@
723704
</item>
724705
</widget>
725706
</item>
726-
<item row="4" column="2">
707+
<item row="2" column="2">
727708
<widget class="QgsColorButton" name="mGridFramePenColorButton">
728709
<property name="text">
729710
<string>Color...</string>
730711
</property>
731712
</widget>
732713
</item>
733-
<item row="5" column="0">
714+
<item row="3" column="0">
734715
<widget class="QLabel" name="mFrameFillLabel">
735716
<property name="text">
736717
<string>Frame fill colors</string>
737718
</property>
738719
</widget>
739720
</item>
740-
<item row="5" column="1">
721+
<item row="3" column="1">
741722
<widget class="QgsColorButton" name="mGridFrameFill1ColorButton">
742723
<property name="text">
743724
<string/>
744725
</property>
745726
</widget>
746727
</item>
747-
<item row="5" column="2">
728+
<item row="3" column="2">
748729
<widget class="QgsColorButton" name="mGridFrameFill2ColorButton">
749730
<property name="text">
750731
<string/>
751732
</property>
752733
</widget>
753734
</item>
735+
<item row="1" column="0">
736+
<widget class="QLabel" name="mFrameWidthLabel">
737+
<property name="text">
738+
<string>Frame size</string>
739+
</property>
740+
<property name="wordWrap">
741+
<bool>false</bool>
742+
</property>
743+
</widget>
744+
</item>
745+
<item row="2" column="1">
746+
<widget class="QDoubleSpinBox" name="mGridFramePenSizeSpinBox">
747+
<property name="suffix">
748+
<string> mm</string>
749+
</property>
750+
</widget>
751+
</item>
752+
<item row="0" column="0">
753+
<widget class="QLabel" name="mFrameStyleLabel_2">
754+
<property name="text">
755+
<string>Frame style</string>
756+
</property>
757+
<property name="wordWrap">
758+
<bool>false</bool>
759+
</property>
760+
</widget>
761+
</item>
762+
<item row="1" column="1" colspan="2">
763+
<widget class="QDoubleSpinBox" name="mFrameWidthSpinBox"/>
764+
</item>
765+
<item row="2" column="0">
766+
<widget class="QLabel" name="mFramePenLabel">
767+
<property name="text">
768+
<string>Frame line thickness</string>
769+
</property>
770+
</widget>
771+
</item>
754772
</layout>
755773
</widget>
756774
</item>
@@ -762,9 +780,6 @@
762780
<property name="title">
763781
<string>Draw coordinates</string>
764782
</property>
765-
<property name="flat">
766-
<bool>false</bool>
767-
</property>
768783
<property name="checkable">
769784
<bool>true</bool>
770785
</property>
@@ -777,13 +792,7 @@
777792
<property name="collapsed" stdset="0">
778793
<bool>true</bool>
779794
</property>
780-
<layout class="QFormLayout" name="formLayout_6">
781-
<property name="fieldGrowthPolicy">
782-
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
783-
</property>
784-
<property name="labelAlignment">
785-
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
786-
</property>
795+
<layout class="QFormLayout" name="formLayout_2">
787796
<property name="leftMargin">
788797
<number>6</number>
789798
</property>
@@ -890,6 +899,20 @@
890899
</property>
891900
</widget>
892901
</item>
902+
<item row="10" column="0">
903+
<widget class="QLabel" name="mFontColorLabel">
904+
<property name="text">
905+
<string>Font color</string>
906+
</property>
907+
</widget>
908+
</item>
909+
<item row="10" column="1">
910+
<widget class="QgsColorButton" name="mAnnotationFontColorButton">
911+
<property name="text">
912+
<string>Font color...</string>
913+
</property>
914+
</widget>
915+
</item>
893916
<item row="11" column="0">
894917
<widget class="QLabel" name="mDistanceToFrameLabel">
895918
<property name="text">
@@ -922,20 +945,6 @@
922945
<item row="12" column="1">
923946
<widget class="QSpinBox" name="mCoordinatePrecisionSpinBox"/>
924947
</item>
925-
<item row="10" column="1">
926-
<widget class="QgsColorButton" name="mAnnotationFontColorButton">
927-
<property name="text">
928-
<string>Font color...</string>
929-
</property>
930-
</widget>
931-
</item>
932-
<item row="10" column="0">
933-
<widget class="QLabel" name="mFontColorLabel">
934-
<property name="text">
935-
<string>Font color</string>
936-
</property>
937-
</widget>
938-
</item>
939948
</layout>
940949
</widget>
941950
</item>

0 commit comments

Comments
 (0)