[QGIS Commit] r9269 - in trunk/qgis/src: app ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Sep 5 19:57:28 EDT 2008
Author: timlinux
Date: 2008-09-05 19:57:28 -0400 (Fri, 05 Sep 2008)
New Revision: 9269
Modified:
trunk/qgis/src/app/qgsrasterlayerproperties.cpp
trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
Log:
Tweaks for raster layer props and got rid of show debug overlay option
Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2008-09-05 21:57:41 UTC (rev 9268)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp 2008-09-05 23:57:28 UTC (rev 9269)
@@ -454,8 +454,6 @@
void QgsRasterLayerProperties::sync()
{
QgsDebugMsg( "called." );
- cboxShowDebugInfo->hide();
-
QgsDebugMsg( "sync populate symbology tab" );
/*
* Symbology Tab
@@ -786,15 +784,11 @@
/*
* General Tab
*/
- cboxShowDebugInfo->hide();
//these properties (layer name and label) are provided by the qgsmaplayer superclass
leLayerSource->setText( mRasterLayer->source() );
leDisplayName->setText( mRasterLayer->name() );
- //update the debug checkbox
- cboxShowDebugInfo->setChecked( mRasterLayer->getShowDebugOverlayFlag() );
-
//display the raster dimensions and no data value
if ( mRasterLayerIsGdal )
{
@@ -1418,15 +1412,7 @@
*/
mRasterLayer->setLayerName( leDisplayName->text() );
- //see if the user would like debug overlays
- if ( cboxShowDebugInfo->isChecked() == true )
- {
- mRasterLayer->setShowDebugOverlayFlag( true );
- }
- else
- {
- mRasterLayer->setShowDebugOverlayFlag( false );
- }
+ mRasterLayer->setShowDebugOverlayFlag( true );
// set up the scale based layer visibility stuff....
mRasterLayer->setScaleBasedVisibility( chkUseScaleDependentRendering->isChecked() );
Modified: trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui
===================================================================
--- trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2008-09-05 21:57:41 UTC (rev 9268)
+++ trunk/qgis/src/ui/qgsrasterlayerpropertiesbase.ui 2008-09-05 23:57:28 UTC (rev 9269)
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>596</width>
- <height>658</height>
+ <width>576</width>
+ <height>588</height>
</rect>
</property>
<property name="windowTitle" >
@@ -22,7 +22,7 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" >
- <item row="0" column="0" >
+ <item row="0" column="0" colspan="4" >
<widget class="QTabWidget" name="tabBar" >
<property name="currentIndex" >
<number>0</number>
@@ -224,32 +224,20 @@
<item row="3" column="3" colspan="2" >
<layout class="QHBoxLayout" >
<item>
- <widget class="QLabel" name="labelDefaultBandCombination" >
+ <widget class="QToolButton" name="pbtnMakeBandCombinationDefault" >
<property name="text" >
- <string>Default R:1 G:2 B:3</string>
+ <string>...</string>
</property>
+ <property name="icon" >
+ <iconset>../../images/themes/default/mActionFileSave.png</iconset>
+ </property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="pbtnMakeBandCombinationDefault" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip" >
- <string>Save current band combination as default. This setting will be persistent between QGIS sessions.</string>
- </property>
- <property name="whatsThis" >
- <string>Save current band combination as a default. This setting will be persistent between QGIS sessions.</string>
- </property>
+ <widget class="QLabel" name="labelDefaultBandCombination" >
<property name="text" >
- <string/>
+ <string>Default R:1 G:2 B:3</string>
</property>
- <property name="icon" >
- <iconset>../../images/themes/default/mActionFileSave.png</iconset>
- </property>
</widget>
</item>
</layout>
@@ -277,7 +265,7 @@
<item row="5" column="1" >
<widget class="QLineEdit" name="leRedMin" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -328,7 +316,7 @@
<item row="5" column="4" >
<widget class="QLineEdit" name="leRedMax" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -366,7 +354,7 @@
<item row="6" column="1" >
<widget class="QLineEdit" name="leGreenMin" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -404,7 +392,7 @@
<item row="6" column="4" >
<widget class="QLineEdit" name="leGreenMax" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -442,7 +430,7 @@
<item row="7" column="1" >
<widget class="QLineEdit" name="leBlueMin" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -480,7 +468,7 @@
<item row="7" column="4" >
<widget class="QLineEdit" name="leBlueMax" >
<property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -511,6 +499,12 @@
</item>
<item row="8" column="4" >
<widget class="QDoubleSpinBox" name="sboxThreeBandStdDev" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="maximum" >
<double>10.000000000000000</double>
</property>
@@ -989,26 +983,13 @@
</property>
</widget>
</item>
- <item row="0" column="2" colspan="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>261</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" >
+ <item row="0" column="1" colspan="2" >
<widget class="QComboBox" name="cboxTransparencyBand" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -1021,27 +1002,14 @@
</property>
</widget>
</item>
- <item row="1" column="2" colspan="2" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>261</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="0" colspan="3" >
+ <item row="1" column="0" colspan="2" >
<widget class="QLabel" name="label_2" >
<property name="text" >
<string>Transparent pixel list</string>
</property>
</widget>
</item>
- <item row="4" column="0" colspan="3" >
+ <item row="2" column="0" colspan="2" >
<widget class="QTableWidget" name="tableTransparency" >
<property name="verticalScrollBarPolicy" >
<enum>Qt::ScrollBarAsNeeded</enum>
@@ -1066,7 +1034,7 @@
</property>
</widget>
</item>
- <item row="4" column="3" >
+ <item row="2" column="2" >
<layout class="QVBoxLayout" >
<property name="leftMargin" >
<number>11</number>
@@ -1176,19 +1144,6 @@
</item>
</layout>
</item>
- <item row="2" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
</item>
@@ -1199,33 +1154,17 @@
<string>Colormap</string>
</attribute>
<layout class="QGridLayout" >
- <item row="0" column="0" colspan="3" >
- <layout class="QHBoxLayout" >
- <property name="leftMargin" >
- <number>11</number>
+ <item row="0" column="0" colspan="2" >
+ <widget class="QLabel" name="mColorInterpolationLabel" >
+ <property name="text" >
+ <string>Color interpolation</string>
</property>
- <property name="topMargin" >
- <number>11</number>
- </property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <item>
- <widget class="QLabel" name="mColorInterpolationLabel" >
- <property name="text" >
- <string>Color interpolation</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="cboxColorInterpolation" />
- </item>
- </layout>
+ </widget>
</item>
- <item row="0" column="3" colspan="6" >
+ <item row="0" column="2" colspan="2" >
+ <widget class="QComboBox" name="cboxColorInterpolation" />
+ </item>
+ <item row="0" column="4" colspan="7" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@@ -1245,21 +1184,21 @@
</property>
</widget>
</item>
- <item row="1" column="1" >
+ <item row="1" column="1" colspan="2" >
<widget class="QPushButton" name="mDeleteEntryButton" >
<property name="text" >
<string>Delete entry</string>
</property>
</widget>
</item>
- <item row="1" column="2" colspan="2" >
+ <item row="1" column="3" colspan="2" >
<widget class="QPushButton" name="pbtnSortColorMap" >
<property name="text" >
<string>Sort</string>
</property>
</widget>
</item>
- <item row="1" column="4" >
+ <item row="1" column="5" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@@ -1272,30 +1211,23 @@
</property>
</spacer>
</item>
- <item row="1" column="5" >
- <layout class="QHBoxLayout" >
- <property name="leftMargin" >
- <number>11</number>
+ <item row="1" column="6" >
+ <widget class="QComboBox" name="cboxColorMapBand" />
+ </item>
+ <item row="1" column="7" >
+ <widget class="QToolButton" name="pbtnLoadColorMapFromBand" >
+ <property name="toolTip" >
+ <string>Load color map from band</string>
</property>
- <item>
- <widget class="QComboBox" name="cboxColorMapBand" />
- </item>
- <item>
- <widget class="QToolButton" name="pbtnLoadColorMapFromBand" >
- <property name="toolTip" >
- <string>Load color map from band</string>
- </property>
- <property name="text" >
- <string>...</string>
- </property>
- <property name="icon" >
- <iconset>../../images/themes/default/mActionNewAttribute.png</iconset>
- </property>
- </widget>
- </item>
- </layout>
+ <property name="text" >
+ <string>...</string>
+ </property>
+ <property name="icon" >
+ <iconset>../../images/themes/default/mActionNewAttribute.png</iconset>
+ </property>
+ </widget>
</item>
- <item row="1" column="6" >
+ <item row="1" column="8" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@@ -1311,7 +1243,7 @@
</property>
</spacer>
</item>
- <item row="1" column="7" >
+ <item row="1" column="9" >
<widget class="QToolButton" name="pbtnLoadColorMapFromFile" >
<property name="toolTip" >
<string>Load color map from file</string>
@@ -1324,7 +1256,7 @@
</property>
</widget>
</item>
- <item row="1" column="8" >
+ <item row="1" column="10" >
<widget class="QToolButton" name="pbtnExportColorMapToFile" >
<property name="toolTip" >
<string>Export color map to file</string>
@@ -1337,7 +1269,7 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="9" >
+ <item row="2" column="0" colspan="11" >
<widget class="QTreeWidget" name="mColormapTreeWidget" >
<property name="columnCount" >
<number>3</number>
@@ -1359,75 +1291,43 @@
</column>
</widget>
</item>
- <item row="3" column="0" colspan="9" >
+ <item row="3" column="0" colspan="11" >
<widget class="QGroupBox" name="groupBox_9" >
<property name="title" >
<string>Generate new color map</string>
</property>
- <layout class="QHBoxLayout" >
- <item>
- <layout class="QHBoxLayout" >
- <property name="leftMargin" >
- <number>11</number>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="mNumberOfEntriesLabel" >
+ <property name="text" >
+ <string>Number of entries</string>
</property>
- <property name="topMargin" >
- <number>11</number>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QSpinBox" name="sboxNumberOfEntries" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="rightMargin" >
- <number>11</number>
+ <property name="maximum" >
+ <number>255</number>
</property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <item>
- <widget class="QLabel" name="mNumberOfEntriesLabel" >
- <property name="text" >
- <string>Number of entries</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QSpinBox" name="sboxNumberOfEntries" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximum" >
- <number>256</number>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="leftMargin" >
- <number>11</number>
+ <item row="0" column="2" >
+ <widget class="QLabel" name="mClassificationModeLabel" >
+ <property name="text" >
+ <string>Classification mode</string>
</property>
- <property name="topMargin" >
- <number>11</number>
- </property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <item>
- <widget class="QLabel" name="mClassificationModeLabel" >
- <property name="text" >
- <string>Classification mode</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="cboxClassificationMode" />
- </item>
- </layout>
+ </widget>
</item>
- <item>
+ <item row="0" column="3" >
+ <widget class="QComboBox" name="cboxClassificationMode" />
+ </item>
+ <item row="0" column="4" >
<widget class="QPushButton" name="mClassifyButton" >
<property name="text" >
<string>Classify</string>
@@ -1444,54 +1344,80 @@
<string>General</string>
</attribute>
<layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>11</number>
- </property>
- <property name="topMargin" >
- <number>11</number>
- </property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <item row="4" column="0" colspan="3" >
- <widget class="QGroupBox" name="grpSRS" >
- <property name="title" >
- <string>Coordinate reference system</string>
+ <item row="0" column="0" colspan="2" >
+ <widget class="QLabel" name="lblDisplayName" >
+ <property name="text" >
+ <string>Display name</string>
</property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>11</number>
- </property>
- <property name="topMargin" >
- <number>11</number>
- </property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <item row="0" column="1" >
- <widget class="QPushButton" name="pbnChangeSpatialRefSys" >
- <property name="text" >
- <string>Change</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLineEdit" name="leSpatialRefSys" >
- <property name="readOnly" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
+ <property name="buddy" >
+ <cstring>leDisplayName</cstring>
+ </property>
</widget>
</item>
- <item row="3" column="0" colspan="3" >
+ <item row="0" column="2" colspan="4" >
+ <widget class="QLineEdit" name="leDisplayName" />
+ </item>
+ <item row="1" column="0" colspan="2" >
+ <widget class="QLabel" name="lblLayerSource" >
+ <property name="text" >
+ <string>Layer source</string>
+ </property>
+ <property name="buddy" >
+ <cstring>leLayerSource</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" colspan="4" >
+ <widget class="QLineEdit" name="leLayerSource" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2" colspan="4" >
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="lblColumns" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Columns:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="lblRows" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>Rows:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2" >
+ <widget class="QLabel" name="lblNoData" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text" >
+ <string>No Data:</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="0" colspan="6" >
<widget class="QGroupBox" name="chkUseScaleDependentRendering" >
<property name="title" >
<string>Scale dependent visibility</string>
@@ -1561,255 +1487,178 @@
</layout>
</widget>
</item>
- <item row="2" column="0" colspan="2" >
- <widget class="QCheckBox" name="cboxShowDebugInfo" >
- <property name="text" >
- <string>Show debug info</string>
+ <item row="4" column="0" colspan="6" >
+ <widget class="QGroupBox" name="grpSRS" >
+ <property name="title" >
+ <string>Coordinate reference system</string>
</property>
+ <layout class="QGridLayout" >
+ <property name="leftMargin" >
+ <number>11</number>
+ </property>
+ <property name="topMargin" >
+ <number>11</number>
+ </property>
+ <property name="rightMargin" >
+ <number>11</number>
+ </property>
+ <property name="bottomMargin" >
+ <number>11</number>
+ </property>
+ <item row="0" column="1" >
+ <widget class="QPushButton" name="pbnChangeSpatialRefSys" >
+ <property name="text" >
+ <string>Change ...</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLineEdit" name="leSpatialRefSys" >
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="2" column="2" >
- <layout class="QHBoxLayout" >
- <property name="leftMargin" >
- <number>11</number>
+ <item row="5" column="0" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="topMargin" >
- <number>11</number>
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
</property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <item>
- <widget class="QLabel" name="lblColumns" >
- <property name="text" >
- <string>Columns:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblRows" >
- <property name="text" >
- <string>Rows:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="lblNoData" >
- <property name="text" >
- <string>No Data:</string>
- </property>
- </widget>
- </item>
- </layout>
+ </spacer>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="lblLayerSource" >
- <property name="text" >
- <string>Layer source</string>
+ <item row="5" column="1" colspan="2" >
+ <widget class="QGroupBox" name="groupBox10" >
+ <property name="maximumSize" >
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
</property>
- <property name="buddy" >
- <cstring>leLayerSource</cstring>
+ <property name="title" >
+ <string>Thumbnail</string>
</property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="pixmapThumbnail" >
+ <property name="minimumSize" >
+ <size>
+ <width>120</width>
+ <height>120</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>120</width>
+ <height>120</height>
+ </size>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="1" column="1" colspan="2" >
- <widget class="QLineEdit" name="leLayerSource" >
- <property name="enabled" >
- <bool>false</bool>
+ <item row="5" column="3" >
+ <widget class="QGroupBox" name="groupBox9" >
+ <property name="maximumSize" >
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="0" column="1" colspan="2" >
- <widget class="QLineEdit" name="leDisplayName" />
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="lblDisplayName" >
- <property name="text" >
- <string>Display name</string>
+ <property name="title" >
+ <string>Legend</string>
</property>
- <property name="buddy" >
- <cstring>leDisplayName</cstring>
- </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="pixmapLegend" >
+ <property name="minimumSize" >
+ <size>
+ <width>120</width>
+ <height>120</height>
+ </size>
+ </property>
+ <property name="maximumSize" >
+ <size>
+ <width>120</width>
+ <height>120</height>
+ </size>
+ </property>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="scaledContents" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="5" column="0" colspan="3" >
- <layout class="QHBoxLayout" >
- <property name="leftMargin" >
- <number>11</number>
+ <item row="5" column="4" >
+ <widget class="QGroupBox" name="groupBox8" >
+ <property name="maximumSize" >
+ <size>
+ <width>140</width>
+ <height>16777215</height>
+ </size>
</property>
- <property name="topMargin" >
- <number>11</number>
+ <property name="title" >
+ <string>Palette</string>
</property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <item>
- <widget class="QGroupBox" name="groupBox10" >
- <property name="title" >
- <string>Thumbnail</string>
- </property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>11</number>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="pixmapPalette" >
+ <property name="minimumSize" >
+ <size>
+ <width>120</width>
+ <height>120</height>
+ </size>
</property>
- <property name="topMargin" >
- <number>11</number>
+ <property name="maximumSize" >
+ <size>
+ <width>120</width>
+ <height>120</height>
+ </size>
</property>
- <property name="rightMargin" >
- <number>11</number>
+ <property name="frameShape" >
+ <enum>QFrame::Box</enum>
</property>
- <property name="bottomMargin" >
- <number>11</number>
+ <property name="scaledContents" >
+ <bool>true</bool>
</property>
- <item row="0" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="pixmapThumbnail" >
- <property name="minimumSize" >
- <size>
- <width>120</width>
- <height>120</height>
- </size>
- </property>
- <property name="frameShape" >
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox9" >
- <property name="title" >
- <string>Legend:</string>
- </property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>11</number>
- </property>
- <property name="topMargin" >
- <number>11</number>
- </property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <item row="0" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>71</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="pixmapLegend" >
- <property name="minimumSize" >
- <size>
- <width>120</width>
- <height>120</height>
- </size>
- </property>
- <property name="frameShape" >
- <enum>QFrame::Box</enum>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox8" >
- <property name="title" >
- <string>Palette:</string>
- </property>
- <layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>11</number>
- </property>
- <property name="topMargin" >
- <number>11</number>
- </property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <item row="0" column="0" >
- <spacer>
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>61</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="pixmapPalette" >
- <property name="minimumSize" >
- <size>
- <width>120</width>
- <height>120</height>
- </size>
- </property>
- <property name="frameShape" >
- <enum>QFrame::Box</enum>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
+ <item row="5" column="5" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tabPageMetadata" >
@@ -1864,8 +1713,8 @@
<property name="html" >
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
+</style></head><body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p></body></html></string>
</property>
</widget>
</item>
@@ -2103,53 +1952,34 @@
</widget>
</item>
<item row="1" column="0" >
- <layout class="QHBoxLayout" >
- <property name="spacing" >
- <number>3</number>
+ <widget class="QPushButton" name="pbnLoadDefaultStyle" >
+ <property name="text" >
+ <string>Restore Default Style</string>
</property>
- <property name="leftMargin" >
- <number>1</number>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QPushButton" name="pbnSaveDefaultStyle" >
+ <property name="text" >
+ <string>Save As Default</string>
</property>
- <property name="topMargin" >
- <number>1</number>
+ </widget>
+ </item>
+ <item row="1" column="2" >
+ <widget class="QPushButton" name="pbnLoadStyle" >
+ <property name="text" >
+ <string>Load Style ...</string>
</property>
- <property name="rightMargin" >
- <number>1</number>
+ </widget>
+ </item>
+ <item row="1" column="3" >
+ <widget class="QPushButton" name="pbnSaveStyleAs" >
+ <property name="text" >
+ <string>Save Style ...</string>
</property>
- <property name="bottomMargin" >
- <number>1</number>
- </property>
- <item>
- <widget class="QPushButton" name="pbnLoadDefaultStyle" >
- <property name="text" >
- <string>Restore Default Style</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnSaveDefaultStyle" >
- <property name="text" >
- <string>Save As Default</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnLoadStyle" >
- <property name="text" >
- <string>Load Style ...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pbnSaveStyleAs" >
- <property name="text" >
- <string>Save Style ...</string>
- </property>
- </widget>
- </item>
- </layout>
+ </widget>
</item>
- <item row="2" column="0" >
+ <item row="2" column="0" colspan="4" >
<widget class="QDialogButtonBox" name="buttonBox" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
@@ -2179,7 +2009,6 @@
<tabstop>tableTransparency</tabstop>
<tabstop>leDisplayName</tabstop>
<tabstop>leLayerSource</tabstop>
- <tabstop>cboxShowDebugInfo</tabstop>
<tabstop>spinMinimumScale</tabstop>
<tabstop>spinMaximumScale</tabstop>
<tabstop>leSpatialRefSys</tabstop>
More information about the QGIS-commit
mailing list