Skip to content

Commit b8d369a

Browse files
authoredMay 18, 2017
Merge pull request #4575 from alexbruy/qgis-sponsors
remove QgsSponsors widget. Instead open sponsors page in the webbrowser (fix #16169)
2 parents ffe5e1c + 5112a0d commit b8d369a

File tree

8 files changed

+9
-364
lines changed

8 files changed

+9
-364
lines changed
 

‎doc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
2222
)
2323
ENDIF(TXT2TAGS_EXECUTABLE)
2424

25-
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)
25+
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)
2626

2727
INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
2828
INSTALL(FILES ../images/icons/qgis-icon-60x60.png DESTINATION ${QGIS_DATA_DIR}/doc/images)
@@ -53,7 +53,7 @@ IF(WITH_APIDOC)
5353
SET(DOXYGEN_INPUT
5454
${CMAKE_SOURCE_DIR}/doc
5555
${CMAKE_SOURCE_DIR}/src/core
56-
${CMAKE_SOURCE_DIR}/src/core/annotations
56+
${CMAKE_SOURCE_DIR}/src/core/annotations
5757
${CMAKE_SOURCE_DIR}/src/core/auth
5858
${CMAKE_SOURCE_DIR}/src/core/composer
5959
${CMAKE_SOURCE_DIR}/src/core/diagram

‎doc/release-sponsors.html

Lines changed: 0 additions & 139 deletions
This file was deleted.

‎src/app/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ SET(QGIS_APP_SRCS
77
qgsabout.cpp
88
qgsalignrasterdialog.cpp
99
qgsapplayertreeviewmenuprovider.cpp
10-
qgssponsors.cpp
1110
qgsaddattrdialog.cpp
1211
qgsaddtaborgroup.cpp
1312
qgsjoindialog.cpp
@@ -302,7 +301,6 @@ SET (QGIS_APP_MOC_HDRS
302301
qgsrelationmanagerdialog.h
303302
qgsrelationadddlg.h
304303
qgsselectbyformdialog.h
305-
qgssponsors.h
306304
qgsstatisticalsummarydockwidget.h
307305
qgssvgannotationdialog.h
308306
qgstextannotationdialog.h
@@ -468,7 +466,7 @@ IF(PEDANTIC)
468466
SET_SOURCE_FILES_PROPERTIES(
469467
qgisappinterface.cpp
470468
${CMAKE_BINARY_DIR}/src/app/moc_qgisappinterface.cxx
471-
PROPERTIES COMPILE_FLAGS "/wd4996"
469+
PROPERTIES COMPILE_FLAGS "/wd4996"
472470
)
473471
ELSE(MSVC)
474472
SET_SOURCE_FILES_PROPERTIES(

‎src/app/qgisapp.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
246246
#include "qgssinglebandgrayrenderer.h"
247247
#include "qgssnappingwidget.h"
248248
#include "qgssourceselectdialog.h"
249-
#include "qgssponsors.h"
250249
#include "qgsstatisticalsummarydockwidget.h"
251250
#include "qgsstatusbar.h"
252251
#include "qgsstatusbarcoordinateswidget.h"
@@ -3730,10 +3729,10 @@ void QgisApp::restoreWindowState()
37303729
///////////// END OF GUI SETUP ROUTINES ///////////////
37313730
void QgisApp::sponsors()
37323731
{
3733-
QgsSponsors *sponsors = new QgsSponsors( this );
3734-
sponsors->show();
3735-
sponsors->raise();
3736-
sponsors->activateWindow();
3732+
QgsSettings settings;
3733+
QString qgisSponsorsUrl = settings.value( QStringLiteral( "qgis/qgisSponsorsUrl" ),
3734+
tr( "http://qgis.org/en/site/about/sponsorship.html" ) ).toString();
3735+
openURL( qgisSponsorsUrl, false );
37373736
}
37383737

37393738
void QgisApp::about()

‎src/app/qgisapp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -849,9 +849,9 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
849849
//! validate a SRS
850850
void validateCrs( QgsCoordinateReferenceSystem &crs );
851851

852-
//! QGis Sponsors
852+
//! QGIS Sponsors
853853
void sponsors();
854-
//! About QGis
854+
//! About QGIS
855855
void about();
856856
//! Add a raster layer to the map (will prompt user for file name using dlg )
857857
void addRasterLayer();

‎src/app/qgssponsors.cpp

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎src/app/qgssponsors.h

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎src/ui/qgssponsorsbase.ui

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.