From 21e8357a46349adb051498738c3bcfb439ac7798 Mon Sep 17 00:00:00 2001 From: gsherman Date: Sun, 18 Aug 2002 16:17:21 +0000 Subject: [PATCH] render fix git-svn-id: http://svn.osgeo.org/qgis/trunk@106 c8812cc2-4d05-0410-92ff-de0c093fc19c --- src/qgis.h | 2 +- src/qgis.kdevprj | 8 +++++++- src/qgisapp.cpp | 7 +++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/qgis.h b/src/qgis.h index 431e44932b5..ef2bb982370 100644 --- a/src/qgis.h +++ b/src/qgis.h @@ -17,6 +17,6 @@ enum WKBTYPE{ WKBMultiLineString, WKBMultiPolygon }; -static const char *qgisVersion = "0.0.4-alpha"; +static const char *qgisVersion = "0.0.5-alpha"; } #endif diff --git a/src/qgis.kdevprj b/src/qgis.kdevprj index 80a24aaa4e1..5d79f9ed380 100644 --- a/src/qgis.kdevprj +++ b/src/qgis.kdevprj @@ -36,7 +36,7 @@ User Interface=*.kdevdlg,*.ui,*.rc,*.dlg groups=Headers,Sources,User Interface,Others [Makefile.am] -files=main.cpp,qgisapp.cpp,qgscoordinatetransform.cpp,qgsdatabaselayer.cpp,qgsdatasource.cpp,qgsdbsourceselect.cpp,qgsmapcanvas.cpp,qgsmaplayer.cpp,qgsnewconnection.cpp,qgspoint.cpp,qgsrasterlayer.cpp,qgsrect.cpp,qgisapp.h,qgscoordinatetransform.h,qgsdatabaselayer.h,qgsdatasource.h,qgsdbsourceselect.h,qgslinesymbol.h,qgsmapcanvas.h,qgsmaplayer.h,qgsmarkersymbol.h,qgsnewconnection.h,qgspoint.h,qgspolygonsymbol.h,qgsrasterlayer.h,qgsrect.h,qgsshapefilelayer.h,qgisappbase.ui,qgsdbsourceselectbase.ui,qgsnewconnectionbase.ui,qgscustomsymbol.cpp,qgscustomsymbol.h,qgslegend.h,qgslegend.cpp,qgslegenditem.cpp,qgslegenditem.h,qgssymbol.h,qgstable.h,qgsshapefilelayer.cpp,qgslegenditembase.h,qgsabout.ui,qgsabout.ui.h,QgsSymbol.cpp,qgsmarkersymbol.cpp,qgslinesymbol.cpp,qgspolygonsymbol.cpp,qgslayerproperties.cpp,qgslayerproperties.h +files=main.cpp,qgisapp.cpp,qgscoordinatetransform.cpp,qgsdatabaselayer.cpp,qgsdatasource.cpp,qgsdbsourceselect.cpp,qgsmapcanvas.cpp,qgsmaplayer.cpp,qgsnewconnection.cpp,qgspoint.cpp,qgsrasterlayer.cpp,qgsrect.cpp,qgisapp.h,qgscoordinatetransform.h,qgsdatabaselayer.h,qgsdatasource.h,qgsdbsourceselect.h,qgslinesymbol.h,qgsmapcanvas.h,qgsmaplayer.h,qgsmarkersymbol.h,qgsnewconnection.h,qgspoint.h,qgspolygonsymbol.h,qgsrasterlayer.h,qgsrect.h,qgsshapefilelayer.h,qgisappbase.ui,qgsdbsourceselectbase.ui,qgsnewconnectionbase.ui,qgscustomsymbol.cpp,qgscustomsymbol.h,qgslegend.h,qgslegend.cpp,qgslegenditem.cpp,qgslegenditem.h,qgssymbol.h,qgstable.h,qgsshapefilelayer.cpp,qgslegenditembase.h,qgsabout.ui,qgsabout.ui.h,QgsSymbol.cpp,qgsmarkersymbol.cpp,qgslinesymbol.cpp,qgspolygonsymbol.cpp,qgslayerproperties.cpp,qgslayerproperties.h,qgis.h sharedlib_LDFLAGS=-version-info 0:0:0 sharedlib_rootname=src sub_dirs= @@ -62,6 +62,12 @@ install=false install_location= type=SOURCE +[qgis.h] +dist=true +install=false +install_location= +type=HEADER + [qgis.kdevprj] dist=true install=false diff --git a/src/qgisapp.cpp b/src/qgisapp.cpp index 62bce251679..cb5708c9ed4 100644 --- a/src/qgisapp.cpp +++ b/src/qgisapp.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -130,6 +131,7 @@ void QgisApp::addLayer() mapCanvas->freeze(); QStringList files = QFileDialog::getOpenFileNames("Shapefiles (*.shp);;All files (*.*)", 0, this, "open files dialog", "Select one or more layers to add"); + QApplication::setOverrideCursor( Qt::WaitCursor ); QStringList::Iterator it = files.begin(); while (it != files.end()) { @@ -163,6 +165,7 @@ void QgisApp::addLayer() qApp->processEvents(); mapCanvas->freeze(false); mapCanvas->render2(); + QApplication::restoreOverrideCursor(); statusBar()->message(mapCanvas->extent().stringRep()); @@ -178,6 +181,9 @@ void QgisApp::addDatabaseLayer() QgsDbSourceSelect *dbs = new QgsDbSourceSelect(); mapCanvas->freeze(); if (dbs->exec()) { + QApplication::setOverrideCursor( Qt::WaitCursor ); + + // repaint the canvas if it was covered by the dialog // add files to the map canvas @@ -212,6 +218,7 @@ void QgisApp::addDatabaseLayer() mapCanvas->freeze(false); mapCanvas->render2(); + QApplication::restoreOverrideCursor(); }