Skip to content

Commit

Permalink
Clean Rendering ui files and fix tab stops
Browse files Browse the repository at this point in the history
  • Loading branch information
@DelazJ @nyalldawson
DelazJ authored and nyalldawson committed Jul 25, 2022
1 parent 4893b98 commit 24a71d0
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 34 deletions.
45 changes: 20 additions & 25 deletions src/ui/qgsoptionsbase.ui
View file
Expand Up @@ -5290,11 +5290,6 @@ p, li { white-space: pre-wrap; }
<header location="global">qgsvariableeditorwidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsScaleComboBox</class>
<extends>QComboBox</extends>
<header>qgsscalecombobox.h</header>
</customwidget>
<customwidget>
<class>QgsColorButton</class>
<extends>QToolButton</extends>
Expand Down Expand Up @@ -5408,6 +5403,13 @@ p, li { white-space: pre-wrap; }
<tabstop>mLocalizedDataPathListWidget</tabstop>
<tabstop>mBtnRemoveHiddenPath</tabstop>
<tabstop>mListHiddenBrowserPaths</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>mOptionsScrollArea_02</tabstop>
<tabstop>cmbEditCreateOptions</tabstop>
<tabstop>pbnEditCreateOptions</tabstop>
<tabstop>pbnEditPyramidsOptions</tabstop>
<tabstop>lstRasterDrivers</tabstop>
<tabstop>lstVectorDrivers</tabstop>
<tabstop>mOptionsScrollArea_06</tabstop>
<tabstop>pbnSelectionColor</tabstop>
<tabstop>pbnCanvasColor</tabstop>
Expand All @@ -5429,8 +5431,8 @@ p, li { white-space: pre-wrap; }
<tabstop>mKeepBaseUnitCheckBox</tabstop>
<tabstop>mDistanceUnitsComboBox</tabstop>
<tabstop>mAreaUnitsComboBox</tabstop>
<tabstop>mCustomizeCoordinateFormatButton</tabstop>
<tabstop>mAngleUnitsComboBox</tabstop>
<tabstop>mCustomizeCoordinateFormatButton</tabstop>
<tabstop>mCustomizeBearingFormatButton</tabstop>
<tabstop>spinZoomFactor</tabstop>
<tabstop>mListGlobalScales</tabstop>
Expand All @@ -5439,16 +5441,6 @@ p, li { white-space: pre-wrap; }
<tabstop>pbnDefaultScaleValues</tabstop>
<tabstop>pbnImportScales</tabstop>
<tabstop>pbnExportScales</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>mColorSchemesComboBox</tabstop>
<tabstop>mSchemeToolButton</tabstop>
<tabstop>mTreeCustomColors</tabstop>
<tabstop>mButtonAddColor</tabstop>
<tabstop>mButtonRemoveColor</tabstop>
<tabstop>mButtonCopyColors</tabstop>
<tabstop>mButtonPasteColors</tabstop>
<tabstop>mButtonImportColors</tabstop>
<tabstop>mButtonExportColors</tabstop>
<tabstop>mOptionsScrollArea_07</tabstop>
<tabstop>chkDisableAttributeValuesDlg</tabstop>
<tabstop>chkReuseLastValues</tabstop>
Expand Down Expand Up @@ -5478,6 +5470,16 @@ p, li { white-space: pre-wrap; }
<tabstop>mTracingConvertToCurveCheckBox</tabstop>
<tabstop>mTracingCustomAngleToleranceSpinBox</tabstop>
<tabstop>mTracingCustomDistanceToleranceSpinBox</tabstop>
<tabstop>scrollArea</tabstop>
<tabstop>mColorSchemesComboBox</tabstop>
<tabstop>mTreeCustomColors</tabstop>
<tabstop>mSchemeToolButton</tabstop>
<tabstop>mButtonAddColor</tabstop>
<tabstop>mButtonRemoveColor</tabstop>
<tabstop>mButtonCopyColors</tabstop>
<tabstop>mButtonPasteColors</tabstop>
<tabstop>mButtonImportColors</tabstop>
<tabstop>mButtonExportColors</tabstop>
<tabstop>mOptionsScrollArea_12</tabstop>
<tabstop>mComposerFontComboBox</tabstop>
<tabstop>mGridStyleComboBox</tabstop>
Expand All @@ -5489,13 +5491,6 @@ p, li { white-space: pre-wrap; }
<tabstop>mBtnAddTemplatePath</tabstop>
<tabstop>mBtnRemoveTemplatePath</tabstop>
<tabstop>mListComposerTemplatePaths</tabstop>
<tabstop>mOptionsScrollArea_02</tabstop>
<tabstop>tabWidget</tabstop>
<tabstop>cmbEditCreateOptions</tabstop>
<tabstop>pbnEditCreateOptions</tabstop>
<tabstop>pbnEditPyramidsOptions</tabstop>
<tabstop>lstRasterDrivers</tabstop>
<tabstop>lstVectorDrivers</tabstop>
<tabstop>mAuthConfigsGrpBx</tabstop>
<tabstop>mOptionsScrollArea_10</tabstop>
<tabstop>mNetworkTimeoutSpinBox</tabstop>
Expand All @@ -5508,8 +5503,6 @@ p, li { white-space: pre-wrap; }
<tabstop>mBrowseCacheDirectory</tabstop>
<tabstop>mCacheSize</tabstop>
<tabstop>mClearCache</tabstop>
<tabstop>mAutoClearAccessCache</tabstop>
<tabstop>mClearAccessCache</tabstop>
<tabstop>grpProxy</tabstop>
<tabstop>mProxyTypeComboBox</tabstop>
<tabstop>leProxyHost</tabstop>
Expand All @@ -5520,6 +5513,8 @@ p, li { white-space: pre-wrap; }
<tabstop>mGPUEnableCheckBox</tabstop>
<tabstop>mOpenClDevicesCombo</tabstop>
<tabstop>mGPUInfoTextBrowser</tabstop>
<tabstop>mAutoClearAccessCache</tabstop>
<tabstop>mClearAccessCache</tabstop>
</tabstops>
<resources>
<include location="../../images/images.qrc"/>
Expand Down
20 changes: 19 additions & 1 deletion src/ui/qgsrasterrenderingoptionsbase.ui
View file
Expand Up @@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>GPS Device Editor</string>
<string>Raster Rendering Options</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
Expand Down Expand Up @@ -297,6 +297,24 @@
<header>qgsdoublespinbox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>spnRed</tabstop>
<tabstop>spnGreen</tabstop>
<tabstop>spnBlue</tabstop>
<tabstop>mZoomedInResamplingComboBox</tabstop>
<tabstop>mZoomedOutResamplingComboBox</tabstop>
<tabstop>spnOversampling</tabstop>
<tabstop>mCbEarlyResampling</tabstop>
<tabstop>cboxContrastEnhancementAlgorithmSingleBand</tabstop>
<tabstop>cboxContrastEnhancementLimitsSingleBand</tabstop>
<tabstop>cboxContrastEnhancementAlgorithmMultiBandSingleByte</tabstop>
<tabstop>cboxContrastEnhancementLimitsMultiBandSingleByte</tabstop>
<tabstop>cboxContrastEnhancementAlgorithmMultiBandMultiByte</tabstop>
<tabstop>cboxContrastEnhancementLimitsMultiBandMultiByte</tabstop>
<tabstop>mRasterCumulativeCutLowerDoubleSpinBox</tabstop>
<tabstop>mRasterCumulativeCutUpperDoubleSpinBox</tabstop>
<tabstop>spnThreeBandStdDev</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
9 changes: 8 additions & 1 deletion src/ui/qgsrenderingoptionsbase.ui
View file
Expand Up @@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>GPS Device Editor</string>
<string>Rendering Options</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
Expand Down Expand Up @@ -153,6 +153,13 @@
<header>qgsdoublespinbox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>chkAddedVisibility</tabstop>
<tabstop>spinMaxThreads</tabstop>
<tabstop>spinMapUpdateInterval</tabstop>
<tabstop>doubleSpinBoxMagnifierDefault</tabstop>
<tabstop>chkAntiAliasing</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
23 changes: 16 additions & 7 deletions src/ui/qgsvectorrenderingoptionsbase.ui
View file
Expand Up @@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>GPS Device Editor</string>
<string>Vector Rendering Options</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
Expand All @@ -43,7 +43,7 @@
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QGridLayout" name="_14" columnstretch="0,1,0,0">
<layout class="QGridLayout" name="_14" columnstretch="0,1,0">
<item row="1" column="1">
<widget class="QgsDoubleSpinBox" name="mSimplifyDrawingSpinBox">
<property name="toolTip">
Expand Down Expand Up @@ -79,7 +79,7 @@
</property>
</widget>
</item>
<item row="4" column="1" colspan="3">
<item row="4" column="1" colspan="2">
<widget class="QgsScaleComboBox" name="mSimplifyMaximumScaleComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
Expand All @@ -99,21 +99,21 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<item row="3" column="0" colspan="3">
<widget class="QCheckBox" name="mSimplifyDrawingAtProvider">
<property name="text">
<string>Simplify on provider side if possible</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="4">
<item row="0" column="0" colspan="3">
<widget class="QLabel" name="label_59">
<property name="text">
<string>&lt;b&gt;Note:&lt;/b&gt; Feature simplification may speed up rendering but can result in rendering inconsistencies</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="3">
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="mSimplifyAlgorithmComboBox"/>
</item>
<item row="1" column="0">
Expand All @@ -126,7 +126,7 @@
</property>
</widget>
</item>
<item row="1" column="2" colspan="2">
<item row="1" column="2">
<widget class="QLabel" name="mSimplifyDrawingPx">
<property name="text">
<string>pixels</string>
Expand Down Expand Up @@ -202,6 +202,15 @@
<header>qgsscalecombobox.h</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>mSimplifyDrawingGroupBox</tabstop>
<tabstop>mSimplifyDrawingSpinBox</tabstop>
<tabstop>mSimplifyAlgorithmComboBox</tabstop>
<tabstop>mSimplifyDrawingAtProvider</tabstop>
<tabstop>mSimplifyMaximumScaleComboBox</tabstop>
<tabstop>mSegmentationToleranceSpinBox</tabstop>
<tabstop>mToleranceTypeComboBox</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>

0 comments on commit 24a71d0

Please sign in to comment.