169 changes: 76 additions & 93 deletions src/ui/qgsmultibandcolorrendererwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>401</width>
<height>203</height>
<width>350</width>
<height>321</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -16,38 +16,8 @@
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<widget class="QLabel" name="mRedBandLabel">
<property name="text">
<string>Red band</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="mRedBandComboBox"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mGreenBandLabel">
<property name="text">
<string>Green band</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="mGreenBandComboBox"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mBlueBandLabel">
<property name="text">
<string>Blue band</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QComboBox" name="mBlueBandComboBox"/>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="mRedMinLineEdit">
<item row="3" column="3">
<widget class="QLineEdit" name="mGreenMaxLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -71,10 +41,13 @@
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QLineEdit" name="mGreenMinLineEdit">
<item row="0" column="1" colspan="3">
<widget class="QComboBox" name="mRedBandComboBox"/>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="mRedMinLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -96,10 +69,13 @@
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QLineEdit" name="mBlueMinLineEdit">
<item row="4" column="1" colspan="3">
<widget class="QComboBox" name="mBlueBandComboBox"/>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="mRedMaxLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -121,8 +97,8 @@
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLineEdit" name="mRedMaxLineEdit">
<item row="5" column="3">
<widget class="QLineEdit" name="mBlueMaxLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -146,10 +122,38 @@
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QLineEdit" name="mGreenMaxLineEdit">
<item row="2" column="1" colspan="3">
<widget class="QComboBox" name="mGreenBandComboBox"/>
</item>
<item row="6" column="1" colspan="3">
<widget class="QComboBox" name="mContrastEnhancementAlgorithmComboBox"/>
</item>
<item row="6" column="0">
<widget class="QLabel" name="mContrastEnhancementAlgorithmLabel">
<property name="text">
<string>Contrast
enhancement</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mBlueBandLabel">
<property name="text">
<string>Blue band</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mGreenBandLabel">
<property name="text">
<string>Green band</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QLineEdit" name="mBlueMinLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -171,10 +175,10 @@
</property>
</widget>
</item>
<item row="3" column="4">
<widget class="QLineEdit" name="mBlueMaxLineEdit">
<item row="3" column="2">
<widget class="QLineEdit" name="mGreenMinLineEdit">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
Expand All @@ -196,7 +200,7 @@
</property>
</widget>
</item>
<item row="0" column="3">
<item row="1" column="1">
<widget class="QLabel" name="mMinLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
Expand All @@ -205,67 +209,46 @@
</sizepolicy>
</property>
<property name="text">
<string>Min</string>
<string>Min/max</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QLabel" name="mMaxLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Max</string>
<item row="7" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</widget>
</spacer>
</item>
<item row="4" column="0">
<widget class="QLabel" name="mContrastEnhancementAlgorithmLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="0" column="0">
<widget class="QLabel" name="mRedBandLabel">
<property name="text">
<string>Contrast enhancement</string>
<string>Red band</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="4">
<widget class="QComboBox" name="mContrastEnhancementAlgorithmComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item row="3" column="1">
<widget class="QLabel" name="label">
<property name="text">
<string>Min/max</string>
</property>
</widget>
</item>
<item row="0" column="2">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
<item row="5" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Min/max</string>
</property>
</spacer>
</widget>
</item>
</layout>
</item>
Expand Down
10 changes: 8 additions & 2 deletions src/ui/qgspalettedrendererwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>211</width>
<height>256</height>
<width>263</width>
<height>340</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -36,6 +36,12 @@
</item>
<item row="1" column="0">
<widget class="QTreeWidget" name="mTreeWidget">
<property name="minimumSize">
<size>
<width>0</width>
<height>280</height>
</size>
</property>
<column>
<property name="text">
<string>Value</string>
Expand Down
3,500 changes: 1,998 additions & 1,502 deletions src/ui/qgsrasterlayerpropertiesbase.ui
View file

Large diffs are not rendered by default.

