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

Fix for wrong title on the dialog for loading a raster layer (said OGR).

Browse Source 
This closes Bug 1151230


git-svn-id: http://svn.osgeo.org/qgis/trunk@3020 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2005-03-25 04:13:34 +00:00
parent 3048a770ec
commit 9d2b360a55
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/qgisapp.cpp
View File

@ -936,7 +936,8 @@ static void buildSupportedVectorFileFilter_(QString & fileFilters)
@param selectedFiles string list of selected files; will be empty @param selectedFiles string list of selected files; will be empty
if none selected if none selected
@param enc encoding?
@param title the title for the dialog
@note @note
Stores persistent settings under /qgis/UI/. The sub-keys will be Stores persistent settings under /qgis/UI/. The sub-keys will be
@ -947,7 +948,8 @@ static void buildSupportedVectorFileFilter_(QString & fileFilters)
with the current filter name. with the current filter name.
*/ */
static void openFilesRememberingFilter_(QString const &filterName, QString const &filters, QStringList & selectedFiles, QString& enc) static void openFilesRememberingFilter_(QString const &filterName,
QString const &filters, QStringList & selectedFiles, QString& enc, QString &title)
{ {
bool haveLastUsedFilter = false; // by default, there is no last bool haveLastUsedFilter = false; // by default, there is no last
@ -971,7 +973,7 @@ static void openFilesRememberingFilter_(QString const &filterName, QString const
// allow for selection of more than one file // allow for selection of more than one file
openFileDialog->setMode(QFileDialog::ExistingFiles); openFileDialog->setMode(QFileDialog::ExistingFiles);
openFileDialog->setCaption(QFileDialog::tr("Open an OGR Supported Data Source")); openFileDialog->setCaption(title);
if (haveLastUsedFilter) // set the filter to the last one used if (haveLastUsedFilter) // set the filter to the last one used
{ {
@ -1031,7 +1033,9 @@ void QgisApp::addLayer()
#endif #endif
QString enc; QString enc;
openFilesRememberingFilter_("lastVectorFileFilter", fileFilters, selectedFiles, enc); QString title = tr("Open an OGR Supported Vector Layer");
openFilesRememberingFilter_("lastVectorFileFilter", fileFilters, selectedFiles, enc,
title);
if (selectedFiles.isEmpty()) if (selectedFiles.isEmpty())
{ {
// no files were selected, so just bail // no files were selected, so just bail
@ -4044,8 +4048,9 @@ void QgisApp::addRasterLayer()
QStringList selectedFiles; QStringList selectedFiles;
QString e;//only for parameter correctness QString e;//only for parameter correctness
QString title = tr("Open a GDAL Supported Raster Data Source");
openFilesRememberingFilter_("lastRasterFileFilter", fileFilters, selectedFiles,e); openFilesRememberingFilter_("lastRasterFileFilter", fileFilters, selectedFiles,e,
title);
if (selectedFiles.isEmpty()) if (selectedFiles.isEmpty())
{ {