Skip to content

Commit 9a48e65

Browse files
NathanW2NathanW2
committedJul 12, 2013
Merge pull request #721 from 3nids/iconmouseontop
put cursor on top of identify/action icons
·
ltr-3_40archive/master_2
2 parents 9db8970 + 5de6836 commit 9a48e65

File tree

13 files changed

+54
-80
lines changed

13 files changed

+54
-80
lines changed
 

‎images/images.qrc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@
334334
<file>themes/default/mIconNoPyramid.png</file>
335335
<file>themes/default/mIconOracle.svg</file>
336336
<file>themes/default/mIconOws.svg</file>
337-
<file>themes/default/mIconPointLayer.png</file>
338-
<file>themes/default/mIconPolygonLayer.png</file>
337+
<file>themes/default/mIconPointLayer.svg</file>
338+
<file>themes/default/mIconPolygonLayer.svg</file>
339339
<file>themes/default/mIconPostgis.svg</file>
340340
<file>themes/default/mIconPrevious.png</file>
341341
<file>themes/default/mIconProjectionDisabled.png</file>

‎images/themes/default/mAction.svg

Lines changed: 23 additions & 41 deletions
Loading

‎images/themes/default/mActionIdentify.svg

Lines changed: 13 additions & 21 deletions
Loading

‎images/themes/default/mIconPointLayer.png

-447 Bytes
Binary file not shown.

‎images/themes/default/mIconPolygonLayer.png

-820 Bytes
Binary file not shown.

‎src/app/legend/qgslegendlayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,11 +300,11 @@ QPixmap QgsLegendLayer::getOriginalPixmap()
300300
switch ( vlayer->geometryType() )
301301
{
302302
case QGis::Point:
303-
return QgsApplication::getThemePixmap( "/mIconPointLayer.png" );
303+
return QgsApplication::getThemePixmap( "/mIconPointLayer.svg" );
304304
case QGis::Line:
305305
return QgsApplication::getThemePixmap( "/mIconLineLayer.svg" );
306306
case QGis::Polygon:
307-
return QgsApplication::getThemePixmap( "/mIconPolygonLayer.png" );
307+
return QgsApplication::getThemePixmap( "/mIconPolygonLayer.svg" );
308308
case QGis::NoGeometry:
309309
return QgsApplication::getThemePixmap( "/mIconTableLayer.png" );
310310
default:

‎src/core/qgsdataitem.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const QIcon &QgsLayerItem::iconPoint()
4545
static QIcon icon;
4646

4747
if ( icon.isNull() )
48-
icon = QgsApplication::getThemeIcon( "/mIconPointLayer.png" );
48+
icon = QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
4949

5050
return icon;
5151
}
@@ -65,7 +65,7 @@ const QIcon &QgsLayerItem::iconPolygon()
6565
static QIcon icon;
6666

6767
if ( icon.isNull() )
68-
icon = QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" );
68+
icon = QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
6969

7070
return icon;
7171
}

‎src/plugins/grass/qgsgrassmodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,9 +544,9 @@ QgsGrassModel::QgsGrassModel( QObject * parent )
544544

545545
mIconFile = QIcon( style->standardPixmap( QStyle::SP_FileIcon ) );
546546

547-
mIconPointLayer = QgsGrassPlugin::getThemeIcon( "/mIconPointLayer.png" );
547+
mIconPointLayer = QgsGrassPlugin::getThemeIcon( "/mIconPointLayer.svg" );
548548
mIconLineLayer = QgsGrassPlugin::getThemeIcon( "/mIconLineLayer.svg" );
549-
mIconPolygonLayer = QgsGrassPlugin::getThemeIcon( "/mIconPolygonLayer.png" );
549+
mIconPolygonLayer = QgsGrassPlugin::getThemeIcon( "/mIconPolygonLayer.svg" );
550550
mIconVectorLayer = QgsGrassPlugin::getThemeIcon( "/grass/grass_browser_vector_layer.png" );
551551
mIconRasterLayer = QgsGrassPlugin::getThemeIcon( "/grass/grass_browser_raster_layer.png" );
552552

‎src/plugins/spatialquery/qgsspatialquerydialog.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,15 +408,15 @@ QIcon QgsSpatialQueryDialog::getIconTypeGeometry( QGis::GeometryType geomType )
408408
QString theName;
409409
if ( geomType == QGis::Point )
410410
{
411-
theName = "/mIconPointLayer.png";
411+
theName = "/mIconPointLayer.svg";
412412
}
413413
else if ( geomType == QGis::Line )
414414
{
415415
theName = "/mIconLineLayer.svg";
416416
}
417417
else // Polygon
418418
{
419-
theName = "/mIconPolygonLayer.png";
419+
theName = "/mIconPolygonLayer.svg";
420420
}
421421
// Copy from qgisapp.cpp
422422
QString myPreferredPath = QgsApplication::activeThemePath() + QDir::separator() + theName;

