Skip to content

Commit

Permalink
[GRASS] fixed icons in browser
Browse files Browse the repository at this point in the history
  • Loading branch information
blazek committed Feb 26, 2018
1 parent 5b1a714 commit d9deb23
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/providers/grass/qgsgrassprovidermodule.cpp
Expand Up @@ -371,6 +371,12 @@ QVector<QgsDataItem *>QgsGrassLocationItem::createChildren()
return mapsets;
}

QIcon QgsGrassLocationItem::icon()
{
return QgsApplication::getThemeIcon( "/grass_mapset.svg" );
}


//----------------------- QgsGrassMapsetItem ------------------------------

QList<QgsGrassImport *> QgsGrassMapsetItem::sImports;
Expand Down Expand Up @@ -412,7 +418,7 @@ QIcon QgsGrassMapsetItem::icon()
return QgsApplication::getThemeIcon( "/grass_mapset_search.svg" );
}
}
return QgsDirectoryItem::icon();
return QgsApplication::getThemeIcon( "/grass_mapset.svg" );
}

void QgsGrassMapsetItem::setState( State state )
Expand Down
2 changes: 1 addition & 1 deletion src/providers/grass/qgsgrassprovidermodule.h
Expand Up @@ -82,7 +82,7 @@ class QgsGrassLocationItem : public QgsDirectoryItem, public QgsGrassObjectItemB
public:
QgsGrassLocationItem( QgsDataItem *parent, QString dirPath, QString path );

QIcon icon() override { return QgsDirectoryItem::icon(); }
QIcon icon() override;

QVector<QgsDataItem *> createChildren() override;
#ifdef HAVE_GUI
Expand Down

2 comments on commit d9deb23

@nyalldawson
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@blazek should this and d9deb23 be backported to 3.0?

@blazek
Copy link
Member Author

@blazek blazek commented on d9deb23 Feb 27, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one probably yes, it is fix.

The second one, you mean probably 5b1a714, is not harmful but it is not fix.

Please sign in to comment.