From d252936285af0d54990febae80270a8e3f96befa Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Wed, 22 Jul 2015 20:18:05 +0200
Subject: [PATCH] Some UI improvements in the options dialog

---
 images/images.qrc                            |   2 +-
 images/themes/default/propertyicons/gdal.png | Bin 2037 -> 0 bytes
 images/themes/default/propertyicons/gdal.svg | 141 +++++++++++++++++++
 src/ui/qgsoptionsbase.ui                     |   5 +-
 4 files changed, 146 insertions(+), 2 deletions(-)
 delete mode 100644 images/themes/default/propertyicons/gdal.png
 create mode 100644 images/themes/default/propertyicons/gdal.svg

diff --git a/images/images.qrc b/images/images.qrc
index 895e3a7bb37..dbcf58aeb7e 100644
--- a/images/images.qrc
+++ b/images/images.qrc
@@ -403,7 +403,7 @@
         <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/gdal.svg</file>
         <file>themes/default/propertyicons/general.svg</file>
         <file>themes/default/propertyicons/histogram.png</file>
         <file>themes/default/propertyicons/join.png</file>
diff --git a/images/themes/default/propertyicons/gdal.png b/images/themes/default/propertyicons/gdal.png
deleted file mode 100644
index cadfc2f0eaefc7f6057b78ee417c2215eb0ad97a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2037
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
T3~H!W00000NkvXXu0mjfK;zFH

