Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove QgsSponsors widget. Instead open sponsors page in the webbrowser (fix #16169) #4575

Merged
merged 1 commit into from May 18, 2017
Merged

remove QgsSponsors widget. Instead open sponsors page in the webbrowser (fix #16169) #4575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/CMakeLists.txt
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions src/app/CMakeLists.txt
View file
Open in desktop
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 @@ -299,7 +298,6 @@ SET (QGIS_APP_MOC_HDRS
qgsrelationmanagerdialog.h
qgsrelationadddlg.h
qgsselectbyformdialog.h
qgssponsors.h
qgsstatisticalsummarydockwidget.h
qgssvgannotationdialog.h
qgstextannotationdialog.h
Expand Down Expand Up @@ -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(
Expand Down
9 changes: 4 additions & 5 deletions src/app/qgisapp.cpp
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -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();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be configurable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think yes, for example for closed networks. Also this done for all other URLs, e.g. bugtracker, homepage

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, please don't forget to mention upstream once in a while despite whitelabeling. Even for closed network customers ;)

openURL( qgisSponsorsUrl, false );
}

void QgisApp::about()
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgisapp.h
View file
Open in desktop
Expand Up @@ -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();
Expand Down
71 changes: 0 additions & 71 deletions src/app/qgssponsors.cpp
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions src/app/qgssponsors.h
View file
Open in desktop

This file was deleted.