mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-14 00:07:35 -04:00
Update vector layer properties dialog with vertical tabs
- Following subsections still need work: Labeling (ng), Diagrams and possibly more on Style - Add new SVG icons for Labels, Display and Metadata tabs - Add up/down, plus/minus icons for consistency - Move Metadata tab to bottom of list for vector and raster layer property dialogs - Update report stylesheet (metadata output) to support direct RTF copy/paste (i.e. black-colored fonts) - Update report stylesheet to use light gray backgrounds for headers instead of unpredictable highlight color
This commit is contained in:
Larry Shaffer
parent
87288b724a
commit
956e18d28f
@ -374,14 +374,17 @@
|
||||
<file>themes/default/propertyicons/CRS.png</file>
|
||||
<file>themes/default/propertyicons/diagram.png</file>
|
||||
<file>themes/default/propertyicons/digitising.png</file>
|
||||
<file>themes/default/propertyicons/display.svg</file>
|
||||
<file>themes/default/propertyicons/gdal.png</file>
|
||||
<file>themes/default/propertyicons/general.png</file>
|
||||
<file>themes/default/propertyicons/histogram.png</file>
|
||||
<file>themes/default/propertyicons/join.png</file>
|
||||
<file>themes/default/propertyicons/labels.png</file>
|
||||
<file>themes/default/propertyicons/labels.svg</file>
|
||||
<file>themes/default/propertyicons/locale.png</file>
|
||||
<file>themes/default/propertyicons/map_tools.png</file>
|
||||
<file>themes/default/propertyicons/metadata.png</file>
|
||||
<file>themes/default/propertyicons/metadata.svg</file>
|
||||
<file>themes/default/propertyicons/network_and_proxy.png</file>
|
||||
<file>themes/default/propertyicons/overlay.png</file>
|
||||
<file>themes/default/propertyicons/pyramids.png</file>
|
||||
|
||||
12
images/themes/default/propertyicons/display.svg
Normal file
12
images/themes/default/propertyicons/display.svg
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
|
||||
<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="19.202px" height="19.202px" viewBox="0 0 19.202 19.202" enable-background="new 0 0 19.202 19.202" xml:space="preserve">
|
||||
<path opacity="0.9" fill="#F5EA90" stroke="#BD9A1D" stroke-width="0.5" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" d="
|
||||
M17.167,9.438c0,1.65-1.35,3-3,3h-3.421c-0.729,0.042-0.664,0.624-1.486,1.572s-3.351,2.845-3.518,2.47s0.669-1.685,1.142-2.436
|
||||
c0.762-1.211,0.22-1.606,0.22-1.606H4.958c-1.65,0-3-1.35-3-3V5.021c0-1.65,1.35-3,3-3h9.208c1.65,0,3,1.35,3,3V9.438z"/>
|
||||
<path fill="#FFFFFF" d="M9.958,3.906c0-0.27-0.45-0.39-1-0.39l-2.708-0.1c-2.146,0-2.885,1.605-2.885,2.885l0.1,1.407
|
||||
c0,0.55,0.151,1,0.457,1c0.307,0,0.458-0.45,0.458-1l0.183-1.229c0.088-0.812,0.75-1.754,1.875-1.883l2.521-0.3
|
||||
C9.508,4.296,9.958,4.176,9.958,3.906z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.1 KiB |
117
images/themes/default/propertyicons/labels.svg
Normal file
117
images/themes/default/propertyicons/labels.svg
Normal file
@ -0,0 +1,117 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1"
|
||||
id="svg5692" inkscape:export-ydpi="90" inkscape:export-filename="/mnt/home1/robert/svn/graphics/trunk/toolbar-icons/24x24/label.png" sodipodi:docname="label.svg" inkscape:version="0.47 r22583" inkscape:export-xdpi="90" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64px" height="64px"
|
||||
viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
|
||||
<title id="title2883">label</title>
|
||||
<defs>
|
||||
|
||||
|
||||
<inkscape:perspective id="perspective3257" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="16 : 10.666667 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 16 : 1" inkscape:vp_z="32 : 16 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective6979" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective7934" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective8023" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective8057" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective8095" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective8219" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective8279" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective3803" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective3869" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective3929" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective3968" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective4002" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective4032" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective4053" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective2905" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective2979" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective2842" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective2978" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective3238" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective4058" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
|
||||
<inkscape:perspective id="perspective8198" sodipodi:type="inkscape:persp3d" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_z="1 : 0.5 : 1">
|
||||
</inkscape:perspective>
|
||||
</defs>
|
||||
<sodipodi:namedview id="base" inkscape:window-y="25" inkscape:snap-bbox="true" inkscape:cy="12" inkscape:window-width="1280" inkscape:current-layer="layer4" inkscape:zoom="29.833333" inkscape:guide-bbox="true" inkscape:document-units="px" borderopacity="1.0" inkscape:window-x="0" inkscape:snap-global="true" bordercolor="#666666" borderlayer="false" inkscape:cx="12" inkscape:window-maximized="1" showguides="true" inkscape:pageshadow="2" inkscape:pageopacity="0.0" showgrid="true" inkscape:grid-bbox="true" pagecolor="#ffffff" inkscape:window-height="950">
|
||||
|
||||
<inkscape:grid type="xygrid" id="grid5700" visible="true" originx="0.5px" dotted="true" originy="0.5px" snapvisiblegridlinesonly="true" spacingx="1px" enabled="true" spacingy="1px" empspacing="5">
|
||||
</inkscape:grid>
|
||||
</sodipodi:namedview>
|
||||
<g id="layer4" transform="translate(0,-8)" inkscape:groupmode="layer" inkscape:label="1">
|
||||
<g id="g3653">
|
||||
|
||||
<linearGradient id="path4080_1_" gradientUnits="userSpaceOnUse" x1="814.1465" y1="-658.5552" x2="803.4866" y2="-642.5653" gradientTransform="matrix(1 0 0 -1 -768 -604)">
|
||||
<stop offset="0" style="stop-color:#EDD400"/>
|
||||
<stop offset="1" style="stop-color:#FFF17A"/>
|
||||
</linearGradient>
|
||||
|
||||
<path id="path4080" sodipodi:nodetypes="cccccc" fill="url(#path4080_1_)" stroke="#C4A000" stroke-width="2.6653" stroke-linecap="round" stroke-linejoin="round" d="
|
||||
M5.35,40l10.661-13.326h42.637v26.652H16.011L5.35,40z"/>
|
||||
<g enable-background="new ">
|
||||
<path fill="#2E3436" d="M27.819,46.065v0.357h-3.207c-0.225-0.338-0.338-0.718-0.338-1.141c-1.04,1.083-2.194,1.625-3.459,1.625
|
||||
c-1.084,0-1.97-0.357-2.658-1.075c-0.535-0.575-0.802-1.356-0.802-2.341c0-2.012,1.118-3.208,3.354-3.587l1.181-0.211
|
||||
c0.956-0.154,1.54-0.28,1.751-0.38c0.014-0.015,0.049-0.034,0.105-0.062c0.338-0.184,0.506-0.478,0.506-0.886
|
||||
c0-0.76-0.57-1.139-1.709-1.139c-0.956,0-1.568,0.225-1.835,0.675l-0.19,0.507l-0.063,0.381h-2.848
|
||||
c0.182-2.631,1.807-3.946,4.873-3.946c3.108,0,4.662,1.168,4.662,3.502v6.328c0,0.479,0.183,0.9,0.549,1.266
|
||||
C27.734,45.98,27.777,46.023,27.819,46.065z M24.253,41.847v-0.803c-0.267,0.128-0.682,0.247-1.244,0.358l-1.013,0.19
|
||||
c-0.929,0.196-1.47,0.548-1.624,1.055l-0.064,0.507c0,0.688,0.344,1.124,1.034,1.308c0.169,0.042,0.359,0.062,0.569,0.062
|
||||
c1.223,0,1.969-0.584,2.237-1.751C24.218,42.493,24.253,42.184,24.253,41.847z"/>
|
||||
<path fill="#2E3436" d="M31.279,31.045h2.954v5.464c0.702-1.111,1.751-1.667,3.143-1.667c1.195,0,2.223,0.422,3.081,1.265
|
||||
c0.183,0.183,0.346,0.374,0.486,0.57c0.816,1.182,1.224,2.582,1.224,4.199c0,1.926-0.557,3.479-1.668,4.663
|
||||
c-0.886,0.913-1.926,1.371-3.121,1.371c-1.393,0-2.44-0.549-3.145-1.646v1.16H31.28L31.279,31.045L31.279,31.045z M36.722,37.311
|
||||
c-0.931,0-1.624,0.499-2.09,1.498l-0.253,0.737c-0.1,0.407-0.148,0.837-0.148,1.287c0,1.533,0.422,2.603,1.266,3.206
|
||||
c0.352,0.269,0.759,0.4,1.224,0.4c0.899,0,1.589-0.484,2.067-1.455c0.281-0.604,0.423-1.301,0.423-2.088
|
||||
c0-1.435-0.395-2.475-1.182-3.123C37.637,37.465,37.198,37.311,36.722,37.311z"/>
|
||||
<path fill="#2E3436" d="M53.935,39.293h-2.826c-0.238-1.083-0.669-1.729-1.286-1.942l-0.592-0.126c-0.069,0-0.147,0-0.232,0
|
||||
c-0.871,0-1.482,0.324-1.835,0.971c-0.38,0.716-0.568,1.638-0.568,2.764c0,1.716,0.463,2.819,1.392,3.312
|
||||
c0.311,0.168,0.646,0.253,1.012,0.253c0.844,0,1.447-0.387,1.815-1.161c0.111-0.252,0.209-0.547,0.294-0.884h2.827
|
||||
c-0.184,1.741-0.95,3.002-2.299,3.776c-0.773,0.436-1.659,0.653-2.658,0.653c-2.224,0-3.77-0.871-4.642-2.616
|
||||
c-0.463-0.929-0.696-2.039-0.696-3.334c0-2.629,0.837-4.437,2.511-5.422c0.801-0.464,1.757-0.696,2.869-0.696
|
||||
c1.941,0,3.34,0.688,4.198,2.068c0.267,0.464,0.464,0.977,0.592,1.54C53.864,38.717,53.908,38.997,53.935,39.293z"/>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 9.9 KiB |
18
images/themes/default/propertyicons/metadata.svg
Normal file
18
images/themes/default/propertyicons/metadata.svg
Normal file
@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
|
||||
<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="64px" height="64px" viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
|
||||
<circle fill="#6D9CCF" stroke="#34497D" stroke-miterlimit="10" cx="32" cy="32" r="28.678"/>
|
||||
<path opacity="0.3" fill="#FFFFFF" d="M8.773,37.198c0.732-8.419,2.376-13.47,7.604-18.698c5.646-5.646,10.875-8.266,20.755-10.514
|
||||
c4.854-1.104-3.554-4.764-15.189-0.411c-6.25,2.338-12.594,8.44-14.82,17.332C4.426,35.673,8.438,41.053,8.773,37.198z"/>
|
||||
<path fill="#FFFFFF" stroke="#34497D" stroke-miterlimit="10" d="M38.875,44.071l-0.71-0.708c-0.647-0.646-1.886-0.518-2.398,0.248
|
||||
c-0.321,0.481-1.805,2.017-2.74,2.739c0.116-0.479,0.338-1.211,0.756-2.399l3.75-10.646c0.881-2.521,1.413-4.043,1.413-5.341
|
||||
c0-2.054-1.514-3.382-3.855-3.382c-5.913,0-10.541,5.34-12.254,7.634c-0.022,0.029-0.042,0.057-0.06,0.082
|
||||
c-0.295,0.335-0.412,0.782-0.32,1.24c0.071,0.354,0.265,0.697,0.562,0.994l0.532,0.531c0.318,0.318,0.731,0.493,1.164,0.493
|
||||
c0.323,0,0.807-0.101,1.283-0.582l0.088-0.103c0.617-0.822,1.77-2.065,2.613-2.83c-0.145,0.492-0.35,1.096-0.591,1.791l-2.607,7.599
|
||||
c-1.857,5.369-2.552,7.378-2.552,8.497c0,1.463,0.935,3.025,3.559,3.025c8.155,0,12.175-6.058,12.616-6.763
|
||||
C39.573,45.438,39.487,44.687,38.875,44.071z"/>
|
||||
<path fill="#FFFFFF" stroke="#34497D" stroke-miterlimit="10" d="M35.563,12.381c-2.622,0-4.921,2.271-4.921,4.861
|
||||
c0,2.953,1.978,4.861,5.039,4.861c3.005,0,5.335-2.772,5.335-5.157C41.017,14.841,39.589,12.381,35.563,12.381z"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.8 KiB |
@ -69,24 +69,35 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
|
||||
QWidget * parent,
|
||||
Qt::WFlags fl
|
||||
)
|
||||
: QDialog( parent, fl )
|
||||
: QgsOptionsDialogBase( "VectorLayerProperties", parent, fl )
|
||||
, layer( lyr )
|
||||
, mMetadataFilled( false )
|
||||
, mRendererDialog( 0 )
|
||||
{
|
||||
setupUi( this );
|
||||
// QgsOptionsDialogBase handles saving/restoring of geometry, splitter and current tab states,
|
||||
// switching vertical tabs between icon/text to icon-only modes (splitter collapsed to left),
|
||||
// and connecting QDialogButtonBox's accepted/rejected signals to dialog's accept/reject slots
|
||||
initOptionsBase( false );
|
||||
|
||||
mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.png" ) );
|
||||
mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.png" ) );
|
||||
|
||||
connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
|
||||
connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
|
||||
connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) );
|
||||
connect( this, SIGNAL( accepted() ), this, SLOT( apply() ) );
|
||||
|
||||
connect( mOptionsStackedWidget, SIGNAL( currentChanged( int ) ), this, SLOT( mOptionsStackedWidget_CurrentChanged( int ) ) );
|
||||
|
||||
connect( insertFieldButton, SIGNAL( clicked() ), this, SLOT( insertField() ) );
|
||||
connect( insertExpressionButton, SIGNAL( clicked() ), this, SLOT( insertExpression() ) );
|
||||
|
||||
// connections for Map Tip display
|
||||
connect( htmlRadio, SIGNAL( toggled( bool ) ), htmlMapTip, SLOT( setEnabled( bool ) ) );
|
||||
connect( htmlRadio, SIGNAL( toggled( bool ) ), insertFieldButton, SLOT( setEnabled( bool ) ) );
|
||||
connect( htmlRadio, SIGNAL( toggled( bool ) ), fieldComboBox, SLOT( setEnabled( bool ) ) );
|
||||
connect( htmlRadio, SIGNAL( toggled( bool ) ), insertExpressionButton, SLOT( setEnabled( bool ) ) );
|
||||
connect( fieldComboRadio, SIGNAL( toggled( bool ) ), displayFieldComboBox, SLOT( setEnabled( bool ) ) );
|
||||
|
||||
QVBoxLayout *layout;
|
||||
|
||||
if ( layer->hasGeometryType() )
|
||||
@ -95,6 +106,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
|
||||
layout = new QVBoxLayout( labelingFrame );
|
||||
layout->setMargin( 0 );
|
||||
labelingDialog = new QgsLabelingGui( QgisApp::instance()->palLabeling(), layer, QgisApp::instance()->mapCanvas(), labelingFrame );
|
||||
labelingDialog->layout()->setMargin( 0 );
|
||||
layout->addWidget( labelingDialog );
|
||||
labelingFrame->setLayout( layout );
|
||||
|
||||
@ -102,6 +114,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
|
||||
layout = new QVBoxLayout( labelOptionsFrame );
|
||||
layout->setMargin( 0 );
|
||||
labelDialog = new QgsLabelDialog( layer->label(), labelOptionsFrame );
|
||||
labelDialog->layout()->setMargin( 0 );
|
||||
layout->addWidget( labelDialog );
|
||||
labelOptionsFrame->setLayout( layout );
|
||||
connect( labelDialog, SIGNAL( labelSourceSet() ), this, SLOT( setLabelCheckBox() ) );
|
||||
@ -110,8 +123,8 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
|
||||
{
|
||||
labelingDialog = 0;
|
||||
labelDialog = 0;
|
||||
tabWidget->setTabEnabled( 1, false ); // hide labeling item
|
||||
tabWidget->setTabEnabled( 2, false ); // hide labeling (deprecated) item
|
||||
mOptsPage_Labels->setEnabled( false ); // disable labeling item
|
||||
mOptsPage_LabelsOld->setEnabled( false ); // disable labeling (deprecated) item
|
||||
}
|
||||
|
||||
// Create the Actions dialog tab
|
||||
@ -119,6 +132,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
|
||||
actionLayout->setMargin( 0 );
|
||||
const QgsFields &fields = layer->pendingFields();
|
||||
actionDialog = new QgsAttributeActionDialog( layer->actions(), fields, actionOptionsFrame );
|
||||
actionDialog->layout()->setMargin( 0 );
|
||||
actionLayout->addWidget( actionDialog );
|
||||
|
||||
// Create the menu for the save style button to choose the output format
|
||||
@ -128,7 +142,9 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
|
||||
QObject::connect( mSaveAsMenu, SIGNAL( triggered( QAction * ) ), this, SLOT( saveStyleAsMenuTriggered( QAction * ) ) );
|
||||
|
||||
mFieldsPropertiesDialog = new QgsFieldsProperties( layer, mFieldsFrame );
|
||||
mFieldsPropertiesDialog->layout()->setMargin( 0 );
|
||||
mFieldsFrame->setLayout( new QVBoxLayout( mFieldsFrame ) );
|
||||
mFieldsFrame->layout()->setMargin( 0 );
|
||||
mFieldsFrame->layout()->addWidget( mFieldsPropertiesDialog );
|
||||
|
||||
connect( mFieldsPropertiesDialog, SIGNAL( toggleEditing() ), this, SLOT( toggleEditing() ) );
|
||||
@ -158,8 +174,7 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
|
||||
}
|
||||
else
|
||||
{
|
||||
// currently only encoding can be set in this group, so hide it completely
|
||||
grpProviderOptions->hide();
|
||||
mDataSourceEncodingFrame->hide();
|
||||
}
|
||||
}
|
||||
|
||||
@ -174,7 +189,9 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
|
||||
}
|
||||
|
||||
diagramPropertiesDialog = new QgsDiagramProperties( layer, mDiagramFrame );
|
||||
diagramPropertiesDialog->layout()->setMargin( 0 );
|
||||
mDiagramFrame->setLayout( new QVBoxLayout( mDiagramFrame ) );
|
||||
mDiagramFrame->layout()->setMargin( 0 );
|
||||
mDiagramFrame->layout()->addWidget( diagramPropertiesDialog );
|
||||
|
||||
//layer title and abstract
|
||||
@ -184,26 +201,18 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
|
||||
mLayerAbstractTextEdit->setPlainText( layer->abstract() );
|
||||
}
|
||||
|
||||
QSettings settings;
|
||||
restoreGeometry( settings.value( "/Windows/VectorLayerProperties/geometry" ).toByteArray() );
|
||||
int tabIndex = settings.value( "/Windows/VectorLayerProperties/row", 0 ).toInt();
|
||||
|
||||
// if the last used tab is not enabled display the first enabled one
|
||||
if ( !tabWidget->isTabEnabled( tabIndex ) )
|
||||
{
|
||||
tabIndex = 0;
|
||||
for ( int i = 0; i < tabWidget->count(); i++ )
|
||||
{
|
||||
if ( tabWidget->isTabEnabled( i ) )
|
||||
{
|
||||
tabIndex = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
tabWidget->setCurrentIndex( tabIndex );
|
||||
|
||||
setWindowTitle( tr( "Layer Properties - %1" ).arg( layer->name() ) );
|
||||
|
||||
QSettings settings;
|
||||
// if dialog hasn't been opened/closed yet, default to Styles tab, which is used most often
|
||||
// this will be read by restoreOptionsBaseUi()
|
||||
if ( !settings.contains( QString( "/Windows/VectorLayerProperties/tab" ) ) )
|
||||
{
|
||||
settings.setValue( QString( "/Windows/VectorLayerProperties/tab" ),
|
||||
mOptStackedWidget->indexOf( mOptsPage_Style ) );
|
||||
}
|
||||
|
||||
restoreOptionsBaseUi();
|
||||
} // QgsVectorLayerProperties ctor
|
||||
|
||||
|
||||
@ -213,10 +222,6 @@ QgsVectorLayerProperties::~QgsVectorLayerProperties()
|
||||
{
|
||||
disconnect( labelDialog, SIGNAL( labelSourceSet() ), this, SLOT( setLabelCheckBox() ) );
|
||||
}
|
||||
|
||||
QSettings settings;
|
||||
settings.setValue( "/Windows/VectorLayerProperties/geometry", saveGeometry() );
|
||||
settings.setValue( "/Windows/VectorLayerProperties/row", tabWidget->currentIndex() );
|
||||
}
|
||||
|
||||
void QgsVectorLayerProperties::toggleEditing()
|
||||
@ -788,13 +793,15 @@ void QgsVectorLayerProperties::updateSymbologyPage()
|
||||
}
|
||||
else
|
||||
{
|
||||
tabWidget->setTabEnabled( 0, false ); // hide symbology item
|
||||
mOptsPage_Style->setEnabled( false ); // hide symbology item
|
||||
}
|
||||
|
||||
if ( mRendererDialog )
|
||||
{
|
||||
mRendererDialog->layout()->setMargin( 0 );
|
||||
widgetStackRenderers->addWidget( mRendererDialog );
|
||||
widgetStackRenderers->setCurrentWidget( mRendererDialog );
|
||||
widgetStackRenderers->currentWidget()->layout()->setMargin( 0 );
|
||||
}
|
||||
}
|
||||
|
||||
@ -804,9 +811,9 @@ void QgsVectorLayerProperties::on_pbnUpdateExtents_clicked()
|
||||
mMetadataFilled = false;
|
||||
}
|
||||
|
||||
void QgsVectorLayerProperties::on_tabWidget_currentChanged( int index )
|
||||
void QgsVectorLayerProperties::mOptionsStackedWidget_CurrentChanged( int indx )
|
||||
{
|
||||
if ( index != 6 || mMetadataFilled )
|
||||
if ( indx != mOptStackedWidget->indexOf( mOptsPage_Metadata ) || mMetadataFilled )
|
||||
return;
|
||||
|
||||
//set the metadata contents (which can be expensive)
|
||||
|
||||
@ -19,6 +19,7 @@
|
||||
#ifndef QGSVECTORLAYERPROPERTIES
|
||||
#define QGSVECTORLAYERPROPERTIES
|
||||
|
||||
#include "qgsoptionsdialogbase.h"
|
||||
#include "ui_qgsvectorlayerpropertiesbase.h"
|
||||
#include "qgisgui.h"
|
||||
#include "qgsaddattrdialog.h"
|
||||
@ -41,7 +42,7 @@ class QgsLabelingGui;
|
||||
class QgsDiagramProperties;
|
||||
class QgsFieldsProperties;
|
||||
|
||||
class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPropertiesBase
|
||||
class QgsVectorLayerProperties : public QgsOptionsDialogBase, private Ui::QgsVectorLayerPropertiesBase
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
@ -106,7 +107,7 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
|
||||
void on_pbnSaveDefaultStyle_clicked();
|
||||
void on_pbnLoadStyle_clicked();
|
||||
void on_pbnSaveStyleAs_clicked();
|
||||
void on_tabWidget_currentChanged( int idx );
|
||||
void mOptionsStackedWidget_CurrentChanged( int indx );
|
||||
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
|
||||
void on_pbnUpdateExtents_clicked();
|
||||
|
||||
|
||||
@ -623,30 +623,48 @@ QString QgsApplication::reportStyleSheet()
|
||||
// Make the style sheet desktop preferences aware by using qappliation
|
||||
// palette as a basis for colors where appropriate
|
||||
//
|
||||
QColor myColor1 = palette().highlight().color();
|
||||
// QColor myColor1 = palette().highlight().color();
|
||||
QColor myColor1( Qt::lightGray );
|
||||
QColor myColor2 = myColor1;
|
||||
myColor2 = myColor2.lighter( 110 ); //10% lighter
|
||||
QString myStyle;
|
||||
myStyle = "p.glossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
|
||||
"stop: 0 " + myColor1.name() + ","
|
||||
"stop: 0.1 " + myColor2.name() + ","
|
||||
"stop: 0.5 " + myColor1.name() + ","
|
||||
"stop: 0.9 " + myColor2.name() + ","
|
||||
"stop: 1 " + myColor1.name() + ");"
|
||||
"color: white;"
|
||||
"padding-left: 4px;"
|
||||
"padding-top: 20px;"
|
||||
"padding-bottom: 8px;"
|
||||
"border: 1px solid #6c6c6c;"
|
||||
" stop: 0 " + myColor1.name() + ","
|
||||
" stop: 0.1 " + myColor2.name() + ","
|
||||
" stop: 0.5 " + myColor1.name() + ","
|
||||
" stop: 0.9 " + myColor2.name() + ","
|
||||
" stop: 1 " + myColor1.name() + ");"
|
||||
" color: black;"
|
||||
" padding-left: 4px;"
|
||||
" padding-top: 20px;"
|
||||
" padding-bottom: 8px;"
|
||||
" border: 1px solid #6c6c6c;"
|
||||
"}"
|
||||
"p.subheaderglossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
|
||||
" stop: 0 " + myColor1.name() + ","
|
||||
" stop: 0.1 " + myColor2.name() + ","
|
||||
" stop: 0.5 " + myColor1.name() + ","
|
||||
" stop: 0.9 " + myColor2.name() + ","
|
||||
" stop: 1 " + myColor1.name() + ");"
|
||||
" font-weight: bold;"
|
||||
" font-size: medium;"
|
||||
" line-height: 1.1em;"
|
||||
" width: 100%;"
|
||||
" color: black;"
|
||||
" padding-left: 4px;"
|
||||
" padding-right: 4px;"
|
||||
" padding-top: 20px;"
|
||||
" padding-bottom: 8px;"
|
||||
" border: 1px solid #6c6c6c;"
|
||||
"}"
|
||||
"th.glossy{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, "
|
||||
"stop: 0 " + myColor1.name() + ","
|
||||
"stop: 0.1 " + myColor2.name() + ","
|
||||
"stop: 0.5 " + myColor1.name() + ","
|
||||
"stop: 0.9 " + myColor2.name() + ","
|
||||
"stop: 1 " + myColor1.name() + ");"
|
||||
"color: white;"
|
||||
"border: 1px solid #6c6c6c;"
|
||||
" stop: 0 " + myColor1.name() + ","
|
||||
" stop: 0.1 " + myColor2.name() + ","
|
||||
" stop: 0.5 " + myColor1.name() + ","
|
||||
" stop: 0.9 " + myColor2.name() + ","
|
||||
" stop: 1 " + myColor1.name() + ");"
|
||||
" color: black;"
|
||||
" border: 1px solid #6c6c6c;"
|
||||
"}"
|
||||
".overview{ font: 1.82em; font-weight: bold;}"
|
||||
"body{ background: white;"
|
||||
|
||||
@ -3396,31 +3396,33 @@ void QgsVectorLayer::setDiagramLayerSettings( const QgsDiagramLayerSettings& s )
|
||||
QString QgsVectorLayer::metadata()
|
||||
{
|
||||
QString myMetadata = "<html><body>";
|
||||
myMetadata += "<table width=\"100%\">";
|
||||
|
||||
//-------------
|
||||
|
||||
myMetadata += "<tr class=\"glossy\"><td>";
|
||||
myMetadata += tr( "General:" );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<p class=\"subheaderglossy\">";
|
||||
myMetadata += tr( "General" );
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
// data comment
|
||||
if ( !( dataComment().isEmpty() ) )
|
||||
{
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += tr( "Layer comment: %1" ).arg( dataComment() );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Layer comment" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += dataComment();
|
||||
myMetadata += "</p>\n";
|
||||
}
|
||||
|
||||
//storage type
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += tr( "Storage type of this layer: %1" ).arg( storageType() );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Storage type of this layer" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += storageType();
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
// data source
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += tr( "Source for this layer: %1" ).arg( publicSource() );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Source for this layer" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += publicSource();
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
//geom type
|
||||
|
||||
@ -3434,42 +3436,46 @@ QString QgsVectorLayer::metadata()
|
||||
{
|
||||
QString typeString( QGis::vectorGeometryType( geometryType() ) );
|
||||
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += tr( "Geometry type of the features in this layer: %1" ).arg( typeString );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Geometry type of the features in this layer" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += typeString;
|
||||
myMetadata += "</p>\n";
|
||||
}
|
||||
|
||||
QgsAttributeList pkAttrList = pendingPkAttributesList();
|
||||
if ( !pkAttrList.isEmpty() )
|
||||
{
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += tr( "Primary key attributes: " );
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Primary key attributes" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
foreach ( int idx, pkAttrList )
|
||||
{
|
||||
myMetadata += pendingFields()[ idx ].name() + " ";
|
||||
}
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "</p>\n";
|
||||
}
|
||||
|
||||
|
||||
//feature count
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += tr( "The number of features in this layer: %1" ).arg( featureCount() );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "The number of features in this layer" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += QString::number( featureCount() );
|
||||
myMetadata += "</p>\n";
|
||||
//capabilities
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += tr( "Editing capabilities of this layer: %1" ).arg( capabilitiesString() );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Editing capabilities of this layer" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += capabilitiesString();
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
//-------------
|
||||
|
||||
QgsRectangle myExtent = extent();
|
||||
myMetadata += "<tr class=\"glossy\"><td>";
|
||||
myMetadata += tr( "Extents:" );
|
||||
myMetadata += "</td></tr>";
|
||||
//extents in layer cs TODO...maybe make a little nested table to improve layout...
|
||||
myMetadata += "<tr><td>" + tr( "In layer spatial reference system units : " );
|
||||
myMetadata += "<p class=\"subheaderglossy\">";
|
||||
myMetadata += tr( "Extents" );
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
//extents in layer cs TODO...maybe make a little nested table to improve layout...
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "In layer spatial reference system units" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
// Try to be a bit clever over what number format we use for the
|
||||
// extents. Some people don't like it using scientific notation when the
|
||||
// numbers get large, but for small numbers this is the more practical
|
||||
@ -3525,7 +3531,7 @@ QString QgsVectorLayer::metadata()
|
||||
myMetadata += tr( "unknown extent" );
|
||||
}
|
||||
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
//extents in project cs
|
||||
|
||||
@ -3534,37 +3540,34 @@ QString QgsVectorLayer::metadata()
|
||||
#if 0
|
||||
// TODO: currently disabled, will revisit later [MD]
|
||||
QgsRectangle myProjectedExtent = coordinateTransform->transformBoundingBox( extent() );
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += tr( "In project spatial reference system units : " )
|
||||
+ tr( "xMin,yMin %1,%2 : xMax,yMax %3,%4" )
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "In project spatial reference system units" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += tr( "xMin,yMin %1,%2 : xMax,yMax %3,%4" )
|
||||
.arg( myProjectedExtent.xMinimum() )
|
||||
.arg( myProjectedExtent.yMinimum() )
|
||||
.arg( myProjectedExtent.xMaximum() )
|
||||
.arg( myProjectedExtent.yMaximum() );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "</p>\n";
|
||||
#endif
|
||||
|
||||
//
|
||||
// Display layer spatial ref system
|
||||
//
|
||||
myMetadata += "<tr class=\"glossy\"><td>";
|
||||
myMetadata += tr( "Layer Spatial Reference System:" );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Layer Spatial Reference System" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += crs().toProj4().replace( QRegExp( "\"" ), " \"" );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
//
|
||||
// Display project (output) spatial ref system
|
||||
//
|
||||
#if 0
|
||||
// TODO: disabled for now, will revisit later [MD]
|
||||
myMetadata += "<tr><td bgcolor=\"gray\">";
|
||||
myMetadata += tr( "Project (Output) Spatial Reference System:" );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<tr><td>";
|
||||
//myMetadata += "<tr><td bgcolor=\"gray\">";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Project (Output) Spatial Reference System" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += coordinateTransform->destCRS().toProj4().replace( QRegExp( "\"" ), " \"" );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "</p>\n";
|
||||
#endif
|
||||
}
|
||||
catch ( QgsCsException &cse )
|
||||
@ -3572,10 +3575,10 @@ QString QgsVectorLayer::metadata()
|
||||
Q_UNUSED( cse );
|
||||
QgsDebugMsg( cse.what() );
|
||||
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += tr( "In project spatial reference system units : " )
|
||||
+ tr( "(Invalid transformation of layer extents)" );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "In project spatial reference system units" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += tr( "(Invalid transformation of layer extents)" );
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
}
|
||||
|
||||
@ -3583,10 +3586,8 @@ QString QgsVectorLayer::metadata()
|
||||
//
|
||||
// Add the info about each field in the attribute table
|
||||
//
|
||||
myMetadata += "<tr class=\"glossy\"><td>";
|
||||
myMetadata += tr( "Attribute field info:" );
|
||||
myMetadata += "</td></tr>";
|
||||
myMetadata += "<tr><td>";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Attribute field info" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
|
||||
// Start a nested table in this trow
|
||||
myMetadata += "<table width=\"100%\">";
|
||||
@ -3633,13 +3634,6 @@ QString QgsVectorLayer::metadata()
|
||||
myMetadata += "</table>"; //end of nested table
|
||||
#endif
|
||||
|
||||
myMetadata += "</td></tr>"; //end of stats container table row
|
||||
//
|
||||
// Close the table
|
||||
//
|
||||
|
||||
myMetadata += "</table>";
|
||||
|
||||
myMetadata += "</body></html>";
|
||||
return myMetadata;
|
||||
}
|
||||
|
||||
@ -487,7 +487,7 @@ QList< QPair< QString, QColor > > QgsRasterLayer::legendSymbologyItems() const
|
||||
QString QgsRasterLayer::metadata()
|
||||
{
|
||||
QString myMetadata ;
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Driver:" ) + "</p>\n";
|
||||
myMetadata += "<p class=\"glossy\">" + tr( "Driver" ) + "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += mDataProvider->description();
|
||||
myMetadata += "</p>\n";
|
||||
@ -513,7 +513,7 @@ QString QgsRasterLayer::metadata()
|
||||
|
||||
myMetadata += "</p>\n";
|
||||
myMetadata += "<p class=\"glossy\">";
|
||||
myMetadata += tr( "Data Type:" );
|
||||
myMetadata += tr( "Data Type" );
|
||||
myMetadata += "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
//just use the first band
|
||||
@ -558,19 +558,19 @@ QString QgsRasterLayer::metadata()
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
myMetadata += "<p class=\"glossy\">";
|
||||
myMetadata += tr( "Pyramid overviews:" );
|
||||
myMetadata += tr( "Pyramid overviews" );
|
||||
myMetadata += "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
|
||||
myMetadata += "<p class=\"glossy\">";
|
||||
myMetadata += tr( "Layer Spatial Reference System: " );
|
||||
myMetadata += tr( "Layer Spatial Reference System" );
|
||||
myMetadata += "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += crs().toProj4();
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
myMetadata += "<p class=\"glossy\">";
|
||||
myMetadata += tr( "Layer Extent (layer original source projection): " );
|
||||
myMetadata += tr( "Layer Extent (layer original source projection)" );
|
||||
myMetadata += "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += mDataProvider->extent().toString();
|
||||
@ -580,7 +580,7 @@ QString QgsRasterLayer::metadata()
|
||||
// TODO: this is not related to layer, to be removed? [MD]
|
||||
#if 0
|
||||
myMetadata += "<tr><td class=\"glossy\">";
|
||||
myMetadata += tr( "Project Spatial Reference System: " );
|
||||
myMetadata += tr( "Project Spatial Reference System" );
|
||||
myMetadata += "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += mCoordinateTransform->destCRS().toProj4();
|
||||
|
||||
@ -95,6 +95,23 @@ void QgsOptionsDialogBase::restoreOptionsBaseUi()
|
||||
settings.value( QString( "/Windows/%1/splitState" ).arg( mOptsKey ) ).isNull() ? 150 : 16777215 );
|
||||
mOptSplitter->restoreState( settings.value( QString( "/Windows/%1/splitState" ).arg( mOptsKey ) ).toByteArray() );
|
||||
int curIndx = settings.value( QString( "/Windows/%1/tab" ).arg( mOptsKey ), 0 ).toInt();
|
||||
|
||||
// if the last used tab is not enabled, or is missing, display the first enabled one
|
||||
if ( !mOptStackedWidget->widget( curIndx )->isEnabled()
|
||||
|| mOptStackedWidget->count() < ( curIndx + 1 ) )
|
||||
{
|
||||
curIndx = 0;
|
||||
for ( int i = 0; i < mOptStackedWidget->count(); i++ )
|
||||
{
|
||||
if ( mOptStackedWidget->widget( i )->isEnabled() )
|
||||
{
|
||||
curIndx = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
curIndx = -1; // default fallback
|
||||
}
|
||||
|
||||
mOptStackedWidget->setCurrentIndex( curIndx );
|
||||
mOptListWidget->setCurrentRow( curIndx );
|
||||
|
||||
|
||||
@ -289,7 +289,7 @@ QString QgsGdalProvider::metadata()
|
||||
// end my added code
|
||||
|
||||
myMetadata += "<p class=\"glossy\">";
|
||||
myMetadata += tr( "Dimensions:" );
|
||||
myMetadata += tr( "Dimensions" );
|
||||
myMetadata += "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += tr( "X: %1 Y: %2 Bands: %3" )
|
||||
@ -326,7 +326,7 @@ QString QgsGdalProvider::metadata()
|
||||
else
|
||||
{
|
||||
myMetadata += "<p class=\"glossy\">";
|
||||
myMetadata += tr( "Origin:" );
|
||||
myMetadata += tr( "Origin" );
|
||||
myMetadata += "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += QString::number( mGeoTransform[0] );
|
||||
@ -335,7 +335,7 @@ QString QgsGdalProvider::metadata()
|
||||
myMetadata += "</p>\n";
|
||||
|
||||
myMetadata += "<p class=\"glossy\">";
|
||||
myMetadata += tr( "Pixel Size:" );
|
||||
myMetadata += tr( "Pixel Size" );
|
||||
myMetadata += "</p>\n";
|
||||
myMetadata += "<p>";
|
||||
myMetadata += QString::number( mGeoTransform[1] );
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>695</width>
|
||||
<height>476</height>
|
||||
<width>609</width>
|
||||
<height>731</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
@ -21,12 +21,41 @@
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="0" column="0">
|
||||
<widget class="QGroupBox" name="groupBox_2">
|
||||
<widget class="QgsCollapsibleGroupBox" name="groupBoxActionList">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>3</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Action list</string>
|
||||
</property>
|
||||
<property name="syncGroup" stdset="0">
|
||||
<string notr="true">actiongroup</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="0" column="0" colspan="5">
|
||||
<item row="1" column="0">
|
||||
<widget class="QPushButton" name="moveUpButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Move the selected action up</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../images/images.qrc">
|
||||
<normaloff>:/images/themes/default/mActionArrowUp.png</normaloff>:/images/themes/default/mActionArrowUp.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0" colspan="6">
|
||||
<widget class="QTableWidget" name="attributeActionTable">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
@ -70,60 +99,101 @@
|
||||
</item>
|
||||
<item row="1" column="3">
|
||||
<widget class="QPushButton" name="removeButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Remove the selected action</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Remove action</string>
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QPushButton" name="moveUpButton">
|
||||
<property name="toolTip">
|
||||
<string>Move the selected action up</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Move up</string>
|
||||
<property name="icon">
|
||||
<iconset resource="../../images/images.qrc">
|
||||
<normaloff>:/images/themes/default/symbologyRemove.png</normaloff>:/images/themes/default/symbologyRemove.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QPushButton" name="moveDownButton">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Move the selected action down</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Move down</string>
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../images/images.qrc">
|
||||
<normaloff>:/images/themes/default/mActionArrowDown.png</normaloff>:/images/themes/default/mActionArrowDown.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="4">
|
||||
<item row="1" column="5">
|
||||
<widget class="QPushButton" name="addDefaultActionsButton">
|
||||
<property name="text">
|
||||
<string>Add default actions</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="4">
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<spacer name="horizontalSpacer_5">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<widget class="QgsCollapsibleGroupBox" name="groupBoxActionProperties">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>3</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Action properties</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Type</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>actionType</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<property name="syncGroup" stdset="0">
|
||||
<string notr="true">actiongroup</string>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<property name="fieldGrowthPolicy">
|
||||
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
||||
</property>
|
||||
<property name="labelAlignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
</property>
|
||||
<item row="0" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
@ -176,7 +246,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>37</width>
|
||||
<width>12</width>
|
||||
<height>24</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -234,24 +304,8 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QPlainTextEdit" name="actionAction">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Enter the action command here</string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string>Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters within [% and %] will be evaluated as expression and replaced by its result. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout_4">
|
||||
<item row="0" column="1">
|
||||
<widget class="QToolButton" name="browseButton">
|
||||
<property name="toolTip">
|
||||
<string>Browse for action</string>
|
||||
@ -265,6 +319,39 @@
|
||||
<property name="text">
|
||||
<string>...</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../images/images.qrc">
|
||||
<normaloff>:/images/themes/default/mActionFileOpen.png</normaloff>:/images/themes/default/mActionFileOpen.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<spacer name="verticalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="0" rowspan="2">
|
||||
<widget class="QPlainTextEdit" name="actionAction">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Enter the action command here</string>
|
||||
</property>
|
||||
<property name="whatsThis">
|
||||
<string>Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters within [% and %] will be evaluated as expression and replaced by its result. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
@ -297,7 +384,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>12</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -340,7 +427,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>12</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -368,22 +455,49 @@
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_1">
|
||||
<property name="text">
|
||||
<string>Type</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>actionType</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>15</x>
|
||||
<y>33</y>
|
||||
<width>41</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Type</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>actionType</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<layoutdefault spacing="6" margin="11"/>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>QgsCollapsibleGroupBox</class>
|
||||
<extends>QGroupBox</extends>
|
||||
<header>qgscollapsiblegroupbox.h</header>
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>attributeActionTable</tabstop>
|
||||
<tabstop>moveUpButton</tabstop>
|
||||
@ -400,6 +514,8 @@
|
||||
<tabstop>insertButton</tabstop>
|
||||
<tabstop>updateButton</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<resources>
|
||||
<include location="../../images/images.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
@ -39,8 +39,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>756</width>
|
||||
<height>627</height>
|
||||
<width>752</width>
|
||||
<height>613</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="scrollAreaLayout">
|
||||
@ -63,7 +63,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>20</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -124,8 +124,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>725</width>
|
||||
<height>397</height>
|
||||
<width>713</width>
|
||||
<height>394</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="label">
|
||||
@ -307,7 +307,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -320,8 +320,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>725</width>
|
||||
<height>293</height>
|
||||
<width>715</width>
|
||||
<height>278</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="label">
|
||||
@ -343,7 +343,7 @@
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
@ -378,7 +378,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>483</width>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -490,7 +490,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -509,8 +509,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>725</width>
|
||||
<height>278</height>
|
||||
<width>713</width>
|
||||
<height>271</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="label">
|
||||
@ -638,7 +638,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -651,7 +651,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -671,8 +671,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>738</width>
|
||||
<height>196</height>
|
||||
<width>728</width>
|
||||
<height>166</height>
|
||||
</rect>
|
||||
</property>
|
||||
<attribute name="label">
|
||||
@ -781,7 +781,7 @@
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
@ -844,7 +844,7 @@
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
@ -891,7 +891,7 @@
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
|
||||
@ -92,18 +92,6 @@
|
||||
<normaloff>:/images/themes/default/propertyicons/general.png</normaloff>:/images/themes/default/propertyicons/general.png</iconset>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Metadata</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Metadata</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../images/images.qrc">
|
||||
<normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Style</string>
|
||||
@ -152,6 +140,18 @@
|
||||
<normaloff>:/images/themes/default/propertyicons/histogram.png</normaloff>:/images/themes/default/propertyicons/histogram.png</iconset>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Metadata</string>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Metadata</string>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../images/images.qrc">
|
||||
<normaloff>:/images/themes/default/propertyicons/metadata.png</normaloff>:/images/themes/default/propertyicons/metadata.png</iconset>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
@ -182,7 +182,7 @@
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="currentIndex">
|
||||
<number>2</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="mOptsPage_General">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_6">
|
||||
@ -212,8 +212,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>713</width>
|
||||
<height>686</height>
|
||||
<width>693</width>
|
||||
<height>646</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_7">
|
||||
@ -379,6 +379,9 @@
|
||||
<string notr="true">rastergeneral</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="_5">
|
||||
<property name="verticalSpacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>11</number>
|
||||
</property>
|
||||
@ -652,130 +655,6 @@
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="mOptsPage_Metadata">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_8">
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">font-weight:bold;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Metadata</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QScrollArea" name="scrollArea_4">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="widgetResizable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="scrollAreaWidgetContents_4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>150</width>
|
||||
<height>236</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_10">
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QgsCollapsibleGroupBox" name="mMetaDescriptionGrpBx">
|
||||
<property name="title">
|
||||
<string>Description</string>
|
||||
</property>
|
||||
<property name="syncGroup" stdset="0">
|
||||
<string notr="true">rastermeta</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_5">
|
||||
<item row="3" column="1">
|
||||
<widget class="QTextEdit" name="mLayerAbstractTextEdit">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="mLayerTitleLineEdit"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="mLayerTitleLabel">
|
||||
<property name="text">
|
||||
<string>Title</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="mLayerAbstractLabel">
|
||||
<property name="text">
|
||||
<string>Abstract</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QgsCollapsibleGroupBox" name="mMetaPropertiesGrpBx">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>5</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Properties</string>
|
||||
</property>
|
||||
<property name="syncGroup" stdset="0">
|
||||
<string notr="true">rastermeta</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_11">
|
||||
<item>
|
||||
<widget class="QTextBrowser" name="txtbMetadata"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="mOptsPage_Style">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_14">
|
||||
<property name="margin">
|
||||
@ -804,8 +683,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>713</width>
|
||||
<height>686</height>
|
||||
<width>610</width>
|
||||
<height>360</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_13">
|
||||
@ -1319,8 +1198,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>431</width>
|
||||
<height>384</height>
|
||||
<width>472</width>
|
||||
<height>439</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_5">
|
||||
@ -1736,8 +1615,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>557</width>
|
||||
<height>164</height>
|
||||
<width>632</width>
|
||||
<height>199</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_12">
|
||||
@ -1800,7 +1679,7 @@
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
@ -1907,8 +1786,8 @@ p, li { white-space: pre-wrap; }
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>82</width>
|
||||
<height>18</height>
|
||||
<width>98</width>
|
||||
<height>31</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_16">
|
||||
@ -1939,6 +1818,130 @@ p, li { white-space: pre-wrap; }
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="mOptsPage_Metadata">
|
||||
<layout class="QVBoxLayout" name="verticalLayout_8">
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_9">
|
||||
<property name="styleSheet">
|
||||
<string notr="true">font-weight:bold;</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Metadata</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QScrollArea" name="scrollArea_4">
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
</property>
|
||||
<property name="widgetResizable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<widget class="QWidget" name="scrollAreaWidgetContents_4">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>195</width>
|
||||
<height>267</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_10">
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QgsCollapsibleGroupBox" name="mMetaDescriptionGrpBx">
|
||||
<property name="title">
|
||||
<string>Description</string>
|
||||
</property>
|
||||
<property name="syncGroup" stdset="0">
|
||||
<string notr="true">rastermeta</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_5">
|
||||
<item row="3" column="1">
|
||||
<widget class="QTextEdit" name="mLayerAbstractTextEdit">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="mLayerTitleLineEdit"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="mLayerTitleLabel">
|
||||
<property name="text">
|
||||
<string>Title</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="mLayerAbstractLabel">
|
||||
<property name="text">
|
||||
<string>Abstract</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QgsCollapsibleGroupBox" name="mMetaPropertiesGrpBx">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>5</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>Properties</string>
|
||||
</property>
|
||||
<property name="syncGroup" stdset="0">
|
||||
<string notr="true">rastermeta</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_11">
|
||||
<item>
|
||||
<widget class="QTextBrowser" name="txtbMetadata"/>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
@ -2008,9 +2011,9 @@ p, li { white-space: pre-wrap; }
|
||||
</widget>
|
||||
<customwidgets>
|
||||
<customwidget>
|
||||
<class>QgsColorButton</class>
|
||||
<extends>QPushButton</extends>
|
||||
<header>qgscolorbutton.h</header>
|
||||
<class>QgsScaleComboBox</class>
|
||||
<extends>QComboBox</extends>
|
||||
<header>qgsscalecombobox.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>QgsCollapsibleGroupBox</class>
|
||||
@ -2019,9 +2022,9 @@ p, li { white-space: pre-wrap; }
|
||||
<container>1</container>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>QgsScaleComboBox</class>
|
||||
<extends>QComboBox</extends>
|
||||
<header>qgsscalecombobox.h</header>
|
||||
<class>QgsColorButton</class>
|
||||
<extends>QPushButton</extends>
|
||||
<header>qgscolorbutton.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>QgsBlendModeComboBox</class>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>643</width>
|
||||
<width>709</width>
|
||||
<height>401</height>
|
||||
</rect>
|
||||
</property>
|
||||
@ -43,34 +43,49 @@
|
||||
<attribute name="headerStretchLastSection">
|
||||
<bool>true</bool>
|
||||
</attribute>
|
||||
<attribute name="headerMinimumSectionSize">
|
||||
<number>100</number>
|
||||
</attribute>
|
||||
<attribute name="headerStretchLastSection">
|
||||
<bool>true</bool>
|
||||
</attribute>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnAddRule">
|
||||
<property name="toolTip">
|
||||
<string>Add rule</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Add</string>
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../images/images.qrc">
|
||||
<normaloff>:/images/themes/default/mActionSignPlus.png</normaloff>:/images/themes/default/mActionSignPlus.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnEditRule">
|
||||
<property name="toolTip">
|
||||
<string>Edit rule</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Edit</string>
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../images/images.qrc">
|
||||
<normaloff>:/images/themes/default/symbologyEdit.png</normaloff>:/images/themes/default/symbologyEdit.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnRemoveRule">
|
||||
<property name="toolTip">
|
||||
<string>Remove rule</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Remove</string>
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../../images/images.qrc">
|
||||
<normaloff>:/images/themes/default/mActionSignMinus.png</normaloff>:/images/themes/default/mActionSignMinus.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -110,7 +125,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -127,6 +142,8 @@
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<resources>
|
||||
<include location="../../images/images.qrc"/>
|
||||
</resources>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>509</width>
|
||||
<height>416</height>
|
||||
<width>444</width>
|
||||
<height>383</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@ -65,14 +65,17 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout">
|
||||
<layout class="QHBoxLayout" name="pushBtnBox">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnAddLayer">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Add symbol layer</string>
|
||||
@ -81,11 +84,11 @@
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnRemoveLayer">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Remove symbol layer</string>
|
||||
@ -94,11 +97,11 @@
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnLock">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Lock layer's color</string>
|
||||
@ -110,11 +113,11 @@
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnUp">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Move up</string>
|
||||
@ -123,11 +126,11 @@
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnDown">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>50</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Move down</string>
|
||||
@ -175,8 +178,6 @@
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
<zorder>stackedWidget</zorder>
|
||||
<zorder>stackedWidget</zorder>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -217,7 +217,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>194</width>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -233,7 +233,7 @@
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>150</width>
|
||||
<width>50</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
@ -300,7 +300,7 @@
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<width>0</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user