Skip to content
Permalink
Browse files

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
  • Loading branch information
dakcarto committed Apr 21, 2013
1 parent 87288b7 commit 956e18d28f5991db47fbc7d2e21adb6a7ac6fa46
@@ -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>
@@ -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>
@@ -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>
@@ -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>

0 comments on commit 956e18d

Please sign in to comment.
You can’t perform that action at this time.