Skip to content
Permalink
Browse files

make december postfix translatable

  • Loading branch information
jef-n committed Dec 4, 2015
1 parent fc7fea5 commit f210fc7ee82420eeb73415b43999d10ae7ad76ac
Showing with 11 additions and 17 deletions.
  1. +1 −1 src/app/main.cpp
  2. +1 −10 src/app/qgsabout.cpp
  3. +1 −4 src/app/qgssponsors.cpp
  4. +1 −2 src/app/qgstipgui.cpp
  5. +4 −0 src/core/qgsapplication.cpp
  6. +3 −0 src/core/qgsapplication.h
@@ -752,7 +752,7 @@ int main( int argc, char *argv[] )

// (if Windows/Mac, use icon from resource)
#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
myApp.setWindowIcon( QIcon( QgsApplication::iconsPath() + "qgis-icon-60x60.png" ) );
myApp.setWindowIcon( QIcon( QgsApplication::appIconPath() ) );
#endif

//
@@ -72,16 +72,7 @@ void QgsAbout::init()
connect( developersMapView, SIGNAL( linkClicked( const QUrl & ) ), this, SLOT( openUrl( const QUrl & ) ) );

// set the 60x60 icon pixmap
QPixmap icon;
if ( QDate::currentDate().month() == 12 )
{
icon.load( QgsApplication::iconsPath() + "qgis-icon-60x60_xmas.png" );
}
else
{
icon.load( QgsApplication::iconsPath() + "qgis-icon-60x60.png" );
}
qgisIcon->setPixmap( icon );
qgisIcon->setPixmap( QPixmap( QgsApplication::appIconPath() ) );

//read the authors file to populate the svn committers list
QStringList lines;
@@ -38,9 +38,6 @@ QgsSponsors::~QgsSponsors()

void QgsSponsors::init()
{

// set the 60x60 icon pixmap
QPixmap icon( QgsApplication::iconsPath() + "qgis-icon-60x60.png" );
qgisIcon->setPixmap( icon );

qgisIcon->setPixmap( QPixmap( QgsApplication::appIconPath() ) );
}
@@ -64,8 +64,7 @@ void QgsTipGui::showTip( QgsTip myTip )
// once Qt 4.6 is the minimum required version for building QGIS.
//
QString content = "<img src='"
+ QgsApplication::iconsPath()
+ "qgis-icon-60x60.png"
+ QgsApplication::appIconPath()
+ "' style='float:left;'>"
+ "<h2>"
+ myTip.title()
@@ -382,6 +382,10 @@ QString QgsApplication::activeThemePath()
return userThemesFolder() + QDir::separator() + themeName() + QDir::separator() + "icons/";
}

QString QgsApplication::appIconPath()
{
return iconsPath() + ( QDate::currentDate().month() == 12 ? tr( "qgis-icon-60x60_xmas.png", "December application icon" ) : QString( "qgis-icon-60x60.png" ) );
}

QString QgsApplication::iconPath( const QString& iconFile )
{
@@ -232,6 +232,9 @@ class CORE_EXPORT QgsApplication : public QApplication
//! deletes provider registry and map layer registry
static void exitQgis();

//! get application icon
static QString appIconPath();

/** Constants for endian-ness */
enum endian_t
{

0 comments on commit f210fc7

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