131 changes: 44 additions & 87 deletions src/ui/qgsrasterminmaxwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,33 @@
<rect>
<x>0</x>
<y>0</y>
<width>371</width>
<height>264</height>
<width>308</width>
<height>334</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="mLoadMinMaxValuesGroupBox">
<property name="title">
<string>Load min/max values</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="margin">
<number>0</number>
<number>6</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="mCumulativeCutRadioButton">
<property name="text">
<string>Cumulative count cut</string>
<string>Cumulative
count cut</string>
</property>
<property name="checked">
<bool>true</bool>
Expand Down Expand Up @@ -94,7 +98,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>268</width>
<width>0</width>
<height>20</height>
</size>
</property>
Expand All @@ -107,7 +111,8 @@
<item>
<widget class="QRadioButton" name="mStdDevRadioButton">
<property name="text">
<string>Mean +/- standard deviation ×</string>
<string>Mean +/-
standard deviation ×</string>
</property>
</widget>
</item>
Expand All @@ -131,8 +136,8 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>318</width>
<height>17</height>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
Expand All @@ -141,19 +146,16 @@
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>3</number>
</property>
<item>
<widget class="QGroupBox" name="mExtentGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Extent</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QRadioButton" name="mFullExtentRadioButton">
<property name="text">
<string>Full</string>
Expand All @@ -163,88 +165,23 @@
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<item>
<widget class="QRadioButton" name="mCurrentExtentRadioButton">
<property name="text">
<string>Current</string>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>60</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="mAccuracyGroupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Accuracy</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>65</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="mActualRadioButton">
<property name="text">
<string>Actual (slower)</string>
</property>
</widget>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacer_8">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>65</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QRadioButton" name="mEstimateRadioButton">
<property name="text">
<string>Estimate (faster)</string>
Expand All @@ -254,6 +191,13 @@
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="mActualRadioButton">
<property name="text">
<string>Actual (slower)</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand All @@ -268,8 +212,8 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>313</width>
<height>21</height>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
Expand All @@ -286,6 +230,19 @@
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources/>
Expand Down
5 changes: 3 additions & 2 deletions src/ui/qgssinglebandgrayrendererwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>463</width>
<width>496</width>
<height>298</height>
</rect>
</property>
Expand All @@ -19,7 +19,8 @@
<item row="4" column="0">
<widget class="QLabel" name="mContrastEnhancementLabel">
<property name="text">
<string>Contrast enhancement</string>
<string>Contrast
enhancement</string>
</property>
</widget>
</item>
Expand Down
178 changes: 74 additions & 104 deletions src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>637</width>
<height>230</height>
<width>616</width>
<height>422</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -79,8 +79,14 @@
<string>...</string>
</property>
<property name="icon">
<iconset>
<normaloff>../../../../../../usr/share/icons/oxygen/16x16/actions/view-sort-ascending.png</normaloff>../../../../../../usr/share/icons/oxygen/16x16/actions/view-sort-ascending.png</iconset>
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionArrowDown.png</normaloff>:/images/themes/default/mActionArrowDown.png</iconset>
</property>
<property name="iconSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
</widget>
</item>
Expand Down Expand Up @@ -191,25 +197,23 @@
<property name="title">
<string>Generate new color map</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QgsColorRampComboBox" name="mColorRampComboBox"/>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
<widget class="QCheckBox" name="mInvertCheckBox">
<property name="text">
<string>Invert</string>
</property>
</spacer>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="mClassificationModeLabel">
<property name="text">
Expand All @@ -220,19 +224,6 @@
<item>
<widget class="QComboBox" name="mClassificationModeComboBox"/>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="mNumberOfEntriesLabel">
<property name="text">
Expand All @@ -256,22 +247,8 @@
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="mMinLabel">
<property name="text">
<string>Min</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mMinLineEdit"/>
</item>
<item>
<spacer name="horizontalSpacer_5">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
Expand All @@ -283,18 +260,19 @@
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
<widget class="QLabel" name="mMinLabel">
<property name="text">
<string>Min</string>
</property>
</spacer>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mMinLineEdit"/>
</item>
<item>
<widget class="QLabel" name="mMaxLabel">
Expand All @@ -319,84 +297,76 @@
</property>
</spacer>
</item>
<item>
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</layout>
</item>
<item>
<widget class="QPushButton" name="mClassifyButton">
<property name="text">
<string>Classify</string>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_3">
<property name="verticalSpacing">
<number>6</number>
</property>
<item row="1" column="1">
<widget class="QLabel" name="mMinMaxOriginLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="mInvertCheckBox">
<property name="text">
<string>Invert</string>
<string>Min / Max origin</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_8">
<item row="1" column="0">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<width>6</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="mClassifyButton">
<property name="text">
<string>Classify</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Min / max origin:</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="mMinMaxOriginLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Min / Max origin</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QWidget" name="mMinMaxContainerWidget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<widget class="QWidget" name="mMinMaxContainerWidget" native="true"/>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
Expand Down
6 changes: 6 additions & 0 deletions src/ui/templates/qgsoptionsdialog_template.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,12 @@
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
Expand Down