Added sponsors generated from changelog site (#3264)

* Added sponsors generated from changelog site
* Use a single rule for including sponsor images rather. Remove terrelogiche duplication. Remove old sponsor images
* Fix indentations and remove sponsors from images.qrc

doc/CMakeLists.txt

@@ -22,11 +22,15 @@ ELSE(TXT2TAGS_EXECUTABLE)
   )
 ENDIF(TXT2TAGS_EXECUTABLE)
 
-SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html contributors.json favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
+SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html contributors.json favicon.ico style.css release-sponsors.html AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
 
 INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
 INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/images)
 
+# Sponsor images
+FILE (GLOB SPONSOR_IMAGES images/projects/thumbnails/* )
+INSTALL (FILES ${SPONSOR_IMAGES} DESTINATION ${QGIS_DATA_DIR}/doc/images/projects/thumbnails/)
+
 IF(WITH_APIDOC)
   FIND_PACKAGE(Doxygen 1.8.2 REQUIRED)
   IF(DOXYGEN_FOUND)

doc/release-sponsors.html

@@ -0,0 +1,139 @@
+<h2 id="sponsors-heading" class="text-muted">Sponsors for QGIS version 2.16.0</h2>
+<hr />
+<h3 class="text-muted"><img src="images/projects/thumbnails/d5fd4af2929840586da0bd45110758c5b0a786ff.png.50x50_q85.png" /> Gold : 9000 EUR</h3>
+<p><a href="http://www.qgis.ch/">QGIS Usergroup Switzerland</a></p>
+<p>June 21, 2016 - June 21, 2017</p>
+<p>Gold : 9000 EUR or more</p>
+<p><img src="images/projects/thumbnails/945e5e1463ca738057fd9bae0a427519ccbfef0d.png.300x150_q85.png" /></p>
+<hr />
+<h3 class="text-muted"><img src="images/projects/thumbnails/0d8ae6aad78ca052492dff96434ddb54d5401262.png.50x50_q85.png" /> Silver : 3000 EUR</h3>
+<p><a href="http://www.opw.ie/">Office of Public Works, Flood Risk Management and Data Management Section</a></p>
+<p>Dec. 15, 2015 - Dec. 15, 2016</p>
+<p>Silver : 3000 EUR or more</p>
+<p><img src="images/projects/thumbnails/35602d87c0858381e9a95a481808b27249f0f592.jpg.200x100_q85.jpg" /></p>
+<p><a href="http://www.sourcepole.com/">Sourcepole AG</a></p>
+<p>Oct. 1, 2015 - Oct. 1, 2016</p>
+<p>Silver : 3000 EUR or more</p>
+<p><img src="images/projects/thumbnails/63b4e423e3ae2888b441002777aee43514e3e271.png.200x100_q85.png" /></p>
+<p><a href="http://www.gaia-mbh.de/">GAIA mbH</a></p>
+<p>Nov. 30, 2015 - Nov. 30, 2016</p>
+<p>Silver : 3000 EUR or more</p>
+<p><img src="images/projects/thumbnails/f6379f3083e612fd47917e1f948d795b6951dde9.png.200x100_q85.png" /></p>
+<hr />
+<h3 class="text-muted"><img src="images/projects/thumbnails/0e2f6fb1efc89d41120cddf90509374642d400b4.png.50x50_q85.png" /> Bronze : 500 EUR</h3>
+<p><a href="http://www.chameleonjohn.com/">ChameleonJohn</a></p>
+<p>Feb. 1, 2016 - Feb. 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/a784c121da037ea4fdb57c0de6ce4573af6d8c6c.png.100x50_q85.png" /></p>
+<p><a href="http://www.gepol.com.pl/">GEPOL Ltd.</a></p>
+<p>April 25, 2016 - April 25, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/95966a3500fe4f686b531f05fcf85f59ed0dcb93.png.100x50_q85.png" /></p>
+<p><a href="http://www.2d3d-gis.com/">2D3D.GIS</a></p>
+<p>Dec. 1, 2015 - Dec. 1, 2016</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/b3196a2b5781e788e6adac40ecf6964eddc4d38e.png.100x50_q85.png" /></p>
+<p><a href="http://www.dr-kerth-lampe.de/">Dr. Kerth + Lampe Geo-Infometric GmbH</a></p>
+<p>Dec. 1, 2015 - Dec. 1, 2016</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/8d0653a46046e8d43a28d4ea3466633f15d17636.png.100x50_q85.jpg" /></p>
+<p><a href="http://www.mappinggis.com/">MappingGIS</a></p>
+<p>Nov. 1, 2015 - Nov. 1, 2016</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/775de328b2774c112cc73fb5aaaee9696220649b.png.100x50_q85.png" /></p>
+<p><a href="https://hostingfacts.com/">HostingFacts.com (Online only ou)</a></p>
+<p>Dec. 1, 2015 - Dec. 1, 2016</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/44e7274c2c76c57d1e2338ddb55a7fb7e764b765.png.100x50_q85.png" /></p>
+<p><a href="http://www.lutraconsulting.co.uk/">Lutra Consulting</a></p>
+<p>Oct. 1, 2015 - Oct. 1, 2016</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/0d5fea827c8bfc486877065e21d3e28f89788e78.png.100x50_q85.png" /></p>
+<p><a href="http://www.gaia3d.com/">Gaia3D, Inc.</a></p>
+<p>May 1, 2016 - May 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/9d30ee055aaea7ef42b807b1b4fcd22566eef69d.png.100x50_q85.png" /></p>
+<p><a href="http://www.urbsol.com.au/">Urbsol</a></p>
+<p>Nov. 1, 2015 - Nov. 1, 2016</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/af9b8c3a4363482f12c7b2dff14659fd9ff6240c.png.100x50_q85.jpg" /></p>
+<p><a href="http://www.ncc.se/en/">NCC Roads AB</a></p>
+<p>May 1, 2016 - May 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/d31441980fc90fb15735df8509527e6a1badce72.png.100x50_q85.png" /></p>
+<p><a href="http://www.molitec.it/">Molitec</a></p>
+<p>March 1, 2016 - March 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/5a65a575314f063d065ef84840e734e411c770f2.png.100x50_q85.png" /></p>
+<p><a href="http://wheregroup.com/">WhereGroup GmbH &amp; Co. KG</a></p>
+<p>Aug. 1, 2015 - Aug. 1, 2016</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/0eb2c265017956fb6b15cb9a098f8d27928152e8.jpg.100x50_q85.jpg" /></p>
+<p><a href="http://www.terrelogiche.com/">TerreLogiche</a></p>
+<p>June 7, 2016 - June 7, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/9e23fb4e1f0416131843750f07e75a9f9d1e724d.jpg.100x50_q85.jpg" /></p>
+<p><a href="http://www.gis-support.com/">GIS Support Sp. z o.o.</a></p>
+<p>March 1, 2016 - March 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/879213e1d9dd7d4e4adb87abf81c96c26c25cd36.png.100x50_q85.jpg" /></p>
+<p><a href="http://www.tragewegen.be/">Trage Wegen vzw</a></p>
+<p>March 1, 2016 - March 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/1607f4bc4a24d0e6aabe5e8e424b93b40b83be3a.png.100x50_q85.png" /></p>
+<p><a href="http://www.gis3w.it/">Gis3W</a></p>
+<p>Jan. 1, 2016 - Jan. 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/69f8dd7f727158ebeb6bcbdce6fef4cb313ad9f9.png.100x50_q85.png" /></p>
+<p><a href="http://www.soltig.net/">SOLTIG (Soluciones en Tecnologías de Información Geográfica)</a></p>
+<p>June 7, 2016 - June 7, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/0baa83c55c7c6194627e87ca81c9dffd4eee9ad1.png.100x50_q85.png" /></p>
+<p><a href="http://geoinnova.org/">Asociación Geoinnova</a></p>
+<p>March 1, 2016 - March 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/bba9a55eb7e288e622e7bf40ee85326c28cf09f3.jpg.100x50_q85.jpg" /></p>
+<p><a href="www.bgeo.es">BGEO Open GIS, SL</a></p>
+<p>March 7, 2016 - March 7, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/c8dbccba699fc2f34ef61b034f7b86adfd96f4c4.png.100x50_q85.jpg" /></p>
+<p><a href="http://www.kbbnet.de/">KBB Underground Technologies GmbH</a></p>
+<p>March 11, 2016 - March 11, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/69255208cf440914eb947bf6dce5cee1c78455ba.jpg.100x50_q85.jpg" /></p>
+<p><a href="http://www.agertechnology.com/">Ager Technology</a></p>
+<p>March 24, 2016 - March 24, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/7ab30679cc486ecb9981c8c02a6d6ba1fb6ca2c7.png.100x50_q85.jpg" /></p>
+<p><a href="http://www.nationalparks.gov.uk/">National Parks UK</a></p>
+<p>March 24, 2016 - March 24, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/6e9c4de359ddbda8ed0b144478e7fa001e22ba63.jpg.100x50_q85.jpg" /></p>
+<p><a href="http://www.qgis.pt/">QGIS user group Portugal</a></p>
+<p>June 26, 2016 - June 26, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/207dd8769c4926452e07e39d88716ec518ff5f3a.png.100x50_q85.png" /></p>
+<p><a href="http://www.footprintsrecruiting.com/teaching-jobs-abroad">Teaching Jobs with Footprints</a></p>
+<p>April 1, 2016 - April 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/46d3e22cccef65fc941eaf0d080fcabbe29d3aff.png.100x50_q85.png" /></p>
+<p><a href="http://www.fornat.ch/">FORNAT AG</a></p>
+<p>April 17, 2016 - April 17, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/e24951be1e5ff2d6fd591f9760871e38a684bed0.png.100x50_q85.png" /></p>
+<p><a href="http://www.gfi-gis.de/">GFI - Gesellschaft für Informationstechnologie mbH</a></p>
+<p>April 15, 2016 - April 15, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/44113fc21a8e2cd84d93459d0f00b3a64850095c.png.100x50_q85.jpg" /></p>
+<p><a href="http://www.rbwm.gov.uk/">Royal Borough of Windsor and Maidenhead</a></p>
+<p>April 1, 2016 - April 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/25ce8c01cf28046bac3866b5649d269138d257a4.png.100x50_q85.png" /></p>
+<p><a href="http://www.cawdorforestry.com/">Cawdor Forestry</a></p>
+<p>Feb. 3, 2016 - Feb. 3, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/1789f70f1058ee18570638070439a8082b91dca8.png.100x50_q85.jpg" /></p>
+<p><a href="http://www.gkg-kassel.de/">GKG Kassel, (Dr.-Ing. Claas Leiner)</a></p>
+<p>March 1, 2016 - March 1, 2017</p>
+<p>Bronze : 500 EUR or more</p>
+<p><img src="images/projects/thumbnails/035ade9287e0bae1ddf62a00a52519f028a18e7f.png.100x50_q85.jpg" /></p>

images/images.qrc

@@ -668,15 +668,4 @@
     <qresource prefix="/images/tips">
         <file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
     </qresource>
-    <qresource prefix="/images/sponsors">
-        <file>sponsors/geosynergy.png</file>
-        <file>sponsors/ibw.png</file>
-        <file>sponsors/vorarlberg.png</file>
-        <file>sponsors/gaia.png</file>
-        <file>sponsors/aas_300wide.png</file>
-        <file>sponsors/bronze.png</file>
-        <file>sponsors/gold.png</file>
-        <file>sponsors/platinum.png</file>
-        <file>sponsors/silver.png</file>
-    </qresource>
 </RCC>

src/app/qgssponsors.cpp

@@ -30,6 +30,34 @@ QgsSponsors::QgsSponsors( QWidget *parent )
 {
   setupUi( this );
   init();
+  QString intro = tr( "<p>We work really hard to make this nice software for you. "
+                      "See all the cool features it has? Get a warm fuzzy feeling when you use it? "
+                      "QGIS is a labour of love by a dedicated team of developers. We want you to copy "
+                      "&amp; share it and put it in the hands of as many people as possible. If QGIS "
+                      "is saving you money or you like our work and have the financial ability to "
+                      "help, please consider sponsoring the development of QGIS. We use money from "
+                      "sponsors to pay for travel and costs related to our bi-annual hackfests, and to "
+                      "generally support the goals of our project.</p><p>Please see the <a "
+                      "href='http://qgis.org/en/site/getinvolved/governance/sponsorship/sponsorship.html'>QGIS "
+                      "Sponsorship Web Page</a> for more details. In the <a "
+                      "href='http://qgis.org/en/site/about/sponsorship.html#list-of-sponsors'>Sponsors "
+                      "page</a> you can see the fine people and companies that are helping us "
+                      "financially - a great big 'thank you' to you all!</p>" );
+  txtSponsors->setText( intro );
+  // read the SPONSORS file and populate the text widget
+  QFile sponsorsFile( QgsApplication::pkgDataPath() + QLatin1String( "/doc/release-sponsors.html" ) );
+  if ( sponsorsFile.open( QIODevice::ReadOnly ) )
+  {
+    QString path = "images/";
+    QString newPath = QgsApplication::pkgDataPath() + QLatin1String( "/doc/images/" );
+    QTextStream sponsorsStream( &sponsorsFile );
+    // Always use UTF-8
+    sponsorsStream.setCodec( "UTF-8" );
+    QString sponsors = sponsorsStream.readAll();
+    sponsors.replace( path, newPath );
+    txtSponsors->append( sponsors );
+
+  }
 }
 
 QgsSponsors::~QgsSponsors()