Cache theme icons for quick access

m-kuhn · m-kuhn · commit c9588cd56ea2 · 2016-04-12T14:35:59.000+02:00
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -412,22 +412,31 @@ QString QgsApplication::iconPath( const QString& iconFile )
 
 QIcon QgsApplication::getThemeIcon( const QString &theName )
 {
+  QgsApplication* app = static_cast<QgsApplication*>( instance() );
+  if ( app->mIconCache.contains( theName ) )
+    return app->mIconCache.value( theName );
+
+  QIcon icon;
+
   QString myPreferredPath = activeThemePath() + QDir::separator() + theName;
   QString myDefaultPath = defaultThemePath() + QDir::separator() + theName;
   if ( QFile::exists( myPreferredPath ) )
   {
-    return QIcon( myPreferredPath );
+    icon = QIcon( myPreferredPath );
   }
   else if ( QFile::exists( myDefaultPath ) )
   {
     //could still return an empty icon if it
     //doesnt exist in the default theme either!
-    return QIcon( myDefaultPath );
+    icon = QIcon( myDefaultPath );
   }
   else
   {
-    return QIcon();
+    icon = QIcon();
   }
+
+  app->mIconCache.insert( theName, icon );
+  return icon;
 }
 
 // TODO: add some caching mechanism ?
diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h
@@ -407,6 +407,8 @@ class CORE_EXPORT QgsApplication : public QApplication
     static QString sUserName;
     static QString sUserFullName;
     static QString sPlatformName;
+
+    QMap<QString, QIcon> mIconCache;
 };
 
 #endif
diff --git a/src/core/qgsfield.cpp b/src/core/qgsfield.cpp
@@ -442,43 +442,43 @@ bool QgsFields::operator==( const QgsFields &other ) const
 QgsFields::const_iterator QgsFields::constBegin() const noexcept
 {
   if ( d->fields.isEmpty() )
-    return const_iterator();
+  return const_iterator();
 
   return const_iterator( &d->fields.first() );
 }
 
 QgsFields::const_iterator QgsFields::constEnd() const noexcept
-{
-  if ( d->fields.isEmpty() )
+  {
+    if ( d->fields.isEmpty() )
     return const_iterator();
 
-  return const_iterator( &d->fields.last() + 1 );
-}
+    return const_iterator( &d->fields.last() + 1 );
+  }
 
-QgsFields::const_iterator QgsFields::begin() const noexcept
-{
-  if ( d->fields.isEmpty() )
-    return const_iterator();
+  QgsFields::const_iterator QgsFields::begin() const noexcept
+    {
+      if ( d->fields.isEmpty() )
+      return const_iterator();
 
-  return const_iterator( &d->fields.first() );
-}
+      return const_iterator( &d->fields.first() );
+    }
 
-QgsFields::const_iterator QgsFields::end() const noexcept
-{
-  if ( d->fields.isEmpty() )
-    return const_iterator();
+    QgsFields::const_iterator QgsFields::end() const noexcept
+      {
+        if ( d->fields.isEmpty() )
+        return const_iterator();
 
-  return const_iterator( &d->fields.last() + 1 );
-}
+        return const_iterator( &d->fields.last() + 1 );
+      }
 
