New icons for identify modes

wonder-sk · wonder-sk · commit c4ef70e8c39f · 2018-04-23T14:18:26.000+02:00
diff --git a/images/images.qrc b/images/images.qrc
@@ -649,6 +649,10 @@
         <file>themes/default/mActionNewReport.svg</file>
         <file>themes/default/mIconReport.svg</file>
         <file>themes/default/downloading_svg.svg</file>
+        <file>themes/default/mActionIdentifyByFreehand.svg</file>
+        <file>themes/default/mActionIdentifyByPolygon.svg</file>
+        <file>themes/default/mActionIdentifyByRadius.svg</file>
+        <file>themes/default/mActionIdentifyByRectangle.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
diff --git a/images/themes/default/mActionIdentifyByFreehand.svg b/images/themes/default/mActionIdentifyByFreehand.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   id="svg12"
+   version="1.1"
+   width="24"
+   height="24">
+  <metadata
+     id="metadata18">
+    <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="defs16" />
+  <path
+     d="m 1.1364216,1.6504 c -2.237601,1.3008 3.8896384,5.4906 1.9674915,8.3984 -1.3990735,3.001 -2.51776726,6.2623 -2.4036758,9.5985 0.0159939,2.6146 3.5401896,4.8272 5.2587602,2.2272 1.3167158,-1.7194 2.7091903,-3.8997 5.1595055,-3.8763 3.013784,-0.1235 6.461621,1.5325 9.107356,-0.6126 C 22.751417,14.544 8.8076934,10.8509 22.464477,7.1891 23.77585,4.1972 20.726131,0.4823 17.527736,1.447 13.940915,2.8444 11.93139,5.4531 8.2746893,3.3927 6.839257,2.5265 2.9053628,0.8486 1.1364216,1.6504 Z"
+     id="path2"
+     style="fill:#ebebeb" />
+  <path
+     d="m 1.1364216,1.6504 c -2.237601,1.3008 3.8896384,5.4906 1.9674915,8.3984 -1.3990735,3.001 -2.51776724,6.2623 -2.40367578,9.5985 0.0159939,2.6146 3.54018958,4.8272 5.25876018,2.2272 1.3167158,-1.7194 2.7091903,-3.8997 5.1595055,-3.8763 3.013784,-0.1235 6.461621,1.5325 9.107356,-0.6126 C 22.751417,14.544 8.8076934,10.8509 22.464477,7.1891 23.77585,4.1972 20.726131,0.4823 17.527736,1.447 13.940915,2.8444 11.93139,5.4531 8.2746893,3.3927 6.839257,2.5265 2.9053628,0.8486 1.1364216,1.6504 Z"
+     id="path6"
+     style="fill:none;stroke:#424242;stroke-width:1.20000005;stroke-dasharray:2.4, 1.2" />
+  <g
+     transform="matrix(1.1228004,0,0,1.1225886,-41.27947,-28.832162)"
+     id="g921">
+    <circle
+       style="fill:#6d97c4;stroke:#445e75;stroke-width:0.21366815;stroke-miterlimit:10"
+       cx="43.444469"
+       cy="32.365807"
+       r="6.1275754"
+       stroke-miterlimit="10"
+       id="circle2" />
+    <path
+       style="opacity:0.3;fill:#ffffff;stroke-width:0.37311715"
+       d="m 38.481599,33.476456 c 0.156406,-1.798872 0.507676,-2.87811 1.624733,-3.995167 1.20637,-1.20637 2.323641,-1.766181 4.434682,-2.246507 1.037146,-0.23589 -0.759376,-1.017915 -3.245405,-0.08782 -1.335426,0.499556 -2.690937,1.803359 -3.166562,3.703297 -0.576263,2.30035 0.280973,3.449886 0.352552,2.626195 z"
+       id="path4-2" />
+    <path
+       style="fill:#ffffff;stroke:#34497d;stroke-width:0.21366815;stroke-miterlimit:10"
+       d="M 44.913438,34.944997 44.761733,34.79372 c -0.138243,-0.138029 -0.402978,-0.11068 -0.512376,0.05299 -0.06859,0.102774 -0.385671,0.430968 -0.58545,0.585237 0.02479,-0.102348 0.07222,-0.258752 0.161532,-0.51259 l 0.801256,-2.274711 c 0.188241,-0.538658 0.301913,-0.863861 0.301913,-1.141202 0,-0.438874 -0.323493,-0.722626 -0.823691,-0.722626 -1.263419,0 -2.252276,1.140988 -2.618289,1.631143 -0.0047,0.0062 -0.009,0.01218 -0.01282,0.01752 -0.06303,0.07158 -0.08803,0.167088 -0.06837,0.264948 0.01517,0.07564 0.05662,0.148927 0.120082,0.212387 l 0.113671,0.113458 c 0.06795,0.06795 0.156191,0.105338 0.24871,0.105338 0.06901,0 0.17243,-0.02159 0.274136,-0.124355 l 0.01881,-0.02201 c 0.131833,-0.175635 0.378192,-0.441224 0.558315,-0.604681 -0.03098,0.105125 -0.07479,0.234181 -0.126279,0.38268 l -0.557032,1.623665 c -0.396782,1.147183 -0.545281,1.576443 -0.545281,1.815538 0,0.312596 0.19978,0.646345 0.760445,0.646345 1.742464,0 2.601409,-1.294401 2.695637,-1.445037 0.09594,-0.160679 0.07756,-0.321143 -0.0532,-0.452763 z"
+       stroke-miterlimit="10"
+       id="path6-6" />
+    <path
+       style="fill:#ffffff;stroke:#34497d;stroke-width:0.21366815;stroke-miterlimit:10"
+       d="m 44.205769,28.173854 c -0.560238,0 -1.051461,0.48524 -1.051461,1.038641 0,0.630962 0.422635,1.03864 1.076674,1.03864 0.642073,0 1.139919,-0.592288 1.139919,-1.101886 2.14e-4,-0.449772 -0.304904,-0.975395 -1.165132,-0.975395 z"
+       stroke-miterlimit="10"
+       id="path8-1" />
+  </g>
+  <path
+     d="M 22.652743,15.6955 9.896279,8.7164 15.373832,22.3178 17.554719,18.7866 21.866878,23.5 23.5,21.9087 19.091401,17.2404 22.652744,15.6955 Z"
+     style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round"
+     id="path8" />
+</svg>
diff --git a/images/themes/default/mActionIdentifyByPolygon.svg b/images/themes/default/mActionIdentifyByPolygon.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   id="svg14"
+   version="1.1"
+   width="24"
+   height="24">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <path
+     style="fill:#e5e5e5"
+     d="M 0.87923617,0.79021565 5.1092502,11.649315 l 0.733002,2.9484 0.08775,2.2286 16.1624398,5.0508 -3.21986,-11.0485 4.04061,-9.7227993 -10.829921,4.0172 z"
+     id="path2-9" />
+  <path
+     style="fill:none;stroke:#424242;stroke-dasharray:4, 1"
+     d="M 0.87923517,0.79023865 5.1092492,11.649377 l 0.820749,5.177032 16.1624398,5.050762 -3.21986,-11.048543 4.04061,-9.7227173 -10.695993,4.106471 z"
+     id="path8-0" />
+  <g
+     transform="matrix(1.1228004,0,0,1.1225886,-41.27947,-28.832162)"
+     id="g921">
+    <circle
+       style="fill:#6d97c4;stroke:#445e75;stroke-width:0.21366815;stroke-miterlimit:10"
+       cx="43.444469"
+       cy="32.365807"
+       r="6.1275754"
+       stroke-miterlimit="10"
+       id="circle2" />
+    <path
+       style="opacity:0.3;fill:#ffffff;stroke-width:0.37311715"
+       d="m 38.481599,33.476456 c 0.156406,-1.798872 0.507676,-2.87811 1.624733,-3.995167 1.20637,-1.20637 2.323641,-1.766181 4.434682,-2.246507 1.037146,-0.23589 -0.759376,-1.017915 -3.245405,-0.08782 -1.335426,0.499556 -2.690937,1.803359 -3.166562,3.703297 -0.576263,2.30035 0.280973,3.449886 0.352552,2.626195 z"
+       id="path4-2" />
+    <path
+       style="fill:#ffffff;stroke:#34497d;stroke-width:0.21366815;stroke-miterlimit:10"
+       d="M 44.913438,34.944997 44.761733,34.79372 c -0.138243,-0.138029 -0.402978,-0.11068 -0.512376,0.05299 -0.06859,0.102774 -0.385671,0.430968 -0.58545,0.585237 0.02479,-0.102348 0.07222,-0.258752 0.161532,-0.51259 l 0.801256,-2.274711 c 0.188241,-0.538658 0.301913,-0.863861 0.301913,-1.141202 0,-0.438874 -0.323493,-0.722626 -0.823691,-0.722626 -1.263419,0 -2.252276,1.140988 -2.618289,1.631143 -0.0047,0.0062 -0.009,0.01218 -0.01282,0.01752 -0.06303,0.07158 -0.08803,0.167088 -0.06837,0.264948 0.01517,0.07564 0.05662,0.148927 0.120082,0.212387 l 0.113671,0.113458 c 0.06795,0.06795 0.156191,0.105338 0.24871,0.105338 0.06901,0 0.17243,-0.02159 0.274136,-0.124355 l 0.01881,-0.02201 c 0.131833,-0.175635 0.378192,-0.441224 0.558315,-0.604681 -0.03098,0.105125 -0.07479,0.234181 -0.126279,0.38268 l -0.557032,1.623665 c -0.396782,1.147183 -0.545281,1.576443 -0.545281,1.815538 0,0.312596 0.19978,0.646345 0.760445,0.646345 1.742464,0 2.601409,-1.294401 2.695637,-1.445037 0.09594,-0.160679 0.07756,-0.321143 -0.0532,-0.452763 z"
+       stroke-miterlimit="10"
+       id="path6-6" />
+    <path
+       style="fill:#ffffff;stroke:#34497d;stroke-width:0.21366815;stroke-miterlimit:10"
+       d="m 44.205769,28.173854 c -0.560238,0 -1.051461,0.48524 -1.051461,1.038641 0,0.630962 0.422635,1.03864 1.076674,1.03864 0.642073,0 1.139919,-0.592288 1.139919,-1.101886 2.14e-4,-0.449772 -0.304904,-0.975395 -1.165132,-0.975395 z"
+       stroke-miterlimit="10"
+       id="path8-1" />
+  </g>
+  <path
+     d="M 22.774364,15.845515 10.0179,8.8664157 l 5.477553,13.6013993 2.180887,-3.5312 4.312159,4.7134 1.633122,-1.5913 -4.408599,-4.6683 z"
+     style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round"
+     id="path10-6" />
+</svg>
diff --git a/images/themes/default/mActionIdentifyByRadius.svg b/images/themes/default/mActionIdentifyByRadius.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   id="svg12"
+   version="1.1"
+   width="24"
+   height="24">
+  <metadata
+     id="metadata18">
+    <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="defs16" />
+  <ellipse
+     cx="12.099533"
+     cy="11.909529"
+     rx="10.509376"
+     ry="10.509375"
+     id="ellipse2"
+     style="fill:#ebebeb" />
+  <circle
+     cx="12"
+     cy="11.999983"
+     r="10.500425"
+     id="circle6"
+     style="fill:none;stroke:#424242;stroke-width:0.99914849;stroke-dasharray:1.99829691, 0.99914846;stroke-dashoffset:0.1684487" />
+  <g
+     transform="matrix(1.1228012,0,0,1.122588,-41.279507,-28.832145)"
+     id="g921">
+    <circle
+       style="fill:#6d97c4;stroke:#445e75;stroke-width:0.21366815;stroke-miterlimit:10"
+       cx="43.444469"
+       cy="32.365807"
+       r="6.1275754"
+       stroke-miterlimit="10"
+       id="circle2" />
+    <path
+       style="opacity:0.3;fill:#ffffff;stroke-width:0.37311715"
+       d="m 38.481599,33.476456 c 0.156406,-1.798872 0.507676,-2.87811 1.624733,-3.995167 1.20637,-1.20637 2.323641,-1.766181 4.434682,-2.246507 1.037146,-0.23589 -0.759376,-1.017915 -3.245405,-0.08782 -1.335426,0.499556 -2.690937,1.803359 -3.166562,3.703297 -0.576263,2.30035 0.280973,3.449886 0.352552,2.626195 z"
+       id="path4-2" />
+    <path
+       style="fill:#ffffff;stroke:#34497d;stroke-width:0.21366815;stroke-miterlimit:10"
+       d="M 44.913438,34.944997 44.761733,34.79372 c -0.138243,-0.138029 -0.402978,-0.11068 -0.512376,0.05299 -0.06859,0.102774 -0.385671,0.430968 -0.58545,0.585237 0.02479,-0.102348 0.07222,-0.258752 0.161532,-0.51259 l 0.801256,-2.274711 c 0.188241,-0.538658 0.301913,-0.863861 0.301913,-1.141202 0,-0.438874 -0.323493,-0.722626 -0.823691,-0.722626 -1.263419,0 -2.252276,1.140988 -2.618289,1.631143 -0.0047,0.0062 -0.009,0.01218 -0.01282,0.01752 -0.06303,0.07158 -0.08803,0.167088 -0.06837,0.264948 0.01517,0.07564 0.05662,0.148927 0.120082,0.212387 l 0.113671,0.113458 c 0.06795,0.06795 0.156191,0.105338 0.24871,0.105338 0.06901,0 0.17243,-0.02159 0.274136,-0.124355 l 0.01881,-0.02201 c 0.131833,-0.175635 0.378192,-0.441224 0.558315,-0.604681 -0.03098,0.105125 -0.07479,0.234181 -0.126279,0.38268 l -0.557032,1.623665 c -0.396782,1.147183 -0.545281,1.576443 -0.545281,1.815538 0,0.312596 0.19978,0.646345 0.760445,0.646345 1.742464,0 2.601409,-1.294401 2.695637,-1.445037 0.09594,-0.160679 0.07756,-0.321143 -0.0532,-0.452763 z"
+       stroke-miterlimit="10"
+       id="path6-6" />
+    <path
+       style="fill:#ffffff;stroke:#34497d;stroke-width:0.21366815;stroke-miterlimit:10"
+       d="m 44.205769,28.173854 c -0.560238,0 -1.051461,0.48524 -1.051461,1.038641 0,0.630962 0.422635,1.03864 1.076674,1.03864 0.642073,0 1.139919,-0.592288 1.139919,-1.101886 2.14e-4,-0.449772 -0.304904,-0.975395 -1.165132,-0.975395 z"
+       stroke-miterlimit="10"
+       id="path8-1" />
+  </g>
+  <path
+     d="M 22.652743,15.6955 9.896279,8.7164 15.373832,22.3178 17.554719,18.7866 21.866878,23.5 23.5,21.9087 19.091401,17.2404 22.652744,15.6955 Z"
+     style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round"
+     id="path8" />
+</svg>
diff --git a/images/themes/default/mActionIdentifyByRectangle.svg b/images/themes/default/mActionIdentifyByRectangle.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   id="svg10"
+   version="1.1"
+   width="24"
+   height="24">
+  <metadata
+     id="metadata16">
+    <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="defs14" />
+  <path
+     d="M 1.4798758,1.4798 H 22.520123 V 20.52 H 1.4798758 Z"
+     id="path2"
+     style="fill:#e5e5e5;stroke:#424242;stroke-width:0.95975173;stroke-dasharray:1.91950336, 0.95975168" />
+  <g
+     transform="matrix(1.1228004,0,0,1.1225886,-41.27947,-28.832162)"
+     id="g921">
+    <circle
+       style="fill:#6d97c4;stroke:#445e75;stroke-width:0.21366815;stroke-miterlimit:10"
+       cx="43.444469"
+       cy="32.365807"
+       r="6.1275754"
+       stroke-miterlimit="10"
+       id="circle2" />
+    <path
+       style="opacity:0.3;fill:#ffffff;stroke-width:0.37311715"
+       d="m 38.481599,33.476456 c 0.156406,-1.798872 0.507676,-2.87811 1.624733,-3.995167 1.20637,-1.20637 2.323641,-1.766181 4.434682,-2.246507 1.037146,-0.23589 -0.759376,-1.017915 -3.245405,-0.08782 -1.335426,0.499556 -2.690937,1.803359 -3.166562,3.703297 -0.576263,2.30035 0.280973,3.449886 0.352552,2.626195 z"
+       id="path4-2" />
+    <path
+       style="fill:#ffffff;stroke:#34497d;stroke-width:0.21366815;stroke-miterlimit:10"
+       d="M 44.913438,34.944997 44.761733,34.79372 c -0.138243,-0.138029 -0.402978,-0.11068 -0.512376,0.05299 -0.06859,0.102774 -0.385671,0.430968 -0.58545,0.585237 0.02479,-0.102348 0.07222,-0.258752 0.161532,-0.51259 l 0.801256,-2.274711 c 0.188241,-0.538658 0.301913,-0.863861 0.301913,-1.141202 0,-0.438874 -0.323493,-0.722626 -0.823691,-0.722626 -1.263419,0 -2.252276,1.140988 -2.618289,1.631143 -0.0047,0.0062 -0.009,0.01218 -0.01282,0.01752 -0.06303,0.07158 -0.08803,0.167088 -0.06837,0.264948 0.01517,0.07564 0.05662,0.148927 0.120082,0.212387 l 0.113671,0.113458 c 0.06795,0.06795 0.156191,0.105338 0.24871,0.105338 0.06901,0 0.17243,-0.02159 0.274136,-0.124355 l 0.01881,-0.02201 c 0.131833,-0.175635 0.378192,-0.441224 0.558315,-0.604681 -0.03098,0.105125 -0.07479,0.234181 -0.126279,0.38268 l -0.557032,1.623665 c -0.396782,1.147183 -0.545281,1.576443 -0.545281,1.815538 0,0.312596 0.19978,0.646345 0.760445,0.646345 1.742464,0 2.601409,-1.294401 2.695637,-1.445037 0.09594,-0.160679 0.07756,-0.321143 -0.0532,-0.452763 z"
+       stroke-miterlimit="10"
+       id="path6-6" />
+    <path
+       style="fill:#ffffff;stroke:#34497d;stroke-width:0.21366815;stroke-miterlimit:10"
+       d="m 44.205769,28.173854 c -0.560238,0 -1.051461,0.48524 -1.051461,1.038641 0,0.630962 0.422635,1.03864 1.076674,1.03864 0.642073,0 1.139919,-0.592288 1.139919,-1.101886 2.14e-4,-0.449772 -0.304904,-0.975395 -1.165132,-0.975395 z"
+       stroke-miterlimit="10"
+       id="path8-1" />
+  </g>
+  <path
+     d="M 22.652743,15.6955 9.896279,8.7164 15.373832,22.3178 17.554719,18.7866 21.866878,23.5 23.5,21.9087 19.091401,17.2404 22.652744,15.6955 Z"
+     style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round"
+     id="path6" />
+</svg>
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -2048,7 +2048,7 @@ void QgsIdentifyResultsDialog::setSelectionMode()
     emit selectionModeChanged();
 }
 
