Skip to content

Commit aeafe3c

Browse files
NathanW2NathanW2
committedDec 3, 2015
Fix lots of bad default base folders. Now point to user home
1 parent 0610878 commit aeafe3c

20 files changed

+30
-30
lines changed
 

‎src/app/composer/qgscomposer.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,7 +1655,7 @@ void QgsComposer::exportCompositionAsPDF( QgsComposer::OutputMode mode )
16551655
}
16561656

16571657
QSettings myQSettings;
1658-
QString lastUsedDir = myQSettings.value( "/UI/lastSaveAtlasAsPdfDir", "." ).toString();
1658+
QString lastUsedDir = myQSettings.value( "/UI/lastSaveAtlasAsPdfDir", QDir::homePath() ).toString();
16591659
outputDir = QFileDialog::getExistingDirectory( this,
16601660
tr( "Export atlas to directory" ),
16611661
lastUsedDir,
@@ -1995,7 +1995,7 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
19951995

19961996
if ( atlasMap->enabled() && mComposition->atlasMode() == QgsComposition::PreviewAtlas )
19971997
{
1998-
QString lastUsedDir = settings.value( "/UI/lastSaveAsImageDir", "." ).toString();
1998+
QString lastUsedDir = settings.value( "/UI/lastSaveAsImageDir", QDir::homePath() ).toString();
19991999
outputFileName = QDir( lastUsedDir ).filePath( atlasMap->currentFilename() );
20002000
}
20012001

@@ -2141,7 +2141,7 @@ void QgsComposer::exportCompositionAsImage( QgsComposer::OutputMode mode )
21412141
}
21422142

21432143
QSettings myQSettings;
2144-
QString lastUsedDir = myQSettings.value( "/UI/lastSaveAtlasAsImagesDir", "." ).toString();
2144+
QString lastUsedDir = myQSettings.value( "/UI/lastSaveAtlasAsImagesDir", QDir::homePath() ).toString();
21452145
QString lastUsedFormat = myQSettings.value( "/UI/lastSaveAtlasAsImagesFormat", "jpg" ).toString();
21462146

21472147
QFileDialog dlg( this, tr( "Export atlas to directory" ) );
@@ -2498,7 +2498,7 @@ void QgsComposer::exportCompositionAsSVG( QgsComposer::OutputMode mode )
24982498
}
24992499

25002500
QSettings myQSettings;
2501-
QString lastUsedDir = myQSettings.value( "/UI/lastSaveAtlasAsSvgDir", "." ).toString();
2501+
QString lastUsedDir = myQSettings.value( "/UI/lastSaveAtlasAsSvgDir", QDir::homePath() ).toString();
25022502