-QgsFields::iterator QgsFields::begin()
-{
-  if ( d->fields.isEmpty() )
-    return iterator();
+      QgsFields::iterator QgsFields::begin()
+      {
+        if ( d->fields.isEmpty() )
+          return iterator();
 
-  d.detach();
-  return iterator( &d->fields.first() );
-}
+        d.detach();
+        return iterator( &d->fields.first() );
+      }
 
 QgsFields::iterator QgsFields::end()
 {
@@ -491,53 +491,34 @@ QgsFields::iterator QgsFields::end()
 
 QIcon QgsFields::iconForField( int fieldIdx ) const
 {
-  static QIcon intIcon;
-  if ( intIcon.isNull() )
-    intIcon = QgsApplication::getThemeIcon( "/mIconFieldInteger.svg" );
-  static QIcon floatIcon;
-  if ( floatIcon.isNull() )
-    floatIcon = QgsApplication::getThemeIcon( "/mIconFieldFloat.svg" );
-  static QIcon stringIcon;
-  if ( stringIcon.isNull() )
-    stringIcon = QgsApplication::getThemeIcon( "/mIconFieldText.svg" );
-  static QIcon dateIcon;
-  if ( dateIcon.isNull() )
-    dateIcon = QgsApplication::getThemeIcon( "/mIconFieldDate.svg" );
-  static QIcon dateTimeIcon;
-  if ( dateTimeIcon.isNull() )
-    dateTimeIcon = QgsApplication::getThemeIcon( "/mIconFieldDateTime.svg" );
-  static QIcon timeIcon;
-  if ( timeIcon.isNull() )
-    timeIcon = QgsApplication::getThemeIcon( "/mIconFieldTime.svg" );
-
   switch ( d->fields.at( fieldIdx ).field.type() )
   {
     case QVariant::Int:
     case QVariant::UInt:
     case QVariant::LongLong:
     case QVariant::ULongLong:
     {
-      return intIcon;
+      return QgsApplication::getThemeIcon( "/mIconFieldInteger.svg" );
     }
     case QVariant::Double:
     {
-      return floatIcon;
+      return QgsApplication::getThemeIcon( "/mIconFieldFloat.svg" );
     }
     case QVariant::String:
     {
-      return stringIcon;
+      return QgsApplication::getThemeIcon( "/mIconFieldText.svg" );
     }
     case QVariant::Date:
     {
-      return dateIcon;
+      return QgsApplication::getThemeIcon( "/mIconFieldDate.svg" );
     }
     case QVariant::DateTime:
     {
-      return dateTimeIcon;
+      return QgsApplication::getThemeIcon( "/mIconFieldDateTime.svg" );
     }
     case QVariant::Time:
     {
-      return timeIcon;
+      return QgsApplication::getThemeIcon( "/mIconFieldTime.svg" );
     }
     default:
       return QIcon();

Original file line number	Diff line number	Diff line change
`@@ -412,22 +412,31 @@ QString QgsApplication::iconPath( const QString& iconFile )`
`412`	`412`
`413`	`413`	`QIcon QgsApplication::getThemeIcon( const QString &theName )`
`414`	`414`	`{`
	`415`	`+ QgsApplication* app = static_cast<QgsApplication*>( instance() );`
	`416`	`+ if ( app->mIconCache.contains( theName ) )`
	`417`	`+ return app->mIconCache.value( theName );`
	`418`	`+`
	`419`	`+ QIcon icon;`
	`420`	`+`
`415`	`421`	`QString myPreferredPath = activeThemePath() + QDir::separator() + theName;`
`416`	`422`	`QString myDefaultPath = defaultThemePath() + QDir::separator() + theName;`
`417`	`423`	`if ( QFile::exists( myPreferredPath ) )`
`418`	`424`	`{`
`419`		`- return QIcon( myPreferredPath );`
	`425`	`+ icon = QIcon( myPreferredPath );`
`420`	`426`	`}`
`421`	`427`	`else if ( QFile::exists( myDefaultPath ) )`
`422`	`428`	`{`
`423`	`429`	`//could still return an empty icon if it`
`424`	`430`	`//doesnt exist in the default theme either!`
`425`		`- return QIcon( myDefaultPath );`
	`431`	`+ icon = QIcon( myDefaultPath );`
`426`	`432`	`}`
`427`	`433`	`else`
`428`	`434`	`{`
`429`		`- return QIcon();`
	`435`	`+ icon = QIcon();`
`430`	`436`	`}`
	`437`	`+`
	`438`	`+ app->mIconCache.insert( theName, icon );`
	`439`	`+ return icon;`
`431`	`440`	`}`
`432`	`441`
`433`	`442`	`// TODO: add some caching mechanism ?`