mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-13 00:03:09 -04:00
Include north arrow image in the resources
This commit is contained in:
parent
fe65ed7688
commit
6d85c9ab98
@ -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>
|
||||
|
@ -1,5 +0,0 @@
|
||||
|
||||
FILE (GLOB PNGIMAGES *.png)
|
||||
|
||||
INSTALL (FILES ${PNGIMAGES}
|
||||
DESTINATION ${QGIS_DATA_DIR}/images/north_arrows)
|
@ -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 ) )
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user