Skip to content

Commit 18c52ab

Browse files
committedDec 3, 2015
More default path fixes. Remove What's This? from toolbar
1 parent 3cbad7d commit 18c52ab

12 files changed

+18
-23
lines changed
 

‎src/app/composer/qgscomposer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3043,7 +3043,7 @@ void QgsComposer::on_mActionLoadFromTemplate_triggered()
30433043
void QgsComposer::loadTemplate( const bool newComposer )
30443044
{
30453045
QSettings settings;
3046-
QString openFileDir = settings.value( "UI/lastComposerTemplateDir", "" ).toString();
3046+
QString openFileDir = settings.value( "UI/lastComposerTemplateDir", QDir::homePath() ).toString();
30473047
QString openFileString = QFileDialog::getOpenFileName( 0, tr( "Load template" ), openFileDir, "*.qpt" );
30483048

30493049
if ( openFileString.isEmpty() )

‎src/app/qgisapp.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,11 +1906,6 @@ void QgisApp::createToolBars()
19061906
connect( tbAddCircularString, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );
19071907
mDigitizeToolBar->insertWidget( mActionMoveFeature, tbAddCircularString );
19081908

1909-
// Help Toolbar
1910-
QAction* actionWhatsThis = QWhatsThis::createAction( this );
1911-
actionWhatsThis->setIcon( QgsApplication::getThemeIcon( "/mActionWhatsThis.svg" ) );
1912-
mHelpToolBar->addAction( actionWhatsThis );
1913-
19141909
// Cad toolbar
19151910
mAdvancedDigitizeToolBar->insertAction( mActionUndo, mAdvancedDigitizingDockWidget->enableAction() );
19161911
}

