[GRASS] distinct icons for open/searched mapset

qgis · Dec 15, 2015 · 5c55183 · 5c55183
1 parent 2f8ea52
commit 5c55183
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/images/images.qrc b/images/images.qrc
@@ -92,6 +92,8 @@
         <file>themes/default/gpsicons/polarchart.svg</file>
         <file>themes/default/grass_location.png</file>
         <file>themes/default/grass_mapset.png</file>
+        <file>themes/default/grass_mapset_open.png</file>
+        <file>themes/default/grass_mapset_search.png</file>
         <file>themes/default/histogram.png</file>
         <file>themes/default/join_bevel.png</file>
         <file>themes/default/join_miter.png</file>

diff --git a/images/themes/default/grass_mapset_open.png b/images/themes/default/grass_mapset_open.png
diff --git a/images/themes/default/grass_mapset_search.png b/images/themes/default/grass_mapset_search.png
diff --git a/src/providers/grass/qgsgrassprovidermodule.cpp b/src/providers/grass/qgsgrassprovidermodule.cpp
@@ -353,9 +353,29 @@ QgsGrassMapsetItem::QgsGrassMapsetItem( QgsDataItem* parent, QString dirPath, QS
   mGrassObject = QgsGrassObject( gisdbase, location, mName, "", QgsGrassObject::Mapset );
   mActions = new QgsGrassItemActions( mGrassObject, true, this );
 
+  // emit data changed to possibly change icon
+  connect( QgsGrass::instance(), SIGNAL( mapsetChanged() ), this, SLOT( emitDataChanged() ) );
+  connect( QgsGrass::instance(), SIGNAL( mapsetSearchPathChanged() ), this, SLOT( emitDataChanged() ) );
+
   mIconName = "grass_mapset.png";
 }
 
+QIcon QgsGrassMapsetItem::icon()
+{
+  if ( mGrassObject == QgsGrass::getDefaultMapsetObject() )
+  {
+    return QgsApplication::getThemeIcon( "/grass_mapset_open.png" );
+  }
+  else if ( mGrassObject.locationIdentical( QgsGrass::getDefaultLocationObject() ) )
+  {
+    if ( QgsGrass::instance()->isMapsetInSearchPath( mName ) )
+    {
+      return QgsApplication::getThemeIcon( "/grass_mapset_search.png" );
+    }
+  }
+  return QgsDataItem::icon();
+}
+
 void QgsGrassMapsetItem::setState( State state )
 {
   QgsDebugMsg( "Entered" );

diff --git a/src/providers/grass/qgsgrassprovidermodule.h b/src/providers/grass/qgsgrassprovidermodule.h
@@ -90,7 +90,7 @@ class QgsGrassMapsetItem : public QgsDirectoryItem, public QgsGrassObjectItemBas
 
     virtual void setState( State state ) override;
 
-    QIcon icon() override { return QgsDataItem::icon(); }
+    QIcon icon() override;
 
     QVector<QgsDataItem*> createChildren() override;
     virtual QList<QAction*> actions() override { return mActions->actions(); }