Skip to content
Permalink
Browse files

Merge pull request #721 from 3nids/iconmouseontop

put cursor on top of identify/action icons
  • Loading branch information
NathanW2 committed Jul 12, 2013
2 parents 9db8970 + 5de6836 commit 9a48e65907190094eda29c84f44f19288b76bd9c
@@ -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>

Large diffs are not rendered by default.

@@ -42,27 +42,14 @@
id="namedview120"
showgrid="false"
inkscape:zoom="7.8995816"
inkscape:cx="51.501"
inkscape:cx="14.15725"
inkscape:cy="16.510546"
inkscape:window-x="758"
inkscape:window-y="24"
inkscape:window-x="2836"
inkscape:window-y="120"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<title
id="title4">Mouse Pointer</title>
<g
id="g6"
transform="matrix(0.09982439,0,0,0.09982439,-1.1019781,-0.44775359)">
<title
id="title8">Layer 1</title>
<metadata
id="svg_35">image/svg+xml</metadata>
<path
id="path827"
d="M 201.45399,112.872 18.385411,12.7151 96.994012,207.909 128.29202,157.233 190.176,224.875 213.61301,202.03799 150.34502,135.04401 201.454,112.872 z"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round" />
</g>
<defs
id="defs12">
<linearGradient
@@ -391,8 +378,8 @@
</linearGradient>
</defs>
<circle
transform="matrix(0.57265697,0,0,0.57265697,12.752572,13.028525)"
style="fill:#6d9ccf;stroke:#34497d;stroke-miterlimit:10"
transform="matrix(0.57265697,0,0,0.57265697,-1.1160383,-0.61600782)"
style="fill:#6d97c4;fill-opacity:1;stroke:#445e75;stroke-width:1;stroke-miterlimit:10;stroke-opacity:1"
sodipodi:ry="28.677999"
sodipodi:rx="28.677999"
sodipodi:cy="32"
@@ -405,18 +392,23 @@
<path
style="opacity:0.3;fill:#ffffff"
inkscape:connector-curvature="0"
d="m 17.776492,34.330219 c 0.419185,-4.821199 1.360633,-7.713689 4.354483,-10.707539 3.233221,-3.233222 6.227645,-4.733583 11.885496,-6.020917 2.779677,-0.632213 -2.035223,-2.728136 -8.698087,-0.235362 -3.579107,1.338872 -7.212042,4.833225 -8.486777,9.925292 -1.544455,6.165223 0.753044,9.246119 0.944885,7.038526 z"
d="M 3.9078817,20.685686 C 4.3270667,15.864487 5.2685147,12.971997 8.2623647,9.9781472 11.495586,6.7449252 14.49001,5.2445642 20.147861,3.9572302 22.927538,3.3250172 18.112638,1.2290941 11.449774,3.7218682 7.8706667,5.0607402 4.2377317,8.5550932 2.9629967,13.64716 c -1.5444549,6.165223 0.753044,9.246119 0.944885,7.038526 z"
id="path5" />
<path
style="fill:#ffffff;stroke:#34497d;stroke-width:0.57265699;stroke-miterlimit:10"
inkscape:connector-curvature="0"
stroke-miterlimit="10"
d="m 35.014611,38.26609 -0.406586,-0.405442 c -0.370508,-0.369935 -1.080031,-0.296635 -1.373231,0.14202 -0.183823,0.275448 -1.033646,1.155049 -1.56908,1.568507 0.06643,-0.274303 0.193557,-0.693487 0.432928,-1.373803 l 2.147463,-6.096507 c 0.504511,-1.443668 0.809166,-2.315252 0.809166,-3.05856 0,-1.176238 -0.867003,-1.936727 -2.207594,-1.936727 -3.38612,0 -6.036377,3.057988 -7.017338,4.371664 -0.0126,0.0166 -0.02405,0.03265 -0.03436,0.04696 -0.168933,0.191839 -0.235934,0.447817 -0.183249,0.710094 0.04066,0.20272 0.151754,0.399142 0.321834,0.569222 l 0.304653,0.304081 c 0.182104,0.182104 0.418611,0.282319 0.666572,0.282319 0.184968,0 0.462134,-0.05785 0.734718,-0.333286 l 0.05041,-0.05898 c 0.35333,-0.470723 1.013603,-1.182536 1.496353,-1.620619 -0.08304,0.281747 -0.200431,0.627632 -0.338441,1.025629 l -1.492915,4.351621 c -1.063425,3.074594 -1.461421,4.225062 -1.461421,4.865866 0,0.837796 0.535434,1.732286 2.038086,1.732286 4.670018,0 6.972098,-3.469155 7.224639,-3.872879 0.257124,-0.430638 0.207876,-0.860703 -0.142592,-1.21346 z"
d="m 21.146001,24.621557 -0.406586,-0.405442 c -0.370508,-0.369935 -1.080031,-0.296635 -1.373231,0.14202 -0.183823,0.275448 -1.033646,1.155049 -1.56908,1.568507 0.06643,-0.274303 0.193557,-0.693487 0.432928,-1.373803 l 2.147463,-6.096507 c 0.504511,-1.443668 0.809166,-2.315252 0.809166,-3.05856 0,-1.176238 -0.867003,-1.936727 -2.207594,-1.936727 -3.38612,0 -6.036377,3.057988 -7.017338,4.371664 -0.0126,0.0166 -0.02405,0.03265 -0.03436,0.04696 -0.168933,0.191839 -0.235934,0.447817 -0.183249,0.710094 0.04066,0.20272 0.151754,0.399142 0.321834,0.569222 l 0.304653,0.304081 c 0.182104,0.182104 0.418611,0.282319 0.666572,0.282319 0.184968,0 0.462134,-0.05785 0.734718,-0.333286 l 0.05041,-0.05898 c 0.35333,-0.470723 1.013603,-1.182536 1.496353,-1.620619 -0.08304,0.281747 -0.200431,0.627632 -0.338441,1.025629 l -1.492915,4.351621 c -1.063425,3.074594 -1.461421,4.225062 -1.461421,4.865866 0,0.837796 0.535434,1.732286 2.038086,1.732286 4.670018,0 6.972098,-3.469155 7.224639,-3.872879 0.257124,-0.430638 0.207876,-0.860703 -0.142592,-1.21346 z"
id="path7" />
<path
style="fill:#ffffff;stroke:#34497d;stroke-width:0.57265699;stroke-miterlimit:10"
inkscape:connector-curvature="0"
stroke-miterlimit="10"
d="m 33.117972,20.118591 c -1.501507,0 -2.818045,1.300504 -2.818045,2.783686 0,1.691056 1.132715,2.783685 2.885619,2.783685 1.720834,0 3.055124,-1.587405 3.055124,-2.953192 5.72e-4,-1.205443 -0.817182,-2.614179 -3.122698,-2.614179 z"
d="m 19.249362,6.4740582 c -1.501507,0 -2.818045,1.300504 -2.818045,2.783686 0,1.6910558 1.132715,2.7836848 2.885619,2.7836848 1.720834,0 3.055124,-1.587405 3.055124,-2.9531918 5.72e-4,-1.205443 -0.817182,-2.614179 -3.122698,-2.614179 z"
id="path9" />
<path
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0"
d="m 45.323671,32.905232 -22.310674,-12.209237 9.580075,23.794352 3.814307,-6.17746 7.541837,8.245634 2.856281,-2.783856 -7.710506,-8.166641 6.228682,-2.702792 z"
id="path827" />
</svg>
Binary file not shown.
Binary file not shown.
@@ -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:
@@ -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;
}
@@ -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" );

@@ -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;
@@ -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
{
@@ -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:
@@ -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:
@@ -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:

0 comments on commit 9a48e65

Please sign in to comment.
You can’t perform that action at this time.