sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

** Changed some calls to QMessageBox::question() to QMessageBox::information()

Browse Source 
since Qt 3.1.2 doesn't have question()


git-svn-id: http://svn.osgeo.org/qgis/trunk@1532 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
larsl 2004-06-07 16:45:03 +00:00
parent ef89cc538a
commit 1cf87b6a0a
3 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,8 +1,12 @@
QGIS Change Log
ChangeLog,v 1.111 2004/06/07 08:43:53 timlinux Exp
ChangeLog,v 1.112 2004/06/07 16:45:02 larsl Exp
------------------------------------------------------------------------------
Version 0.3 'Madison' .... development version
2004-06-07 [larsl] 0.3.0devel16
** Changed some calls to QMessageBox::question() to QMessageBox::information()
since Qt 3.1.2 doesn't have question()
2004-06-07 [ts] 0.3.0devel15
** Implemented map overview using maplayers rather than snapshots of a raster layer.

4
configure.in
View File

@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl configure.in,v 1.114 2004/06/07 08:43:53 timlinux Exp
dnl configure.in,v 1.115 2004/06/07 16:45:02 larsl Exp
AC_INIT
@ -24,7 +24,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=3
MICRO_VERSION=0
EXTRA_VERSION=15
EXTRA_VERSION=16
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else

38
src/qgisapp.cpp
View File

@ -828,8 +828,11 @@ bool QgisApp::addLayer(QFileInfo const & vectorFile)
renderer->initializeSymbology(layer);
mMapCanvas->addLayer(layer);
#ifdef QGISDEBUG
if (!QMessageBox::question( this, tr("Add to overview"),tr("Would you like to add this layer to the overview map?"),
tr("&Yes"), tr("&No"),QString::null, 0, 1 ) )
if (QMessageBox::information( this, tr("Add to overview"),
tr("Would you like to add this layer to "
"the overview map?"),
QMessageBox::Yes, QMessageBox::No) ==
QMessageBox::Yes )
{
mOverviewCanvas->freeze(false);
mOverviewCanvas->addLayer(layer);
@ -946,8 +949,11 @@ bool QgisApp::addLayer(QStringList const &theLayerQStringList)
renderer->initializeSymbology(layer);
mMapCanvas->addLayer(layer);
#ifdef QGISDEBUG
if (!QMessageBox::question( this, tr("Add to overview"),tr("Would you like to add this layer to the overview map?"),
tr("&Yes"), tr("&No"),QString::null, 0, 1 ) )
if (QMessageBox::information( this, tr("Add to overview"),
tr("Would you like to add this layer to the "
"overview map?"),
QMessageBox::Yes, QMessageBox::No) ==
QMessageBox::Yes)
{
mOverviewCanvas->freeze(false);
mOverviewCanvas->addLayer(layer);
@ -1288,8 +1294,11 @@ bool QgisApp::addRasterLayer(QFileInfo const & rasterFile)
// add it to the mapcanvas collection
mMapCanvas->addLayer(layer);
#ifdef QGISDEBUG
if (!QMessageBox::question( this, tr("Add to overview"),tr("Would you like to add this layer to the overview map?"),
tr("&Yes"), tr("&No"),QString::null, 0, 1 ) )
if (QMessageBox::information( this, tr("Add to overview"),
tr("Would you like to add this layer to the "
"overview map?"),
QMessageBox::Yes, QMessageBox::No) ==
QMessageBox::Yes)
{
mOverviewCanvas->freeze(false);
mOverviewCanvas->addLayer(layer);
@ -1404,8 +1413,11 @@ bool QgisApp::addRasterLayer(QStringList const &theFileNameQStringList)
mMapCanvas->addLayer(layer);
#ifdef QGISDEBUG
if (!QMessageBox::question( this, tr("Add to overview"),tr("Would you like to add this layer to the overview map?"),
tr("&Yes"), tr("&No"),QString::null, 0, 1 ) )
if (QMessageBox::information( this, tr("Add to overview"),
tr("Would you like to add this layer to "
"the overview map?"),
QMessageBox::Yes, QMessageBox::No ) ==
QMessageBox::Yes)
{
mOverviewCanvas->freeze(false);
mOverviewCanvas->addLayer(layer);
@ -1580,8 +1592,9 @@ void QgisApp::addDatabaseLayer()
// add it to the mapcanvas collection
mMapCanvas->addLayer(layer);
#ifdef QGISDEBUG
if (!QMessageBox::question( this, tr("Add to overview"),tr("Would you like to add this layer to the overview map?"),
tr("&Yes"), tr("&No"),QString::null, 0, 1 ) )
if (QMessageBox::information( this, tr("Add to overview"),tr("Would you like to add this layer to the overview map?"),
QMessageBox::Yes, QMessageBox::No ) ==
QMessageBox::Yes)
{
mOverviewCanvas->freeze(false);
mOverviewCanvas->addLayer(layer);
@ -2805,8 +2818,9 @@ void QgisApp::addVectorLayer(QString vectorLayerPath, QString baseName, QString
// add it to the mapcanvas collection
mMapCanvas->addLayer(layer);
#ifdef QGISDEBUG
if (!QMessageBox::question( this, tr("Add to overview"),tr("Would you like to add this layer to the overview map?"),
tr("&Yes"), tr("&No"),QString::null, 0, 1 ) )
if (QMessageBox::information( this, tr("Add to overview"),tr("Would you like to add this layer to the overview map?"),
QMessageBox::Yes, QMessageBox::No ) ==
QMessageBox::Yes)
{
mOverviewCanvas->freeze(false);
mOverviewCanvas->addLayer(layer);