diff --git a/images/themes/default/propertyicons/gdal.svg b/images/themes/default/propertyicons/gdal.svg
new file mode 100644
index 00000000000..4ec9f555858
--- /dev/null
+++ b/images/themes/default/propertyicons/gdal.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="571.5"
+   height="632.057"
+   viewBox="0 0 571.5 632.057"
+   overflow="visible"
+   enable-background="new 0 0 571.5 632.057"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="gdal.svg"><metadata
+     id="metadata81"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs79" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1834"
+     inkscape:window-height="938"
+     id="namedview77"
+     showgrid="false"
+     inkscape:zoom="0.74676808"
+     inkscape:cx="177.75783"
+     inkscape:cy="113.62591"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" /><g
+     id="Layer_5" /><ellipse
+     style="fill:#71c9f1"
+     id="ellipse6"
+     ry="225.439"
+     rx="224.981"
+     cy="406.61801"
+     cx="346.517" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path8"
+     d="m 501.978,457.39 c -7.509,-0.713 -16.236,0.223 -23.391,-2.537 -8.306,-3.204 -4.547,-10.3 -9.413,-16.078 -3.78,-4.487 -11.079,-5.93 -16.188,-8.536 -6.96,-3.549 -13.698,-7.636 -21.302,-9.71 -7.862,-2.143 -17.271,0.333 -24.15,4.177 -2.157,1.205 -7.1,5.316 -9.661,3.283 -2.681,-2.127 2.007,-10.977 -4.186,-8.791 -5.667,2 -8.333,10.666 -13,10 -5.563,-0.797 -10.045,-2.484 -15.7,-2.025 -4.935,0.4 -9.862,1.645 -13.318,-2.984 -3.655,-4.897 -0.294,-11.042 -2.59,-16.06 -3.943,-8.621 -14.11,-0.312 -20.288,-4.171 4.428,-3.34 8.556,-9.208 8.812,-14.902 0.24,-5.296 -3.365,-9.285 -8.459,-5.876 -2.794,1.87 -2.717,5.298 -4.786,7.61 -3.579,3.998 -22.032,5.008 -23.392,-2.131 -1.274,-6.693 -3.8,-19.088 -0.613,-25.461 2.46,-4.92 5.587,-10.722 11.14,-12.62 5.662,-1.937 13.416,0.266 19.726,-1.347 5.419,-1.385 11.471,-3.187 16.794,-0.577 5.431,2.663 6.361,8.669 8.675,13.876 1.333,3 6.333,7 4.998,-1.009 -1.043,-6.257 -6.906,-13.907 -3.835,-20.018 2.753,-5.469 9.375,-7.259 12.905,-11.957 3.462,-4.605 0.965,-10.548 3.581,-15.406 2.607,-4.842 8.754,-6.369 11.152,-11.427 1.169,-2.466 6.492,-16.992 11.812,-12.393 2.256,1.95 0.915,4.433 4.449,1.971 1.443,-1.005 6.797,-4.77 3.601,-6.54 -2.938,-1.626 -8,0.977 -9.614,-3.112 -2.782,-7.047 10.244,-10.657 11.95,-15.776 1,-3 0.999,-4 -6.667,-7 -5.263,-2.06 -10.834,-13.366 -16.136,-13.021 -2.959,0.193 -2.355,3.443 -4.236,3.981 -4.458,1.275 -6.904,-5.511 -9.975,-7.852 -2.22,-1.691 -10.525,-5.292 -13.255,-3.211 -6.569,5.007 11.048,30.222 -1.377,34.982 -3.051,1.169 -9.481,-11.799 -13.748,-13.541 -6.876,-2.808 -18.555,-1.837 -18.288,-12.673 0.259,-10.54 13.503,-7.468 16.641,-14.656 2.782,-6.372 -7.008,-16.185 -12.755,-14.704 -0.313,1.593 0.765,5.348 -0.234,6.547 -3.135,3.749 -22.685,0.086 -26.976,-1.256 -7.398,-2.314 -15.241,-3.933 -22.041,-7.793 -5.896,-3.347 -9.099,-9.623 -16.62,-6.803 -5.333,2 -8.581,4.748 -13.247,6.749 -4.513,1.935 -9.57,2.161 -14.054,4.299 -4.543,2.167 -1.849,10.273 -5.445,14.193 -4.375,4.767 -11.717,4.507 -17.641,5.074 -1.479,0.142 -11.102,0.365 -11.364,1.94 -0.377,2.465 24.337,-0.224 26.059,-0.717 3.962,-1.134 6.864,-4.043 10.679,-5.509 4.563,-1.753 10.064,-2.544 12.391,2.452 2.72,5.866 0.49,11.602 -1.584,17.235 -2.341,6.359 -1.505,7.897 0.193,14.208 1.063,3.951 0.289,6.358 -1.373,10.062 -4.133,9.214 -15.476,25.558 -11.28,36.347 3.218,8.275 10.404,15.299 16.03,21.95 3.825,4.522 3.212,8.959 5.922,14.176 2.562,4.931 6.369,9.652 9.468,14.285 4.448,6.649 5.391,15.301 10.732,21.386 4.689,5.344 18.895,14.808 26.259,15.046 2.229,0.071 4.227,-2.034 6.38,-1.789 6.695,0.77 10.746,7.212 16.557,9.839 5.312,2.401 12.593,0.383 17.068,4.591 5.602,5.266 6.109,13.242 14.608,15.555 4.236,1.151 9.679,-0.793 13.622,1.16 11.421,5.661 3.7,18.943 0.003,26.387 -3.837,7.723 -7.906,16.742 -6.265,25.596 1.417,7.646 7.29,12.614 11.329,18.841 3.502,5.398 4.498,12.508 10.363,16.07 4.594,2.789 13.605,2.979 16.249,8.182 2.943,5.793 -3.647,14.68 -5.068,20.259 -1.802,7.076 -3.995,14.092 -6.196,21.056 -2.197,6.953 -5.879,11.785 -8.91,18.124 -2.504,5.236 -9.558,25.709 1.111,24.759 15.161,-1.355 20.782,-21.278 33.737,-26.138 2.666,-1 25,-17.666 29,-21 4,-3.332 14,-7.332 15.333,-11.332 1.333,-4 6.333,-7 8,-14.001 1.917,-8.052 14.624,-10.232 20.124,-15.672 7.525,-7.445 11.274,-18.378 15.207,-27.991 3.35,-8.187 10.577,-14.424 12.632,-23.294 2.588,-11.177 -6.133,-13.849 -16.671,-14.851 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path10"
+     d="m 381.378,381.335 c -1.71,-0.46 -3.672,-0.411 -5.432,-0.978 -2.658,-0.856 -4.965,-2.606 -7.574,-3.604 -2.751,-1.053 -5.575,-1.834 -8.521,-2.048 -1.604,-0.117 -3.228,-0.049 -4.813,0.229 -1.477,0.259 -3.017,0.697 -4.387,1.315 -0.578,0.261 -1.629,0.807 -1.259,1.641 0.655,1.472 4.881,0.516 6.075,0.517 4.407,0.004 9.582,-0.109 13.225,2.781 0.947,0.752 1.812,1.611 2.563,2.56 0.613,0.771 1.158,1.651 2.077,2.095 0.902,0.436 1.856,-0.061 2.698,-0.418 1.194,-0.506 2.403,-0.981 3.641,-1.37 1.015,-0.318 2.294,-0.438 3.014,-1.312 0.6,-0.728 -0.414,-1.167 -1.307,-1.408 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path12"
+     d="m 401.687,385.114 c -2.328,-0.596 -4.999,2.082 -8.334,0.75 -3.021,-1.209 -3.718,-2.699 -5.646,-3.062 -1.204,-0.227 -3.259,0.418 -1.688,1.812 2.719,2.412 4.67,4.588 8,6.084 2.071,0.93 7.254,0.213 9.25,-0.918 3.418,-1.934 2.001,-3.75 -1.582,-4.666 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path14"
+     d="m 417.418,273.486 c -0.908,-0.569 -4.107,-7.395 -6.731,-1.956 -3.417,7.083 9.064,8.755 10.345,7.231 1.281,-1.524 -3.261,-5.054 -3.614,-5.275 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path16"
+     d="m 360.747,219.091 c -1.993,-0.813 -19.86,-8.049 -20.452,-2.425 -0.387,3.669 6.869,4.285 9.104,4.869 3.51,0.918 9.196,3.659 10.155,7.568 0.661,2.702 -3.062,6.094 2.133,6.094 2.333,0 7.333,1.333 7.333,1.333 0,0 2.331,1.332 4.33,1 5.634,-0.933 -3.676,-9.816 -5.043,-11.32 -2.56,-2.815 -3.88,-5.617 -7.56,-7.119 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path18"
+     d="m 309.146,212.979 c -1.678,-0.62 -5.983,-1.21 -6.354,-1.005 -3.8,2.109 -3.879,3.164 0.234,5.171 3.782,1.846 7.568,3.359 11.677,4.333 2.281,0.541 6.878,0.554 4.704,-3.035 -1.836,-3.028 -7.161,-4.319 -10.261,-5.464 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path20"
+     d="m 348.823,199.695 c -1.944,-1.491 -4.894,0.116 -6.754,0.966 -4.292,1.959 -8.718,0.723 -13.063,2.073 -1.127,0.35 -2.913,1.235 -3.002,2.619 -0.118,1.815 2.478,2.298 3.74,2.786 1.955,0.756 3.552,2.407 5.803,1.95 1.804,-0.366 3.223,-1.749 5.056,-2.105 2.112,-0.41 4.178,-0.647 5.794,-2.204 1.193,-1.149 4.435,-4.535 2.426,-6.085 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path22"
+     d="m 409.354,226.53 c -0.277,-1.943 0.044,-3.902 -0.289,-5.833 -1.829,-10.604 -14.968,-16.208 -23.786,-19.79 -3.56,-1.446 -7.52,-2.477 -11.37,-2.703 -5.047,-0.295 -11.717,-0.849 -16.163,2.083 -1.566,1.033 -2.45,2.509 -2.168,4.596 0.491,3.619 7.262,2.939 9.767,3.551 7.157,1.748 13.058,5.072 18.678,9.865 8.422,7.184 15.936,13.401 26.332,17.563 1.666,0.667 4.991,1.393 4.261,-1.401 -1.031,-3.936 -4.595,-3.264 -5.262,-7.931 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path24"
+     d="m 526.982,282.734 c 0.352,6.433 1.142,12.889 3.198,19.021 0.987,2.942 2.672,5.6 3.723,8.518 2.473,6.87 1.067,14.3 2.423,21.351 1.335,6.941 5.996,12.545 8.022,19.24 1.876,6.197 0.695,13.385 3.337,19.332 1.507,3.391 4.328,5.977 6.224,9.145 2.399,4.01 5.111,14.822 10.22,16.139 3.615,0.932 3.283,-7.537 3.784,-9.68 0.519,-2.219 1.267,-4.58 1.886,-6.961 -4.898,-39.934 -20.21,-76.639 -43.142,-107.295 -0.017,0.349 0.138,7.751 0.325,11.19 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path26"
+     d="m 476.633,224.922 c 0.477,2.124 1.054,4.656 -0.107,5.572 -2.11,1.665 -5.297,-1.39 -6.854,-2.635 -1.262,-1.009 -3.767,-3.708 -5.544,-2.832 -3.024,1.491 7.355,8.955 8.257,9.812 1.441,1.37 2.495,3.188 4.04,4.431 3.075,2.472 3.656,-0.448 5.861,-1.96 3.364,-2.308 6.416,1.998 8.007,4.324 2.456,3.59 4.026,7.599 6.747,11.036 3.116,3.936 6.173,7.852 8.763,12.208 2.714,4.562 5.375,9.192 8.843,13.237 2.25,2.625 6.559,4.244 7.52,3.403 1.647,-1.44 -0.844,-4.196 -1.373,-5.637 -1.469,-4 -4.137,-7.383 -6.099,-11.132 -1.967,-3.76 -4.444,-12.495 -4.486,-12.773 -10.307,-10.95 -21.691,-20.868 -33.99,-29.577 -0.015,0.604 0.188,1.518 0.415,2.523 z" /><path
+     style="fill:#359946"
+     inkscape:connector-curvature="0"
+     id="path28"
+     d="m 419.521,197.116 c 4.331,3.715 9.838,5.95 15.165,8.081 3.333,1.333 4.333,3 8.333,5 4.945,2.473 9.567,5.014 14.826,6.81 1.517,0.518 5.319,2.592 6.841,1.523 0.674,-0.474 0.79,-1.88 0.596,-3.397 -15.574,-9.72 -32.418,-17.584 -50.229,-23.287 0.157,0.317 2.928,3.95 4.468,5.27 z" /><g
+     id="Layer_3"><path
+       fill="#ED1E3A"
+       d="M182.65,173.129l-2.333,6.184l186.476,68.695c0.404-2.107,1.5-4.08,2.162-6.247L182.65,173.129z"
+       id="path49" /><path
+       fill="#ED1E3A"
+       d="M180.528,179.824l-33.894,195.825c2.202,1.482,4.432,2.82,6.716,4.102l34.414-198.825L180.528,179.824z"
+       id="path51" /><path
+       fill="#ED1E3A"
+       d="M244.787,288.181c-66.626,41.209-91.718,80.856-96.071,88.376c1.7,1.018,3.417,1.962,5.158,2.872   c10.307-16.118,37.901-52.546,94.204-86.861c51.214-31.214,96.002-40.895,117.844-43.891c0.354-1.78,1.219-3.4,2.071-5.071   C353.696,245.325,300.475,253.737,244.787,288.181z"
+       id="path53" /><polygon
+       fill="#666667"
+       points="263.86,51.352 183.091,103.005 168.93,51.652 249.699,0  "
+       id="polygon55" /><path
+       d="M175.983,114.397c0,0-12.522,3.461-23.303,9.845c-10.781,6.384-19.823,15.693-19.823,15.693l-34.207-57.5   c0,0,6.653-12.348,17.642-18.854c10.565-6.257,25.482-6.683,25.482-6.683L175.983,114.397z"
+       id="path57" /><path
+       fill="#666667"
+       d="M152.493,136.525c19.72-12.891,41.243-20.098,49.737-16.902c-5.473-2.507-27.143-10.826-50.188,2.244   c-23.858,13.531-26.183,34.557-26.165,42.379C126.953,157.471,136.976,146.669,152.493,136.525z"
+       id="path59" /><path
+       fill="#989898"
+       d="M205.773,125.483c0.139-0.985,0.084-1.885-0.177-2.681c-0.111-0.342-0.26-0.665-0.448-0.967   c-0.125-0.201-0.267-0.394-0.427-0.578c-0.318-0.367-0.707-0.697-1.167-0.988c-1.379-0.871-3.304-1.323-5.658-1.393   c-0.392-0.012-0.796-0.012-1.212-0.003c-0.831,0.018-1.708,0.08-2.626,0.18c-0.459,0.051-0.929,0.112-1.408,0.182   c-0.24,0.035-0.481,0.073-0.727,0.114c-0.488,0.081-0.987,0.171-1.494,0.271c-0.254,0.051-0.51,0.102-0.769,0.157   c-0.516,0.109-1.041,0.229-1.574,0.358c-10.13,2.447-23.218,8.3-35.594,16.39c-12.051,7.876-20.788,16.152-24.596,22.63   c-0.205,0.349-0.397,0.694-0.573,1.034c-0.177,0.339-0.339,0.673-0.486,1.001c-0.146,0.328-0.278,0.65-0.396,0.965   c-0.41,1.104-0.634,2.131-0.66,3.066c-0.008,0.268,0.001,0.527,0.026,0.78c0.147,1.511,0.884,2.74,2.263,3.611   c7.357,4.647,30.218-2.63,51.062-16.256c0.651-0.426,1.293-0.853,1.924-1.28C195.589,142.238,204.864,131.969,205.773,125.483z"
+       id="path61" /><rect
+       x="141.008"
+       y="160.14"
+       transform="matrix(0.7021 0.7121 -0.7121 0.7021 164.3516 -70.1016)"
+       width="49.895"
+       height="2.455"
+       id="rect63" /><rect
+       x="155.701"
+       y="153.297"
+       transform="matrix(-0.2491 -0.9685 0.9685 -0.2491 75.9908 367.9678)"
+       width="49.894"
+       height="2.454"
+       id="rect65" /><path
+       d="M182.736,172.197l-22.197-40.319c-0.891,0.273-1.691,0.455-2.214,1.07l22.261,40.433L182.736,172.197z"
+       id="path67" /><circle
+       cx="184.314"
+       cy="176.851"
+       r="6.662"
+       id="circle69" /><polygon
+       fill="#666667"
+       points="110.624,151.075 26.927,204.696 13.282,152.997 96.979,99.375  "
+       id="polygon71" /><path
+       d="M97.479,128.201l2.529,3.574l23.545-15.261c-0.268-0.568-2.182-3.293-2.52-3.79L97.479,128.201z"
+       id="path73" /><path
+       d="M157.986,89.501l2.529,3.574l23.546-15.261c-0.269-0.569-2.182-3.294-2.521-3.791L157.986,89.501z"
+       id="path75" /></g></svg>
\ No newline at end of file
diff --git a/src/ui/qgsoptionsbase.ui b/src/ui/qgsoptionsbase.ui
index f6d54be31f3..54a43badd28 100644
--- a/src/ui/qgsoptionsbase.ui
+++ b/src/ui/qgsoptionsbase.ui
@@ -209,7 +209,7 @@
           </property>
           <property name="icon">
            <iconset resource="../../images/images.qrc">
-            <normaloff>:/images/themes/default/propertyicons/gdal.png</normaloff>:/images/themes/default/propertyicons/gdal.png</iconset>
+            <normaloff>:/images/themes/default/propertyicons/gdal.svg</normaloff>:/images/themes/default/propertyicons/gdal.svg</iconset>
           </property>
          </item>
          <item>
@@ -3022,6 +3022,9 @@
                   </item>
                   <item row="4" column="0">
                    <widget class="QLabel" name="label_13">
+                    <property name="toolTip">
+                     <string>If unchecked large numbers will be converted from m. to km. and from ft. to miles</string>
+                    </property>
                     <property name="text">
                      <string>Keep base unit</string>
                     </property>