New icons for identify modes

qgis · Apr 23, 2018 · c4ef70e · c4ef70e
1 parent 8c7b632
commit c4ef70e
Show file tree

Hide file tree

Showing 8 changed files with 264 additions and 10 deletions.
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
diff --git a/images/themes/default/mActionIdentifyByPolygon.svg b/images/themes/default/mActionIdentifyByPolygon.svg
diff --git a/images/themes/default/mActionIdentifyByRadius.svg b/images/themes/default/mActionIdentifyByRadius.svg
diff --git a/images/themes/default/mActionIdentifyByRectangle.svg b/images/themes/default/mActionIdentifyByRectangle.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>