Skip to content

Commit db11248

Browse files
pblottierepblottiere
committedAug 28, 2017
Fix column name in join configuration
·
ltr-3_40final-3_0_0
1 parent b8a90ca commit db11248

File tree

1 file changed

+62
-305
lines changed

1 file changed

+62
-305
lines changed
 

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 62 additions & 305 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,7 @@
4646
<enum>QFrame::Raised</enum>
4747
</property>
4848
<layout class="QVBoxLayout" name="verticalLayout_2">
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">
49+
<property name="margin">
5950
<number>0</number>
6051
</property>
6152
<item>
@@ -282,16 +273,7 @@
282273
<enum>QFrame::Raised</enum>
283274
</property>
284275
<layout class="QVBoxLayout" name="verticalLayout_3">
285-
<property name="leftMargin">
286-
<number>0</number>
287-
</property>
288-
<property name="topMargin">
289-
<number>0</number>
290-
</property>
291-
<property name="rightMargin">
292-
<number>0</number>
293-
</property>
294-
<property name="bottomMargin">
276+
<property name="margin">
295277
<number>0</number>
296278
</property>
297279
<item>
@@ -307,16 +289,7 @@
307289
</property>
308290
<widget class="QWidget" name="mOptsPage_Information">
309291
<layout class="QVBoxLayout" name="verticalLayout_5">
310-
<property name="leftMargin">
311-
<number>0</number>
312-
</property>
313-
<property name="topMargin">
314-
<number>0</number>
315-
</property>
316-
<property name="rightMargin">
317-
<number>0</number>
318-
</property>
319-
<property name="bottomMargin">
292+
<property name="margin">
320293
<number>0</number>
321294
</property>
322295
<item>
@@ -328,16 +301,7 @@
328301
<enum>QFrame::Raised</enum>
329302
</property>
330303
<layout class="QVBoxLayout" name="verticalLayout_7">
331-
<property name="leftMargin">
332-
<number>0</number>
333-
</property>
334-
<property name="topMargin">
335-
<number>0</number>
336-
</property>
337-
<property name="rightMargin">
338-
<number>0</number>
339-
</property>
340-
<property name="bottomMargin">
304+
<property name="margin">
341305
<number>0</number>
342306
</property>
343307
<item>
@@ -354,16 +318,7 @@
354318
</widget>
355319
<widget class="QWidget" name="mOptsPage_General">
356320
<layout class="QVBoxLayout" name="verticalLayout_14">
357-
<property name="leftMargin">
358-
<number>0</number>
359-
</property>
360-
<property name="topMargin">
361-
<number>0</number>
362-
</property>
363-
<property name="rightMargin">
364-
<number>0</number>
365-
</property>
366-
<property name="bottomMargin">
321+
<property name="margin">
367322
<number>0</number>
368323
</property>
369324
<item>
@@ -379,29 +334,20 @@
379334
<rect>
380335
<x>0</x>
381336
<y>0</y>
382-
<width>306</width>
383-
<height>508</height>
337+
<width>309</width>
338+
<height>468</height>
384339
</rect>
385340
</property>
386341
<layout class="QVBoxLayout" name="verticalLayout_13">
387-
<property name="leftMargin">
388-
<number>0</number>
389-
</property>
390-
<property name="topMargin">
391-
<number>0</number>
392-
</property>
393-
<property name="rightMargin">
394-
<number>0</number>
395-
</property>
396-
<property name="bottomMargin">
342+
<property name="margin">
397343
<number>0</number>
398344
</property>
399345
<item>
400346
<widget class="QgsCollapsibleGroupBox" name="mMetaDescriptionGrpBx">
401347
<property name="title">
402348
<string>Description</string>
403349
</property>
404-
<property name="syncGroup" stdset="0">
350+
<property name="syncGroup">
405351
<string notr="true">vectormeta</string>
406352
</property>
407353
<layout class="QGridLayout" name="gridLayout_5">
@@ -580,7 +526,7 @@ border-radius: 2px;</string>
580526
<property name="title">
581527
<string>Attribution</string>
582528
</property>
583-
<property name="syncGroup" stdset="0">
529+
<property name="syncGroup">
584530
<string notr="true">vectormeta</string>
585531
</property>
586532
<layout class="QGridLayout" name="gridLayout_7">
@@ -626,7 +572,7 @@ border-radius: 2px;</string>
626572
<property name="title">
627573
<string>MetadataUrl</string>
628574
</property>
629-
<property name="syncGroup" stdset="0">
575+
<property name="syncGroup">
630576
<string notr="true">vectormeta</string>
631577
</property>
632578
<layout class="QGridLayout" name="gridLayout_9">
@@ -805,16 +751,7 @@ border-radius: 2px;</string>
805751
</widget>
806752
<widget class="QWidget" name="mOptsPage_Source">
807753
<layout class="QVBoxLayout" name="verticalLayout_6">
808-
<property name="leftMargin">
809-
<number>0</number>
810-
</property>
811-
<property name="topMargin">
812-
<number>0</number>
813-
</property>
814-
<property name="rightMargin">
815-
<number>0</number>
816-
</property>
817-
<property name="bottomMargin">
754+
<property name="margin">
818755
<number>0</number>
819756
</property>
820757
<item>
@@ -830,21 +767,12 @@ border-radius: 2px;</string>
830767
<rect>
831768
<x>0</x>
832769
<y>0</y>
833-
<width>268</width>
834-
<height>321</height>
770+
<width>282</width>
771+
<height>315</height>
835772
</rect>
836773
</property>
837774
<layout class="QVBoxLayout" name="verticalLayout_9">
838-
<property name="leftMargin">
839-
<number>0</number>
840-
</property>
841-
<property name="topMargin">
842-
<number>0</number>
843-
</property>
844-
<property name="rightMargin">
845-
<number>0</number>
846-
</property>
847-
<property name="bottomMargin">
775+
<property name="margin">
848776
<number>0</number>
849777
</property>
850778
<item>
@@ -862,16 +790,7 @@ border-radius: 2px;</string>
862790
<enum>QFrame::Raised</enum>
863791
</property>
864792
<layout class="QHBoxLayout" name="horizontalLayout_4">
865-
<property name="leftMargin">
866-
<number>0</number>
867-
</property>
868-
<property name="topMargin">
869-
<number>0</number>
870-
</property>
871-
<property name="rightMargin">
872-
<number>0</number>
873-
</property>
874-
<property name="bottomMargin">
793+
<property name="margin">
875794
<number>0</number>
876795
</property>
877796
<item>
@@ -920,7 +839,7 @@ border-radius: 2px;</string>
920839
<property name="checkable">
921840
<bool>false</bool>
922841
</property>
923-
<property name="syncGroup" stdset="0">
842+
<property name="syncGroup">
924843
<string notr="true">vectorgeneral</string>
925844
</property>
926845
<layout class="QVBoxLayout" name="verticalLayout_28">
@@ -935,7 +854,7 @@ border-radius: 2px;</string>
935854
</widget>
936855
</item>
937856
<item>
938-
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector" native="true">
857+
<widget class="QgsProjectionSelectionWidget" name="mCrsSelector">
939858
<property name="focusPolicy">
940859
<enum>Qt::StrongFocus</enum>
941860
</property>
@@ -1043,16 +962,7 @@ border-radius: 2px;</string>
1043962
</widget>
1044963
<widget class="QWidget" name="mOptsPage_Style">
1045964
<layout class="QVBoxLayout" name="verticalLayout_11">
1046-
<property name="leftMargin">
1047-
<number>0</number>
1048-
</property>
1049-
<property name="topMargin">
1050-
<number>0</number>
1051-
</property>
1052-
<property name="rightMargin">
1053-
<number>0</number>
1054-
</property>
1055-
<property name="bottomMargin">
965+
<property name="margin">
1056966
<number>0</number>
1057967
</property>
1058968
<item>
@@ -1073,16 +983,7 @@ border-radius: 2px;</string>
1073983
</rect>
1074984
</property>
1075985
<layout class="QVBoxLayout" name="verticalLayout_18">
1076-
<property name="leftMargin">
1077-
<number>0</number>
1078-
</property>
1079-
<property name="topMargin">
1080-
<number>0</number>
1081-
</property>
1082-
<property name="rightMargin">
1083-
<number>0</number>
1084-
</property>
1085-
<property name="bottomMargin">
986+
<property name="margin">
1086987
<number>0</number>
1087988
</property>
1088989
<item>
@@ -1112,16 +1013,7 @@ border-radius: 2px;</string>
11121013
</widget>
11131014
<widget class="QWidget" name="mOptsPage_Labels">
11141015
<layout class="QVBoxLayout" name="verticalLayout_12">
1115-
<property name="leftMargin">
1116-
<number>0</number>
1117-
</property>
1118-
<property name="topMargin">
1119-
<number>0</number>
1120-
</property>
1121-
<property name="rightMargin">
1122-
<number>0</number>
1123-
</property>
1124-
<property name="bottomMargin">
1016+
<property name="margin">
11251017
<number>0</number>
11261018
</property>
11271019
<item>
@@ -1144,16 +1036,7 @@ border-radius: 2px;</string>
11441036
</widget>
11451037
<widget class="QWidget" name="mOptsPage_Fields">
11461038
<layout class="QVBoxLayout" name="verticalLayout_15">
1147-
<property name="leftMargin">
1148-
<number>0</number>
1149-
</property>
1150-
<property name="topMargin">
1151-
<number>0</number>
1152-
</property>
1153-
<property name="rightMargin">
1154-
<number>0</number>
1155-
</property>
1156-
<property name="bottomMargin">
1039+
<property name="margin">
11571040
<number>0</number>
11581041
</property>
11591042
<item>
@@ -1174,16 +1057,7 @@ border-radius: 2px;</string>
11741057
</rect>
11751058
</property>
11761059
<layout class="QVBoxLayout" name="verticalLayout_20">
1177-
<property name="leftMargin">
1178-
<number>0</number>
1179-
</property>
1180-
<property name="topMargin">
1181-
<number>0</number>
1182-
</property>
1183-
<property name="rightMargin">
1184-
<number>0</number>
1185-
</property>
1186-
<property name="bottomMargin">
1060+
<property name="margin">
11871061
<number>0</number>
11881062
</property>
11891063
<item>
@@ -1204,16 +1078,7 @@ border-radius: 2px;</string>
12041078
</widget>
12051079
<widget class="QWidget" name="mOptsPage_Rendering">
12061080
<layout class="QVBoxLayout" name="verticalLayout_19">
1207-
<property name="leftMargin">
1208-
<number>0</number>
1209-
</property>
1210-
<property name="topMargin">
1211-
<number>0</number>
1212-
</property>
1213-
<property name="rightMargin">
1214-
<number>0</number>
1215-
</property>
1216-
<property name="bottomMargin">
1081+
<property name="margin">
12171082
<number>0</number>
12181083
</property>
12191084
<item>
@@ -1229,21 +1094,12 @@ border-radius: 2px;</string>
12291094
<rect>
12301095
<x>0</x>
12311096
<y>0</y>
1232-
<width>632</width>
1233-
<height>276</height>
1097+
<width>634</width>
1098+
<height>324</height>
12341099
</rect>
12351100
</property>
12361101
<layout class="QVBoxLayout" name="verticalLayout_32">
1237-
<property name="leftMargin">
1238-
<number>0</number>
1239-
</property>
1240-
<property name="topMargin">
1241-
<number>0</number>
1242-
</property>
1243-
<property name="rightMargin">
1244-
<number>0</number>
1245-
</property>
1246-
<property name="bottomMargin">
1102+
<property name="margin">
12471103
<number>0</number>
12481104
</property>
12491105
<item>
@@ -1256,7 +1112,7 @@ border-radius: 2px;</string>
12561112
</property>
12571113
<layout class="QGridLayout" name="gridLayout_6">
12581114
<item row="0" column="0">
1259-
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true">
1115+
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget">
12601116
<property name="focusPolicy">
12611117
<enum>Qt::StrongFocus</enum>
12621118
</property>
@@ -1456,16 +1312,7 @@ border-radius: 2px;</string>
14561312
</widget>
14571313
<widget class="QWidget" name="mOptsPage_Display">
14581314
<layout class="QVBoxLayout" name="verticalLayout_25">
1459-
<property name="leftMargin">
1460-
<number>0</number>
1461-
</property>
1462-
<property name="topMargin">
1463-
<number>0</number>
1464-
</property>
1465-
<property name="rightMargin">
1466-
<number>0</number>
1467-
</property>
1468-
<property name="bottomMargin">
1315+
<property name="margin">
14691316
<number>0</number>
14701317
</property>
14711318
<item>
@@ -1474,16 +1321,7 @@ border-radius: 2px;</string>
14741321
<bool>true</bool>
14751322
</property>
14761323
<layout class="QGridLayout" name="gridLayout_10">
1477-
<property name="leftMargin">
1478-
<number>0</number>
1479-
</property>
1480-
<property name="topMargin">
1481-
<number>0</number>
1482-
</property>
1483-
<property name="rightMargin">
1484-
<number>0</number>
1485-
</property>
1486-
<property name="bottomMargin">
1324+
<property name="margin">
14871325
<number>0</number>
14881326
</property>
14891327
<item row="0" column="0">
@@ -1494,7 +1332,7 @@ border-radius: 2px;</string>
14941332
</widget>
14951333
</item>
14961334
<item row="0" column="1">
1497-
<widget class="QgsFieldExpressionWidget" name="mDisplayExpressionWidget" native="true">
1335+
<widget class="QgsFieldExpressionWidget" name="mDisplayExpressionWidget">
14981336
<property name="focusPolicy">
14991337
<enum>Qt::StrongFocus</enum>
15001338
</property>
@@ -1545,7 +1383,7 @@ border-radius: 2px;</string>
15451383
</widget>
15461384
</item>
15471385
<item row="1" column="0" colspan="2">
1548-
<widget class="QgsFieldExpressionWidget" name="mMapTipExpressionFieldWidget" native="true">
1386+
<widget class="QgsFieldExpressionWidget" name="mMapTipExpressionFieldWidget">
15491387
<property name="focusPolicy">
15501388
<enum>Qt::StrongFocus</enum>
15511389
</property>
@@ -1564,16 +1402,7 @@ border-radius: 2px;</string>
15641402
</widget>
15651403
<widget class="QWidget" name="mOptsPage_Actions">
15661404
<layout class="QVBoxLayout" name="verticalLayout_16">
1567-
<property name="leftMargin">
1568-
<number>0</number>
1569-
</property>
1570-
<property name="topMargin">
1571-
<number>0</number>
1572-
</property>
1573-
<property name="rightMargin">
1574-
<number>0</number>
1575-
</property>
1576-
<property name="bottomMargin">
1405+
<property name="margin">
15771406
<number>0</number>
15781407
</property>
15791408
<item>
@@ -1594,16 +1423,7 @@ border-radius: 2px;</string>
15941423
</rect>
15951424
</property>
15961425
<layout class="QVBoxLayout" name="verticalLayout_21">
1597-
<property name="leftMargin">
1598-
<number>0</number>
1599-
</property>
1600-
<property name="topMargin">
1601-
<number>0</number>
1602-
</property>
1603-
<property name="rightMargin">
1604-
<number>0</number>
1605-
</property>
1606-
<property name="bottomMargin">
1426+
<property name="margin">
16071427
<number>0</number>
16081428
</property>
16091429
<item>
@@ -1630,16 +1450,7 @@ border-radius: 2px;</string>
16301450
</widget>
16311451
<widget class="QWidget" name="mOptsPage_Joins">
16321452
<layout class="QVBoxLayout" name="verticalLayout_17">
1633-
<property name="leftMargin">
1634-
<number>0</number>
1635-
</property>
1636-
<property name="topMargin">
1637-
<number>0</number>
1638-
</property>
1639-
<property name="rightMargin">
1640-
<number>0</number>
1641-
</property>
1642-
<property name="bottomMargin">
1453+
<property name="margin">
16431454
<number>0</number>
16441455
</property>
16451456
<item>
@@ -1656,20 +1467,11 @@ border-radius: 2px;</string>
16561467
<x>0</x>
16571468
<y>0</y>
16581469
<width>653</width>
1659-
<height>542</height>
1470+
<height>538</height>
16601471
</rect>
16611472
</property>
16621473
<layout class="QVBoxLayout" name="verticalLayout_23">
1663-
<property name="leftMargin">
1664-
<number>0</number>
1665-
</property>
1666-
<property name="topMargin">
1667-
<number>0</number>
1668-
</property>
1669-
<property name="rightMargin">
1670-
<number>0</number>
1671-
</property>
1672-
<property name="bottomMargin">
1474+
<property name="margin">
16731475
<number>0</number>
16741476
</property>
16751477
<item>
@@ -1709,7 +1511,7 @@ border-radius: 2px;</string>
17091511
</column>
17101512
<column>
17111513
<property name="text">
1712-
<string>New Column</string>
1514+
<string>Upsert On Edit</string>
17131515
</property>
17141516
</column>
17151517
<column>
@@ -1787,16 +1589,7 @@ border-radius: 2px;</string>
17871589
</widget>
17881590
<widget class="QWidget" name="mOptsPage_Diagrams">
17891591
<layout class="QVBoxLayout" name="verticalLayout_10">
1790-
<property name="leftMargin">
1791-
<number>0</number>
1792-
</property>
1793-
<property name="topMargin">
1794-
<number>0</number>
1795-
</property>
1796-
<property name="rightMargin">
1797-
<number>0</number>
1798-
</property>
1799-
<property name="bottomMargin">
1592+
<property name="margin">
18001593
<number>0</number>
18011594
</property>
18021595
<item>
@@ -1819,16 +1612,7 @@ border-radius: 2px;</string>
18191612
</widget>
18201613
<widget class="QWidget" name="page">
18211614
<layout class="QVBoxLayout" name="verticalLayout_4">
1822-
<property name="leftMargin">
1823-
<number>0</number>
1824-
</property>
1825-
<property name="topMargin">
1826-
<number>0</number>
1827-
</property>
1828-
<property name="rightMargin">
1829-
<number>0</number>
1830-
</property>
1831-
<property name="bottomMargin">
1615+
<property name="margin">
18321616
<number>0</number>
18331617
</property>
18341618
<item>
@@ -1851,16 +1635,7 @@ border-radius: 2px;</string>
18511635
</widget>
18521636
<widget class="QWidget" name="mOptsPage_Legend">
18531637
<layout class="QVBoxLayout" name="verticalLayout_8">
1854-
<property name="leftMargin">
1855-
<number>0</number>
1856-
</property>
1857-
<property name="topMargin">
1858-
<number>0</number>
1859-
</property>
1860-
<property name="rightMargin">
1861-
<number>0</number>
1862-
</property>
1863-
<property name="bottomMargin">
1638+
<property name="margin">
18641639
<number>0</number>
18651640
</property>
18661641
<item>
@@ -1879,16 +1654,7 @@ border-radius: 2px;</string>
18791654
</widget>
18801655
<widget class="QWidget" name="mOptsPage_DataDependencies">
18811656
<layout class="QVBoxLayout" name="verticalLayout_29">
1882-
<property name="leftMargin">
1883-
<number>0</number>
1884-
</property>
1885-
<property name="topMargin">
1886-
<number>0</number>
1887-
</property>
1888-
<property name="rightMargin">
1889-
<number>0</number>
1890-
</property>
1891-
<property name="bottomMargin">
1657+
<property name="margin">
18921658
<number>0</number>
18931659
</property>
18941660
<item>
@@ -1963,16 +1729,7 @@ border-radius: 2px;</string>
19631729
<enum>QFrame::Raised</enum>
19641730
</property>
19651731
<layout class="QGridLayout" name="gridLayout_btnbox">
1966-
<property name="leftMargin">
1967-
<number>0</number>
1968-
</property>
1969-
<property name="topMargin">
1970-
<number>0</number>
1971-
</property>
1972-
<property name="rightMargin">
1973-
<number>0</number>
1974-
</property>
1975-
<property name="bottomMargin">
1732+
<property name="margin">
19761733
<number>0</number>
19771734
</property>
19781735
<item row="2" column="1" colspan="4">
@@ -1991,12 +1748,6 @@ border-radius: 2px;</string>
19911748
</layout>
19921749
</widget>
19931750
<customwidgets>
1994-
<customwidget>
1995-
<class>QgsScrollArea</class>
1996-
<extends>QScrollArea</extends>
1997-
<header>qgsscrollarea.h</header>
1998-
<container>1</container>
1999-
</customwidget>
20001751
<customwidget>
20011752
<class>QgsCollapsibleGroupBox</class>
20021753
<extends>QGroupBox</extends>
@@ -2010,10 +1761,9 @@ border-radius: 2px;</string>
20101761
<container>1</container>
20111762
</customwidget>
20121763
<customwidget>
2013-
<class>QgsLayerTreeView</class>
2014-
<extends>QTreeView</extends>
2015-
<header>qgslayertreeview.h</header>
2016-
<container>1</container>
1764+
<class>QgsFilterLineEdit</class>
1765+
<extends>QLineEdit</extends>
1766+
<header>qgsfilterlineedit.h</header>
20171767
</customwidget>
20181768
<customwidget>
20191769
<class>QgsProjectionSelectionWidget</class>
@@ -2022,15 +1772,27 @@ border-radius: 2px;</string>
20221772
<container>1</container>
20231773
</customwidget>
20241774
<customwidget>
2025-
<class>QgsVariableEditorWidget</class>
1775+
<class>QgsScaleRangeWidget</class>
20261776
<extends>QWidget</extends>
2027-
<header location="global">qgsvariableeditorwidget.h</header>
1777+
<header>qgsscalerangewidget.h</header>
1778+
</customwidget>
1779+
<customwidget>
1780+
<class>QgsScrollArea</class>
1781+
<extends>QScrollArea</extends>
1782+
<header>qgsscrollarea.h</header>
20281783
<container>1</container>
20291784
</customwidget>
20301785
<customwidget>
2031-
<class>QgsScaleRangeWidget</class>
1786+
<class>QgsLayerTreeView</class>
1787+
<extends>QTreeView</extends>
1788+
<header>qgslayertreeview.h</header>
1789+
<container>1</container>
1790+
</customwidget>
1791+
<customwidget>
1792+
<class>QgsVariableEditorWidget</class>
20321793
<extends>QWidget</extends>
2033-
<header>qgsscalerangewidget.h</header>
1794+
<header location="global">qgsvariableeditorwidget.h</header>
1795+
<container>1</container>
20341796
</customwidget>
20351797
<customwidget>
20361798
<class>QgsScaleComboBox</class>
@@ -2048,11 +1810,6 @@ border-radius: 2px;</string>
20481810
<extends>QWidget</extends>
20491811
<header>qgscodeeditorhtml.h</header>
20501812
</customwidget>
2051-
<customwidget>
2052-
<class>QgsFilterLineEdit</class>
2053-
<extends>QLineEdit</extends>
2054-
<header>qgsfilterlineedit.h</header>
2055-
</customwidget>
20561813
</customwidgets>
20571814
<tabstops>
20581815
<tabstop>mOptionsListWidget</tabstop>

0 commit comments

Comments
 (0)
Please sign in to comment.