Merge pull request #43476 from DelazJ/attributeTableFilterIcons

Use dedicated icons for attribute table filter items
qgis · Jun 1, 2021 · e544cd6 · e544cd6
2 parents 1975368 + 2a57643
commit e544cd6
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 12 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -365,6 +365,7 @@
         <file>themes/default/mActionViewScaleInCanvas.svg</file>
         <file>themes/default/mActionOffsetCurve.svg</file>
         <file>themes/default/mActionOpenTable.svg</file>
+        <file>themes/default/mActionOpenTableEdited.svg</file>
         <file>themes/default/mActionOpenTableSelected.svg</file>
         <file>themes/default/mActionOpenTableVisible.svg</file>
         <file>themes/default/mActionAddTable.svg</file>

diff --git a/images/themes/default/mActionOpenTableEdited.svg b/images/themes/default/mActionOpenTableEdited.svg
diff --git a/src/gui/attributetable/qgsfeaturefilterwidget.cpp b/src/gui/attributetable/qgsfeaturefilterwidget.cpp
@@ -52,12 +52,11 @@ QgsFeatureFilterWidget::QgsFeatureFilterWidget( QWidget *parent )
   mActionStoredFilterExpressions->setMenu( mStoredFilterExpressionMenu );
 
   // Set filter icon in a couple of places
-  QIcon filterIcon = QgsApplication::getThemeIcon( "/mActionFilter2.svg" );
-  mActionShowAllFilter->setIcon( filterIcon );
-  mActionAdvancedFilter->setIcon( filterIcon );
-  mActionSelectedFilter->setIcon( filterIcon );
-  mActionVisibleFilter->setIcon( filterIcon );
-  mActionEditedFilter->setIcon( filterIcon );
+  mActionShowAllFilter->setIcon( QgsApplication::getThemeIcon( "/mActionOpenTable.svg" ) );
+  mActionAdvancedFilter->setIcon( QgsApplication::getThemeIcon( "/mActionFilter2.svg" ) );
+  mActionSelectedFilter->setIcon( QgsApplication::getThemeIcon( "/mActionOpenTableSelected.svg" ) );
+  mActionVisibleFilter->setIcon( QgsApplication::getThemeIcon( "/mActionOpenTableVisible.svg" ) );
+  mActionEditedFilter->setIcon( QgsApplication::getThemeIcon( "/mActionOpenTableEdited.svg" ) );
 
 
   // Set button to store or delete stored filter expressions

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -1689,7 +1689,7 @@ Shift+R to enable range selection.</string>
      <normaloff>:/images/themes/default/mActionOpenTableSelected.svg</normaloff>:/images/themes/default/mActionOpenTableSelected.svg</iconset>
    </property>
    <property name="text">
-    <string>Open Attribute Table (Selected items)</string>
+    <string>Open Attribute Table (Selected Features)</string>
    </property>
    <property name="shortcut">
     <string>Shift+F6</string>
@@ -1701,7 +1701,7 @@ Shift+R to enable range selection.</string>
      <normaloff>:/images/themes/default/mActionOpenTableVisible.svg</normaloff>:/images/themes/default/mActionOpenTableVisible.svg</iconset>
    </property>
    <property name="text">
-    <string>Open Attribute Table (Visible items)</string>
+    <string>Open Attribute Table (Visible Features)</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+F6</string>

diff --git a/src/ui/qgsfeaturefilterwidget.ui b/src/ui/qgsfeaturefilterwidget.ui
@@ -165,7 +165,7 @@
   <action name="mActionShowAllFilter">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionFilter.svg</normaloff>:/images/themes/default/mActionFilter.svg</iconset>
+     <normaloff>:/images/themes/default/mActionOpenTable.svg</normaloff>:/images/themes/default/mActionOpenTable.svg</iconset>
    </property>
    <property name="text">
     <string>Show All Features</string>
@@ -186,7 +186,7 @@
   <action name="mActionSelectedFilter">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionFilter.svg</normaloff>:/images/themes/default/mActionFilter.svg</iconset>
+     <normaloff>:/images/themes/default/mActionOpenTableSelected.svg</normaloff>:/images/themes/default/mActionOpenTableSelected.svg</iconset>
    </property>
    <property name="text">
     <string>Show Selected Features</string>
@@ -195,7 +195,7 @@
   <action name="mActionVisibleFilter">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionFilter.svg</normaloff>:/images/themes/default/mActionFilter.svg</iconset>
+     <normaloff>:/images/themes/default/mActionOpenTableVisible.svg</normaloff>:/images/themes/default/mActionOpenTableVisible.svg</iconset>
    </property>
    <property name="text">
     <string>Show Features Visible On Map</string>
@@ -204,7 +204,7 @@
   <action name="mActionEditedFilter">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionFilter.svg</normaloff>:/images/themes/default/mActionFilter.svg</iconset>
+     <normaloff>:/images/themes/default/mActionOpenTableEdited.svg</normaloff>:/images/themes/default/mActionOpenTableEdited.svg</iconset>
    </property>
    <property name="text">
     <string>Show Edited and New Features</string>