Skip to content

Commit 514d09b

Browse files
m-kuhnm-kuhn
committedSep 28, 2018
Fix rebase problems
·
ltr-3_40final-3_4_0
1 parent 0e52074 commit 514d09b

File tree

1 file changed

+66
-90
lines changed

1 file changed

+66
-90
lines changed
 

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 66 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<iconset resource="../../images/images.qrc">
2424
<normaloff>:/images/icons/qgis-icon-16x16.png</normaloff>:/images/icons/qgis-icon-16x16.png</iconset>
2525
</property>
26-
<layout class="QVBoxLayout" name="verticalLayout_26">
27-
<item>
26+
<layout class="QGridLayout" name="gridLayout">
27+
<item row="0" column="0">
2828
<widget class="QSplitter" name="mOptionsSplitter">
2929
<property name="orientation">
3030
<enum>Qt::Horizontal</enum>
@@ -357,7 +357,7 @@
357357
</sizepolicy>
358358
</property>
359359
<property name="currentIndex">
360-
<number>18</number>
360+
<number>1</number>
361361
</property>
362362
<widget class="QWidget" name="mOptsPage_Information">
363363
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -433,7 +433,7 @@
433433
<rect>
434434
<x>0</x>
435435
<y>0</y>
436-
<width>325</width>
436+
<width>289</width>
437437
<height>389</height>
438438
</rect>
439439
</property>
@@ -2358,86 +2358,56 @@ border-radius: 2px;</string>
23582358
<number>0</number>
23592359
</property>
23602360
<item row="0" column="0">
2361-
<widget class="QScrollArea" name="scrollArea_2">
2362-
<property name="widgetResizable">
2363-
<bool>true</bool>
2361+
<widget class="QGroupBox" name="mGeometryAutoFixesGroupBox">
2362+
<property name="title">
2363+
<string>Automatic Fixes</string>
23642364
</property>
2365-
<widget class="QWidget" name="scrollAreaWidgetContents_2">
2366-
<property name="geometry">
2367-
<rect>
2368-
<x>0</x>
2369-
<y>0</y>
2370-
<width>651</width>
2371-
<height>804</height>
2372-
</rect>
2373-
</property>
2374-
<layout class="QVBoxLayout" name="verticalLayout_20">
2375-
<item>
2376-
<widget class="QGroupBox" name="mGeometryAutoFixesGroupBox">
2377-
<property name="title">
2378-
<string>Automatic Fixes</string>
2379-
</property>
2380-
<layout class="QFormLayout" name="formLayout">
2381-
<item row="2" column="0">
2382-
<widget class="QLabel" name="label">
2383-
<property name="toolTip">
2384-
<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>
2385-
</property>
2386-
<property name="text">
2387-
<string>Geometry precision</string>
2388-
</property>
2389-
</widget>
2390-
</item>
2391-
<item row="0" column="0" colspan="2">
2392-
<widget class="QCheckBox" name="mRemoveDuplicateNodesCheckbox">
2393-
<property name="text">
2394-
<string>Remove duplicate nodes</string>
2395-
</property>
2396-
</widget>
2397-
</item>
2398-
<item row="2" column="1">
2399-
<layout class="QHBoxLayout" name="horizontalLayout_11" stretch="0,0">
2400-
<item>
2401-
<widget class="QLabel" name="mPrecisionUnitsLabel">
2402-
<property name="text">
2403-
<string>[Units]</string>
2404-
</property>
2405-
</widget>
2406-
</item>
2407-
<item>
2408-
<widget class="QLineEdit" name="mGeometryPrecisionLineEdit">
2409-
<property name="inputMethodHints">
2410-
<set>Qt::ImhFormattedNumbersOnly</set>
2411-
</property>
2412-
<property name="text">
2413-
<string/>
2414-
</property>
2415-
<property name="placeholderText">
2416-
<string>[No precision restriction]</string>
2417-
</property>
2418-
</widget>
2419-
</item>
2420-
</layout>
2421-
</item>
2422-
</layout>
2423-
</widget>
2424-
</item>
2425-
<item>
2426-
<widget class="QGroupBox" name="mGeometryValidationGroupBox">
2427-
<property name="title">
2428-
<string>Geometry checks</string>
2429-
</property>
2430-
</widget>
2431-
</item>
2432-
<item>
2433-
<widget class="QGroupBox" name="mTopologyChecksGroupBox">
2434-
<property name="title">
2435-
<string>Topology checks</string>
2436-
</property>
2437-
</widget>
2438-
</item>
2439-
</layout>
2440-
</widget>
2365+
<layout class="QFormLayout" name="formLayout">
2366+
<item row="1" column="0">
2367+
<widget class="QLabel" name="label">
2368+
<property name="toolTip">
2369+
<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>
2370+
</property>
2371+
<property name="text">
2372+
<string>Geometry precision</string>
2373+
</property>
2374+
</widget>
2375+
</item>
2376+
<item row="0" column="0" colspan="2">
2377+
<widget class="QCheckBox" name="mRemoveDuplicateNodesCheckbox">
2378+
<property name="text">
2379+
<string>Remove duplicate nodes</string>
2380+
</property>
2381+
</widget>
2382+
</item>
2383+
<item row="1" column="1">
2384+
<layout class="QHBoxLayout" name="horizontalLayout_11" stretch="1,2">
2385+
<item>
2386+
<widget class="QgsDoubleSpinBox" name="mGeometryPrecisionSpinBox">
2387+
<property name="toolTip">
2388+
<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>
2389+
</property>
2390+
<property name="specialValueText">
2391+
<string>[Disabled]</string>
2392+
</property>
2393+
</widget>
2394+
</item>
2395+
<item>
2396+
<spacer name="horizontalSpacer_9">
2397+
<property name="orientation">
2398+
<enum>Qt::Horizontal</enum>
2399+
</property>
2400+
<property name="sizeHint" stdset="0">
2401+
<size>
2402+
<width>40</width>
2403+
<height>20</height>
2404+
</size>
2405+
</property>
2406+
</spacer>
2407+
</item>
2408+
</layout>
2409+
</item>
2410+
</layout>
24412411
</widget>
24422412
</item>
24432413
</layout>
@@ -2448,7 +2418,7 @@ border-radius: 2px;</string>
24482418
</widget>
24492419
</widget>
24502420
</item>
2451-
<item>
2421+
<item row="1" column="0">
24522422
<widget class="QFrame" name="mButtonBoxFrame">
24532423
<property name="sizePolicy">
24542424
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
@@ -2491,18 +2461,18 @@ border-radius: 2px;</string>
24912461
</layout>
24922462
</widget>
24932463
<customwidgets>
2494-
<customwidget>
2495-
<class>QgsCollapsibleGroupBox</class>
2496-
<extends>QGroupBox</extends>
2497-
<header>qgscollapsiblegroupbox.h</header>
2498-
<container>1</container>
2499-
</customwidget>
25002464
<customwidget>
25012465
<class>QgsScrollArea</class>
25022466
<extends>QScrollArea</extends>
25032467
<header>qgsscrollarea.h</header>
25042468
<container>1</container>
25052469
</customwidget>
2470+
<customwidget>
2471+
<class>QgsCollapsibleGroupBox</class>
2472+
<extends>QGroupBox</extends>
2473+
<header>qgscollapsiblegroupbox.h</header>
2474+
<container>1</container>
2475+
</customwidget>
25062476
<customwidget>
25072477
<class>QgsProjectionSelectionWidget</class>
25082478
<extends>QWidget</extends>
@@ -2559,6 +2529,11 @@ border-radius: 2px;</string>
25592529
<header>qgsvectorlayerlegendwidget.h</header>
25602530
<container>1</container>
25612531
</customwidget>
2532+
<customwidget>
2533+
<class>QgsDoubleSpinBox</class>
2534+
<extends>QDoubleSpinBox</extends>
2535+
<header>qgsdoublespinbox.h</header>
2536+
</customwidget>
25622537
</customwidgets>
25632538
<tabstops>
25642539
<tabstop>mSearchLineEdit</tabstop>
@@ -2621,6 +2596,7 @@ border-radius: 2px;</string>
26212596
<tabstop>mLayerLegendUrlLineEdit</tabstop>
26222597
<tabstop>mLayerLegendUrlFormatComboBox</tabstop>
26232598
<tabstop>mRemoveDuplicateNodesCheckbox</tabstop>
2599+
<tabstop>mGeometryPrecisionSpinBox</tabstop>
26242600
</tabstops>
26252601
<resources>
26262602
<include location="../../images/images.qrc"/>

0 commit comments

Comments
 (0)
Please sign in to comment.