Showing with 75 additions and 76 deletions.
  1. +5 −5 i18n/qgis_de.ts
  2. +4 −4 src/ui/qgsmultibandcolorrendererwidgetbase.ui
  3. +60 −64 src/ui/qgssinglebandgrayrendererwidgetbase.ui
  4. +6 −3 tests/src/core/testziplayer.cpp
10 changes: 5 additions & 5 deletions i18n/qgis_de.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3179,7 +3179,7 @@ when pressing on the tool dialog&apos;s Help button.</source>
<message>
<location filename="../python/plugins/GdalTools/tools/widgetOverview.ui" line="45"/>
<source>Resampling method</source>
<translation>Stichprobenmethode</translation>
<translation>Abtastungsmethode</translation>
</message>
<message>
<location filename="../python/plugins/GdalTools/tools/widgetOverview.ui" line="53"/>
Expand Down Expand Up @@ -3610,7 +3610,7 @@ Der &apos;Grau&apos;-wert (aus GDAL 1.7) ermöglicht Datensätze mit einer Farbt
<message>
<location filename="../python/plugins/GdalTools/tools/widgetWarp.ui" line="111"/>
<source>&amp;Resampling method</source>
<translation>&amp;Stichprobenmethode</translation>
<translation>&amp;Abtastungsmethode</translation>
</message>
<message>
<location filename="../python/plugins/GdalTools/tools/widgetWarp.ui" line="161"/>
Expand Down Expand Up @@ -30917,7 +30917,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/qgsrasterlayerpropertiesbase.ui" line="51"/>
<source>Resampling</source>
<translation>Stichproben</translation>
<translation>Abtastung</translation>
</message>
<message>
<location filename="../src/ui/qgsrasterlayerpropertiesbase.ui" line="57"/>
Expand Down Expand Up @@ -31132,7 +31132,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/ui/qgsrasterlayerpropertiesbase.ui" line="878"/>
<source>Resampling method</source>
<translation>Stichprobenmethode</translation>
<translation>Abtastungsmethode</translation>
</message>
<message>
<location filename="../src/ui/qgsrasterlayerpropertiesbase.ui" line="886"/>
Expand Down Expand Up @@ -34952,7 +34952,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/plugins/georeferencer/qgstransformsettingsdialogbase.ui" line="39"/>
<source>Resampling method:</source>
<translation>Stichprobenmethode:</translation>
<translation>Abtastungsmethode:</translation>
</message>
<message>
<location filename="../src/plugins/georeferencer/qgstransformsettingsdialogbase.ui" line="53"/>
Expand Down
8 changes: 4 additions & 4 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>320</width>
<height>529</height>
<width>893</width>
<height>204</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -58,7 +58,7 @@
</item>
</layout>
</item>
<item row="1" column="0">
<item row="0" column="1">
<widget class="QGroupBox" name="mMinMaxGroupBox">
<property name="title">
<string>Min/Max values</string>
Expand Down Expand Up @@ -299,7 +299,7 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<item row="0" column="2">
<widget class="QGroupBox" name="mLoadMinMaxValuesGroupBox">
<property name="title">
<string>Load min-/max values</string>
Expand Down
124 changes: 60 additions & 64 deletions src/ui/qgssinglebandgrayrendererwidgetbase.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,63 +6,15 @@
<rect>
<x>0</x>
<y>0</y>
<width>388</width>
<height>292</height>
<width>625</width>
<height>204</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mGrayBandLabel">
<property name="text">
<string>Gray band</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="mGrayBandComboBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mContrastEnhancementLabel">
<property name="text">
<string>Contrast enhancement</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="mContrastEnhancementComboBox"/>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="mMinLabel">
<property name="text">
<string>Min</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mMinLineEdit"/>
</item>
<item>
<widget class="QLabel" name="mMaxLabel">
<property name="text">
<string>Max</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mMaxLineEdit"/>
</item>
</layout>
</item>
<item row="2" column="0">
<item row="0" column="1" rowspan="2">
<widget class="QGroupBox" name="mLoadMinMaxValuesGroupBox">
<property name="title">
<string>Load min-/max values</string>
Expand Down Expand Up @@ -118,6 +70,19 @@
</property>
</widget>
</item>
<item row="4" column="1" colspan="4">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>303</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="2" colspan="3">
<spacer name="horizontalSpacer">
<property name="orientation">
Expand Down Expand Up @@ -171,22 +136,53 @@
</property>
</widget>
</item>
<item row="4" column="1" colspan="4">
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>303</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item row="0" column="0" rowspan="2">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="mGrayBandLabel">
<property name="text">
<string>Gray band</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="mGrayBandComboBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mContrastEnhancementLabel">
<property name="text">
<string>Contrast enhancement</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QComboBox" name="mContrastEnhancementComboBox"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mMinLabel">
<property name="text">
<string>Min</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="mMinLineEdit"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="mMaxLabel">
<property name="text">
<string>Max</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="mMaxLineEdit"/>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
Expand Down
9 changes: 6 additions & 3 deletions tests/src/core/testziplayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,11 @@ void TestZipLayer::testPassthruVectorZip()

void TestZipLayer::testPassthruVectorTar()
{
QSettings settings;
QString myFileName = mDataDir + "points2.tar";
#if GDAL_VERSION_NUM < 1800
QSKIP( "This test requires GDAL >= 1.8", SkipSingle );
#endif
QSettings settings;
QString myFileName = mDataDir + "points2.tar";
foreach( QString s, mScanZipSettings )
{
settings.setValue( "/qgis/scanZipInBrowser", s );
Expand All @@ -315,10 +315,10 @@ void TestZipLayer::testPassthruVectorTar()

void TestZipLayer::testPassthruVectorGzip()
{
QSettings settings;
#if GDAL_VERSION_NUM < 1700
QSKIP( "This test requires GDAL >= 1.7", SkipSingle );
#endif
QSettings settings;
foreach( QString s, mScanZipSettings )
{
settings.setValue( "/qgis/scanZipInBrowser", s );
Expand Down Expand Up @@ -491,6 +491,9 @@ void TestZipLayer::testZipItemSubfolder()

void TestZipLayer::testTarItemSubfolder()
{
#if GDAL_VERSION_NUM < 1800
QSKIP( "This test requires GDAL >= 1.8", SkipSingle );
#endif
QSettings settings;
foreach( QString s, mScanZipSettings )
{
Expand Down