25032503
// open file dialog
25042504
outputDir = QFileDialog::getExistingDirectory( this,

‎src/app/composer/qgscomposerarrowwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ void QgsComposerArrowWidget::on_mStartMarkerToolButton_clicked()
261261

262262
if ( openDir.isEmpty() )
263263
{
264-
openDir = s.value( "/UI/lastComposerMarkerDir", "" ).toString();
264+
openDir = s.value( "/UI/lastComposerMarkerDir", QDir::homePath() ).toString();
265265
}
266266

267267
QString svgFileName = QFileDialog::getOpenFileName( this, tr( "Start marker svg file" ), openDir );
@@ -288,7 +288,7 @@ void QgsComposerArrowWidget::on_mEndMarkerToolButton_clicked()
288288

289289
if ( openDir.isEmpty() )
290290
{
291-
openDir = s.value( "/UI/lastComposerMarkerDir", "" ).toString();
291+
openDir = s.value( "/UI/lastComposerMarkerDir", QDir::homePath() ).toString();
292292
}
293293

294294
QString svgFileName = QFileDialog::getOpenFileName( this, tr( "End marker svg file" ), openDir );

‎src/app/composer/qgscomposerhtmlwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void QgsComposerHtmlWidget::on_mUrlLineEdit_editingFinished()
133133
void QgsComposerHtmlWidget::on_mFileToolButton_clicked()
134134
{
135135
QSettings s;
136-
QString lastDir = s.value( "/UI/lastHtmlDir", "" ).toString();
136+
QString lastDir = s.value( "/UI/lastHtmlDir", QDir::homePath() ).toString();
137137
QString file = QFileDialog::getOpenFileName( this, tr( "Select HTML document" ), lastDir, "HTML (*.html *.htm);;All files (*.*)" );
138138
if ( !file.isEmpty() )
139139
{

‎src/app/composer/qgscomposermanager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ void QgsComposerManager::on_mTemplate_currentIndexChanged( int indx )
324324
void QgsComposerManager::on_mTemplatePathBtn_pressed()
325325
{
326326
QSettings settings;
327-
QString lastTmplDir = settings.value( "/UI/lastComposerTemplateDir", "." ).toString();
327+
QString lastTmplDir = settings.value( "/UI/lastComposerTemplateDir", QDir::homePath() ).toString();
328328
QString tmplPath = QFileDialog::getOpenFileName( this,
329329
tr( "Choose template" ),
330330
lastTmplDir,

‎src/app/composer/qgscomposerpicturewidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void QgsComposerPictureWidget::on_mPictureBrowseButton_clicked()
8686

8787
if ( openDir.isEmpty() )
8888
{
89-
openDir = s.value( "/UI/lastComposerPictureDir", "" ).toString();
89+
openDir = s.value( "/UI/lastComposerPictureDir", QDir::homePath() ).toString();
9090
}
9191

9292
//show file dialog

‎src/app/ogr/qgsopenvectorlayerdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ QString QgsOpenVectorLayerDialog::openDirectory()
115115
QSettings settings;
116116

117117
bool haveLastUsedDir = settings.contains( "/UI/LastUsedDirectory" );
118-
QString lastUsedDir = settings.value( "/UI/LastUsedDirectory", QVariant() ).toString();
118+
QString lastUsedDir = settings.value( "/UI/LastUsedDirectory", QDir::homePath() ).toString();
119119
if ( !haveLastUsedDir )
120120
lastUsedDir = "";
121121

‎src/app/ogr/qgsvectorlayersaveasdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ void QgsVectorLayerSaveAsDialog::on_leFilename_textChanged( const QString& text
291291
void QgsVectorLayerSaveAsDialog::on_browseFilename_clicked()
292292
{
293293
QSettings settings;
294-
QString dirName = leFilename->text().isEmpty() ? settings.value( "/UI/lastVectorFileFilterDir", "." ).toString() : leFilename->text();
294+
QString dirName = leFilename->text().isEmpty() ? settings.value( "/UI/lastVectorFileFilterDir", QDir::homePath() ).toString() : leFilename->text();
295295
QString filterString = QgsVectorFileWriter::filterForDriver( format() );
296296
QString outputFile = QFileDialog::getSaveFileName( 0, tr( "Save layer as..." ), dirName, filterString );
297297
if ( !outputFile.isNull() )

‎src/app/qgsalignrasterdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ void QgsAlignRasterLayerConfigDialog::setItem( const QString& inputFilename, con
436436
void QgsAlignRasterLayerConfigDialog::browseOutputFilename()
437437
{
438438
QSettings settings;
439-
QString dirName = editOutput->text().isEmpty() ? settings.value( "/UI/lastRasterFileDir", "." ).toString() : editOutput->text();
439+
QString dirName = editOutput->text().isEmpty() ? settings.value( "/UI/lastRasterFileDir", QDir::homePath() ).toString() : editOutput->text();
440440

441441
QString fileName = QFileDialog::getSaveFileName( this, tr( "Select output file" ), dirName, tr( "GeoTIFF" ) + " (*.tif *.tiff *.TIF *.TIFF)" );
442442

‎src/app/qgsoptions.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ void QgsOptions::on_mProjectOnLaunchPushBtn_pressed()
968968
{
969969
// Retrieve last used project dir from persistent settings
970970
QSettings settings;
971-
QString lastUsedDir = settings.value( "/UI/lastProjectDir", "." ).toString();
971+
QString lastUsedDir = settings.value( "/UI/lastProjectDir", QDir::homePath() ).toString();
972972
QString projPath = QFileDialog::getOpenFileName( this,
973973
tr( "Choose project file to open at launch" ),
974974
lastUsedDir,
@@ -2078,7 +2078,7 @@ void QgsOptions::on_mButtonAddColor_clicked()
20782078
void QgsOptions::on_mButtonImportColors_clicked()
20792079
{
20802080
QSettings s;
2081-
QString lastDir = s.value( "/UI/lastGplPaletteDir", "" ).toString();
2081+
QString lastDir = s.value( "/UI/lastGplPaletteDir", QDir::homePath() ).toString();
20822082
QString filePath = QFileDialog::getOpenFileName( this, tr( "Select palette file" ), lastDir, "GPL (*.gpl);;All files (*.*)" );
20832083
activateWindow();
20842084
if ( filePath.isEmpty() )
@@ -2107,7 +2107,7 @@ void QgsOptions::on_mButtonImportColors_clicked()
21072107
void QgsOptions::on_mButtonExportColors_clicked()
21082108
{
21092109
QSettings s;
2110-
QString lastDir = s.value( "/UI/lastGplPaletteDir", "" ).toString();
2110+
QString lastDir = s.value( "/UI/lastGplPaletteDir", QDir::homePath() ).toString();
21112111
QString fileName = QFileDialog::getSaveFileName( this, tr( "Palette file" ), lastDir, "GPL (*.gpl)" );
21122112
activateWindow();
21132113
if ( fileName.isEmpty() )

‎src/app/qgsprojectproperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1769,7 +1769,7 @@ void QgsProjectProperties::on_mButtonAddColor_clicked()
17691769
void QgsProjectProperties::on_mButtonImportColors_clicked()
17701770
{
17711771
QSettings s;
1772-
QString lastDir = s.value( "/UI/lastGplPaletteDir", "" ).toString();
1772+
QString lastDir = s.value( "/UI/lastGplPaletteDir", QDir::homePath() ).toString();
17731773
QString filePath = QFileDialog::getOpenFileName( this, tr( "Select palette file" ), lastDir, "GPL (*.gpl);;All files (*.*)" );
17741774
activateWindow();
17751775
if ( filePath.isEmpty() )
@@ -1798,7 +1798,7 @@ void QgsProjectProperties::on_mButtonImportColors_clicked()
17981798
void QgsProjectProperties::on_mButtonExportColors_clicked()
17991799
{
18001800
QSettings s;
1801-
QString lastDir = s.value( "/UI/lastGplPaletteDir", "" ).toString();
1801+
QString lastDir = s.value( "/UI/lastGplPaletteDir", QDir::homePath() ).toString();
18021802
QString fileName = QFileDialog::getSaveFileName( this, tr( "Palette file" ), lastDir, "GPL (*.gpl)" );
18031803
activateWindow();
18041804
if ( fileName.isEmpty() )

‎src/gui/qgisgui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ namespace QgisGui
105105
#endif
106106

107107
QSettings settings; // where we keep last used filter in persistent state
108-
QString lastUsedDir = settings.value( "/UI/lastSaveAsImageDir", "." ).toString();
108+
QString lastUsedDir = settings.value( "/UI/lastSaveAsImageDir", QDir::homePath() ).toString();
109109

110110
// Prefer "png" format unless the user previously chose a different format
111111
QString pngExtension = "png";

‎src/gui/qgscolordialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ void QgsColorDialogV2::on_mButtonBox_clicked( QAbstractButton * button )
379379
void QgsColorDialogV2::importColors()
380380
{
381381
QSettings s;
382-
QString lastDir = s.value( "/UI/lastGplPaletteDir", "" ).toString();
382+
QString lastDir = s.value( "/UI/lastGplPaletteDir", QDir::homePath() ).toString();
383383
QString filePath = QFileDialog::getOpenFileName( this, tr( "Select palette file" ), lastDir, "GPL (*.gpl);;All files (*.*)" );
384384
activateWindow();
385385
if ( filePath.isEmpty() )
@@ -421,7 +421,7 @@ void QgsColorDialogV2::refreshSchemeComboBox()
421421
void QgsColorDialogV2::importPalette()
422422
{
423423
QSettings s;
424-
QString lastDir = s.value( "/UI/lastGplPaletteDir", "" ).toString();
424+
QString lastDir = s.value( "/UI/lastGplPaletteDir", QDir::homePath() ).toString();
425425
QString filePath = QFileDialog::getOpenFileName( this, tr( "Select palette file" ), lastDir, "GPL (*.gpl);;All files (*.*)" );
426426
activateWindow();
427427
if ( filePath.isEmpty() )
@@ -563,7 +563,7 @@ QString QgsColorDialogV2::gplFilePath()
563563
void QgsColorDialogV2::exportColors()
564564
{
565565
QSettings s;
566-
QString lastDir = s.value( "/UI/lastGplPaletteDir", "" ).toString();
566+
QString lastDir = s.value( "/UI/lastGplPaletteDir", QDir::homePath() ).toString();
567567
QString fileName = QFileDialog::getSaveFileName( this, tr( "Palette file" ), lastDir, "GPL (*.gpl)" );
568568
activateWindow();
569569
if ( fileName.isEmpty() )

‎src/gui/qgsnewvectorlayerdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ QString QgsNewVectorLayerDialog::runAndCreateLayer( QWidget* parent, QString* pE
244244
geomDialog.attributes( attributes );
245245

246246
QSettings settings;
247-
QString lastUsedDir = settings.value( "/UI/lastVectorFileFilterDir", "." ).toString();
247+
QString lastUsedDir = settings.value( "/UI/lastVectorFileFilterDir", QDir::homePath() ).toString();
248248
QString filterString = QgsVectorFileWriter::filterForDriver( fileformat );
249249
QString fileName = QFileDialog::getSaveFileName( 0, tr( "Save layer as..." ), lastUsedDir, filterString );
250250
if ( fileName.isNull() )

‎src/gui/qgsrasterlayersaveasdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void QgsRasterLayerSaveAsDialog::on_mBrowseButton_clicked()
157157
QString fileName;
158158

159159
QSettings settings;
160-
QString dirName = mSaveAsLineEdit->text().isEmpty() ? settings.value( "/UI/lastRasterFileDir", "." ).toString() : mSaveAsLineEdit->text();
160+
QString dirName = mSaveAsLineEdit->text().isEmpty() ? settings.value( "/UI/lastRasterFileDir", QDir::homePath() ).toString() : mSaveAsLineEdit->text();
161161

162162
if ( mTileModeCheckBox->isChecked() )
163163
{

‎src/gui/qgssearchquerybuilder.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ void QgsSearchQueryBuilder::on_btnILike_clicked()
365365
void QgsSearchQueryBuilder::saveQuery()
366366
{
367367
QSettings s;
368-
QString lastQueryFileDir = s.value( "/UI/lastQueryFileDir", "" ).toString();
368+
QString lastQueryFileDir = s.value( "/UI/lastQueryFileDir", QDir::homePath() ).toString();
369369
//save as qqt (QGIS query file)
370370
QString saveFileName = QFileDialog::getSaveFileName( 0, tr( "Save query to file" ), lastQueryFileDir, "*.qqf" );
371371
if ( saveFileName.isNull() )
@@ -401,7 +401,7 @@ void QgsSearchQueryBuilder::saveQuery()
401401
void QgsSearchQueryBuilder::loadQuery()
402402
{
403403
QSettings s;
404-
QString lastQueryFileDir = s.value( "/UI/lastQueryFileDir", "" ).toString();
404+
QString lastQueryFileDir = s.value( "/UI/lastQueryFileDir", QDir::homePath() ).toString();
405405

406406
QString queryFileName = QFileDialog::getOpenFileName( 0, tr( "Load query from file" ), lastQueryFileDir, tr( "Query files" ) + " (*.qqf);;" + tr( "All files" ) + " (*)" );
407407
if ( queryFileName.isNull() )

‎src/gui/symbology-ng/qgssvgselectorwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ void QgsSvgSelectorWidget::populateIcons( const QModelIndex& idx )
255255
void QgsSvgSelectorWidget::on_mFilePushButton_clicked()
256256
{
257257
QSettings settings;
258-
QString openDir = settings.value( "/UI/lastSVGMarkerDir", "." ).toString();
258+
QString openDir = settings.value( "/UI/lastSVGMarkerDir", QDir::homePath() ).toString();
259259

260260
QString lineEditText = mFileLineEdit->text();
261261
if ( !lineEditText.isEmpty() )

‎src/gui/symbology-ng/qgssymbollayerv2widget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2895,7 +2895,7 @@ void QgsRasterFillSymbolLayerWidget::on_mBrowseToolButton_clicked()
28952895

28962896
if ( openDir.isEmpty() )
28972897
{
2898-
openDir = s.value( "/UI/lastRasterFillImageDir", "" ).toString();
2898+
openDir = s.value( "/UI/lastRasterFillImageDir", QDir::homePath() ).toString();
28992899
}
29002900

29012901
//show file dialog

‎src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ void dxf2shpConverterGui::getOutputDir()
158158
QSettings settings;
159159
QString s = QFileDialog::getSaveFileName( this,
160160
tr( "Choose a file name to save to" ),
161-
settings.value( "/UI/lastShapefileDir", "./" ).toString(),
161+
settings.value( "/UI/lastShapefileDir", QDir::homePath() ).toString(),
162162
tr( "Shapefile" ) + " (*.shp)" );
163163

164164
if ( !s.isEmpty() )

‎src/providers/spatialite/qgsspatialitedataitems.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ QGISEXTERN bool createDb( const QString& dbPath, QString& errCause );
317317
void QgsSLRootItem::createDatabase()
318318
{
319319
QSettings settings;
320-
QString lastUsedDir = settings.value( "/UI/lastSpatiaLiteDir", "." ).toString();
320+
QString lastUsedDir = settings.value( "/UI/lastSpatiaLiteDir", QDir::homePath() ).toString();
321321

322322
QString filename = QFileDialog::getSaveFileName( 0, tr( "New SpatiaLite Database File" ),
323323
lastUsedDir,

‎src/providers/spatialite/qgsspatialitesourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ bool QgsSpatiaLiteSourceSelect::newConnection( QWidget* parent )
269269
{
270270
// Retrieve last used project dir from persistent settings
271271
QSettings settings;
272-
QString lastUsedDir = settings.value( "/UI/lastSpatiaLiteDir", "." ).toString();
272+
QString lastUsedDir = settings.value( "/UI/lastSpatiaLiteDir", QDir::homePath() ).toString();
273273

274274
QString myFile = QFileDialog::getOpenFileName( parent,
275275
tr( "Choose a SpatiaLite/SQLite DB to open" ),

0 commit comments

Comments
 (0)