remove QgsSponsors widget. Instead open sponsors page in the webbrowser

(fix #16169)
qgis · May 17, 2017 · 5112a0d · 5112a0d
1 parent d0d6959
commit 5112a0d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 364 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -22,7 +22,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
   )
 ENDIF(TXT2TAGS_EXECUTABLE)
 
-SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html nohelp.html contributors.json favicon.ico style.css release-sponsors.html AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS LICENSE)
+SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html news.html developersmap.html nohelp.html contributors.json favicon.ico style.css 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)
@@ -53,7 +53,7 @@ IF(WITH_APIDOC)
     SET(DOXYGEN_INPUT
       ${CMAKE_SOURCE_DIR}/doc
       ${CMAKE_SOURCE_DIR}/src/core
-      ${CMAKE_SOURCE_DIR}/src/core/annotations      
+      ${CMAKE_SOURCE_DIR}/src/core/annotations
       ${CMAKE_SOURCE_DIR}/src/core/auth
       ${CMAKE_SOURCE_DIR}/src/core/composer
       ${CMAKE_SOURCE_DIR}/src/core/diagram

diff --git a/doc/release-sponsors.html b/doc/release-sponsors.html
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -7,7 +7,6 @@ SET(QGIS_APP_SRCS
   qgsabout.cpp
   qgsalignrasterdialog.cpp
   qgsapplayertreeviewmenuprovider.cpp
-  qgssponsors.cpp
   qgsaddattrdialog.cpp
   qgsaddtaborgroup.cpp
   qgsjoindialog.cpp
@@ -299,7 +298,6 @@ SET (QGIS_APP_MOC_HDRS
   qgsrelationmanagerdialog.h
   qgsrelationadddlg.h
   qgsselectbyformdialog.h
-  qgssponsors.h
   qgsstatisticalsummarydockwidget.h
   qgssvgannotationdialog.h
   qgstextannotationdialog.h
@@ -462,7 +460,7 @@ IF(PEDANTIC)
     SET_SOURCE_FILES_PROPERTIES(
         qgisappinterface.cpp
         ${CMAKE_BINARY_DIR}/src/app/moc_qgisappinterface.cxx
-	PROPERTIES COMPILE_FLAGS "/wd4996"
+    PROPERTIES COMPILE_FLAGS "/wd4996"
     )
   ELSE(MSVC)
     SET_SOURCE_FILES_PROPERTIES(

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -243,7 +243,6 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #include "qgssinglebandgrayrenderer.h"
 #include "qgssnappingwidget.h"
 #include "qgssourceselectdialog.h"
-#include "qgssponsors.h"
 #include "qgsstatisticalsummarydockwidget.h"
 #include "qgsstatusbarcoordinateswidget.h"
 #include "qgsstatusbarmagnifierwidget.h"
@@ -3692,10 +3691,10 @@ void QgisApp::restoreWindowState()
 ///////////// END OF GUI SETUP ROUTINES ///////////////
 void QgisApp::sponsors()
 {
-  QgsSponsors *sponsors = new QgsSponsors( this );
-  sponsors->show();
-  sponsors->raise();
-  sponsors->activateWindow();
+  QgsSettings settings;
+  QString qgisSponsorsUrl = settings.value( QStringLiteral( "qgis/qgisSponsorsUrl" ),
+                            tr( "http://qgis.org/en/site/about/sponsorship.html" ) ).toString();
+  openURL( qgisSponsorsUrl, false );
 }
 
 void QgisApp::about()

diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -843,9 +843,9 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
     //! validate a SRS
     void validateCrs( QgsCoordinateReferenceSystem &crs );
 
-    //! QGis Sponsors
+    //! QGIS Sponsors
     void sponsors();
-    //! About QGis
+    //! About QGIS
     void about();
     //! Add a raster layer to the map (will prompt user for file name using dlg )
     void addRasterLayer();

diff --git a/src/app/qgssponsors.cpp b/src/app/qgssponsors.cpp
diff --git a/src/app/qgssponsors.h b/src/app/qgssponsors.h