-QgsMapToolSelectionHandler::SelectionMode QgsIdentifyResultsDialog::selectionMode()
+QgsMapToolSelectionHandler::SelectionMode QgsIdentifyResultsDialog::selectionMode() const
 {
   return mSelectionMode;
 }
diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h
@@ -168,7 +168,7 @@ class APP_EXPORT QgsIdentifyResultsDialog: public QDialog, private Ui::QgsIdenti
      */
     QgsExpressionContextScope expressionContextScope() const;
 
-    QgsMapToolSelectionHandler::SelectionMode selectionMode();
+    QgsMapToolSelectionHandler::SelectionMode selectionMode() const;
 
   signals:
     void selectedFeatureChanged( QgsVectorLayer *, QgsFeatureId featureId );
diff --git a/src/ui/qgsidentifyresultsbase.ui b/src/ui/qgsidentifyresultsbase.ui
@@ -339,11 +339,10 @@
     <string>Print Selected HTML Response</string>
    </property>
   </action>
-
-<action name="mActionSelectFeatures">
+  <action name="mActionSelectFeatures">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionSelectRectangle.svg</normaloff>:/images/themes/default/mActionSelectRectangle.svg</iconset>
+     <normaloff>:/images/themes/default/mActionIdentifyByRectangle.svg</normaloff>:/images/themes/default/mActionIdentifyByRectangle.svg</iconset>
    </property>
    <property name="text">
     <string>Identify Feature(s)</string>
