Skip to content

Commit

Permalink
replace datum in qgsoptionsbase after rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@3nids @nyalldawson
3nids authored and nyalldawson committed Dec 15, 2017
1 parent 5cc3a1f commit a421939
Showing 1 changed file with 128 additions and 107 deletions.
235 changes: 128 additions & 107 deletions src/ui/qgsoptionsbase.ui
View file
Expand Up @@ -308,7 +308,7 @@
<item>
<widget class="QStackedWidget" name="mOptionsStackedWidget">
<property name="currentIndex">
<number>5</number>
<number>10</number>
</property>
<widget class="QWidget" name="mOptionsPageGeneral">
<layout class="QVBoxLayout" name="verticalLayout_3">
Expand Down Expand Up @@ -337,8 +337,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1159</width>
<height>1434</height>
<width>848</width>
<height>812</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_28">
Expand Down Expand Up @@ -1032,8 +1032,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1092</width>
<height>1502</height>
<width>848</width>
<height>1114</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_22">
Expand Down Expand Up @@ -1568,8 +1568,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1010</width>
<height>1266</height>
<width>848</width>
<height>812</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_27">
Expand Down Expand Up @@ -1936,8 +1936,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1351</width>
<height>1933</height>
<width>848</width>
<height>1020</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_22">
Expand Down Expand Up @@ -2687,8 +2687,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>269</width>
<height>424</height>
<width>848</width>
<height>812</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_46">
Expand Down Expand Up @@ -2838,8 +2838,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>813</width>
<height>751</height>
<width>848</width>
<height>812</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_25">
Expand Down Expand Up @@ -3095,8 +3095,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>1081</width>
<height>1164</height>
<width>637</width>
<height>663</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_30">
Expand Down Expand Up @@ -3539,8 +3539,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>920</width>
<height>924</height>
<width>513</width>
<height>611</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_39">
Expand Down Expand Up @@ -3808,8 +3808,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>1072</width>
<height>1551</height>
<width>597</width>
<height>784</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_31">
Expand Down Expand Up @@ -4403,8 +4403,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>823</width>
<height>576</height>
<width>521</width>
<height>361</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
Expand Down Expand Up @@ -4542,19 +4542,89 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>838</width>
<height>855</height>
<width>848</width>
<height>812</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_15">
<item row="5" column="0" rowspan="2">
<item row="4" column="0">
<widget class="QgsCollapsibleGroupBox" name="grpProjectionBehavior">
<property name="title">
<string>CRS for new layers</string>
</property>
<layout class="QGridLayout" name="gridLayout_14" columnstretch="0,1">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>When a new layer is created, or when a layer is loaded that has no CRS</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radPromptForProjection">
<property name="text">
<string>Pro&amp;mpt for CRS</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="radUseProjectProjection">
<property name="text">
<string>Use pro&amp;ject CRS</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QRadioButton" name="radUseGlobalProjection">
<property name="text">
<string>&amp;Use a default CRS</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QgsProjectionSelectionWidget" name="leLayerGlobalCrs" native="true">
<property name="enabled">
<bool>false</bool>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="5" column="0">
<widget class="QgsCollapsibleGroupBox" name="mDefaultDatumTransformGroupBox">
<property name="title">
<string>Default datum transformations</string>
</property>
<layout class="QGridLayout" name="gridLayout_10">
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_38">
<item row="2" column="0">
<widget class="QLabel" name="label_40">
<property name="text">
<string>Enter default datum transformations which will be used in any newly created project</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="mShowDatumTransformDialogCheckBox">
<property name="text">
<string>Ask for datum transformation if several are available</string>
</property>
</widget>
</item>
<item row="3" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_41">
<item>
<widget class="QToolButton" name="mAddDefaultTransformButton">
<property name="toolTip">
Expand Down Expand Up @@ -4584,7 +4654,18 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_38">
<widget class="QToolButton" name="mEditDefaultTransformButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionToggleEditing.svg</normaloff>:/images/themes/default/mActionToggleEditing.svg</iconset>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_43">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -4598,7 +4679,7 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</item>
</layout>
</item>
<item row="2" column="0">
<item row="4" column="0">
<widget class="QTreeWidget" name="mDefaultDatumTransformTreeWidget">
<column>
<property name="text">
Expand All @@ -4622,16 +4703,29 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</column>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="chkShowDatumTransformDialog">
<property name="text">
<string>Ask for datum transformation when no default is defined</string>
<item row="1" column="0">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,1">
<property name="topMargin">
Expand Down Expand Up @@ -4659,75 +4753,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QgsCollapsibleGroupBox" name="grpProjectionBehavior">
<property name="title">
<string>CRS for new layers</string>
</property>
<layout class="QGridLayout" name="gridLayout_14" columnstretch="0,1">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_8">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>When a new layer is created, or when a layer is loaded that has no CRS</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radPromptForProjection">
<property name="text">
<string>Pro&amp;mpt for CRS</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QRadioButton" name="radUseProjectProjection">
<property name="text">
<string>Use pro&amp;ject CRS</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QRadioButton" name="radUseGlobalProjection">
<property name="text">
<string>&amp;Use a default CRS</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QgsProjectionSelectionWidget" name="leLayerGlobalCrs" native="true">
<property name="enabled">
<bool>false</bool>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="7" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
Expand Down Expand Up @@ -4771,8 +4796,8 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<rect>
<x>0</x>
<y>0</y>
<width>1258</width>
<height>1349</height>
<width>848</width>
<height>812</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_33">
Expand Down Expand Up @@ -5542,10 +5567,6 @@ The bigger the number, the faster zooming with the mouse wheel will be.</string>
<tabstop>radUseProjectProjection</tabstop>
<tabstop>radUseGlobalProjection</tabstop>
<tabstop>leLayerGlobalCrs</tabstop>
<tabstop>chkShowDatumTransformDialog</tabstop>
<tabstop>mAddDefaultTransformButton</tabstop>
<tabstop>mRemoveDefaultTransformButton</tabstop>
<tabstop>mDefaultDatumTransformTreeWidget</tabstop>
<tabstop>mAuthConfigsGrpBx</tabstop>
<tabstop>mOptionsScrollArea_10</tabstop>
<tabstop>leWmsSearch</tabstop>
Expand Down

0 comments on commit a421939

Please sign in to comment.