Skip to content

Commit 19a6bab

Browse files
jef-njef-n
committedFeb 9, 2012
arrange buttons on raster transparency tab horizontally
·
ltr-3_40Before-merge-new_vector_api
1 parent c3c7abc commit 19a6bab

File tree

1 file changed

+73
-70
lines changed

1 file changed

+73
-70
lines changed
 

‎src/ui/qgsrasterlayerpropertiesbase.ui

Lines changed: 73 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<rect>
6262
<x>0</x>
6363
<y>0</y>
64-
<width>766</width>
65-
<height>699</height>
64+
<width>441</width>
65+
<height>607</height>
6666
</rect>
6767
</property>
6868
<layout class="QVBoxLayout" name="verticalLayout_2">
@@ -971,8 +971,8 @@
971971
<rect>
972972
<x>0</x>
973973
<y>0</y>
974-
<width>770</width>
975-
<height>703</height>
974+
<width>553</width>
975+
<height>397</height>
976976
</rect>
977977
</property>
978978
<layout class="QGridLayout" name="gridLayout_7">
@@ -1115,14 +1115,14 @@
11151115
</property>
11161116
</widget>
11171117
</item>
1118-
<item row="1" column="0" colspan="2">
1118+
<item row="2" column="0">
11191119
<widget class="QLabel" name="label_2">
11201120
<property name="text">
11211121
<string>Transparent pixel list</string>
11221122
</property>
11231123
</widget>
11241124
</item>
1125-
<item row="2" column="0" colspan="2">
1125+
<item row="3" column="0" colspan="2">
11261126
<widget class="QTableWidget" name="tableTransparency">
11271127
<property name="verticalScrollBarPolicy">
11281128
<enum>Qt::ScrollBarAsNeeded</enum>
@@ -1147,11 +1147,24 @@
11471147
</property>
11481148
</widget>
11491149
</item>
1150-
<item row="2" column="2">
1151-
<layout class="QVBoxLayout">
1150+
<item row="2" column="1">
1151+
<layout class="QHBoxLayout" name="horizontalLayout_2">
11521152
<property name="margin">
11531153
<number>11</number>
11541154
</property>
1155+
<item>
1156+
<spacer name="horizontalSpacer_3">
1157+
<property name="orientation">
1158+
<enum>Qt::Horizontal</enum>
1159+
</property>
1160+
<property name="sizeHint" stdset="0">
1161+
<size>
1162+
<width>40</width>
1163+
<height>20</height>
1164+
</size>
1165+
</property>
1166+
</spacer>
1167+
</item>
11551168
<item>
11561169
<widget class="QToolButton" name="pbnAddValuesManually">
11571170
<property name="toolTip">
@@ -1212,43 +1225,43 @@
12121225
</widget>
12131226
</item>
12141227
<item>
1215-
<spacer>
1228+
<spacer name="horizontalSpacer_2">
12161229
<property name="orientation">
1217-
<enum>Qt::Vertical</enum>
1230+
<enum>Qt::Horizontal</enum>
12181231
</property>
12191232
<property name="sizeHint" stdset="0">
12201233
<size>
1221-
<width>20</width>
1222-
<height>181</height>
1234+
<width>40</width>
1235+
<height>20</height>
12231236
</size>
12241237
</property>
12251238
</spacer>
12261239
</item>
12271240
<item>
1228-
<widget class="QToolButton" name="pbnImportTransparentPixelValues">
1241+
<widget class="QToolButton" name="pbnExportTransparentPixelValues">
12291242
<property name="toolTip">
1230-
<string>Import from file</string>
1243+
<string>Export to file</string>
12311244
</property>
12321245
<property name="text">
12331246
<string>...</string>
12341247
</property>
12351248
<property name="icon">
12361249
<iconset>
1237-
<normaloff>../../images/themes/default/mActionFolder.png</normaloff>../../images/themes/default/mActionFolder.png</iconset>
1250+
<normaloff>../../images/themes/default/mActionFileSave.png</normaloff>../../images/themes/default/mActionFileSave.png</iconset>
12381251
</property>
12391252
</widget>
12401253
</item>
12411254
<item>
1242-
<widget class="QToolButton" name="pbnExportTransparentPixelValues">
1255+
<widget class="QToolButton" name="pbnImportTransparentPixelValues">
12431256
<property name="toolTip">
1244-
<string>Export to file</string>
1257+
<string>Import from file</string>
12451258
</property>
12461259
<property name="text">
12471260
<string>...</string>
12481261
</property>
12491262
<property name="icon">
12501263
<iconset>
1251-
<normaloff>../../images/themes/default/mActionFileSave.png</normaloff>../../images/themes/default/mActionFileSave.png</iconset>
1264+
<normaloff>../../images/themes/default/mActionFolder.png</normaloff>../../images/themes/default/mActionFolder.png</iconset>
12521265
</property>
12531266
</widget>
12541267
</item>
@@ -1327,16 +1340,6 @@
13271340
<string>Color map</string>
13281341
</property>
13291342
<layout class="QGridLayout" name="gridLayout_2">
1330-
<item row="0" column="0" colspan="2">
1331-
<widget class="QLabel" name="mColorInterpolationLabel">
1332-
<property name="text">
1333-
<string>Color interpolation</string>
1334-
</property>
1335-
</widget>
1336-
</item>
1337-
<item row="0" column="2" colspan="2">
1338-
<widget class="QComboBox" name="cboxColorInterpolation"/>
1339-
</item>
13401343
<item row="0" column="4" colspan="7">
13411344
<spacer>
13421345
<property name="orientation">
@@ -1350,6 +1353,45 @@
13501353
</property>
13511354
</spacer>
13521355
</item>
1356+
<item row="1" column="5">
1357+
<spacer>
1358+
<property name="orientation">
1359+
<enum>Qt::Horizontal</enum>
1360+
</property>
1361+
<property name="sizeHint" stdset="0">
1362+
<size>
1363+
<width>41</width>
1364+
<height>27</height>
1365+
</size>
1366+
</property>
1367+
</spacer>
1368+
</item>
1369+
<item row="1" column="8">
1370+
<spacer>
1371+
<property name="orientation">
1372+
<enum>Qt::Horizontal</enum>
1373+
</property>
1374+
<property name="sizeType">
1375+
<enum>QSizePolicy::Minimum</enum>
1376+
</property>
1377+
<property name="sizeHint" stdset="0">
1378+
<size>
1379+
<width>20</width>
1380+
<height>20</height>
1381+
</size>
1382+
</property>
1383+
</spacer>
1384+
</item>
1385+
<item row="0" column="0" colspan="2">
1386+
<widget class="QLabel" name="mColorInterpolationLabel">
1387+
<property name="text">
1388+
<string>Color interpolation</string>
1389+
</property>
1390+
</widget>
1391+
</item>
1392+
<item row="0" column="2" colspan="2">
1393+
<widget class="QComboBox" name="cboxColorInterpolation"/>
1394+
</item>
13531395
<item row="1" column="0">
13541396
<widget class="QPushButton" name="pbtnAddColorMapEntry">
13551397
<property name="text">
@@ -1371,19 +1413,6 @@
13711413
</property>
13721414
</widget>
13731415
</item>
1374-
<item row="1" column="5">
1375-
<spacer>
1376-
<property name="orientation">
1377-
<enum>Qt::Horizontal</enum>
1378-
</property>
1379-
<property name="sizeHint" stdset="0">
1380-
<size>
1381-
<width>41</width>
1382-
<height>27</height>
1383-
</size>
1384-
</property>
1385-
</spacer>
1386-
</item>
13871416
<item row="1" column="6">
13881417
<widget class="QComboBox" name="cboxColorMapBand"/>
13891418
</item>
@@ -1401,22 +1430,6 @@
14011430
</property>
14021431
</widget>
14031432
</item>
1404-
<item row="1" column="8">
1405-
<spacer>
1406-
<property name="orientation">
1407-
<enum>Qt::Horizontal</enum>
1408-
</property>
1409-
<property name="sizeType">
1410-
<enum>QSizePolicy::Minimum</enum>
1411-
</property>
1412-
<property name="sizeHint" stdset="0">
1413-
<size>
1414-
<width>20</width>
1415-
<height>20</height>
1416-
</size>
1417-
</property>
1418-
</spacer>
1419-
</item>
14201433
<item row="1" column="9">
14211434
<widget class="QToolButton" name="pbtnLoadColorMapFromFile">
14221435
<property name="toolTip">
@@ -1468,17 +1481,6 @@
14681481
</widget>
14691482
</item>
14701483
</layout>
1471-
<zorder>mColorInterpolationLabel</zorder>
1472-
<zorder>cboxColorInterpolation</zorder>
1473-
<zorder>pbtnAddColorMapEntry</zorder>
1474-
<zorder>mDeleteEntryButton</zorder>
1475-
<zorder>pbtnSortColorMap</zorder>
1476-
<zorder>cboxColorMapBand</zorder>
1477-
<zorder>pbtnLoadColorMapFromBand</zorder>
1478-
<zorder>pbtnLoadColorMapFromFile</zorder>
1479-
<zorder>pbtnExportColorMapToFile</zorder>
1480-
<zorder>mColormapTreeWidget</zorder>
1481-
<zorder>grpGenerateColorMap</zorder>
14821484
</widget>
14831485
</item>
14841486
</layout>
@@ -1799,8 +1801,8 @@
17991801
<rect>
18001802
<x>0</x>
18011803
<y>0</y>
1802-
<width>748</width>
1803-
<height>681</height>
1804+
<width>97</width>
1805+
<height>229</height>
18041806
</rect>
18051807
</property>
18061808
<layout class="QVBoxLayout" name="verticalLayout">
@@ -1881,6 +1883,7 @@ p, li { white-space: pre-wrap; }
18811883
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
18821884
&lt;tr&gt;
18831885
&lt;td style=&quot;border: none;&quot;&gt;
1886+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
18841887
&lt;p style=&quot;-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:'Ubuntu'; font-size:11pt;&quot;&gt;&lt;/p&gt;
18851888
&lt;p style=&quot;-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:'Ubuntu'; font-size:9pt;&quot;&gt;&lt;/p&gt;
18861889
&lt;p style=&quot;-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:'Ubuntu'; font-size:9pt;&quot;&gt;&lt;/p&gt;

0 commit comments

Comments
 (0)
Please sign in to comment.