diff --git a/CMakeLists.txt b/CMakeLists.txt index 27522e080f8..7f6eb6803ca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -395,7 +395,7 @@ ENDIF (ENABLE_TESTS) ############################################################# # install stuff -INSTALL (FILES AUTHORS SPONSORS DONORS TRANSLATORS INSTALL CODING +INSTALL (FILES AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS INSTALL CODING DESTINATION ${QGIS_DATA_DIR}/doc) # manual page - makes sense only on unix systems diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5d622801e91..ead70569918 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,7 +1,9 @@ -The following people have submitted code, patches, graphics, comments, -feedback, reviews and/or many other things that have aided the development of -QGIS: - +# This file will be used to populate the contributors tab in the about dialog +# Lines prefixed with # will be ignored +# The following people have submitted code, patches, graphics, comments, +# feedback, reviews and/or many other things that have aided the development of +# QGIS: +# Arthur Nanni Baba Yoshihiko Brent Wood @@ -17,12 +19,10 @@ Hyao (IRC nickname) Ivan Lucena Jean-Denis Giguere Jerrit Collord -Jürgen E. Fischer Magnus Homann Markus Neteler Maurizio Napolitano Paul Ramsey -Peter Ersts Richard Kostecky Stefanie Tellex Tom Russo diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp index 61f1dd033c5..037e90ae114 100644 --- a/src/app/qgsabout.cpp +++ b/src/app/qgsabout.cpp @@ -55,53 +55,64 @@ void QgsAbout::init() QPixmap icon( QgsApplication::iconsPath() + "qgis-icon-60x60.png" ); qgisIcon->setPixmap( icon ); - //read the authors file to populate the contributors list + //read the authors file to populate the svn committers list QStringList lines; + // + // Load the authors (svn committers) list + // QFile file( QgsApplication::authorsFilePath() ); -#ifdef QGISDEBUG - printf( "Reading authors file %s.............................................\n", - file.fileName().toLocal8Bit().constData() ); -#endif if ( file.open( QIODevice::ReadOnly ) ) { QTextStream stream( &file ); // Always use UTF-8 stream.setCodec( "UTF-8" ); QString line; -#ifdef QGISDEBUG - int i = 1; -#endif - while ( !stream.atEnd() ) { line = stream.readLine(); // line of text excluding '\n' //ignore the line if it starts with a hash.... if ( line.left( 1 ) == "#" ) continue; -#ifdef QGISDEBUG - printf( "Contributor: %3d: %s\n", i++, line.toLocal8Bit().constData() ); -#endif QStringList myTokens = line.split( "\t", QString::SkipEmptyParts ); - //printf ("Added contributor name to listbox: %s ",myTokens[0]); lines += myTokens[0]; - - // add the image to the map - /* Uncomment this block to preload the images (takes time at initial startup) - QString authorName = myTokens[0].replace(" ","_"); - - QString myString =QString(appPath + "/images/developers/") + authorName + QString(".jpg"); - printf ("Loading mug: %s\n", myString.toLocal8Bit().constData()); - QPixmap *pixmap = new QPixmap(myString); - mugs[myTokens[0]] = *pixmap; - */ } file.close(); - listBox1->clear(); - listBox1->insertItems( 0, lines ); + lstDevelopers->clear(); + lstDevelopers->insertItems( 0, lines ); - // Load in the image for the first author - if ( listBox1->count() > 0 ) - listBox1->setCurrentRow( 0 ); + if ( lstDevelopers->count() > 0 ) + { + lstDevelopers->setCurrentRow( 0 ); + } + } + + lines.clear(); + // + // Now load up the contributors list + // + QFile file2( QgsApplication::contributorsFilePath() ); + printf( "Reading contributors file %s.............................................\n", + file2.fileName().toLocal8Bit().constData() ); + if ( file2.open( QIODevice::ReadOnly ) ) + { + QTextStream stream( &file2 ); + // Always use UTF-8 + stream.setCodec( "UTF-8" ); + QString line; + while ( !stream.atEnd() ) + { + line = stream.readLine(); // line of text excluding '\n' + //ignore the line if it starts with a hash.... + if ( line.left( 1 ) == "#" ) continue; + lines += line; + } + file2.close(); + lstContributors->clear(); + lstContributors->insertItems( 0, lines ); + if ( lstContributors->count() > 0 ) + { + lstContributors->setCurrentRow( 0 ); + } } @@ -294,9 +305,9 @@ void QgsAbout::setPluginInfo() myString += "\n\n"; QString myStyle = QgsApplication::reportStyleSheet(); - txtBrowserPlugins->clear(); - txtBrowserPlugins->document()->setDefaultStyleSheet( myStyle ); - txtBrowserPlugins->setText( myString ); + txtProviders->clear(); + txtProviders->document()->setDefaultStyleSheet( myStyle ); + txtProviders->setText( myString ); } void QgsAbout::on_buttonCancel_clicked() @@ -304,28 +315,6 @@ void QgsAbout::on_buttonCancel_clicked() reject(); } -void QgsAbout::on_listBox1_currentItemChanged( QListWidgetItem *theItem ) -{ - //replace spaces in author name -#ifdef QGISDEBUG - printf( "Loading mug: " ); -#endif - QString myString = listBox1->currentItem()->text(); - myString = myString.replace( " ", "_" ); - myString = QgsAbout::fileSystemSafe( myString ); -#ifdef QGISDEBUG - printf( "Loading mug: %s", myString.toLocal8Bit().constData() ); -#endif - myString = QgsApplication::developerPath() + myString + QString( ".jpg" ); -#ifdef QGISDEBUG - printf( "Loading mug: %s\n", myString.toLocal8Bit().constData() ); -#endif - - /* Uncomment this block to use preloaded images - pixAuthorMug->setPixmap(mugs[myString]); - */ -} - void QgsAbout::on_btnQgisUser_clicked() { // find a browser diff --git a/src/app/qgsabout.h b/src/app/qgsabout.h index d1f4d19bdd2..91af7801d28 100644 --- a/src/app/qgsabout.h +++ b/src/app/qgsabout.h @@ -37,7 +37,6 @@ class QgsAbout : public QDialog, private Ui::QgsAbout private slots: void on_buttonCancel_clicked(); - void on_listBox1_currentItemChanged( QListWidgetItem *theItem ); void on_btnQgisUser_clicked(); void on_btnQgisHome_clicked(); }; diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index 30f4ac8bf6c..c4f9253922d 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -161,6 +161,13 @@ const QString QgsApplication::authorsFilePath() { return mPkgDataPath + QString( "/doc/AUTHORS" ); } +/*! + Returns the path to the contributors file. +*/ +const QString QgsApplication::contributorsFilePath() +{ + return mPkgDataPath + QString( "/doc/CONTRIBUTORS" ); +} /*! Returns the path to the sponsors file. */ diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h index 2dca03c58fb..adf3c67e35b 100644 --- a/src/core/qgsapplication.h +++ b/src/core/qgsapplication.h @@ -54,6 +54,12 @@ class CORE_EXPORT QgsApplication: public QApplication //! Returns the path to the authors file. static const QString authorsFilePath(); + /** Returns the path to the contributors file. + * Contributors are people who have submitted patches + * but dont have svn write access. + * @note this function was added in version 1.3 */ + static const QString contributorsFilePath(); + /**Returns the path to the sponsors file. @note this function was added in version 1.2*/ static const QString sponsorsFilePath(); diff --git a/src/ui/qgsabout.ui b/src/ui/qgsabout.ui index fe7dfa972a0..e31d149cffc 100644 --- a/src/ui/qgsabout.ui +++ b/src/ui/qgsabout.ui @@ -1,84 +1,83 @@ - - + QgsAbout - - + + 0 0 - 529 - 375 + 753 + 416 - + About Quantum GIS - + true - - - - + + + + 0 - - + + About - - - + + + - - + + 60 60 - - :/images/icons/qgis-icon-60x60.png + + :/images/icons/qgis-icon-60x60.png - + false - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Quantum GIS (QGIS)</span></p></body></html> +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Quantum GIS (QGIS)</span></p></body></html> - + Qt::AlignCenter - - - + + + Version - + Qt::AlignCenter - + true - + - + Qt::Vertical - + 20 21 @@ -86,35 +85,35 @@ p, li { white-space: pre-wrap; } - - - + + + Quantum GIS is licensed under the GNU General Public License - + Qt::AlignCenter - + true - - - + + + http://www.gnu.org/licenses - + Qt::AlignCenter - + - + Qt::Vertical - + 20 40 @@ -122,24 +121,24 @@ p, li { white-space: pre-wrap; } - - + + - - + + QGIS Home Page - + false - - + + Join our user mailing list - + false @@ -148,156 +147,161 @@ p, li { white-space: pre-wrap; } - - + + What's New - - - - + + + + Qt::NoFocus - + false - + 2 - + true - - - Developers - - - - - - true - - - - - - - + + Providers - - - + + + - - - Sponsors + + + Developers - - - - - Sponsors + + + + + true - - - - - true - - - true - - - - - - - - - - Donors + + true - - - - - true - - - true - - - - - - + + + Contributors + + + + + 0 + 0 + 713 + 314 + + + + true + + + + + Translators - - - + + + + + + + + + Sponsors + + + + + + true + + + true + + + + + + + + Donors + + + + + + true + + + true + + - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 0 - - - - - - - - Ok - - - - - - true - - - - + + + + QDialogButtonBox::Close + + - + tabWidget - btnQgisUser btnQgisHome - buttonCancel - txtBrowserPlugins - listBox1 + btnQgisUser + txtProviders + lstDevelopers + txtSponsors + txtTranslators + buttonBox + txtDonors + lstContributors - + - + + + buttonBox + clicked(QAbstractButton*) + QgsAbout + accept() + + + 719 + 386 + + + 674 + 414 + + + +