Skip to content

Commit 6d85c9a

Browse files
committedJul 24, 2011
Include north arrow image in the resources
1 parent fe65ed7 commit 6d85c9a

File tree

5 files changed

+3
-9
lines changed

5 files changed

+3
-9
lines changed
 

‎images/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ QT4_ADD_RESOURCES(IMAGE_RCC_SRCS ${IMAGE_RCCS})
1010

1111
########################################################
1212
# Continue on to subdirs
13-
ADD_SUBDIRECTORY(north_arrows)
1413
ADD_SUBDIRECTORY(icons)
1514
ADD_SUBDIRECTORY(themes)
1615
ADD_SUBDIRECTORY(svg)

‎images/images.qrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@
347347
<file>themes/gis/plugins/spit.png</file>
348348
<file>themes/gis/plugins/wfs.png</file>
349349
<file>splash/splash.png</file>
350+
<file>north_arrows/default.png</file>
350351
</qresource>
351352
<qresource prefix="/images/tips">
352353
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

‎images/north_arrows/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/plugins/north_arrow/plugin.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ void QgsNorthArrowPlugin::renderNorthArrow( QPainter * theQPainter )
167167

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

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

173172
//QgsDebugMsg("Trying to load " + myFileNameQString);
174173
if ( myQPixmap.load( myFileNameQString ) )

‎src/plugins/north_arrow/plugingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ void QgsNorthArrowPluginGui::on_sliderRotation_valueChanged( int theInt )
9797
void QgsNorthArrowPluginGui::rotatePixmap( int theRotationInt )
9898
{
9999
QPixmap myQPixmap;
100-
QString myFileNameQString = QgsApplication::pkgDataPath() + "/images/north_arrows/default.png";
100+
QString myFileNameQString = ":/images/north_arrows/default.png";
101101
// QgsDebugMsg(QString("Trying to load %1").arg(myFileNameQString));
102102
if ( myQPixmap.load( myFileNameQString ) )
103103
{

0 commit comments

Comments
 (0)
Please sign in to comment.