Skip to content

Commit a421939

Browse files
3nidsnyalldawson
3nids
authored and
nyalldawson
committed
replace datum in qgsoptionsbase after rebase
1 parent 5cc3a1f commit a421939

File tree

1 file changed

+128
-107
lines changed

1 file changed

+128
-107
lines changed

‎src/ui/qgsoptionsbase.ui

+128-107
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@
308308
<item>
309309
<widget class="QStackedWidget" name="mOptionsStackedWidget">
310310
<property name="currentIndex">
311-
<number>5</number>
311+
<number>10</number>
312312
</property>
313313
<widget class="QWidget" name="mOptionsPageGeneral">
314314
<layout class="QVBoxLayout" name="verticalLayout_3">
@@ -337,8 +337,8 @@
337337
<rect>
338338
<x>0</x>
339339
<y>0</y>
340-
<width>1159</width>
341-
<height>1434</height>
340+
<width>848</width>
341+
<height>812</height>
342342
</rect>
343343
</property>
344344
<layout class="QVBoxLayout" name="verticalLayout_28">
@@ -1032,8 +1032,8 @@
10321032
<rect>
10331033
<x>0</x>
10341034
<y>0</y>
1035-
<width>1092</width>
1036-
<height>1502</height>
1035+
<width>848</width>
1036+
<height>1114</height>
10371037
</rect>
10381038
</property>
10391039
<layout class="QVBoxLayout" name="verticalLayout_22">
@@ -1568,8 +1568,8 @@
15681568
<rect>
15691569
<x>0</x>
15701570
<y>0</y>
1571-
<width>1010</width>
1572-
<height>1266</height>
1571+
<width>848</width>
1572+
<height>812</height>
15731573
</rect>
15741574
</property>
15751575
<layout class="QVBoxLayout" name="verticalLayout_27">
@@ -1936,8 +1936,8 @@
19361936
<rect>
19371937
<x>0</x>
19381938
<y>0</y>
1939-
<width>1351</width>
1940-
<height>1933</height>
1939+
<width>848</width>
1940+
<height>1020</height>
19411941
</rect>
19421942
</property>
19431943
<layout class="QGridLayout" name="gridLayout_22">
@@ -2687,8 +2687,8 @@
26872687
<rect>
26882688
<x>0</x>
26892689
<y>0</y>
2690-
<width>269</width>
2691-
<height>424</height>
2690+
<width>848</width>
2691+
<height>812</height>
26922692
</rect>
26932693
</property>
26942694
<layout class="QHBoxLayout" name="horizontalLayout_46">
@@ -2838,8 +2838,8 @@
28382838
<rect>
28392839
<x>0</x>
28402840
<y>0</y>
2841-
<width>813</width>
2842-
<height>751</height>
2841+
<width>848</width>
2842+
<height>812</height>
28432843
</rect>
28442844
</property>
28452845
<layout class="QVBoxLayout" name="verticalLayout_25">
@@ -3095,8 +3095,8 @@
30953095
<rect>
30963096
<x>0</x>
30973097
<y>0</y>
3098-
<width>1081</width>
3099-
<height>1164</height>
3098+
<width>637</width>
3099+
<height>663</height>
31003100
</rect>
31013101
</property>
31023102
<layout class="QVBoxLayout" name="verticalLayout_30">
@@ -3539,8 +3539,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
35393539
<rect>
35403540
<x>0</x>
35413541
<y>0</y>
3542-
<width>920</width>
3543-
<height>924</height>
3542+
<width>513</width>
3543+
<height>611</height>
35443544
</rect>
35453545
</property>
35463546
<layout class="QVBoxLayout" name="verticalLayout_39">
@@ -3808,8 +3808,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
38083808
<rect>
38093809
<x>0</x>
38103810
<y>0</y>
3811-
<width>1072</width>
3812-
<height>1551</height>
3811+
<width>597</width>
3812+
<height>784</height>
38133813
</rect>
38143814
</property>
38153815
<layout class="QVBoxLayout" name="verticalLayout_31">
@@ -4403,8 +4403,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
44034403
<rect>
44044404
<x>0</x>
44054405
<y>0</y>
4406-
<width>823</width>
4407-
<height>576</height>
4406+
<width>521</width>
4407+
<height>361</height>
44084408
</rect>
44094409
</property>
44104410
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -4542,19 +4542,89 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
45424542
<rect>
45434543
<x>0</x>
45444544
<y>0</y>
4545-
<width>838</width>
4546-
<height>855</height>
4545+
<width>848</width>
4546+
<height>812</height>
45474547
</rect>
45484548
</property>
45494549
<layout class="QGridLayout" name="gridLayout_15">
4550-
<item row="5" column="0" rowspan="2">
4550+
<item row="4" column="0">
4551+
<widget class="QgsCollapsibleGroupBox" name="grpProjectionBehavior">
4552+
<property name="title">
4553+
<string>CRS for new layers</string>
4554+
</property>
4555+
<layout class="QGridLayout" name="gridLayout_14" columnstretch="0,1">
4556+
<item row="0" column="0" colspan="2">
4557+
<widget class="QLabel" name="label_8">
4558+
<property name="sizePolicy">
4559+
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
4560+
<horstretch>0</horstretch>
4561+
<verstretch>0</verstretch>
4562+
</sizepolicy>
4563+
</property>
4564+
<property name="text">
4565+
<string>When a new layer is created, or when a layer is loaded that has no CRS</string>
4566+
</property>
4567+
<property name="wordWrap">
4568+
<bool>true</bool>
4569+
</property>
4570+
</widget>
4571+
</item>
4572+
<item row="1" column="0">
4573+
<widget class="QRadioButton" name="radPromptForProjection">
4574+
<property name="text">
4575+
<string>Pro&amp;mpt for CRS</string>
4576+
</property>
4577+
</widget>
4578+
</item>
4579+
<item row="2" column="0">
4580+
<widget class="QRadioButton" name="radUseProjectProjection">
4581+
<property name="text">
4582+
<string>Use pro&amp;ject CRS</string>
4583+
</property>
4584+
</widget>
4585+
</item>
4586+
<item row="3" column="0">
4587+
<widget class="QRadioButton" name="radUseGlobalProjection">
4588+
<property name="text">
4589+
<string>&amp;Use a default CRS</string>
4590+
</property>
4591+
</widget>
4592+
</item>
4593+
<item row="3" column="1">
4594+
<widget class="QgsProjectionSelectionWidget" name="leLayerGlobalCrs" native="true">
4595+
<property name="enabled">
4596+
<bool>false</bool>
4597+
</property>
4598+
<property name="focusPolicy">
4599+
<enum>Qt::StrongFocus</enum>
4600+
</property>
4601+
</widget>
4602+
</item>
4603+
</layout>
4604+
</widget>
4605+
</item>
4606+
<item row="5" column="0">
45514607
<widget class="QgsCollapsibleGroupBox" name="mDefaultDatumTransformGroupBox">
45524608
<property name="title">
45534609
<string>Default datum transformations</string>
45544610
</property>
45554611
<layout class="QGridLayout" name="gridLayout_10">
4556-
<item row="1" column="0">
4557-
<layout class="QHBoxLayout" name="horizontalLayout_38">
4612+
<item row="2" column="0">
4613+
<widget class="QLabel" name="label_40">
4614+
<property name="text">
4615+
<string>Enter default datum transformations which will be used in any newly created project</string>
4616+
</property>
4617+
</widget>
4618+
</item>
4619+
<item row="0" column="0">
4620+
<widget class="QCheckBox" name="mShowDatumTransformDialogCheckBox">
4621+
<property name="text">
4622+
<string>Ask for datum transformation if several are available</string>
4623+
</property>
4624+
</widget>
4625+
</item>
4626+
<item row="3" column="0">
4627+
<layout class="QHBoxLayout" name="horizontalLayout_41">
45584628
<item>
45594629
<widget class="QToolButton" name="mAddDefaultTransformButton">
45604630
<property name="toolTip">
@@ -4584,7 +4654,18 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
45844654
</widget>
45854655
</item>
45864656
<item>
4587-
<spacer name="horizontalSpacer_38">
4657+
<widget class="QToolButton" name="mEditDefaultTransformButton">
4658+
<property name="text">
4659+
<string>...</string>
4660+
</property>
4661+
<property name="icon">
4662+
<iconset resource="../../images/images.qrc">
4663+
<normaloff>:/images/themes/default/mActionToggleEditing.svg</normaloff>:/images/themes/default/mActionToggleEditing.svg</iconset>
4664+
</property>
4665+
</widget>
4666+
</item>
4667+
<item>
4668+
<spacer name="horizontalSpacer_43">
45884669
<property name="orientation">
45894670
<enum>Qt::Horizontal</enum>
45904671
</property>
@@ -4598,7 +4679,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
45984679
</item>
45994680
</layout>
46004681
</item>
4601-
<item row="2" column="0">
4682+
<item row="4" column="0">
46024683
<widget class="QTreeWidget" name="mDefaultDatumTransformTreeWidget">
46034684
<column>
46044685
<property name="text">
@@ -4622,16 +4703,29 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
46224703
</column>
46234704
</widget>
46244705
</item>
4625-
<item row="0" column="0">
4626-
<widget class="QCheckBox" name="chkShowDatumTransformDialog">
4627-
<property name="text">
4628-
<string>Ask for datum transformation when no default is defined</string>
4706+
<item row="1" column="0">
4707+
<widget class="Line" name="line_2">
4708+
<property name="orientation">
4709+
<enum>Qt::Horizontal</enum>
46294710
</property>
46304711
</widget>
46314712
</item>
46324713
</layout>
46334714
</widget>
46344715
</item>
4716+
<item row="6" column="0">
4717+
<spacer name="verticalSpacer">
4718+
<property name="orientation">
4719+
<enum>Qt::Vertical</enum>
4720+
</property>
4721+
<property name="sizeHint" stdset="0">
4722+
<size>
4723+
<width>20</width>
4724+
<height>40</height>
4725+
</size>
4726+
</property>
4727+
</spacer>
4728+
</item>
46354729
<item row="2" column="0">
46364730
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,1">
46374731
<property name="topMargin">
@@ -4659,75 +4753,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
46594753
</item>
46604754
</layout>
46614755
</item>
4662-
<item row="4" column="0">
4663-
<widget class="QgsCollapsibleGroupBox" name="grpProjectionBehavior">
4664-
<property name="title">
4665-
<string>CRS for new layers</string>
4666-
</property>
4667-
<layout class="QGridLayout" name="gridLayout_14" columnstretch="0,1">
4668-
<item row="0" column="0" colspan="2">
4669-
<widget class="QLabel" name="label_8">
4670-
<property name="sizePolicy">
4671-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
4672-
<horstretch>0</horstretch>
4673-
<verstretch>0</verstretch>
4674-
</sizepolicy>
4675-
</property>
4676-
<property name="text">
4677-
<string>When a new layer is created, or when a layer is loaded that has no CRS</string>
4678-
</property>
4679-
<property name="wordWrap">
4680-
<bool>true</bool>
4681-
</property>
4682-
</widget>
4683-
</item>
4684-
<item row="1" column="0">
4685-
<widget class="QRadioButton" name="radPromptForProjection">
4686-
<property name="text">
4687-
<string>Pro&amp;mpt for CRS</string>
4688-
</property>
4689-
</widget>
4690-
</item>
4691-
<item row="2" column="0">
4692-
<widget class="QRadioButton" name="radUseProjectProjection">
4693-
<property name="text">
4694-
<string>Use pro&amp;ject CRS</string>
4695-
</property>
4696-
</widget>
4697-
</item>
4698-
<item row="3" column="0">
4699-
<widget class="QRadioButton" name="radUseGlobalProjection">
4700-
<property name="text">
4701-
<string>&amp;Use a default CRS</string>
4702-
</property>
4703-
</widget>
4704-
</item>
4705-
<item row="3" column="1">
4706-
<widget class="QgsProjectionSelectionWidget" name="leLayerGlobalCrs" native="true">
4707-
<property name="enabled">
4708-
<bool>false</bool>
4709-
</property>
4710-
<property name="focusPolicy">
4711-
<enum>Qt::StrongFocus</enum>
4712-
</property>
4713-
</widget>
4714-
</item>
4715-
</layout>
4716-
</widget>
4717-
</item>
4718-
<item row="7" column="0">
4719-
<spacer name="verticalSpacer">
4720-
<property name="orientation">
4721-
<enum>Qt::Vertical</enum>
4722-
</property>
4723-
<property name="sizeHint" stdset="0">
4724-
<size>
4725-
<width>20</width>
4726-
<height>40</height>
4727-
</size>
4728-
</property>
4729-
</spacer>
4730-
</item>
47314756
</layout>
47324757
</widget>
47334758
</widget>
@@ -4771,8 +4796,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
47714796
<rect>
47724797
<x>0</x>
47734798
<y>0</y>
4774-
<width>1258</width>
4775-
<height>1349</height>
4799+
<width>848</width>
4800+
<height>812</height>
47764801
</rect>
47774802
</property>
47784803
<layout class="QVBoxLayout" name="verticalLayout_33">
@@ -5542,10 +5567,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
55425567
<tabstop>radUseProjectProjection</tabstop>
55435568
<tabstop>radUseGlobalProjection</tabstop>
55445569
<tabstop>leLayerGlobalCrs</tabstop>
5545-
<tabstop>chkShowDatumTransformDialog</tabstop>
5546-
<tabstop>mAddDefaultTransformButton</tabstop>
5547-
<tabstop>mRemoveDefaultTransformButton</tabstop>
5548-
<tabstop>mDefaultDatumTransformTreeWidget</tabstop>
55495570
<tabstop>mAuthConfigsGrpBx</tabstop>
55505571
<tabstop>mOptionsScrollArea_10</tabstop>
55515572
<tabstop>leWmsSearch</tabstop>

0 commit comments

Comments
 (0)