Skip to content

Commit 150ffa3

Browse files
3nids3nids
committedJun 6, 2014
fix #10405 and #10303 partially: removes the scroll area for the style page
·
ltr-3_40archive/master_2
1 parent 9019805 commit 150ffa3

File tree

1 file changed

+235
-74
lines changed

1 file changed

+235
-74
lines changed
 

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 235 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,16 @@
4646
<enum>QFrame::Raised</enum>
4747
</property>
4848
<layout class="QVBoxLayout" name="verticalLayout_2">
49-
<property name="margin">
49+
<property name="leftMargin">
50+
<number>0</number>
51+
</property>
52+
<property name="topMargin">
53+
<number>0</number>
54+
</property>
55+
<property name="rightMargin">
56+
<number>0</number>
57+
</property>
58+
<property name="bottomMargin">
5059
<number>0</number>
5160
</property>
5261
<item>
@@ -234,7 +243,16 @@
234243
<enum>QFrame::Raised</enum>
235244
</property>
236245
<layout class="QVBoxLayout" name="verticalLayout_3">
237-
<property name="margin">
246+
<property name="leftMargin">
247+
<number>0</number>
248+
</property>
249+
<property name="topMargin">
250+
<number>0</number>
251+
</property>
252+
<property name="rightMargin">
253+
<number>0</number>
254+
</property>
255+
<property name="bottomMargin">
238256
<number>0</number>
239257
</property>
240258
<item>
@@ -246,11 +264,20 @@
246264
</sizepolicy>
247265
</property>
248266
<property name="currentIndex">
249-
<number>0</number>
267+
<number>1</number>
250268
</property>
251269
<widget class="QWidget" name="mOptsPage_General">
252270
<layout class="QVBoxLayout" name="verticalLayout_14">
253-
<property name="margin">
271+
<property name="leftMargin">
272+
<number>0</number>
273+
</property>
274+
<property name="topMargin">
275+
<number>0</number>
276+
</property>
277+
<property name="rightMargin">
278+
<number>0</number>
279+
</property>
280+
<property name="bottomMargin">
254281
<number>0</number>
255282
</property>
256283
<item>
@@ -271,15 +298,24 @@
271298
</rect>
272299
</property>
273300
<layout class="QVBoxLayout" name="verticalLayout_13">
274-
<property name="margin">
301+
<property name="leftMargin">
302+
<number>0</number>
303+
</property>
304+
<property name="topMargin">
305+
<number>0</number>
306+
</property>
307+
<property name="rightMargin">
308+
<number>0</number>
309+
</property>
310+
<property name="bottomMargin">
275311
<number>0</number>
276312
</property>
277313
<item>
278314
<widget class="QgsCollapsibleGroupBox" name="groupBox">
279315
<property name="title">
280316
<string>Layer info</string>
281317
</property>
282-
<property name="syncGroup">
318+
<property name="syncGroup" stdset="0">
283319
<string notr="true">vectorgeneral</string>
284320
</property>
285321
<layout class="QGridLayout" name="gridLayout">
@@ -293,7 +329,16 @@
293329
<item row="5" column="0">
294330
<widget class="QFrame" name="mDataSourceEncodingFrame">
295331
<layout class="QHBoxLayout" name="horizontalLayout_4">
296-
<property name="margin">
332+
<property name="leftMargin">
333+
<number>0</number>
334+
</property>
335+
<property name="topMargin">
336+
<number>0</number>
337+
</property>
338+
<property name="rightMargin">
339+
<number>0</number>
340+
</property>
341+
<property name="bottomMargin">
297342
<number>0</number>
298343
</property>
299344
</layout>
@@ -377,7 +422,7 @@
377422
<property name="checkable">
378423
<bool>false</bool>
379424
</property>
380-
<property name="syncGroup">
425+
<property name="syncGroup" stdset="0">
381426
<string notr="true">vectorgeneral</string>
382427
</property>
383428
<layout class="QVBoxLayout" name="verticalLayout_27">
@@ -465,7 +510,7 @@
465510
</property>
466511
<layout class="QGridLayout" name="gridLayout_6">
467512
<item row="0" column="0">
468-
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget">
513+
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true">
469514
<property name="toolTip">
470515
<string>A widget to define the scale visibility</string>
471516
</property>
@@ -551,58 +596,39 @@
551596
</widget>
552597
<widget class="QWidget" name="mOptsPage_Style">
553598
<layout class="QVBoxLayout" name="verticalLayout_11">
554-
<property name="margin">
599+
<property name="leftMargin">
600+
<number>0</number>
601+
</property>
602+
<property name="topMargin">
603+
<number>0</number>
604+
</property>
605+
<property name="rightMargin">
606+
<number>0</number>
607+
</property>
608+
<property name="bottomMargin">
555609
<number>0</number>
556610
</property>
557611
<item>
558-
<widget class="QScrollArea" name="scrollArea_3">
559-
<property name="frameShape">
560-
<enum>QFrame::NoFrame</enum>
561-
</property>
562-
<property name="widgetResizable">
563-
<bool>true</bool>
612+
<widget class="QStackedWidget" name="widgetStackRenderers">
613+
<property name="frameShadow">
614+
<enum>QFrame::Sunken</enum>
564615
</property>
565-
<widget class="QWidget" name="scrollAreaWidgetContents_3">
566-
<property name="geometry">
567-
<rect>
568-
<x>0</x>
569-
<y>0</y>
570-
<width>100</width>
571-
<height>30</height>
572-
</rect>
573-
</property>
574-
<layout class="QVBoxLayout" name="verticalLayout_18">
575-
<property name="margin">
576-
<number>0</number>
577-
</property>
578-
<item>
579-
<widget class="QStackedWidget" name="widgetStackRenderers">
580-
<property name="sizePolicy">
581-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
582-
<horstretch>0</horstretch>
583-
<verstretch>0</verstretch>
584-
</sizepolicy>
585-
</property>
586-
<property name="frameShape">
587-
<enum>QFrame::NoFrame</enum>
588-
</property>
589-
<property name="frameShadow">
590-
<enum>QFrame::Sunken</enum>
591-
</property>
592-
<property name="currentIndex">
593-
<number>-1</number>
594-
</property>
595-
</widget>
596-
</item>
597-
</layout>
598-
</widget>
599616
</widget>
600617
</item>
601618
</layout>
602619
</widget>
603620
<widget class="QWidget" name="mOptsPage_Labels">
604621
<layout class="QVBoxLayout" name="verticalLayout_12">
605-
<property name="margin">
622+
<property name="leftMargin">
623+
<number>0</number>
624+
</property>
625+
<property name="topMargin">
626+
<number>0</number>
627+
</property>
628+
<property name="rightMargin">
629+
<number>0</number>
630+
</property>
631+
<property name="bottomMargin">
606632
<number>0</number>
607633
</property>
608634
<item>
@@ -625,7 +651,16 @@
625651
</widget>
626652
<widget class="QWidget" name="mOptsPage_LabelsOld">
627653
<layout class="QVBoxLayout" name="verticalLayout_30">
628-
<property name="margin">
654+
<property name="leftMargin">
655+
<number>0</number>
656+
</property>
657+
<property name="topMargin">
658+
<number>0</number>
659+
</property>
660+
<property name="rightMargin">
661+
<number>0</number>
662+
</property>
663+
<property name="bottomMargin">
629664
<number>0</number>
630665
</property>
631666
<item>
@@ -641,12 +676,21 @@
641676
<rect>
642677
<x>0</x>
643678
<y>0</y>
644-
<width>121</width>
679+
<width>123</width>
645680
<height>38</height>
646681
</rect>
647682
</property>
648683
<layout class="QVBoxLayout" name="verticalLayout_28">
649-
<property name="margin">
684+
<property name="leftMargin">
685+
<number>0</number>
686+
</property>
687+
<property name="topMargin">
688+
<number>0</number>
689+
</property>
690+
<property name="rightMargin">
691+
<number>0</number>
692+
</property>
693+
<property name="bottomMargin">
650694
<number>0</number>
651695
</property>
652696
<item>
@@ -689,7 +733,16 @@
689733
</widget>
690734
<widget class="QWidget" name="mOptsPage_Fields">
691735
<layout class="QVBoxLayout" name="verticalLayout_15">
692-
<property name="margin">
736+
<property name="leftMargin">
737+
<number>0</number>
738+
</property>
739+
<property name="topMargin">
740+
<number>0</number>
741+
</property>
742+
<property name="rightMargin">
743+
<number>0</number>
744+
</property>
745+
<property name="bottomMargin">
693746
<number>0</number>
694747
</property>
695748
<item>
@@ -710,7 +763,16 @@
710763
</rect>
711764
</property>
712765
<layout class="QVBoxLayout" name="verticalLayout_20">
713-
<property name="margin">
766+
<property name="leftMargin">
767+
<number>0</number>
768+
</property>
769+
<property name="topMargin">
770+
<number>0</number>
771+
</property>
772+
<property name="rightMargin">
773+
<number>0</number>
774+
</property>
775+
<property name="bottomMargin">
714776
<number>0</number>
715777
</property>
716778
<item>
@@ -731,7 +793,16 @@
731793
</widget>
732794
<widget class="QWidget" name="mOptsPage_Rendering">
733795
<layout class="QVBoxLayout" name="verticalLayout_19">
734-
<property name="margin">
796+
<property name="leftMargin">
797+
<number>0</number>
798+
</property>
799+
<property name="topMargin">
800+
<number>0</number>
801+
</property>
802+
<property name="rightMargin">
803+
<number>0</number>
804+
</property>
805+
<property name="bottomMargin">
735806
<number>0</number>
736807
</property>
737808
<item>
@@ -747,7 +818,7 @@
747818
<rect>
748819
<x>0</x>
749820
<y>0</y>
750-
<width>702</width>
821+
<width>721</width>
751822
<height>171</height>
752823
</rect>
753824
</property>
@@ -874,7 +945,16 @@
874945
</widget>
875946
<widget class="QWidget" name="mOptsPage_Display">
876947
<layout class="QVBoxLayout" name="verticalLayout_25">
877-
<property name="margin">
948+
<property name="leftMargin">
949+
<number>0</number>
950+
</property>
951+
<property name="topMargin">
952+
<number>0</number>
953+
</property>
954+
<property name="rightMargin">
955+
<number>0</number>
956+
</property>
957+
<property name="bottomMargin">
878958
<number>0</number>
879959
</property>
880960
<item>
@@ -890,12 +970,21 @@
890970
<rect>
891971
<x>0</x>
892972
<y>0</y>
893-
<width>476</width>
973+
<width>487</width>
894974
<height>182</height>
895975
</rect>
896976
</property>
897977
<layout class="QVBoxLayout" name="verticalLayout_26">
898-
<property name="margin">
978+
<property name="leftMargin">
979+
<number>0</number>
980+
</property>
981+
<property name="topMargin">
982+
<number>0</number>
983+
</property>
984+
<property name="rightMargin">
985+
<number>0</number>
986+
</property>
987+
<property name="bottomMargin">
899988
<number>0</number>
900989
</property>
901990
<item>
@@ -1035,7 +1124,16 @@
10351124
</widget>
10361125
<widget class="QWidget" name="mOptsPage_Actions">
10371126
<layout class="QVBoxLayout" name="verticalLayout_16">
1038-
<property name="margin">
1127+
<property name="leftMargin">
1128+
<number>0</number>
1129+
</property>
1130+
<property name="topMargin">
1131+
<number>0</number>
1132+
</property>
1133+
<property name="rightMargin">
1134+
<number>0</number>
1135+
</property>
1136+
<property name="bottomMargin">
10391137
<number>0</number>
10401138
</property>
10411139
<item>
@@ -1056,7 +1154,16 @@
10561154
</rect>
10571155
</property>
10581156
<layout class="QVBoxLayout" name="verticalLayout_21">
1059-
<property name="margin">
1157+
<property name="leftMargin">
1158+
<number>0</number>
1159+
</property>
1160+
<property name="topMargin">
1161+
<number>0</number>
1162+
</property>
1163+
<property name="rightMargin">
1164+
<number>0</number>
1165+
</property>
1166+
<property name="bottomMargin">
10601167
<number>0</number>
10611168
</property>
10621169
<item>
@@ -1083,7 +1190,16 @@
10831190
</widget>
10841191
<widget class="QWidget" name="mOptsPage_Joins">
10851192
<layout class="QVBoxLayout" name="verticalLayout_17">
1086-
<property name="margin">
1193+
<property name="leftMargin">
1194+
<number>0</number>
1195+
</property>
1196+
<property name="topMargin">
1197+
<number>0</number>
1198+
</property>
1199+
<property name="rightMargin">
1200+
<number>0</number>
1201+
</property>
1202+
<property name="bottomMargin">
10871203
<number>0</number>
10881204
</property>
10891205
<item>
@@ -1104,7 +1220,16 @@
11041220
</rect>
11051221
</property>
11061222
<layout class="QVBoxLayout" name="verticalLayout_23">
1107-
<property name="margin">
1223+
<property name="leftMargin">
1224+
<number>0</number>
1225+
</property>
1226+
<property name="topMargin">
1227+
<number>0</number>
1228+
</property>
1229+
<property name="rightMargin">
1230+
<number>0</number>
1231+
</property>
1232+
<property name="bottomMargin">
11081233
<number>0</number>
11091234
</property>
11101235
<item>
@@ -1181,7 +1306,16 @@
11811306
</widget>
11821307
<widget class="QWidget" name="mOptsPage_Diagrams">
11831308
<layout class="QVBoxLayout" name="verticalLayout_10">
1184-
<property name="margin">
1309+
<property name="leftMargin">
1310+
<number>0</number>
1311+
</property>
1312+
<property name="topMargin">
1313+
<number>0</number>
1314+
</property>
1315+
<property name="rightMargin">
1316+
<number>0</number>
1317+
</property>
1318+
<property name="bottomMargin">
11851319
<number>0</number>
11861320
</property>
11871321
<item>
@@ -1202,7 +1336,16 @@
12021336
</rect>
12031337
</property>
12041338
<layout class="QVBoxLayout" name="verticalLayout_24">
1205-
<property name="margin">
1339+
<property name="leftMargin">
1340+
<number>0</number>
1341+
</property>
1342+
<property name="topMargin">
1343+
<number>0</number>
1344+
</property>
1345+
<property name="rightMargin">
1346+
<number>0</number>
1347+
</property>
1348+
<property name="bottomMargin">
12061349
<number>0</number>
12071350
</property>
12081351
<item>
@@ -1223,7 +1366,16 @@
12231366
</widget>
12241367
<widget class="QWidget" name="mOptsPage_Metadata">
12251368
<layout class="QVBoxLayout" name="verticalLayout_7">
1226-
<property name="margin">
1369+
<property name="leftMargin">
1370+
<number>0</number>
1371+
</property>
1372+
<property name="topMargin">
1373+
<number>0</number>
1374+
</property>
1375+
<property name="rightMargin">
1376+
<number>0</number>
1377+
</property>
1378+
<property name="bottomMargin">
12271379
<number>0</number>
12281380
</property>
12291381
<item>
@@ -1239,7 +1391,7 @@
12391391
<rect>
12401392
<x>0</x>
12411393
<y>0</y>
1242-
<width>393</width>
1394+
<width>392</width>
12431395
<height>608</height>
12441396
</rect>
12451397
</property>
@@ -1249,7 +1401,7 @@
12491401
<property name="title">
12501402
<string>Description</string>
12511403
</property>
1252-
<property name="syncGroup">
1404+
<property name="syncGroup" stdset="0">
12531405
<string notr="true">vectormeta</string>
12541406
</property>
12551407
<layout class="QGridLayout" name="gridLayout_5">
@@ -1344,7 +1496,7 @@
13441496
<property name="title">
13451497
<string>Attribution</string>
13461498
</property>
1347-
<property name="syncGroup">
1499+
<property name="syncGroup" stdset="0">
13481500
<string notr="true">vectormeta</string>
13491501
</property>
13501502
<layout class="QGridLayout" name="gridLayout_7">
@@ -1376,7 +1528,7 @@
13761528
<property name="title">
13771529
<string>MetadataUrl</string>
13781530
</property>
1379-
<property name="syncGroup">
1531+
<property name="syncGroup" stdset="0">
13801532
<string notr="true">vectormeta</string>
13811533
</property>
13821534
<layout class="QGridLayout" name="gridLayout_9">
@@ -1531,7 +1683,7 @@
15311683
<property name="title">
15321684
<string>Properties</string>
15331685
</property>
1534-
<property name="syncGroup">
1686+
<property name="syncGroup" stdset="0">
15351687
<string notr="true">vectormeta</string>
15361688
</property>
15371689
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1620,7 +1772,16 @@
16201772
<enum>QFrame::Raised</enum>
16211773
</property>
16221774
<layout class="QGridLayout" name="gridLayout_btnbox">
1623-
<property name="margin">
1775+
<property name="leftMargin">
1776+
<number>0</number>
1777+
</property>
1778+
<property name="topMargin">
1779+
<number>0</number>
1780+
</property>
1781+
<property name="rightMargin">
1782+
<number>0</number>
1783+
</property>
1784+
<property name="bottomMargin">
16241785
<number>0</number>
16251786
</property>
16261787
<item row="2" column="1" colspan="4">

0 commit comments

Comments
 (0)
Please sign in to comment.