Merge pull request #721 from 3nids/iconmouseontop

put cursor on top of identify/action icons
qgis · Jul 12, 2013 · 9a48e65 · 9a48e65
2 parents 9db8970 + 5de6836
commit 9a48e65
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 80 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -334,8 +334,8 @@
         <file>themes/default/mIconNoPyramid.png</file>
         <file>themes/default/mIconOracle.svg</file>
         <file>themes/default/mIconOws.svg</file>
-        <file>themes/default/mIconPointLayer.png</file>
-        <file>themes/default/mIconPolygonLayer.png</file>
+        <file>themes/default/mIconPointLayer.svg</file>
+        <file>themes/default/mIconPolygonLayer.svg</file>
         <file>themes/default/mIconPostgis.svg</file>
         <file>themes/default/mIconPrevious.png</file>
         <file>themes/default/mIconProjectionDisabled.png</file>

diff --git a/images/themes/default/mAction.svg b/images/themes/default/mAction.svg
diff --git a/images/themes/default/mActionIdentify.svg b/images/themes/default/mActionIdentify.svg
diff --git a/images/themes/default/mIconPointLayer.png b/images/themes/default/mIconPointLayer.png
diff --git a/images/themes/default/mIconPolygonLayer.png b/images/themes/default/mIconPolygonLayer.png
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -300,11 +300,11 @@ QPixmap QgsLegendLayer::getOriginalPixmap()
       switch ( vlayer->geometryType() )
       {
         case QGis::Point:
-          return QgsApplication::getThemePixmap( "/mIconPointLayer.png" );
+          return QgsApplication::getThemePixmap( "/mIconPointLayer.svg" );
         case QGis::Line:
           return QgsApplication::getThemePixmap( "/mIconLineLayer.svg" );
         case QGis::Polygon:
-          return QgsApplication::getThemePixmap( "/mIconPolygonLayer.png" );
+          return QgsApplication::getThemePixmap( "/mIconPolygonLayer.svg" );
         case QGis::NoGeometry:
           return QgsApplication::getThemePixmap( "/mIconTableLayer.png" );
         default:

diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -45,7 +45,7 @@ const QIcon &QgsLayerItem::iconPoint()
   static QIcon icon;
 
   if ( icon.isNull() )
-    icon = QgsApplication::getThemeIcon( "/mIconPointLayer.png" );
+    icon = QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
 
   return icon;
 }
@@ -65,7 +65,7 @@ const QIcon &QgsLayerItem::iconPolygon()
   static QIcon icon;
 
   if ( icon.isNull() )
-    icon = QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" );
+    icon = QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
 
   return icon;
 }

diff --git a/src/plugins/grass/qgsgrassmodel.cpp b/src/plugins/grass/qgsgrassmodel.cpp
@@ -544,9 +544,9 @@ QgsGrassModel::QgsGrassModel( QObject * parent )
 
   mIconFile = QIcon( style->standardPixmap( QStyle::SP_FileIcon ) );
 
-  mIconPointLayer = QgsGrassPlugin::getThemeIcon( "/mIconPointLayer.png" );
+  mIconPointLayer = QgsGrassPlugin::getThemeIcon( "/mIconPointLayer.svg" );
   mIconLineLayer = QgsGrassPlugin::getThemeIcon( "/mIconLineLayer.svg" );
-  mIconPolygonLayer = QgsGrassPlugin::getThemeIcon( "/mIconPolygonLayer.png" );
+  mIconPolygonLayer = QgsGrassPlugin::getThemeIcon( "/mIconPolygonLayer.svg" );
   mIconVectorLayer = QgsGrassPlugin::getThemeIcon( "/grass/grass_browser_vector_layer.png" );
   mIconRasterLayer = QgsGrassPlugin::getThemeIcon( "/grass/grass_browser_raster_layer.png" );
 

diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp
@@ -408,15 +408,15 @@ QIcon QgsSpatialQueryDialog::getIconTypeGeometry( QGis::GeometryType geomType )
   QString theName;
   if ( geomType == QGis::Point )
   {
-    theName = "/mIconPointLayer.png";
+    theName = "/mIconPointLayer.svg";
   }
   else if ( geomType == QGis::Line )
   {
     theName = "/mIconLineLayer.svg";
   }
   else // Polygon
   {
-    theName = "/mIconPolygonLayer.png";
+    theName = "/mIconPolygonLayer.svg";
   }
   // Copy from qgisapp.cpp
   QString myPreferredPath = QgsApplication::activeThemePath() + QDir::separator() + theName;

