Skip to content

Commit 7c4cb0c

Browse files
alexbruyalexbruy
committedOct 4, 2014
move raster thumbnails from General tab to Style (fix #7946)
·
ltr-3_40archive/master_2
1 parent 30dd6e7 commit 7c4cb0c

File tree

1 file changed

+163
-169
lines changed

1 file changed

+163
-169
lines changed
 

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 163 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
</sizepolicy>
183183
</property>
184184
<property name="currentIndex">
185-
<number>0</number>
185+
<number>1</number>
186186
</property>
187187
<widget class="QWidget" name="mOptsPage_General">
188188
<layout class="QVBoxLayout" name="verticalLayout_6">
@@ -203,7 +203,7 @@
203203
<x>0</x>
204204
<y>0</y>
205205
<width>615</width>
206-
<height>509</height>
206+
<height>508</height>
207207
</rect>
208208
</property>
209209
<layout class="QVBoxLayout" name="verticalLayout_7">
@@ -218,7 +218,7 @@
218218
<property name="title">
219219
<string>Layer info</string>
220220
</property>
221-
<property name="syncGroup" stdset="0">
221+
<property name="syncGroup">
222222
<string notr="true">rastergeneral</string>
223223
</property>
224224
<layout class="QGridLayout" name="gridLayout_4">
@@ -324,7 +324,7 @@
324324
<property name="title">
325325
<string>Coordinate reference system</string>
326326
</property>
327-
<property name="syncGroup" stdset="0">
327+
<property name="syncGroup">
328328
<string notr="true">rastergeneral</string>
329329
</property>
330330
<layout class="QGridLayout" name="_6">
@@ -365,18 +365,18 @@
365365
<property name="checked">
366366
<bool>false</bool>
367367
</property>
368-
<property name="syncGroup" stdset="0">
368+
<property name="syncGroup">
369369
<string notr="true">rastergeneral</string>
370370
</property>
371371
<layout class="QGridLayout" name="_5">
372-
<property name="margin">
373-
<number>11</number>
374-
</property>
375372
<property name="verticalSpacing">
376373
<number>6</number>
377374
</property>
375+
<property name="margin">
376+
<number>11</number>
377+
</property>
378378
<item row="0" column="0" colspan="2">
379-
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget" native="true">
379+
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget">
380380
<property name="toolTip">
381381
<string/>
382382
</property>
@@ -388,129 +388,6 @@
388388
</layout>
389389
</widget>
390390
</item>
391-
<item>
392-
<layout class="QHBoxLayout" name="horizontalLayout_10">
393-
<item>
394-
<spacer name="spacer_2">
395-
<property name="orientation">
396-
<enum>Qt::Horizontal</enum>
397-
</property>
398-
<property name="sizeHint" stdset="0">
399-
<size>
400-
<width>0</width>
401-
<height>20</height>
402-
</size>
403-
</property>
404-
</spacer>
405-
</item>
406-
<item>
407-
<widget class="QGroupBox" name="groupBox10">
408-
<property name="title">
409-
<string>Thumbnail</string>
410-
</property>
411-
<layout class="QGridLayout" name="_7">
412-
<item row="0" column="0">
413-
<widget class="QLabel" name="pixmapThumbnail">
414-
<property name="minimumSize">
415-
<size>
416-
<width>120</width>
417-
<height>120</height>
418-
</size>
419-
</property>
420-
<property name="maximumSize">
421-
<size>
422-
<width>120</width>
423-
<height>120</height>
424-
</size>
425-
</property>
426-
<property name="frameShape">
427-
<enum>QFrame::StyledPanel</enum>
428-
</property>
429-
<property name="scaledContents">
430-
<bool>true</bool>
431-
</property>
432-
</widget>
433-
</item>
434-
</layout>
435-
</widget>
436-
</item>
437-
<item>
438-
<widget class="QGroupBox" name="groupBox9">
439-
<property name="title">
440-
<string>Legend</string>
441-
</property>
442-
<layout class="QGridLayout" name="_8">
443-
<item row="0" column="0">
444-
<widget class="QLabel" name="pixmapLegend">
445-
<property name="minimumSize">
446-
<size>
447-
<width>120</width>
448-
<height>120</height>
449-
</size>
450-
</property>
451-
<property name="maximumSize">
452-
<size>
453-
<width>120</width>
454-
<height>120</height>
455-
</size>
456-
</property>
457-
<property name="frameShape">
458-
<enum>QFrame::Box</enum>
459-
</property>
460-
<property name="scaledContents">
461-
<bool>true</bool>
462-
</property>
463-
</widget>
464-
</item>
465-
</layout>
466-
</widget>
467-
</item>
468-
<item>
469-
<widget class="QGroupBox" name="groupBox8">
470-
<property name="title">
471-
<string>Palette</string>
472-
</property>
473-
<layout class="QGridLayout" name="_9">
474-
<item row="0" column="0">
475-
<widget class="QLabel" name="pixmapPalette">
476-
<property name="minimumSize">
477-
<size>
478-
<width>120</width>
479-
<height>120</height>
480-
</size>
481-
</property>
482-
<property name="maximumSize">
483-
<size>
484-
<width>120</width>
485-
<height>120</height>
486-
</size>
487-
</property>
488-
<property name="frameShape">
489-
<enum>QFrame::Box</enum>
490-
</property>
491-
<property name="scaledContents">
492-
<bool>true</bool>
493-
</property>
494-
</widget>
495-
</item>
496-
</layout>
497-
</widget>
498-
</item>
499-
<item>
500-
<spacer name="spacer">
501-
<property name="orientation">
502-
<enum>Qt::Horizontal</enum>
503-
</property>
504-
<property name="sizeHint" stdset="0">
505-
<size>
506-
<width>0</width>
507-
<height>20</height>
508-
</size>
509-
</property>
510-
</spacer>
511-
</item>
512-
</layout>
513-
</item>
514391
<item>
515392
<spacer name="verticalSpacer_3">
516393
<property name="orientation">
@@ -549,16 +426,10 @@
549426
<x>0</x>
550427
<y>0</y>
551428
<width>615</width>
552-
<height>509</height>
429+
<height>508</height>
553430
</rect>
554431
</property>
555-
<layout class="QVBoxLayout" name="verticalLayout_13">
556-
<property name="topMargin">
557-
<number>0</number>
558-
</property>
559-
<property name="bottomMargin">
560-
<number>0</number>
561-
</property>
432+
<layout class="QVBoxLayout" name="verticalLayout_10">
562433
<item>
563434
<widget class="QgsCollapsibleGroupBox" name="mBandRenderingGrpBx">
564435
<property name="sizePolicy">
@@ -570,7 +441,7 @@
570441
<property name="title">
571442
<string>Band rendering</string>
572443
</property>
573-
<property name="syncGroup" stdset="0">
444+
<property name="syncGroup">
574445
<string notr="true">rasterstyle</string>
575446
</property>
576447
<layout class="QVBoxLayout" name="verticalLayout_21">
@@ -658,13 +529,13 @@
658529
<property name="title">
659530
<string>Color rendering</string>
660531
</property>
661-
<property name="collapsed" stdset="0">
532+
<property name="collapsed">
662533
<bool>false</bool>
663534
</property>
664-
<property name="saveCollapsedState" stdset="0">
535+
<property name="saveCollapsedState">
665536
<bool>true</bool>
666537
</property>
667-
<property name="syncGroup" stdset="0">
538+
<property name="syncGroup">
668539
<string notr="true">rasterstyle</string>
669540
</property>
670541
<layout class="QGridLayout" name="gridLayout_2">
@@ -960,13 +831,13 @@
960831
<property name="checkable">
961832
<bool>false</bool>
962833
</property>
963-
<property name="collapsed" stdset="0">
834+
<property name="collapsed">
964835
<bool>false</bool>
965836
</property>
966-
<property name="saveCollapsedState" stdset="0">
837+
<property name="saveCollapsedState">
967838
<bool>true</bool>
968839
</property>
969-
<property name="syncGroup" stdset="0">
840+
<property name="syncGroup">
970841
<string notr="true">rasterstyle</string>
971842
</property>
972843
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -1016,6 +887,129 @@
1016887
</layout>
1017888
</widget>
1018889
</item>
890+
<item>
891+
<layout class="QHBoxLayout" name="horizontalLayout_10">
892+
<item>
893+
<spacer name="spacer_2">
894+
<property name="orientation">
895+
<enum>Qt::Horizontal</enum>
896+
</property>
897+
<property name="sizeHint" stdset="0">
898+
<size>
899+
<width>0</width>
900+
<height>20</height>
901+
</size>
902+
</property>
903+
</spacer>
904+
</item>
905+
<item>
906+
<widget class="QGroupBox" name="groupBox10">
907+
<property name="title">
908+
<string>Thumbnail</string>
909+
</property>
910+
<layout class="QGridLayout" name="_7">
911+
<item row="0" column="0">
912+
<widget class="QLabel" name="pixmapThumbnail">
913+
<property name="minimumSize">
914+
<size>
915+
<width>120</width>
916+
<height>120</height>
917+
</size>
918+
</property>
919+
<property name="maximumSize">
920+
<size>
921+
<width>120</width>
922+
<height>120</height>
923+
</size>
924+
</property>
925+
<property name="frameShape">
926+
<enum>QFrame::StyledPanel</enum>
927+
</property>
928+
<property name="scaledContents">
929+
<bool>true</bool>
930+
</property>
931+
</widget>
932+
</item>
933+
</layout>
934+
</widget>
935+
</item>
936+
<item>
937+
<widget class="QGroupBox" name="groupBox9">
938+
<property name="title">
939+
<string>Legend</string>
940+
</property>
941+
<layout class="QGridLayout" name="_8">
942+
<item row="0" column="0">
943+
<widget class="QLabel" name="pixmapLegend">
944+
<property name="minimumSize">
945+
<size>
946+
<width>120</width>
947+
<height>120</height>
948+
</size>
949+
</property>
950+
<property name="maximumSize">
951+
<size>
952+
<width>120</width>
953+
<height>120</height>
954+
</size>
955+
</property>
956+
<property name="frameShape">
957+
<enum>QFrame::Box</enum>
958+
</property>
959+
<property name="scaledContents">
960+
<bool>true</bool>
961+
</property>
962+
</widget>
963+
</item>
964+
</layout>
965+
</widget>
966+
</item>
967+
<item>
968+
<widget class="QGroupBox" name="groupBox8">
969+
<property name="title">
970+
<string>Palette</string>
971+
</property>
972+
<layout class="QGridLayout" name="_9">
973+
<item row="0" column="0">
974+
<widget class="QLabel" name="pixmapPalette">
975+
<property name="minimumSize">
976+
<size>
977+
<width>120</width>
978+
<height>120</height>
979+
</size>
980+
</property>
981+
<property name="maximumSize">
982+
<size>
983+
<width>120</width>
984+
<height>120</height>
985+
</size>
986+
</property>
987+
<property name="frameShape">
988+
<enum>QFrame::Box</enum>
989+
</property>
990+
<property name="scaledContents">
991+
<bool>true</bool>
992+
</property>
993+
</widget>
994+
</item>
995+
</layout>
996+
</widget>
997+
</item>
998+
<item>
999+
<spacer name="spacer">
1000+
<property name="orientation">
1001+
<enum>Qt::Horizontal</enum>
1002+
</property>
1003+
<property name="sizeHint" stdset="0">
1004+
<size>
1005+
<width>0</width>
1006+
<height>20</height>
1007+
</size>
1008+
</property>
1009+
</spacer>
1010+
</item>
1011+
</layout>
1012+
</item>
10191013
<item>
10201014
<spacer name="verticalSpacer">
10211015
<property name="orientation">
@@ -1053,8 +1047,8 @@
10531047
<rect>
10541048
<x>0</x>
10551049
<y>0</y>
1056-
<width>615</width>
1057-
<height>509</height>
1050+
<width>400</width>
1051+
<height>381</height>
10581052
</rect>
10591053
</property>
10601054
<layout class="QVBoxLayout" name="verticalLayout_5">
@@ -1071,7 +1065,7 @@
10711065
<property name="title">
10721066
<string>Global transparency</string>
10731067
</property>
1074-
<property name="syncGroup" stdset="0">
1068+
<property name="syncGroup">
10751069
<string notr="true">rastertransp</string>
10761070
</property>
10771071
<layout class="QGridLayout" name="_3">
@@ -1155,7 +1149,7 @@
11551149
<property name="title">
11561150
<string>No data value</string>
11571151
</property>
1158-
<property name="syncGroup" stdset="0">
1152+
<property name="syncGroup">
11591153
<string notr="true">rastertransp</string>
11601154
</property>
11611155
<layout class="QGridLayout" name="gridLayout_11">
@@ -1229,7 +1223,7 @@
12291223
<property name="title">
12301224
<string>Custom transparency options</string>
12311225
</property>
1232-
<property name="syncGroup" stdset="0">
1226+
<property name="syncGroup">
12331227
<string notr="true">rastertransp</string>
12341228
</property>
12351229
<layout class="QGridLayout" name="gridLayout_3">
@@ -1460,8 +1454,8 @@
14601454
<rect>
14611455
<x>0</x>
14621456
<y>0</y>
1463-
<width>600</width>
1464-
<height>205</height>
1457+
<width>515</width>
1458+
<height>196</height>
14651459
</rect>
14661460
</property>
14671461
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -1524,8 +1518,8 @@
15241518
<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;
15251519
&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;
15261520
p, li { white-space: pre-wrap; }
1527-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
1528-
&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>
1521+
&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;
1522+
&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>
15291523
</property>
15301524
</widget>
15311525
</item>
@@ -1621,8 +1615,8 @@ p, li { white-space: pre-wrap; }
16211615
<rect>
16221616
<x>0</x>
16231617
<y>0</y>
1624-
<width>84</width>
1625-
<height>36</height>
1618+
<width>100</width>
1619+
<height>30</height>
16261620
</rect>
16271621
</property>
16281622
<layout class="QVBoxLayout" name="verticalLayout_16">
@@ -1671,8 +1665,8 @@ p, li { white-space: pre-wrap; }
16711665
<rect>
16721666
<x>0</x>
16731667
<y>0</y>
1674-
<width>393</width>
1675-
<height>608</height>
1668+
<width>302</width>
1669+
<height>593</height>
16761670
</rect>
16771671
</property>
16781672
<layout class="QGridLayout" name="gridLayout_12">
@@ -1681,7 +1675,7 @@ p, li { white-space: pre-wrap; }
16811675
<property name="title">
16821676
<string>Description</string>
16831677
</property>
1684-
<property name="syncGroup" stdset="0">
1678+
<property name="syncGroup">
16851679
<string notr="true">rastermeta</string>
16861680
</property>
16871681
<layout class="QGridLayout" name="gridLayout_5">
@@ -1776,7 +1770,7 @@ p, li { white-space: pre-wrap; }
17761770
<property name="title">
17771771
<string>Attribution</string>
17781772
</property>
1779-
<property name="syncGroup" stdset="0">
1773+
<property name="syncGroup">
17801774
<string notr="true">vectormeta</string>
17811775
</property>
17821776
<layout class="QGridLayout" name="gridLayout_7">
@@ -1808,7 +1802,7 @@ p, li { white-space: pre-wrap; }
18081802
<property name="title">
18091803
<string>MetadataUrl</string>
18101804
</property>
1811-
<property name="syncGroup" stdset="0">
1805+
<property name="syncGroup">
18121806
<string notr="true">vectormeta</string>
18131807
</property>
18141808
<layout class="QGridLayout" name="gridLayout_9">
@@ -1963,7 +1957,7 @@ p, li { white-space: pre-wrap; }
19631957
<property name="title">
19641958
<string>Properties</string>
19651959
</property>
1966-
<property name="syncGroup" stdset="0">
1960+
<property name="syncGroup">
19671961
<string notr="true">rastermeta</string>
19681962
</property>
19691963
<layout class="QVBoxLayout" name="verticalLayout_11">
@@ -2060,17 +2054,17 @@ p, li { white-space: pre-wrap; }
20602054
</layout>
20612055
</widget>
20622056
<customwidgets>
2063-
<customwidget>
2064-
<class>QgsColorButtonV2</class>
2065-
<extends>QToolButton</extends>
2066-
<header>qgscolorbuttonv2.h</header>
2067-
</customwidget>
20682057
<customwidget>
20692058
<class>QgsCollapsibleGroupBox</class>
20702059
<extends>QGroupBox</extends>
20712060
<header>qgscollapsiblegroupbox.h</header>
20722061
<container>1</container>
20732062
</customwidget>
2063+
<customwidget>
2064+
<class>QgsColorButtonV2</class>
2065+
<extends>QToolButton</extends>
2066+
<header>qgscolorbuttonv2.h</header>
2067+
</customwidget>
20742068
<customwidget>
20752069
<class>QgsScaleRangeWidget</class>
20762070
<extends>QWidget</extends>

0 commit comments

Comments
 (0)
Please sign in to comment.