‎src/plugins/sqlanywhere/sadbtablemodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,15 +293,15 @@ QIcon SaDbTableModel::iconForType( QGis::WkbType type ) const
293293
{
294294
if ( type == QGis::WKBPoint || type == QGis::WKBPoint25D || type == QGis::WKBMultiPoint || type == QGis::WKBMultiPoint25D )
295295
{
296-
return SqlAnywhere::getThemeIcon( "/mIconPointLayer.png" );
296+
return SqlAnywhere::getThemeIcon( "/mIconPointLayer.svg" );
297297
}
298298
else if ( type == QGis::WKBLineString || type == QGis::WKBLineString25D || type == QGis::WKBMultiLineString || type == QGis::WKBMultiLineString25D )
299299
{
300300
return SqlAnywhere::getThemeIcon( "/mIconLineLayer.svg" );
301301
}
302302
else if ( type == QGis::WKBPolygon || type == QGis::WKBPolygon25D || type == QGis::WKBMultiPolygon || type == QGis::WKBMultiPolygon25D )
303303
{
304-
return SqlAnywhere::getThemeIcon( "/mIconPolygonLayer.png" );
304+
return SqlAnywhere::getThemeIcon( "/mIconPolygonLayer.svg" );
305305
}
306306
else
307307
{

‎src/providers/mssql/qgsmssqltablemodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ QIcon QgsMssqlTableModel::iconForWkbType( QGis::WkbType type )
296296
case QGis::WKBPoint25D:
297297
case QGis::WKBMultiPoint:
298298
case QGis::WKBMultiPoint25D:
299-
return QgsApplication::getThemeIcon( "/mIconPointLayer.png" );
299+
return QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
300300
case QGis::WKBLineString:
301301
case QGis::WKBLineString25D:
302302
case QGis::WKBMultiLineString:
@@ -306,7 +306,7 @@ QIcon QgsMssqlTableModel::iconForWkbType( QGis::WkbType type )
306306
case QGis::WKBPolygon25D:
307307
case QGis::WKBMultiPolygon:
308308
case QGis::WKBMultiPolygon25D:
309-
return QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" );
309+
return QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
310310
case QGis::WKBNoGeometry:
311311
return QgsApplication::getThemeIcon( "/mIconTableLayer.png" );
312312
case QGis::WKBUnknown:

‎src/providers/oracle/qgsoracletablemodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ QIcon QgsOracleTableModel::iconForWkbType( QGis::WkbType type )
232232
case QGis::WKBPoint25D:
233233
case QGis::WKBMultiPoint:
234234
case QGis::WKBMultiPoint25D:
235-
return QgsApplication::getThemeIcon( "/mIconPointLayer.png" );
235+
return QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
236236
case QGis::WKBLineString:
237237
case QGis::WKBLineString25D:
238238
case QGis::WKBMultiLineString:
@@ -242,7 +242,7 @@ QIcon QgsOracleTableModel::iconForWkbType( QGis::WkbType type )
242242
case QGis::WKBPolygon25D:
243243
case QGis::WKBMultiPolygon:
244244
case QGis::WKBMultiPolygon25D:
245-
return QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" );
245+
return QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
246246
case QGis::WKBNoGeometry:
247247
return QgsApplication::getThemeIcon( "/mIconTableLayer.png" );
248248
case QGis::WKBUnknown:

‎src/providers/postgres/qgspgtablemodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ QIcon QgsPgTableModel::iconForWkbType( QGis::WkbType type )
235235
case QGis::WKBPoint25D:
236236
case QGis::WKBMultiPoint:
237237
case QGis::WKBMultiPoint25D:
238-
return QgsApplication::getThemeIcon( "/mIconPointLayer.png" );
238+
return QgsApplication::getThemeIcon( "/mIconPointLayer.svg" );
239239
case QGis::WKBLineString:
240240
case QGis::WKBLineString25D:
241241
case QGis::WKBMultiLineString:
@@ -245,7 +245,7 @@ QIcon QgsPgTableModel::iconForWkbType( QGis::WkbType type )
245245
case QGis::WKBPolygon25D:
246246
case QGis::WKBMultiPolygon:
247247
case QGis::WKBMultiPolygon25D:
248-
return QgsApplication::getThemeIcon( "/mIconPolygonLayer.png" );
248+
return QgsApplication::getThemeIcon( "/mIconPolygonLayer.svg" );
249249
case QGis::WKBNoGeometry:
250250
return QgsApplication::getThemeIcon( "/mIconTableLayer.png" );
251251
case QGis::WKBUnknown:

0 commit comments

Comments
 (0)
Please sign in to comment.