Include north arrow image in the resources

qgis · Jul 24, 2011 · 6d85c9a · 6d85c9a
1 parent fe65ed7
commit 6d85c9a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/images/CMakeLists.txt b/images/CMakeLists.txt
@@ -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)
diff --git a/images/images.qrc b/images/images.qrc
@@ -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>

diff --git a/images/north_arrows/CMakeLists.txt b/images/north_arrows/CMakeLists.txt
diff --git a/src/plugins/north_arrow/plugin.cpp b/src/plugins/north_arrow/plugin.cpp
@@ -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 ) )

diff --git a/src/plugins/north_arrow/plugingui.cpp b/src/plugins/north_arrow/plugingui.cpp
@@ -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 ) )
   {