‎src/app/qgsfieldsproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ QgsAttributeEditorElement* QgsFieldsProperties::createAttributeEditorWidget( QTr
808808
void QgsFieldsProperties::on_pbnSelectEditForm_clicked()
809809
{
810810
QSettings myQSettings;
811-
QString lastUsedDir = myQSettings.value( "style/lastUIDir", "." ).toString();
811+
QString lastUsedDir = myQSettings.value( "style/lastUIDir", QDir::homePath() ).toString();
812812
QString uifilename = QFileDialog::getOpenFileName( this, tr( "Select edit form" ), lastUsedDir, tr( "UI file" ) + " (*.ui)" );
813813

814814
if ( uifilename.isNull() )

‎src/app/qgsrasterlayerproperties.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,7 @@ void QgsRasterLayerProperties::adjustTransparencyCellWidth( int row, int column
12261226
void QgsRasterLayerProperties::on_pbnExportTransparentPixelValues_clicked()
12271227
{
12281228
QSettings myQSettings;
1229-
QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
1229+
QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", QDir::homePath() ).toString();
12301230
QString myFileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), myLastDir, tr( "Textfile" ) + " (*.txt)" );
12311231
if ( !myFileName.isEmpty() )
12321232
{
@@ -1391,7 +1391,7 @@ void QgsRasterLayerProperties::on_pbnImportTransparentPixelValues_clicked()
13911391
bool myImportError = false;
13921392
QString myBadLines;
13931393
QSettings myQSettings;
1394-
QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", "" ).toString();
1394+
QString myLastDir = myQSettings.value( "lastRasterFileFilterDir", QDir::homePath() ).toString();
13951395
QString myFileName = QFileDialog::getOpenFileName( this, tr( "Open file" ), myLastDir, tr( "Textfile" ) + " (*.txt)" );
13961396
QFile myInputFile( myFileName );
13971397
if ( myInputFile.open( QFile::ReadOnly ) )
@@ -1684,7 +1684,7 @@ void QgsRasterLayerProperties::saveDefaultStyle_clicked()
16841684
void QgsRasterLayerProperties::loadStyle_clicked()
16851685
{
16861686
QSettings settings;
1687-
QString lastUsedDir = settings.value( "style/lastStyleDir", "." ).toString();
1687+
QString lastUsedDir = settings.value( "style/lastStyleDir", QDir::homePath() ).toString();
16881688

16891689
QString fileName = QFileDialog::getOpenFileName(
16901690
this,
@@ -1715,7 +1715,7 @@ void QgsRasterLayerProperties::loadStyle_clicked()
17151715
void QgsRasterLayerProperties::saveStyleAs_clicked()
17161716
{
17171717
QSettings settings;
1718-
QString lastUsedDir = settings.value( "style/lastStyleDir", "." ).toString();
1718+
QString lastUsedDir = settings.value( "style/lastStyleDir", QDir::homePath() ).toString();
17191719

17201720
QString outputFileName = QFileDialog::getSaveFileName(
17211721
this,

‎src/app/qgssavestyletodbdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void QgsSaveStyleToDbDialog::accept()
6868
void QgsSaveStyleToDbDialog::on_mFilePickButton_clicked()
6969
{
7070
QSettings myQSettings; // where we keep last used filter in persistent state
71-
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", "." ).toString();
71+
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", QDir::homePath() ).toString();
7272

7373
QString myFileName = QFileDialog::getOpenFileName( this, tr( "Attach Qt Designer UI file" ), myLastUsedDir, tr( "Qt Designer UI file .ui" ) + " (*.ui)" );
7474
if ( myFileName.isNull() )

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ void QgsVectorLayerProperties::saveDefaultStyle_clicked()
814814
void QgsVectorLayerProperties::loadStyle_clicked()
815815
{
816816
QSettings myQSettings; // where we keep last used filter in persistent state
817-
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", "." ).toString();
817+
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", QDir::homePath() ).toString();
818818

819819
QString myFileName = QFileDialog::getOpenFileName( this, tr( "Load layer properties from style file" ), myLastUsedDir,
820820
tr( "QGIS Layer Style File" ) + " (*.qml);;" + tr( "SLD File" ) + " (*.sld)" );
@@ -875,7 +875,7 @@ void QgsVectorLayerProperties::saveStyleAsMenuTriggered( QAction *action )
875875
void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )
876876
{
877877
QSettings myQSettings; // where we keep last used filter in persistent state
878-
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", "." ).toString();
878+
QString myLastUsedDir = myQSettings.value( "style/lastStyleDir", QDir::homePath() ).toString();
879879

880880
QString format, extension;
881881
if ( styleType == DB )

‎src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ void QgsSingleBandPseudoColorRendererWidget::on_mLoadFromFileButton_clicked()
492492
void QgsSingleBandPseudoColorRendererWidget::on_mExportToFileButton_clicked()
493493
{
494494
QSettings settings;
495-
QString lastDir = settings.value( "lastRasterFileFilterDir", "" ).toString();
495+
QString lastDir = settings.value( "lastRasterFileFilterDir", QDir::homePath() ).toString();
496496
QString fileName = QFileDialog::getSaveFileName( this, tr( "Save file" ), lastDir, tr( "Textfile (*.txt)" ) );
497497
if ( !fileName.isEmpty() )
498498
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ int QgsCategorizedSymbolRendererV2Widget::matchToSymbols( QgsStyleV2* style )
964964
void QgsCategorizedSymbolRendererV2Widget::matchToSymbolsFromXml()
965965
{
966966
QSettings settings;
967-
QString openFileDir = settings.value( "UI/lastMatchToSymbolsDir", "" ).toString();
967+
QString openFileDir = settings.value( "UI/lastMatchToSymbolsDir", QDir::homePath() ).toString();
968968

969969
QString fileName = QFileDialog::getOpenFileName( this, tr( "Match to symbols from file" ), openFileDir,
970970
tr( "XML files (*.xml *XML)" ) );

‎src/plugins/evis/eventbrowser/evisconfiguration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ eVisConfiguration::eVisConfiguration()
4545
setAttributeCompassOffset( myQSettings.value( "/eVis/attributecompassoffset", false ).toBool() );
4646
setCompassOffsetField( myQSettings.value( "/eVis/compassoffsetfield", "" ).toString() );
4747

48-
setBasePath( myQSettings.value( "/eVis/basepath", "" ).toString() );
48+
setBasePath( myQSettings.value( "/eVis/basepath", QDir::homePath() ).toString() );
4949
mUseOnlyFilename = myQSettings.value( "/eVis/useonlyfilename", false ).toBool();
5050
}
5151

‎src/plugins/georeferencer/qgstransformsettingsdialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ void QgsTransformSettingsDialog::resetSettings()
137137
s.setValue( "/Plugin-GeoReferencer/user_specified_resx", 1.0 );
138138
s.setValue( "/Plugin-GeoReferencer/user_specified_resy", -1.0 );
139139
s.setValue( "/Plugin-GeoReferencer/word_file_checkbox", false );
140-
s.setValue( "/Plugin-GeoReferencer/lastPDFReportDir", "" );
140+
s.setValue( "/Plugin-GeoReferencer/lastPDFReportDir", QDir::homePath() );
141141
}
142142

143143
void QgsTransformSettingsDialog::changeEvent( QEvent *e )
@@ -218,7 +218,7 @@ void QgsTransformSettingsDialog::on_tbnOutputRaster_clicked()
218218
void QgsTransformSettingsDialog::on_tbnMapFile_clicked()
219219
{
220220
QSettings s;
221-
QString myLastUsedDir = s.value( "/Plugin-GeoReferencer/lastPDFReportDir", "" ).toString();
221+
QString myLastUsedDir = s.value( "/Plugin-GeoReferencer/lastPDFReportDir", QDir::homePath() ).toString();
222222
QString initialFile = !mMapFileLineEdit->text().isEmpty() ? mMapFileLineEdit->text() : myLastUsedDir;
223223
QString outputFileName = QFileDialog::getSaveFileName( this, tr( "Save Map File as" ), initialFile, tr( "PDF Format" ) + " (*.pdf *PDF)" );
224224
if ( !outputFileName.isNull() )
@@ -234,7 +234,7 @@ void QgsTransformSettingsDialog::on_tbnMapFile_clicked()
234234
void QgsTransformSettingsDialog::on_tbnReportFile_clicked()
235235
{
236236
QSettings s;
237-
QString myLastUsedDir = s.value( "/Plugin-GeoReferencer/lastPDFReportDir", "" ).toString();
237+
QString myLastUsedDir = s.value( "/Plugin-GeoReferencer/lastPDFReportDir", QDir::homePath() ).toString();
238238
QString initialFile = !mReportFileLineEdit->text().isEmpty() ? mReportFileLineEdit->text() : myLastUsedDir;
239239
QString outputFileName = QFileDialog::getSaveFileName( this, tr( "Save Report File as" ), initialFile, tr( "PDF Format" ) + " (*.pdf *PDF)" );
240240
if ( !outputFileName.isNull() )

‎src/plugins/gps_importer/qgsgpsplugin.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void QgsGPSPlugin::run()
166166
void QgsGPSPlugin::createGPX()
167167
{
168168
QSettings settings;
169-
QString dir = settings.value( "/Plugin-GPS/gpxdirectory", "." ).toString();
169+
QString dir = settings.value( "/Plugin-GPS/gpxdirectory", QDir::homePath() ).toString();
170170
QString fileName =
171171
QFileDialog::getSaveFileName( mQGisInterface->mainWindow(),
172172
tr( "Save new GPX file as..." ),
@@ -562,7 +562,7 @@ void QgsGPSPlugin::setupBabel()
562562
{
563563
// where is gpsbabel?
564564
QSettings settings;
565-
mBabelPath = settings.value( "/Plugin-GPS/gpsbabelpath", "" ).toString();
565+
mBabelPath = settings.value( "/Plugin-GPS/gpsbabelpath", QDir::homePath() ).toString();
566566
if ( mBabelPath.isEmpty() )
567567
mBabelPath = "gpsbabel";
568568
// the importable formats

‎src/plugins/heatmap/heatmapgui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ void HeatmapGui::on_mButtonBox_helpRequested()
241241
void HeatmapGui::on_mBrowseButton_clicked()
242242
{
243243
QSettings s;
244-
QString lastDir = s.value( "/Heatmap/lastOutputDir", "" ).toString();
244+
QString lastDir = s.value( "/Heatmap/lastOutputDir", QDir::homePath() ).toString();
245245

246246
QString outputFilename = QFileDialog::getSaveFileName( 0, tr( "Save Heatmap as:" ), lastDir );
247247
if ( !outputFilename.isEmpty() )

0 commit comments

Comments
 (0)
Please sign in to comment.