sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

move raster thumbnails from General tab to Style (fix #7946)

Browse Source
This commit is contained in:
Alexander Bruy 2014-09-26 13:46:34 +03:00
parent 30dd6e779b
commit 7c4cb0cf8b
1 changed files with 163 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

332
src/ui/qgsrasterlayerpropertiesbase.ui
View File

@ -182,7 +182,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="mOptsPage_General"> <widget class="QWidget" name="mOptsPage_General">
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
@ -203,7 +203,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>615</width> <width>615</width>
<height>509</height> <height>508</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
@ -218,7 +218,7 @@
<property name="title"> <property name="title">
<string>Layer info</string> <string>Layer info</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rastergeneral</string> <string notr="true">rastergeneral</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
@ -324,7 +324,7 @@
<property name="title"> <property name="title">
<string>Coordinate reference system</string> <string>Coordinate reference system</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rastergeneral</string> <string notr="true">rastergeneral</string>
</property> </property>
<layout class="QGridLayout" name="_6"> <layout class="QGridLayout" name="_6">
@ -365,18 +365,18 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rastergeneral</string> <string notr="true">rastergeneral</string>
</property> </property>
<layout class="QGridLayout" name="_5"> <layout class="QGridLayout" name="_5">
<property name="margin">
<number>11</number>
</property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>11</number>
</property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true"> <widget class="QgsScaleRangeWidget" name="mScaleRangeWidget">
<property name="toolTip"> <property name="toolTip">
<string/> <string/>
</property> </property>
@ -388,129 +388,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<spacer name="spacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="groupBox10">
<property name="title">
<string>Thumbnail</string>
</property>
<layout class="QGridLayout" name="_7">
<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>
<widget class="QGroupBox" name="groupBox9">
<property name="title">
<string>Legend</string>
</property>
<layout class="QGridLayout" name="_8">
<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>
<widget class="QGroupBox" name="groupBox8">
<property name="title">
<string>Palette</string>
</property>
<layout class="QGridLayout" name="_9">
<item row="0" column="0">
<widget class="QLabel" name="pixmapPalette">
<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>
<spacer name="spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
@ -549,16 +426,10 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>615</width> <width>615</width>
<height>509</height> <height>508</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_13"> <layout class="QVBoxLayout" name="verticalLayout_10">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QgsCollapsibleGroupBox" name="mBandRenderingGrpBx"> <widget class="QgsCollapsibleGroupBox" name="mBandRenderingGrpBx">
<property name="sizePolicy"> <property name="sizePolicy">
@ -570,7 +441,7 @@
<property name="title"> <property name="title">
<string>Band rendering</string> <string>Band rendering</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rasterstyle</string> <string notr="true">rasterstyle</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_21"> <layout class="QVBoxLayout" name="verticalLayout_21">
@ -658,13 +529,13 @@
<property name="title"> <property name="title">
<string>Color rendering</string> <string>Color rendering</string>
</property> </property>
<property name="collapsed" stdset="0"> <property name="collapsed">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="saveCollapsedState" stdset="0"> <property name="saveCollapsedState">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rasterstyle</string> <string notr="true">rasterstyle</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
@ -960,13 +831,13 @@
<property name="checkable"> <property name="checkable">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="collapsed" stdset="0"> <property name="collapsed">
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="saveCollapsedState" stdset="0"> <property name="saveCollapsedState">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rasterstyle</string> <string notr="true">rasterstyle</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
@ -1016,6 +887,129 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<spacer name="spacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QGroupBox" name="groupBox10">
<property name="title">
<string>Thumbnail</string>
</property>
<layout class="QGridLayout" name="_7">
<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>
<widget class="QGroupBox" name="groupBox9">
<property name="title">
<string>Legend</string>
</property>
<layout class="QGridLayout" name="_8">
<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>
<widget class="QGroupBox" name="groupBox8">
<property name="title">
<string>Palette</string>
</property>
<layout class="QGridLayout" name="_9">
<item row="0" column="0">
<widget class="QLabel" name="pixmapPalette">
<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>
<spacer name="spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
@ -1053,8 +1047,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>615</width> <width>400</width>
<height>509</height> <height>381</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
@ -1071,7 +1065,7 @@
<property name="title"> <property name="title">
<string>Global transparency</string> <string>Global transparency</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rastertransp</string> <string notr="true">rastertransp</string>
</property> </property>
<layout class="QGridLayout" name="_3"> <layout class="QGridLayout" name="_3">
@ -1155,7 +1149,7 @@
<property name="title"> <property name="title">
<string>No data value</string> <string>No data value</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rastertransp</string> <string notr="true">rastertransp</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_11"> <layout class="QGridLayout" name="gridLayout_11">
@ -1229,7 +1223,7 @@
<property name="title"> <property name="title">
<string>Custom transparency options</string> <string>Custom transparency options</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rastertransp</string> <string notr="true">rastertransp</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
@ -1460,8 +1454,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>600</width> <width>515</width>
<height>205</height> <height>196</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_12"> <layout class="QVBoxLayout" name="verticalLayout_12">
@ -1524,8 +1518,8 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell';&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Cantarell'; font-size:11pt;&quot;&gt;&lt;br /&gt;&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1621,8 +1615,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>84</width> <width>100</width>
<height>36</height> <height>30</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_16"> <layout class="QVBoxLayout" name="verticalLayout_16">
@ -1671,8 +1665,8 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>393</width> <width>302</width>
<height>608</height> <height>593</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_12"> <layout class="QGridLayout" name="gridLayout_12">
@ -1681,7 +1675,7 @@ p, li { white-space: pre-wrap; }
<property name="title"> <property name="title">
<string>Description</string> <string>Description</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rastermeta</string> <string notr="true">rastermeta</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
@ -1776,7 +1770,7 @@ p, li { white-space: pre-wrap; }
<property name="title"> <property name="title">
<string>Attribution</string> <string>Attribution</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">vectormeta</string> <string notr="true">vectormeta</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QGridLayout" name="gridLayout_7">
@ -1808,7 +1802,7 @@ p, li { white-space: pre-wrap; }
<property name="title"> <property name="title">
<string>MetadataUrl</string> <string>MetadataUrl</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">vectormeta</string> <string notr="true">vectormeta</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_9"> <layout class="QGridLayout" name="gridLayout_9">
@ -1963,7 +1957,7 @@ p, li { white-space: pre-wrap; }
<property name="title"> <property name="title">
<string>Properties</string> <string>Properties</string>
</property> </property>
<property name="syncGroup" stdset="0"> <property name="syncGroup">
<string notr="true">rastermeta</string> <string notr="true">rastermeta</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_11"> <layout class="QVBoxLayout" name="verticalLayout_11">
@ -2060,17 +2054,17 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
</customwidget>
<customwidget> <customwidget>
<class>QgsCollapsibleGroupBox</class> <class>QgsCollapsibleGroupBox</class>
<extends>QGroupBox</extends> <extends>QGroupBox</extends>
<header>qgscollapsiblegroupbox.h</header> <header>qgscollapsiblegroupbox.h</header>
<container>1</container> <container>1</container>
</customwidget> </customwidget>
<customwidget>
<class>QgsColorButtonV2</class>
<extends>QToolButton</extends>
<header>qgscolorbuttonv2.h</header>
</customwidget>
<customwidget> <customwidget>
<class>QgsScaleRangeWidget</class> <class>QgsScaleRangeWidget</class>
<extends>QWidget</extends> <extends>QWidget</extends>