@@ -355,7 +354,7 @@
   <action name="mActionSelectPolygon">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionSelectPolygon.svg</normaloff>:/images/themes/default/mActionSelectPolygon.svg</iconset>
+     <normaloff>:/images/themes/default/mActionIdentifyByPolygon.svg</normaloff>:/images/themes/default/mActionIdentifyByPolygon.svg</iconset>
    </property>
    <property name="text">
     <string>Identify Features by Polygon</string>
@@ -364,7 +363,7 @@
   <action name="mActionSelectFreehand">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionSelectFreehand.svg</normaloff>:/images/themes/default/mActionSelectFreehand.svg</iconset>
+     <normaloff>:/images/themes/default/mActionIdentifyByFreehand.svg</normaloff>:/images/themes/default/mActionIdentifyByFreehand.svg</iconset>
    </property>
    <property name="text">
     <string>Identify Features by Freehand</string>
@@ -373,14 +372,12 @@
   <action name="mActionSelectRadius">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionSelectRadius.svg</normaloff>:/images/themes/default/mActionSelectRadius.svg</iconset>
+     <normaloff>:/images/themes/default/mActionIdentifyByRadius.svg</normaloff>:/images/themes/default/mActionIdentifyByRadius.svg</iconset>
    </property>
    <property name="text">
     <string>Identify Features by Radius</string>
    </property>
   </action>
-
-
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>

Original file line number	Diff line number	Diff line change
`@@ -2048,7 +2048,7 @@ void QgsIdentifyResultsDialog::setSelectionMode()`
`2048`	`2048`	`emit selectionModeChanged();`
`2049`	`2049`	`}`
`2050`	`2050`
`2051`		`-QgsMapToolSelectionHandler::SelectionMode QgsIdentifyResultsDialog::selectionMode()`
	`2051`	`+QgsMapToolSelectionHandler::SelectionMode QgsIdentifyResultsDialog::selectionMode() const`
`2052`	`2052`	`{`
`2053`	`2053`	`return mSelectionMode;`
`2054`	`2054`	`}`