From 5112a0dc888ce4b62686848b0538ec5c178dee3e Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Wed, 17 May 2017 11:31:52 +0300 Subject: [PATCH] remove QgsSponsors widget. Instead open sponsors page in the webbrowser (fix #16169) --- doc/CMakeLists.txt | 4 +- doc/release-sponsors.html | 139 -------------------------------------- src/app/CMakeLists.txt | 4 +- src/app/qgisapp.cpp | 9 ++- src/app/qgisapp.h | 4 +- src/app/qgssponsors.cpp | 71 ------------------- src/app/qgssponsors.h | 36 ---------- src/ui/qgssponsorsbase.ui | 106 ----------------------------- 8 files changed, 9 insertions(+), 364 deletions(-) delete mode 100644 doc/release-sponsors.html delete mode 100644 src/app/qgssponsors.cpp delete mode 100644 src/app/qgssponsors.h delete mode 100644 src/ui/qgssponsorsbase.ui diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 9fc9564780cb..a26334c66dd6 100755 --- 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 deleted file mode 100644 index 3f8dfd84d9e4..000000000000 --- a/doc/release-sponsors.html +++ /dev/null @@ -1,139 +0,0 @@ -

Sponsors for QGIS version 2.16.0

-
-

Gold : 9000 EUR

-

QGIS Usergroup Switzerland

-

June 21, 2016 - June 21, 2017

-

Gold : 9000 EUR or more

-

-
-

Silver : 3000 EUR

-

Office of Public Works, Flood Risk Management and Data Management Section

-

Dec. 15, 2015 - Dec. 15, 2016

-

Silver : 3000 EUR or more

-

-

Sourcepole AG

-

Oct. 1, 2015 - Oct. 1, 2016

-

Silver : 3000 EUR or more

-

-

GAIA mbH

-

Nov. 30, 2015 - Nov. 30, 2016

-

Silver : 3000 EUR or more

-

-
-

Bronze : 500 EUR

-

ChameleonJohn

-

Feb. 1, 2016 - Feb. 1, 2017

-

Bronze : 500 EUR or more

-

-

GEPOL Ltd.

-

April 25, 2016 - April 25, 2017

-

Bronze : 500 EUR or more

-

-

2D3D.GIS

-

Dec. 1, 2015 - Dec. 1, 2016

-

Bronze : 500 EUR or more

-

-

Dr. Kerth + Lampe Geo-Infometric GmbH

-

Dec. 1, 2015 - Dec. 1, 2016

-

Bronze : 500 EUR or more

-

-

MappingGIS

-

Nov. 1, 2015 - Nov. 1, 2016

-

Bronze : 500 EUR or more

-

-

HostingFacts.com (Online only ou)

-

Dec. 1, 2015 - Dec. 1, 2016

-

Bronze : 500 EUR or more

-

-

Lutra Consulting

-

Oct. 1, 2015 - Oct. 1, 2016

-

Bronze : 500 EUR or more

-

-

Gaia3D, Inc.

-

May 1, 2016 - May 1, 2017

-

Bronze : 500 EUR or more

-

-

Urbsol

-

Nov. 1, 2015 - Nov. 1, 2016

-

Bronze : 500 EUR or more

-

-

NCC Roads AB

-

May 1, 2016 - May 1, 2017

-

Bronze : 500 EUR or more

-

-

Molitec

-

March 1, 2016 - March 1, 2017

-

Bronze : 500 EUR or more

-

-

WhereGroup GmbH & Co. KG

-

Aug. 1, 2015 - Aug. 1, 2016

-

Bronze : 500 EUR or more

-

-

TerreLogiche

-

June 7, 2016 - June 7, 2017

-

Bronze : 500 EUR or more

-

-

GIS Support Sp. z o.o.

-

March 1, 2016 - March 1, 2017

-

Bronze : 500 EUR or more

-

-

Trage Wegen vzw

-

March 1, 2016 - March 1, 2017

-

Bronze : 500 EUR or more

-

-

Gis3W

-

Jan. 1, 2016 - Jan. 1, 2017

-

Bronze : 500 EUR or more

-

-

SOLTIG (Soluciones en Tecnologías de Información Geográfica)

-

June 7, 2016 - June 7, 2017

-

Bronze : 500 EUR or more

-

-

Asociación Geoinnova

-

March 1, 2016 - March 1, 2017

-

Bronze : 500 EUR or more

-

-

BGEO Open GIS, SL

-

March 7, 2016 - March 7, 2017

-

Bronze : 500 EUR or more

-

-

KBB Underground Technologies GmbH

-

March 11, 2016 - March 11, 2017

-

Bronze : 500 EUR or more

-

-

Ager Technology

-

March 24, 2016 - March 24, 2017

-

Bronze : 500 EUR or more

-

-

National Parks UK

-

March 24, 2016 - March 24, 2017

-

Bronze : 500 EUR or more

-

-

QGIS user group Portugal

-

June 26, 2016 - June 26, 2017

-

Bronze : 500 EUR or more

-

-

Teaching Jobs with Footprints

-

April 1, 2016 - April 1, 2017

-

Bronze : 500 EUR or more

-

-

FORNAT AG

-

April 17, 2016 - April 17, 2017

-

Bronze : 500 EUR or more

-

-

GFI - Gesellschaft für Informationstechnologie mbH

-

April 15, 2016 - April 15, 2017

-

Bronze : 500 EUR or more

-

-

Royal Borough of Windsor and Maidenhead

-

April 1, 2016 - April 1, 2017

-

Bronze : 500 EUR or more

-

-

Cawdor Forestry

-

Feb. 3, 2016 - Feb. 3, 2017

-

Bronze : 500 EUR or more

-

-

GKG Kassel, (Dr.-Ing. Claas Leiner)

-

March 1, 2016 - March 1, 2017

-

Bronze : 500 EUR or more

-

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 3f2c2b7c4d1f..e375207d0549 100755 --- 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 index a811e5874a0b..fc30ef9c47f0 100644 --- 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 index e93e0b64bf1b..7b5ecf4bd0ac 100644 --- 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 deleted file mode 100644 index 3ccf0c9739a1..000000000000 --- a/src/app/qgssponsors.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/*************************************************************************** - qgssponsors.cpp - description - ------------------- - begin : Sat Aug 10 2002 - copyright : (C) 2002 by Gary E.Sherman - email : sherman at mrcc.com - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ - -#include "qgssponsors.h" -#include "qgsapplication.h" -#include -#include - -#ifdef Q_OS_MACX -QgsSponsors::QgsSponsors( QWidget *parent ) - : QDialog( parent, Qt::WindowSystemMenuHint ) // Modeless dialog with close button only -#else -QgsSponsors::QgsSponsors( QWidget * parent ) - : QDialog( parent ) // Normal dialog in non Mac-OS -#endif -{ - setupUi( this ); - init(); - QString intro = tr( "

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 labor of love by a dedicated team of developers. We want you to copy " - "& 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.

Please see the QGIS " - "Sponsorship Web Page for more details. In the Sponsors " - "page you can see the fine people and companies that are helping us " - "financially - a great big 'thank you' to you all!

" ); - txtSponsors->setText( intro ); - // read the SPONSORS file and populate the text widget - QFile sponsorsFile( QgsApplication::pkgDataPath() + QStringLiteral( "/doc/release-sponsors.html" ) ); - if ( sponsorsFile.open( QIODevice::ReadOnly ) ) - { - QString path = QStringLiteral( "images/" ); - QString newPath = QgsApplication::pkgDataPath() + QStringLiteral( "/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() -{ -} - -void QgsSponsors::init() -{ - // set the 60x60 icon pixmap - qgisIcon->setPixmap( QPixmap( QgsApplication::appIconPath() ) ); -} diff --git a/src/app/qgssponsors.h b/src/app/qgssponsors.h deleted file mode 100644 index f238c2fe10b9..000000000000 --- a/src/app/qgssponsors.h +++ /dev/null @@ -1,36 +0,0 @@ -/*************************************************************************** - qgssponsors.h - description - ------------------- - begin : Sat Aug 10 2002 - copyright : (C) 2002 by Gary E.Sherman - email : sherman at mrcc.com - ***************************************************************************/ - -/*************************************************************************** - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ***************************************************************************/ -#ifndef QGSSPONSORS_H -#define QGSSPONSORS_H - -#include "ui_qgssponsorsbase.h" -#include "qgis_app.h" - -class APP_EXPORT QgsSponsors : public QDialog, private Ui::QgsSponsorsBase -{ - Q_OBJECT - public: - QgsSponsors( QWidget *parent ); - ~QgsSponsors(); - - private: - void init(); - - private slots: -}; - -#endif diff --git a/src/ui/qgssponsorsbase.ui b/src/ui/qgssponsorsbase.ui deleted file mode 100644 index b84c0d83d697..000000000000 --- a/src/ui/qgssponsorsbase.ui +++ /dev/null @@ -1,106 +0,0 @@ - - - QgsSponsorsBase - - - - 0 - 0 - 640 - 453 - - - - QGIS Sponsors - - - - - - TextLabel - - - - - - - - 0 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - - - - - - - - - buttonBox - accepted() - QgsSponsorsBase - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - QgsSponsorsBase - reject() - - - 316 - 260 - - - 286 - 274 - - - - -