mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
**Updated whats new section for 0.0.14
**Added All Rasters filter to the add raster dialog **Fixed broken properties dialog for Database layers (temporary until datasourcebranch is merged) git-svn-id: http://svn.osgeo.org/qgis/trunk@418 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
469984032f
commit
29ebf8c39e
@ -235,12 +235,9 @@ void QgisApp::about()
|
|||||||
QString watsNew = "Version ";
|
QString watsNew = "Version ";
|
||||||
watsNew += QGis::qgisVersion;
|
watsNew += QGis::qgisVersion;
|
||||||
watsNew += "\n"
|
watsNew += "\n"
|
||||||
"** New build system (uses GNU Automake/Autoconf)\n"
|
"** Raster support\n"
|
||||||
"** Improvement to sorting in attribute table\n"
|
"** Improved data source handling\n"
|
||||||
"** Persistent selections (shapefiles only)\n"
|
"** Symbology\n"
|
||||||
"** Display order can be changed by dragging a layer to a new position in the legend\n"
|
|
||||||
"** Export QGIS view as a Mapserver map file\n"
|
|
||||||
"** Fix for crash on SuSE 9.0 when moving mouse in legend area\n"
|
|
||||||
"\n"
|
"\n"
|
||||||
;
|
;
|
||||||
|
|
||||||
@ -306,6 +303,7 @@ void QgisApp::addRasterLayer()
|
|||||||
QString myArcInfoAsciiGridFilterString="Arc Info Ascii Grid (*.asc;*.grd)";
|
QString myArcInfoAsciiGridFilterString="Arc Info Ascii Grid (*.asc;*.grd)";
|
||||||
QString myGeoTiffFilterString="Geo tiff (*.tif)";
|
QString myGeoTiffFilterString="Geo tiff (*.tif)";
|
||||||
QString myUsgsAsciiDemFilterString="USGS ASCII DEM (*.dem)";
|
QString myUsgsAsciiDemFilterString="USGS ASCII DEM (*.dem)";
|
||||||
|
QString myAllRasterFormats = "All Rasters (*.adf;*.asc;*.grd;*.tif;*.png;*.jpg;*.dem)";
|
||||||
//QString myBilFilterString="Band Interleaved by Line (*.bil)";
|
//QString myBilFilterString="Band Interleaved by Line (*.bil)";
|
||||||
//QString myJpgFilterString="Geo jpg (*.jpg)";
|
//QString myJpgFilterString="Geo jpg (*.jpg)";
|
||||||
QStringList myFileNameQStringList = QFileDialog::getOpenFileNames(
|
QStringList myFileNameQStringList = QFileDialog::getOpenFileNames(
|
||||||
@ -314,7 +312,8 @@ void QgisApp::addRasterLayer()
|
|||||||
//myBilFilterString + ";;" +
|
//myBilFilterString + ";;" +
|
||||||
//myJpgFilterString + ";;" +
|
//myJpgFilterString + ";;" +
|
||||||
myGeoTiffFilterString + ";;" +
|
myGeoTiffFilterString + ";;" +
|
||||||
myUsgsAsciiDemFilterString, //filters to select
|
myUsgsAsciiDemFilterString + ";;" +
|
||||||
|
myAllRasterFormats, //filters to select
|
||||||
"." , //initial dir
|
"." , //initial dir
|
||||||
this , //parent dialog
|
this , //parent dialog
|
||||||
"OpenFileDialog" , //QFileDialog qt object name
|
"OpenFileDialog" , //QFileDialog qt object name
|
||||||
@ -770,7 +769,7 @@ void QgisApp::layerProperties(QListViewItem * lvi)
|
|||||||
qApp->processEvents();
|
qApp->processEvents();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (lyr->type()==QgsMapLayer::VECTOR)
|
else if ((lyr->type()==QgsMapLayer::VECTOR) || (lyr->type()==QgsMapLayer::DATABASE))
|
||||||
{
|
{
|
||||||
QgsLayerProperties *lp = new QgsLayerProperties(lyr);
|
QgsLayerProperties *lp = new QgsLayerProperties(lyr);
|
||||||
if (lp->exec()) {
|
if (lp->exec()) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user