Skip to content
Permalink
Browse files

Include north arrow image in the resources

  • Loading branch information
wonder-sk committed Jul 24, 2011
1 parent fe65ed7 commit 6d85c9ab98c599f1dc92b29c8d02f24f091975b3
@@ -10,7 +10,6 @@ QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})

########################################################
# Continue on to subdirs
ADD_SUBDIRECTORY(north_arrows)
ADD_SUBDIRECTORY(icons)
ADD_SUBDIRECTORY(themes)
ADD_SUBDIRECTORY(svg)
@@ -347,6 +347,7 @@
<file>themes/gis/plugins/spit.png</file>
<file>themes/gis/plugins/wfs.png</file>
<file>splash/splash.png</file>
<file>north_arrows/default.png</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

This file was deleted.

@@ -167,8 +167,7 @@ void QgsNorthArrowPlugin::renderNorthArrow( QPainter * theQPainter )

QPixmap myQPixmap; //to store the north arrow image in

QString myFileNameQString = QDir::cleanPath( QgsApplication::pkgDataPath() +
"/images/north_arrows/default.png" );
QString myFileNameQString = ":/images/north_arrows/default.png";

//QgsDebugMsg("Trying to load " + myFileNameQString);
if ( myQPixmap.load( myFileNameQString ) )
@@ -97,7 +97,7 @@ void QgsNorthArrowPluginGui::on_sliderRotation_valueChanged( int theInt )
void QgsNorthArrowPluginGui::rotatePixmap( int theRotationInt )
{
QPixmap myQPixmap;
QString myFileNameQString = QgsApplication::pkgDataPath() + "/images/north_arrows/default.png";
QString myFileNameQString = ":/images/north_arrows/default.png";
// QgsDebugMsg(QString("Trying to load %1").arg(myFileNameQString));
if ( myQPixmap.load( myFileNameQString ) )
{

0 comments on commit 6d85c9a

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