Skip to content

Commit

Permalink
Merge pull request #4575 from alexbruy/qgis-sponsors
Browse files Browse the repository at this point in the history
remove QgsSponsors widget. Instead open sponsors page in the webbrowser (fix #16169)
  • Loading branch information
alexbruy authored May 18, 2017
2 parents ffe5e1c + 5112a0d commit b8d369a
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 364 deletions.
4 changes: 2 additions & 2 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
139 changes: 0 additions & 139 deletions doc/release-sponsors.html

This file was deleted.

4 changes: 1 addition & 3 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ SET(QGIS_APP_SRCS
qgsabout.cpp
qgsalignrasterdialog.cpp
qgsapplayertreeviewmenuprovider.cpp
qgssponsors.cpp
qgsaddattrdialog.cpp
qgsaddtaborgroup.cpp
qgsjoindialog.cpp
Expand Down Expand Up @@ -302,7 +301,6 @@ SET (QGIS_APP_MOC_HDRS
qgsrelationmanagerdialog.h
qgsrelationadddlg.h
qgsselectbyformdialog.h
qgssponsors.h
qgsstatisticalsummarydockwidget.h
qgssvgannotationdialog.h
qgstextannotationdialog.h
Expand Down Expand Up @@ -468,7 +466,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(
Expand Down
9 changes: 4 additions & 5 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
#include "qgssinglebandgrayrenderer.h"
#include "qgssnappingwidget.h"
#include "qgssourceselectdialog.h"
#include "qgssponsors.h"
#include "qgsstatisticalsummarydockwidget.h"
#include "qgsstatusbar.h"
#include "qgsstatusbarcoordinateswidget.h"
Expand Down Expand Up @@ -3730,10 +3729,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()
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgisapp.h
Original file line number Diff line number Diff line change
Expand Up @@ -849,9 +849,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();
Expand Down
71 changes: 0 additions & 71 deletions src/app/qgssponsors.cpp

This file was deleted.

36 changes: 0 additions & 36 deletions src/app/qgssponsors.h

This file was deleted.

Loading

0 comments on commit b8d369a

Please sign in to comment.