Skip to content

Commit

Permalink
Fix rebase issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-kuhn
m-kuhn committed Oct 15, 2018
1 parent 81cfc36 commit 7b3221f
Showing 1 changed file with 92 additions and 69 deletions.
161 changes: 92 additions & 69 deletions src/ui/qgsvectorlayerpropertiesbase.ui
View file
Expand Up @@ -23,8 +23,8 @@
<iconset resource="../../images/images.qrc"> <iconset resource="../../images/images.qrc">
<normaloff>:/images/icons/qgis-icon-16x16.png</normaloff>:/images/icons/qgis-icon-16x16.png</iconset> <normaloff>:/images/icons/qgis-icon-16x16.png</normaloff>:/images/icons/qgis-icon-16x16.png</iconset>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="verticalLayout_26">
<item row="0" column="0"> <item>
<widget class="QSplitter" name="mOptionsSplitter"> <widget class="QSplitter" name="mOptionsSplitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
Expand Down Expand Up @@ -357,7 +357,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>18</number>
</property> </property>
<widget class="QWidget" name="mOptsPage_Information"> <widget class="QWidget" name="mOptsPage_Information">
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
Expand Down Expand Up @@ -433,7 +433,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>289</width> <width>325</width>
<height>389</height> <height>389</height>
</rect> </rect>
</property> </property>
Expand Down Expand Up @@ -1961,8 +1961,8 @@ border-radius: 2px;</string>
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>653</width> <width>340</width>
<height>806</height> <height>630</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_13">
Expand Down Expand Up @@ -2358,56 +2358,86 @@ border-radius: 2px;</string>
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="mGeometryAutoFixesGroupBox"> <widget class="QScrollArea" name="scrollArea_2">
<property name="title"> <property name="widgetResizable">
<string>Automatic Fixes</string> <bool>true</bool>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <widget class="QWidget" name="scrollAreaWidgetContents_2">
<item row="1" column="0"> <property name="geometry">
<widget class="QLabel" name="label"> <rect>
<property name="toolTip"> <x>0</x>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The geometry precision defines the maximum precision to of geometry coordinates that should be stored on this layer. A snap to grid algorithm will be applied on every geometry entering this layer, resulting in coordinates being rounded to multiples of this value. The operation is applied in this layer's coordinate reference system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <y>0</y>
</property> <width>651</width>
<property name="text"> <height>804</height>
<string>Geometry precision</string> </rect>
</property> </property>
</widget> <layout class="QVBoxLayout" name="verticalLayout_20">
</item> <item>
<item row="0" column="0" colspan="2"> <widget class="QGroupBox" name="mGeometryAutoFixesGroupBox">
<widget class="QCheckBox" name="mRemoveDuplicateNodesCheckbox"> <property name="title">
<property name="text"> <string>Automatic Fixes</string>
<string>Remove duplicate nodes</string> </property>
</property> <layout class="QFormLayout" name="formLayout">
</widget> <item row="2" column="0">
</item> <widget class="QLabel" name="label">
<item row="1" column="1"> <property name="toolTip">
<layout class="QHBoxLayout" name="horizontalLayout_11" stretch="1,2"> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The geometry precision defines the maximum precision to of geometry coordinates that should be stored on this layer. A snap to grid algorithm will be applied on every geometry entering this layer, resulting in coordinates being rounded to multiples of this value. The operation is applied in this layer's coordinate reference system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<item> </property>
<widget class="QgsDoubleSpinBox" name="mGeometryPrecisionSpinBox"> <property name="text">
<property name="toolTip"> <string>Geometry precision</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The geometry precision defines the maximum precision to of geometry coordinates that should be stored on this layer. A snap to grid algorithm will be applied on every geometry entering this layer, resulting in coordinates being rounded to multiples of this value. The operation is applied in this layer's coordinate reference system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> </property>
</property> </widget>
<property name="specialValueText"> </item>
<string>[Disabled]</string> <item row="0" column="0" colspan="2">
</property> <widget class="QCheckBox" name="mRemoveDuplicateNodesCheckbox">
</widget> <property name="text">
</item> <string>Remove duplicate nodes</string>
<item> </property>
<spacer name="horizontalSpacer_9"> </widget>
<property name="orientation"> </item>
<enum>Qt::Horizontal</enum> <item row="2" column="1">
</property> <layout class="QHBoxLayout" name="horizontalLayout_11" stretch="0,0">
<property name="sizeHint" stdset="0"> <item>
<size> <widget class="QLabel" name="mPrecisionUnitsLabel">
<width>40</width> <property name="text">
<height>20</height> <string>[Units]</string>
</size> </property>
</property> </widget>
</spacer> </item>
</item> <item>
</layout> <widget class="QLineEdit" name="mGeometryPrecisionLineEdit">
</item> <property name="inputMethodHints">
</layout> <set>Qt::ImhFormattedNumbersOnly</set>
</property>
<property name="text">
<string/>
</property>
<property name="placeholderText">
<string>[No precision restriction]</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="mGeometryValidationGroupBox">
<property name="title">
<string>Geometry checks</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="mTopologyChecksGroupBox">
<property name="title">
<string>Topology checks</string>
</property>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>
Expand All @@ -2418,7 +2448,7 @@ border-radius: 2px;</string>
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QFrame" name="mButtonBoxFrame"> <widget class="QFrame" name="mButtonBoxFrame">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
Expand Down Expand Up @@ -2461,18 +2491,18 @@ border-radius: 2px;</string>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsCollapsibleGroupBox</class> <class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends> <extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header> <header>qgscollapsiblegroupbox.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsScrollArea</class>
<extends>QScrollArea</extends>
<header>qgsscrollarea.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>QgsProjectionSelectionWidget</class> <class>QgsProjectionSelectionWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>
Expand Down Expand Up @@ -2529,11 +2559,6 @@ border-radius: 2px;</string>
<header>qgsvectorlayerlegendwidget.h</header> <header>qgsvectorlayerlegendwidget.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsDoubleSpinBox</class>
<extends>QDoubleSpinBox</extends>
<header>qgsdoublespinbox.h</header>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>mSearchLineEdit</tabstop> <tabstop>mSearchLineEdit</tabstop>
Expand Down Expand Up @@ -2596,7 +2621,6 @@ border-radius: 2px;</string>
<tabstop>mLayerLegendUrlLineEdit</tabstop> <tabstop>mLayerLegendUrlLineEdit</tabstop>
<tabstop>mLayerLegendUrlFormatComboBox</tabstop> <tabstop>mLayerLegendUrlFormatComboBox</tabstop>
<tabstop>mRemoveDuplicateNodesCheckbox</tabstop> <tabstop>mRemoveDuplicateNodesCheckbox</tabstop>
<tabstop>mGeometryPrecisionSpinBox</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../../images/images.qrc"/> <include location="../../images/images.qrc"/>
Expand Down Expand Up @@ -2629,7 +2653,6 @@ border-radius: 2px;</string>
<include location="../../images/images.qrc"/> <include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/> <include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/> <include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>
Expand Down

0 comments on commit 7b3221f

Please sign in to comment.