Better SVG downloading icon

qgis · Apr 9, 2018 · 887db6e · 887db6e
1 parent 9c28c91
commit 887db6e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/images/images.qrc b/images/images.qrc
@@ -648,6 +648,7 @@
         <file>themes/default/mIconLayout.svg</file>
         <file>themes/default/mActionNewReport.svg</file>
         <file>themes/default/mIconReport.svg</file>
+        <file>themes/default/downloading_svg.svg</file>
     </qresource>
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

diff --git a/images/themes/default/downloading_svg.svg b/images/themes/default/downloading_svg.svg
diff --git a/src/core/symbology/qgssvgcache.cpp b/src/core/symbology/qgssvgcache.cpp
@@ -84,7 +84,21 @@ QgsSvgCache::QgsSvgCache( QObject *parent )
   , mMutex( QMutex::Recursive )
 {
   mMissingSvg = QStringLiteral( "<svg width='10' height='10'><text x='5' y='10' font-size='10' text-anchor='middle'>?</text></svg>" ).toLatin1();
-  mFetchingSvg = QStringLiteral( "<svg width='10' height='10'><text x='5' y='10' font-size='10' text-anchor='middle'>&#8987;</text></svg>" ).toLatin1();
+
+  const QString downloadingSvgPath = QgsApplication::defaultThemePath() + QStringLiteral( "downloading_svg.svg" );
+  if ( QFile::exists( downloadingSvgPath ) )
+  {
+    QFile file( downloadingSvgPath );
+    if ( file.open( QIODevice::ReadOnly ) )
+    {
+      mFetchingSvg = file.readAll();
+    }
+  }
+
+  if ( mFetchingSvg.isEmpty() )
+  {
+    mFetchingSvg = QStringLiteral( "<svg width='10' height='10'><text x='5' y='10' font-size='10' text-anchor='middle'>?</text></svg>" ).toLatin1();
+  }
 }
 
 QgsSvgCache::~QgsSvgCache()

diff --git a/...testdata/control_images/svg_cache/expected_waiting_svg/expected_waiting_svg.png b/...testdata/control_images/svg_cache/expected_waiting_svg/expected_waiting_svg.png
diff --git a/...ata/control_images/svg_cache/expected_waiting_svg/expected_waiting_svg_mask.png b/...ata/control_images/svg_cache/expected_waiting_svg/expected_waiting_svg_mask.png