diff --git a/src/plugins/sqlanywhere/sadbtablemodel.cpp b/src/plugins/sqlanywhere/sadbtablemodel.cpp
@@ -293,15 +293,15 @@ QIcon SaDbTableModel::iconForType( QGis::WkbType type ) const
 {
   if ( type == QGis::WKBPoint || type == QGis::WKBPoint25D || type == QGis::WKBMultiPoint || type == QGis::WKBMultiPoint25D )
   {
-    return SqlAnywhere::getThemeIcon( "/mIconPointLayer.png" );
+    return SqlAnywhere::getThemeIcon( "/mIconPointLayer.svg" );
   }
   else if ( type == QGis::WKBLineString || type == QGis::WKBLineString25D || type == QGis::WKBMultiLineString || type == QGis::WKBMultiLineString25D )
   {
     return SqlAnywhere::getThemeIcon( "/mIconLineLayer.svg" );
   }
   else if ( type == QGis::WKBPolygon || type == QGis::WKBPolygon25D || type == QGis::WKBMultiPolygon || type == QGis::WKBMultiPolygon25D )
   {
-    return SqlAnywhere::getThemeIcon( "/mIconPolygonLayer.png" );
+    return SqlAnywhere::getThemeIcon( "/mIconPolygonLayer.svg" );
   }
   else
   {

diff --git a/src/providers/mssql/qgsmssqltablemodel.cpp b/src/providers/mssql/qgsmssqltablemodel.cpp
@@ -296,7 +296,7 @@ QIcon QgsMssqlTableModel::iconForWkbType( QGis::WkbType type )
     case QGis::WKBPoint25D:
     case QGis::WKBMultiPoint:
     case QGis::WKBMultiPoint25D:
-      return QgsApplication::getThemeIcon( "/mIconPointLayer.png" );
+      return QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
     case QGis::WKBLineString:
     case QGis::WKBLineString25D:
     case QGis::WKBMultiLineString:
@@ -306,7 +306,7 @@ QIcon QgsMssqlTableModel::iconForWkbType( QGis::WkbType type )
     case QGis::WKBPolygon25D:
     case QGis::WKBMultiPolygon:
     case QGis::WKBMultiPolygon25D:
-      return QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" );
+      return QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
     case QGis::WKBNoGeometry:
       return QgsApplication::getThemeIcon( "/mIconTableLayer.png" );
     case QGis::WKBUnknown:

diff --git a/src/providers/oracle/qgsoracletablemodel.cpp b/src/providers/oracle/qgsoracletablemodel.cpp
@@ -232,7 +232,7 @@ QIcon QgsOracleTableModel::iconForWkbType( QGis::WkbType type )
     case QGis::WKBPoint25D:
     case QGis::WKBMultiPoint:
     case QGis::WKBMultiPoint25D:
-      return QgsApplication::getThemeIcon( "/mIconPointLayer.png" );
+      return QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
     case QGis::WKBLineString:
     case QGis::WKBLineString25D:
     case QGis::WKBMultiLineString:
@@ -242,7 +242,7 @@ QIcon QgsOracleTableModel::iconForWkbType( QGis::WkbType type )
     case QGis::WKBPolygon25D:
     case QGis::WKBMultiPolygon:
     case QGis::WKBMultiPolygon25D:
-      return QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" );
+      return QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
     case QGis::WKBNoGeometry:
       return QgsApplication::getThemeIcon( "/mIconTableLayer.png" );
     case QGis::WKBUnknown:

diff --git a/src/providers/postgres/qgspgtablemodel.cpp b/src/providers/postgres/qgspgtablemodel.cpp
@@ -235,7 +235,7 @@ QIcon QgsPgTableModel::iconForWkbType( QGis::WkbType type )
     case QGis::WKBPoint25D:
     case QGis::WKBMultiPoint:
     case QGis::WKBMultiPoint25D:
-      return QgsApplication::getThemeIcon( "/mIconPointLayer.png" );
+      return QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
     case QGis::WKBLineString:
     case QGis::WKBLineString25D:
     case QGis::WKBMultiLineString:
@@ -245,7 +245,7 @@ QIcon QgsPgTableModel::iconForWkbType( QGis::WkbType type )
     case QGis::WKBPolygon25D:
     case QGis::WKBMultiPolygon:
     case QGis::WKBMultiPolygon25D:
-      return QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" );
+      return QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
     case QGis::WKBNoGeometry:
       return QgsApplication::getThemeIcon( "/mIconTableLayer.png" );
     case QGis::WKBUnknown: